diff --git a/src/main/java/cokr/xit/fims/excl/LevyExclQuery.java b/src/main/java/cokr/xit/fims/excl/LevyExclQuery.java index 21b7214e..01c57664 100644 --- a/src/main/java/cokr/xit/fims/excl/LevyExclQuery.java +++ b/src/main/java/cokr/xit/fims/excl/LevyExclQuery.java @@ -17,44 +17,46 @@ public class LevyExclQuery extends CmmnQuery { private static final long serialVersionUID = 1L; // ID - private String crdnId; // 단속 ID - private String[] levyExclIds; // 부과제외 Ids - private String levyExclId; // 부과제외 ID - private String[] opnnIds; // 의견제출 Ids - private String opnnId; // 의견제출 ID - private String mngId; // 의견제출 심의 회원 ID - private String[] reRegIds; // 재등록 Ids - private String reRegId; // 재등록 ID + private String crdnId; // 단속 ID + private String[] levyExclIds; // 부과제외 Ids + private String levyExclId; // 부과제외 ID + private String[] opnnIds; // 의견제출 Ids + private String opnnId; // 의견제출 ID + private String mngId; // 의견제출 심의 회원 ID + private String[] reRegIds; // 재등록 Ids + private String reRegId; // 재등록 ID // 검색 조건 - private String schLevyExclYmdFrom; // 부과제외_부과제외 일자 시작 - private String schLevyExclYmdTo; // 부과제외_부과제외 일자 종료 - private String schLevyExclSeCd; // 부과제외_부과제외 구분 코드 - private String schRcptYmdFrom; // 의견제출_접수 일자 시작 - private String schRcptYmdTo; // 의견제출_접수 일자 종료 - private String schAnsYmdFrom; // 의견제출_답변 일자 시작 - private String schAnsYmdTo; // 의견제출_답변 일자 종료 - private String schOpnnSbmsnSttsCd; // 의견제출_의견 제출 상태 코드 - private String schOpnnSbmsnSeCd; // 의견제출_의견 제출 구분 코드 - private String schSttrNm; // 의견제출_진술자 명 - private String schReRegYmdFrom; // 단속재등록_재등록 일자 시작 - private String schReRegYmdTo; // 단속재등록_재등록 일자 종료 - private String schVhrno; // 단속(TB_CRDN)_차량번호 - private String schCrdnYmdFrom; // 단속(TB_CRDN)_단속 일자 시작 - private String schCrdnYmdTo; // 단속(TB_CRDN)_단속 일자 종료 - private String schRtpyrNm; // 납부자(TB_PAYER)_납부자 명 + private String schLevyExclYmdFrom; // 부과제외_부과제외 일자 시작 + private String schLevyExclYmdTo; // 부과제외_부과제외 일자 종료 + private String schLevyExclSeCd; // 부과제외_부과제외 구분 코드 + private String schLevyExclRsnCd; // 부과제외_부과제외 구분 코드 + private String schRcptYmdFrom; // 의견제출_접수 일자 시작 + private String schRcptYmdTo; // 의견제출_접수 일자 종료 + private String schAnsYmdFrom; // 의견제출_답변 일자 시작 + private String schAnsYmdTo; // 의견제출_답변 일자 종료 + private String schOpnnSbmsnSttsCd; // 의견제출_의견 제출 상태 코드 + private String schOpnnSbmsnSeCd; // 의견제출_의견 제출 구분 코드 + private String schSttrNm; // 의견제출_진술자 명 + private String schReRegYmdFrom; // 단속재등록_재등록 일자 시작 + private String schReRegYmdTo; // 단속재등록_재등록 일자 종료 + private String schCrdnYmdFrom; // 단속(TB_CRDN)_단속 일자 시작 + private String schCrdnYmdTo; // 단속(TB_CRDN)_단속 일자 종료 + private String schVhrno; // 단속(TB_CRDN)_차량번호 + private String schRtpyrNo; // 납부자(TB_PAYER)_납부자 번호 + private String schRtpyrNm; // 납부자(TB_PAYER)_납부자 명 // 상세 검색 조건 // 동적 검색 조건 - private String levyExclSeCd; // 부과제외_부과 제외 구분 코드 - private String levyExclSeNm; // 부과제외_부과 제외 구분 명 - private String vhrno; // 단속(TB_CRDN)_차량번호 - private String rtpyrNm; // 납부자(TB_PAYER)_납부자 명 + private String levyExclSeCd; // 부과제외_부과 제외 구분 코드 + private String levyExclSeNm; // 부과제외_부과 제외 구분 명 + private String vhrno; // 단속(TB_CRDN)_차량번호 + private String rtpyrNm; // 납부자(TB_PAYER)_납부자 명 // ETC - private String callPurpose; // infoDialog 호출 용도(view 조회(편집불가), create 등록, update 수정, refresh 재조회). - private String delRsn; // 삭제 사유 - private String ansRsnCd; // 민원 답변 문구(TB_CVLCPT_ANS_WORDS) - 답변 사유 코드 - private String sndngRcvmtCd; // 발송 수납 코드 + private String callPurpose; // infoDialog 호출 용도(view 조회(편집불가), create 등록, update 수정, refresh 재조회). + private String delRsn; // 삭제 사유 + private String ansRsnCd; // 민원 답변 문구(TB_CVLCPT_ANS_WORDS) - 답변 사유 코드 + private String sndngRcvmtCd; // 발송 수납 코드 public String getCrdnId() { return ifEmpty(crdnId, () -> null); @@ -155,6 +157,15 @@ public class LevyExclQuery extends CmmnQuery { return self(); } + public String getSchLevyExclRsnCd() { + return ifEmpty(schLevyExclRsnCd, () -> null); + } + + public T setSchLevyExclRsnCd(String schLevyExclRsnCd) { + this.schLevyExclRsnCd = schLevyExclRsnCd; + return self(); + } + public String getSchRcptYmdFrom() { return ifEmpty(schRcptYmdFrom, () -> null); } @@ -245,6 +256,15 @@ public class LevyExclQuery extends CmmnQuery { return self(); } + public String getSchRtpyrNo() { + return ifEmpty(schRtpyrNo, () -> null); + } + + public T setSchRtpyrNo(String schRtpyrNo) { + this.schRtpyrNo = schRtpyrNo; + return self(); + } + public String getSchRtpyrNm() { return ifEmpty(schRtpyrNm, () -> null); } diff --git a/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml b/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml index 4ee3df41..2b57952b 100644 --- a/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml @@ -77,87 +77,98 @@ @@ -166,18 +177,19 @@ - AND CRR.RE_REG_ID IN ( + AND CRR.RE_REG_ID IN ( #{reRegId} ) - AND CRR.RE_REG_ID = #{reRegId} + AND CRR.RE_REG_ID= #{reRegId} - AND CRR.DEL_YN = #{delYn} + AND CRR.DEL_YN = #{delYn} - AND C.CRDN_ID = #{crdnId} + AND C.CRDN_ID = #{crdnId} + AND C.DEL_YN = #{delYn} 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 89fce31e..a4998c26 100644 --- a/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml @@ -55,9 +55,12 @@ , (SELECT GET_CODE_NM('FIM002', CA.CRDN_SE_CD) FROM DUAL) AS CRDN_SE_NM , (SELECT GET_CODE_NM('FIM007', CA.CRDN_SPAREA_CD) FROM DUAL) AS CRDN_SPAREA_NM , (SELECT GET_CODE_NM('LVS005', CA.USE_FUEL_CD) FROM DUAL) AS USE_FUEL_NM - , (SELECT GET_CODE_NM('FIM034', CA.PARKNG_PSBLTY_RSLT_CD) FROM DUAL) AS PARKNG_PSBLTY_RSLT_NM - , (SELECT V.VLTN_ARTCL FROM TB_VLTN V WHERE C.VLTN_ID = V.VLTN_ID) AS VLTN_ARTCL + , (SELECT GET_CODE_NM('FIM034', CA.PARKNG_PSBLTY_RSLT_CD) FROM DUAL) AS PARKNG_PSBLTY_RSLT_NM + , V.VLTN_ID + , V.VLTN_CD + , V.VLTN_ARTCL , P.RTPYR_ID + , P.RTPYR_SE_CD , (SELECT GET_CODE_NM('FIM011', P.RTPYR_SE_CD) FROM DUAL) AS RTPYR_SE_NM , P.RTPYR_NO , P.RTPYR_NM @@ -73,6 +76,7 @@ FROM TB_LEVY_EXCL LE INNER JOIN TB_CRDN C ON (LE.CRDN_ID = C.CRDN_ID) INNER JOIN TB_CRDN_ADI CA ON (C.CRDN_ID = CA.CRDN_ID) + LEFT OUTER JOIN TB_VLTN V ON (C.VLTN_ID = V.VLTN_ID) LEFT OUTER JOIN TB_PAYER P ON (C.RTPYR_ID = P.RTPYR_ID) LEFT OUTER JOIN TB_PAYER_ADDR PA ON (C.RTPYR_ID = PA.RTPYR_ID AND C.ADDR_SN = PA.ADDR_SN) LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.LINK_ID = CC.CVLCPT_LINK_ID AND C.CVLCPT_LINK_YN = 'Y' AND CC.DEL_YN = 'N') @@ -90,6 +94,9 @@ AND LE.LEVY_EXCL_SE_CD = #{schLevyExclSeCd} + + + AND LE.LEVY_EXCL_RSN_CD = #{schLevyExclRsnCd} AND LE.DEL_YN = #{delYn} @@ -102,6 +109,9 @@ AND C.VHRNO = #{schVhrno} + + + AND P.RTPYR_NO = #{schRtpyrNo} AND P.RTPYR_NM = #{schRtpyrNm} @@ -157,9 +167,13 @@ C.FFNLG_AMT C.ADVNTCE_AMT C.CRDN_STTS_CD - P.RTPYR_NM + P.RTPYR_SE_CD P.RTPYR_NO - P.RTPYR_BRDT + P.RTPYR_NM + PA.ZIP + PA.ADDR + PA.DTL_ADDR + V.VLTN_ARTCL CC.CVLCPT_RCPT_YMD CC.CVLCPT_APLY_NO CC.CVLCPT_RCPT_NO @@ -172,10 +186,10 @@ - AND C.SGG_CD = #{sggCd} AND C.TASK_SE_CD = #{taskSeCd} AND C.DEL_YN = 'N' + @@ -225,9 +239,9 @@ AND C.CRDN_ID = #{crdnId} + AND C.DEL_YN = 'N' - AND C.DEL_YN = 'N' diff --git a/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml b/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml index c7ff3f44..e30c2842 100644 --- a/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml @@ -70,6 +70,7 @@ , OS.PIC_RVW_OPNN , OS.OPNN_SBMSN_STTS_CD , (SELECT GET_CODE_NM('FIM031', OS.OPNN_SBMSN_STTS_CD) FROM DUAL) AS OPNN_SBMSN_STTS_NM + , OS.ANS_YMD , (CONCAT(OS.ANS_YMD, OS.ANS_TM)) AS ANS_YMD_TM , OS.ANS_CN , OS.DEL_YN @@ -97,6 +98,7 @@ , V.VLTN_CD , V.VLTN_ARTCL , P.RTPYR_ID + , P.RTPYR_SE_CD , (SELECT GET_CODE_NM('FIM011', P.RTPYR_SE_CD) FROM DUAL) AS RTPYR_SE_NM , P.RTPYR_NO , P.RTPYR_NM @@ -112,7 +114,7 @@ FROM TB_OPNN_SBMSN OS INNER JOIN TB_CRDN C ON (OS.CRDN_ID = C.CRDN_ID) INNER JOIN TB_CRDN_ADI CA ON (C.CRDN_ID = CA.CRDN_ID) - INNER JOIN TB_VLTN V ON (C.VLTN_ID = V.VLTN_ID) + LEFT OUTER JOIN TB_VLTN V ON (C.VLTN_ID = V.VLTN_ID) LEFT OUTER JOIN TB_PAYER P ON (C.RTPYR_ID = P.RTPYR_ID) LEFT OUTER JOIN TB_PAYER_ADDR PA ON (C.RTPYR_ID = PA.RTPYR_ID AND C.ADDR_SN = PA.ADDR_SN) LEFT OUTER JOIN TB_RDUCT R ON (C.CRDN_ID = R.CRDN_ID AND R.DEL_YN = 'N') @@ -205,19 +207,24 @@ OS.OPNN_SBMSN_STTS_CD OS.OPNN_SBMSN_SE_CD OS.OPNN_SBMSN_GIST + OS.DOC_NO + OS.ANS_YMD + OS.ANS_CN C.CRDN_YMD C.VHRNO + C.CRDN_STDG_NM C.CRDN_PLC C.FFNLG_CRDN_AMT C.FFNLG_AMT C.ADVNTCE_AMT C.CRDN_STTS_CD - OS.DOC_NO - OS.ANS_YMD - OS.ANS_CN - P.RTPYR_NM + P.RTPYR_SE_CD P.RTPYR_NO - P.RTPYR_BRDT + P.RTPYR_NM + PA.ZIP + PA.ADDR + PA.DTL_ADDR + V.VLTN_ARTCL #{term} @@ -225,10 +232,10 @@ - AND C.SGG_CD = #{sggCd} AND C.TASK_SE_CD = #{taskSeCd} AND C.DEL_YN = 'N' + @@ -312,9 +319,9 @@ AND C.CRDN_ID = #{crdnId} + AND C.DEL_YN = 'N' - AND C.DEL_YN = 'N' 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 0fd83add..e006d543 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 @@ -37,7 +37,7 @@
- 업무구분 + 업무구분
- 부과제외일자 + @@ -63,44 +63,31 @@
- -
- +
- 단속일자 - - - - ~ - - - -
- -
- - -
- -
- - + +
- + - + + ~ + + + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
-
- @@ -132,16 +147,14 @@
-
- - - + +
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 2ccdee8a..6443f775 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 @@ -37,7 +37,7 @@
- 업무구분 + 업무구분
- 접수일자 + @@ -63,7 +63,7 @@
- 답변일자 + @@ -76,7 +76,7 @@
- + @@ -96,34 +96,16 @@
- +
- -
- 단속일자 - - - - ~ - - - -
- -
- - -
- + - + + ~ + + + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
-
- @@ -156,8 +166,8 @@
-
- diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp index c6a05296..5278626b 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp @@ -50,7 +50,7 @@
- 재등록일자 + @@ -61,31 +61,13 @@
- -
- 단속일자 - - - - ~ - - - -
- -
- - -
- + - + + ~ + + + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
-
- @@ -117,16 +127,14 @@
-
- - - + +
@@ -540,7 +548,7 @@ } // 초기 화면 설정 - $P.initForm = () => { + $P.initForm = (taskSeCd) => { // 화면 초기화 $("#frmSearch--${pageName}")[0].reset();