From 1dc6bfa459098540a08cff86a4f83dda099ffacb Mon Sep 17 00:00:00 2001 From: jjh Date: Fri, 29 Dec 2023 14:03:30 +0900 Subject: [PATCH] =?UTF-8?q?=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/fims/excl/web/Excl01Controller.java | 37 ++++++++++--------- .../xit/fims/excl/web/Excl02Controller.java | 3 ++ .../xit/fims/excl/web/Excl03Controller.java | 1 - .../java/cokr/xit/fims/sprt/SprtQuery.java | 32 ---------------- .../sql/mapper/fims/excl/levyExcl-mapper.xml | 2 +- .../WEB-INF/jsp/fims/excl/excl01010-main.jsp | 8 +++- .../WEB-INF/jsp/fims/excl/excl02010-main.jsp | 8 +++- 7 files changed, 38 insertions(+), 53 deletions(-) diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java index c6672d78..664e9a33 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java @@ -112,23 +112,26 @@ public class Excl01Controller extends ApplicationController { , Map.entry("부과제외일자", xlsx.format(o -> xlsx.str2date(o.get("LEVY_EXCL_YMD"))).style(dateYMD)) , Map.entry("부과제외구분", xlsx.style("LEVY_EXCL_SE_NM", center)) , Map.entry("부과제외사유", "LEVY_EXCL_RSN_NM") - , Map.entry("기타내용", "ETC_CN") - , Map.entry("민원신청번호", xlsx.style("CVLCPT_APLY_NO", center)) - , Map.entry("민원접수번호", xlsx.style("CVLCPT_RCPT_NO", center)) - , Map.entry("민원접수일자", xlsx.format(o -> xlsx.str2date(o.get("CVLCPT_RCPT_YMD"))).style(dateYMD)) - , Map.entry("단속일시", xlsx.format(o -> xlsx.str2datetime(o.get("CRDN_YMD_TM"))).style(dateDT)) - , Map.entry("차량번호", "VHRNO") - , Map.entry("단속법정동", "CRDN_STDG_NM") - , Map.entry("단속장소", "CRDN_PLC") - , Map.entry("위반항목", "VLTN_ARTCL") - , Map.entry("최초단속금액", xlsx.style("FFNLG_CRDN_AMT", numeric)) - , Map.entry("처리상태", "CRDN_STTS_NM") - , Map.entry("납부자명", "RTPYR_NM") - , Map.entry("납부자생일", xlsx.style("RTPYR_BRDT_MASK", center)) - , Map.entry("등록일시", xlsx.format(o -> xlsx.str2datetime(o.get("REG_DT"))).style(dateDT)) - , Map.entry("등록사용자", xlsx.style("RGTR_NM", center)) - , Map.entry("수정일시", xlsx.format(o -> xlsx.str2datetime(o.get("MDFCN_DT"))).style(dateDT)) - , Map.entry("수정사용자", xlsx.style("MDFR_NM", center)) + , Map.entry("기타내용", "ETC_CN") + , Map.entry("민원신청번호", xlsx.style("CVLCPT_APLY_NO", center)) + , Map.entry("민원접수번호", xlsx.style("CVLCPT_RCPT_NO", center)) + , Map.entry("민원접수일자", xlsx.format(o -> xlsx.str2date(o.get("CVLCPT_RCPT_YMD"))).style(dateYMD)) + , Map.entry("단속일시", xlsx.format(o -> xlsx.str2datetime(o.get("CRDN_YMD_TM"))).style(dateDT)) + , Map.entry("차량번호", "VHRNO") + , Map.entry("단속법정동", "CRDN_STDG_NM") + , Map.entry("단속장소", "CRDN_PLC") + , Map.entry("위반항목", "VLTN_ARTCL") + , Map.entry("최초단속금액", xlsx.style("FFNLG_CRDN_AMT", numeric)) + , Map.entry("처리상태", "CRDN_STTS_NM") + , Map.entry("납부자명", "RTPYR_NM") + , Map.entry("납부자생일", xlsx.style("RTPYR_BRDT_MASK", center)) + , Map.entry("우편번호", xlsx.style("ZIP", center)) + , Map.entry("주소", "ADDR") + , Map.entry("상세주소", "DTL_ADDR") + , Map.entry("등록일시", xlsx.format(o -> xlsx.str2datetime(o.get("REG_DT"))).style(dateDT)) + , Map.entry("등록사용자", xlsx.style("RGTR_NM", center)) + , Map.entry("수정일시", xlsx.format(o -> xlsx.str2datetime(o.get("MDFCN_DT"))).style(dateDT)) + , Map.entry("수정사용자", xlsx.style("MDFR_NM", center)) ) ); diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java index 95a132b9..f0fa807e 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java @@ -127,6 +127,9 @@ public class Excl02Controller extends ApplicationController { , Map.entry("소유주관계", xlsx.style("OWNR_REL_NM", center)) , Map.entry("진술자명", "STTR_NM") , Map.entry("진술자생일", xlsx.style("STTR_BRDT_MASK", center)) + , Map.entry("우편번호", xlsx.style("STTR_ZIP", center)) + , Map.entry("진술자주소", "STTR_ADDR") + , Map.entry("진술자상세주소", "STTR_DADDR") , Map.entry("의견제출상태", xlsx.style("OPNN_SBMSN_STTS_NM", center)) , Map.entry("의견제출분류", "OPNN_SBMSN_SE_NM") , Map.entry("의견제출요지", "OPNN_SBMSN_GIST") diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java index 18728eef..e2f7fa1a 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java @@ -3,7 +3,6 @@ package cokr.xit.fims.excl.web; import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.function.BiFunction; import javax.annotation.Resource; diff --git a/src/main/java/cokr/xit/fims/sprt/SprtQuery.java b/src/main/java/cokr/xit/fims/sprt/SprtQuery.java index 1114d2e7..d6499eab 100644 --- a/src/main/java/cokr/xit/fims/sprt/SprtQuery.java +++ b/src/main/java/cokr/xit/fims/sprt/SprtQuery.java @@ -34,7 +34,6 @@ public class SprtQuery extends CmmnQuery { private String levyNo; // 부과 번호 // ETC private String callPurpose; // infoDialog 호출 용도(view 조회(편집불가), create 등록, update 수정, refresh 재조회). - private String delYn; // 삭제 여부 private String delRsn; // 삭제 사유 private String inquiryCondition; // 조회 조건 @@ -44,7 +43,6 @@ public class SprtQuery extends CmmnQuery { public T setCallControlName(String callControlName) { this.callControlName = callControlName; - return self(); } @@ -54,7 +52,6 @@ public class SprtQuery extends CmmnQuery { public T setCvlcptDscsnIDs(String... cvlcptDscsnIDs) { this.cvlcptDscsnIDs = cvlcptDscsnIDs; - return self(); } @@ -64,7 +61,6 @@ public class SprtQuery extends CmmnQuery { public T setCrdnId(String crdnId) { this.crdnId = crdnId; - return self(); } @@ -74,7 +70,6 @@ public class SprtQuery extends CmmnQuery { public T setCrdnIDs(String... crdnIDs) { this.crdnIDs = crdnIDs; - return self(); } @@ -84,7 +79,6 @@ public class SprtQuery extends CmmnQuery { public T setRtpyrId(String rtpyrId) { this.rtpyrId = rtpyrId; - return self(); } @@ -94,7 +88,6 @@ public class SprtQuery extends CmmnQuery { public T setLevyExclId(String levyExclId) { this.levyExclId = levyExclId; - return self(); } @@ -104,7 +97,6 @@ public class SprtQuery extends CmmnQuery { public T setOpnnId(String opnnId) { this.opnnId = opnnId; - return self(); } @@ -114,7 +106,6 @@ public class SprtQuery extends CmmnQuery { public T setLevyId(String levyId) { this.levyId = levyId; - return self(); } @@ -124,7 +115,6 @@ public class SprtQuery extends CmmnQuery { public T setCvlcptDscsnId(String cvlcptDscsnId) { this.cvlcptDscsnId = cvlcptDscsnId; - return self(); } @@ -134,7 +124,6 @@ public class SprtQuery extends CmmnQuery { public T setIschKeywordSet(List ischKeywordSet) { this.ischKeywordSet = ischKeywordSet; - return self(); } @@ -144,7 +133,6 @@ public class SprtQuery extends CmmnQuery { public T setIschOnlyDataSet(List ischOnlyDataSet) { this.ischOnlyDataSet = ischOnlyDataSet; - return self(); } @@ -154,7 +142,6 @@ public class SprtQuery extends CmmnQuery { public T setIschExclDataSet(List ischExclDataSet) { this.ischExclDataSet = ischExclDataSet; - return self(); } @@ -164,7 +151,6 @@ public class SprtQuery extends CmmnQuery { public T setGridType(String gridType) { this.gridType = gridType; - return self(); } @@ -174,7 +160,6 @@ public class SprtQuery extends CmmnQuery { public T setVhrno(String vhrno) { this.vhrno = vhrno; - return self(); } @@ -184,7 +169,6 @@ public class SprtQuery extends CmmnQuery { public T setRtpyrNo(String rtpyrNo) { this.rtpyrNo = rtpyrNo; - return self(); } @@ -194,7 +178,6 @@ public class SprtQuery extends CmmnQuery { public T setRtpyrNm(String rtpyrNm) { this.rtpyrNm = rtpyrNm; - return self(); } @@ -204,7 +187,6 @@ public class SprtQuery extends CmmnQuery { public T setFyr(String fyr) { this.fyr = fyr; - return self(); } @@ -214,7 +196,6 @@ public class SprtQuery extends CmmnQuery { public T setLevyNo(String levyNo) { this.levyNo = levyNo; - return self(); } @@ -225,17 +206,6 @@ public class SprtQuery extends CmmnQuery { public T setCallPurpose(String callPurpose) { this.callPurpose = callPurpose; - - return self(); - } - - public String getDelYn() { - return ifEmpty(delYn, () -> null); - } - - public T setDelYn(String delYn) { - this.delYn = delYn; - return self(); } @@ -245,7 +215,6 @@ public class SprtQuery extends CmmnQuery { public T setDelRsn(String delRsn) { this.delRsn = delRsn; - return self(); } @@ -255,7 +224,6 @@ public class SprtQuery extends CmmnQuery { public T setInquiryCondition(String inquiryCondition) { this.inquiryCondition = inquiryCondition; - return self(); } // ETC ///////////////////////////////////////////////////////////////////// diff --git a/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml b/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml index 456118c8..48fc1fdf 100644 --- a/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml @@ -52,7 +52,7 @@ , C.FFNLG_CRDN_AMT /* 과태료 단속 금액 */ , C.FFNLG_AMT /* 과태료 금액 */ , C.CRDN_STTS_CD /* 단속 상태 코드 */ - , (CONCAT(C.CRDN_YMD, C.CRDN_TM)) AS CRDN_YMD_TM /* 단속 일시 */ + , (CONCAT(C.CRDN_YMD, C.CRDN_TM)) AS CRDN_YMD_TM /* 단속 일시 */ , (SELECT GET_CODE_NM('FIM054', C.TASK_SE_CD) FROM DUAL) AS TASK_SE_NM /* 업무 구분 명 */ , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM /* 단속 상태 명 */ , CA.CRDN_SE_CD /* 단속 구분 코드 */ diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp index 3c3b4c29..86d8745f 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp @@ -215,6 +215,9 @@ 처리상태 납부자명 납부자생일 + 우편번호 + 주소 + 상세주소 등록일시 등록사용자 수정일시 @@ -245,6 +248,9 @@ {CRDN_STTS_NM} {RTPYR_NM} {RTPYR_BRDT_MASK} + {ZIP} + {ADDR} + {DTL_ADDR} {REG_DT} {RGTR_NM} {MDFCN_DT} @@ -254,7 +260,7 @@ diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp index 395fd048..8c2af508 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp @@ -216,6 +216,9 @@ 소유주관계 진술자명 진술자생일 + 우편번호 + 진술자주소 + 진술자상세주소 의견제출상태 의견제출분류 의견제출요지 @@ -253,6 +256,9 @@ {OWNR_REL_NM} {STTR_NM} {STTR_BRDT_MASK} + {STTR_ZIP} + {STTR_ADDR} + {STTR_DADDR} {OPNN_SBMSN_STTS_NM} {OPNN_SBMSN_SE_NM} {OPNN_SBMSN_GIST} @@ -278,7 +284,7 @@