From f955db0b0ae8e83be6dd8b3bae32980c20083671 Mon Sep 17 00:00:00 2001 From: dbnt-design Date: Wed, 8 Nov 2023 11:37:59 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EA=B1=B4=EC=84=A4=EA=B8=B0=EC=A4=80?= =?UTF-8?q?=EC=BD=94=EB=93=9C=EB=A6=AC=EC=8A=A4=ED=8A=B8=EC=BD=94=EB=93=9C?= =?UTF-8?q?=EB=B3=84=EB=A6=AC=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dbnt/kcscbackend/standardCode/StandardCodeController.java | 2 +- .../dbnt/kcscbackend/standardCode/entity/TnDocumentInfo.java | 2 ++ .../kcscbackend/standardCode/mapper/StandardCodeMapper.java | 2 +- .../kcscbackend/standardCode/service/StandardCodeService.java | 4 ++-- .../src/main/resources/mybatisMapper/StandardCodeMapper.xml | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/StandardCodeController.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/StandardCodeController.java index 136c339..b711a1b 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/StandardCodeController.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/StandardCodeController.java @@ -119,7 +119,7 @@ public class StandardCodeController extends BaseController { tnDocumentInfo.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); Map resultMap = new HashMap<>(); - resultMap.put("resultList", standardCodeService.selectStandardcodlist(tnDocumentInfo.getListCode())); + resultMap.put("resultList", standardCodeService.selectStandardcodelist(tnDocumentInfo.getListCode())); resultMap.put("resultCnt", standardCodeService.selectStandardCodeListCnt(tnDocumentInfo)); Integer totCnt = (Integer) resultMap.get("resultCnt"); paginationInfo.setTotalRecordCount(totCnt); diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/entity/TnDocumentInfo.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/entity/TnDocumentInfo.java index a6d3da8..de220d3 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/entity/TnDocumentInfo.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/entity/TnDocumentInfo.java @@ -87,6 +87,8 @@ public class TnDocumentInfo { @Column(name = "old_seq") private Integer oldSeq; + + @Schema(description = "현재페이지") private int pageIndex = 1; @Schema(description = "페이지갯수") diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/mapper/StandardCodeMapper.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/mapper/StandardCodeMapper.java index f388e42..8e257d9 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/mapper/StandardCodeMapper.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/mapper/StandardCodeMapper.java @@ -16,5 +16,5 @@ public interface StandardCodeMapper { List selectStandardCodeRevisionhistoryList(Integer groupseq); - List selectStandardcodlist(String code); + List selectStandardcodelist(String code); } diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/service/StandardCodeService.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/service/StandardCodeService.java index db39d12..3621a53 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/service/StandardCodeService.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/service/StandardCodeService.java @@ -39,7 +39,7 @@ public class StandardCodeService { return standardCodeMapper.selectStandardCodeRevisionhistoryList(groupseq); } - public List selectStandardcodlist(String code){ - return standardCodeMapper.selectStandardcodlist(code); + public List selectStandardcodelist(String code){ + return standardCodeMapper.selectStandardcodelist(code); } } diff --git a/kcsc-back-end/src/main/resources/mybatisMapper/StandardCodeMapper.xml b/kcsc-back-end/src/main/resources/mybatisMapper/StandardCodeMapper.xml index 8dc264e..d69e018 100644 --- a/kcsc-back-end/src/main/resources/mybatisMapper/StandardCodeMapper.xml +++ b/kcsc-back-end/src/main/resources/mybatisMapper/StandardCodeMapper.xml @@ -71,7 +71,7 @@ and tdi.use_yn = 'Y' order by tdi.kcsc_cd; - select case when a3.doc_level > 1 then a3.doc_code_name From da4fc0eaa4c2c7b259f7889b5bd521d8de585ac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Wed, 8 Nov 2023 13:53:23 +0900 Subject: [PATCH 2/3] =?UTF-8?q?gradle=20=EC=84=A4=EC=A0=95=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gradle/wrapper/gradle-wrapper.properties | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/kcsc-back-end/gradle/wrapper/gradle-wrapper.properties b/kcsc-back-end/gradle/wrapper/gradle-wrapper.properties index ac72c34..a371fc3 100644 --- a/kcsc-back-end/gradle/wrapper/gradle-wrapper.properties +++ b/kcsc-back-end/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,13 @@ +#distributionBase=GRADLE_USER_HOME +#distributionPath=wrapper/dists +#distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +#networkTimeout=10000 +#validateDistributionUrl=true +#zipStoreBase=GRADLE_USER_HOME +#zipStorePath=wrapper/dists + distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip -networkTimeout=10000 -validateDistributionUrl=true +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 4f3a87eaf92ae0bf3ef1e912c2a5ca5bc411e578 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Wed, 8 Nov 2023 14:08:10 +0900 Subject: [PATCH 3/3] no message --- .../gradle/wrapper/gradle-wrapper.properties | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/kcsc-back-end/gradle/wrapper/gradle-wrapper.properties b/kcsc-back-end/gradle/wrapper/gradle-wrapper.properties index a371fc3..ac72c34 100644 --- a/kcsc-back-end/gradle/wrapper/gradle-wrapper.properties +++ b/kcsc-back-end/gradle/wrapper/gradle-wrapper.properties @@ -1,13 +1,7 @@ -#distributionBase=GRADLE_USER_HOME -#distributionPath=wrapper/dists -#distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip -#networkTimeout=10000 -#validateDistributionUrl=true -#zipStoreBase=GRADLE_USER_HOME -#zipStorePath=wrapper/dists - distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists