diff --git a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java index 45173c02..fc8185a7 100644 --- a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java +++ b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java @@ -29,6 +29,12 @@ public class CrdnQuery extends QueryRequest { private String schRductYmdTo; private String schCrdnYmdFrom; private String schCrdnYmdTo; + private Integer schCrdnCntFrom; + private Integer schCrdnCntTo; + private String schOnlySamePlace; + private String schOnlyUnpay; + private String schExclEnd; + private String schExclTimeout; private String crdnInptSeCd; public String getGrid() { @@ -148,6 +154,60 @@ public class CrdnQuery extends QueryRequest { return self(); } + public Integer getSchCrdnCntFrom() { + return ifEmpty(schCrdnCntFrom, () -> null); + } + + public T setSchCrdnCntFrom(Integer schCrdnCntFrom) { + this.schCrdnCntFrom = schCrdnCntFrom; + return self(); + } + + public Integer getSchCrdnCntTo() { + return ifEmpty(schCrdnCntTo, () -> null); + } + + public T setSchCrdnCntTo(Integer schCrdnCntTo) { + this.schCrdnCntTo = schCrdnCntTo; + return self(); + } + + public String getSchOnlySamePlace() { + return ifEmpty(schOnlySamePlace, () -> null); + } + + public T setSchOnlySamePlace(String schOnlySamePlace) { + this.schOnlySamePlace = schOnlySamePlace; + return self(); + } + + public String getSchOnlyUnpay() { + return ifEmpty(schOnlyUnpay, () -> null); + } + + public T setSchOnlyUnpay(String schOnlyUnpay) { + this.schOnlyUnpay = schOnlyUnpay; + return self(); + } + + public String getSchExclEnd() { + return ifEmpty(schExclEnd, () -> null); + } + + public T setSchExclEnd(String schExclEnd) { + this.schExclEnd = schExclEnd; + return self(); + } + + public String getSchExclTimeout() { + return ifEmpty(schExclTimeout, () -> null); + } + + public T setSchExclTimeout(String schExclTimeout) { + this.schExclTimeout = schExclTimeout; + return self(); + } + public String getCrdnInptSeCd() { return ifEmpty(crdnInptSeCd, () -> null); } diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml index 0481b7b3..2e9c72e4 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml @@ -238,6 +238,7 @@ AND C.${by} LIKE CONCAT('%', #{term}, '%') SELECT C.CRDN_ID , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM , C.VHRNO + , C.VLTN_NMTM , C.CRDN_STDG_NM @@ -249,14 +250,24 @@ SELECT C.CRDN_ID , C.CRDN_INPT_SE_CD FROM TB_CRDN C WHERE C.DEL_YN = 'N' - - - -AND C.CRDN_ID = #{crdnId} -AND C.TASK_SE_CD = #{taskSeCd} + AND C.TASK_SE_CD = #{taskSeCd} AND C.CRDN_YMD = ]]> #{schCrdnYmdFrom} AND C.CRDN_YMD #{schCrdnYmdTo} + +AND C.CRDN_INPT_SE_CD = #{crdnInptSeCd} +AND C.VHRNO = #{vhrno} +AND C.CRDN_STTS_CD != '81' + + + + + + + + + + @@ -267,22 +278,38 @@ SELECT C.CRDN_ID SELECT GROUP_CONCAT(C.CRDN_ID) AS CRDN_ID_LIST , C.VHRNO + + , C.CRDN_STDG_NM + + + , '' AS CRDN_STDG_NM + + , COUNT(*) AS CRDN_CNT FROM TB_CRDN C WHERE C.DEL_YN = 'N' AND C.TASK_SE_CD = #{taskSeCd} AND C.VHRNO != '' AND C.CRDN_STDG_NM != '' - - - -AND C.CRDN_ID = #{crdnId} AND C.CRDN_YMD = ]]> #{schCrdnYmdFrom} AND C.CRDN_YMD #{schCrdnYmdTo} -GROUP BY C.VHRNO, C.CRDN_STDG_NM HAVING COUNT(*) = ]]> 2 +AND C.CRDN_INPT_SE_CD = #{crdnInptSeCd} +AND C.VHRNO = #{vhrno} +AND C.CRDN_STTS_CD != '81' + + + +GROUP BY C.VHRNO, C.CRDN_STDG_NM +HAVING COUNT(*) = ]]> + + #{schCrdnCntFrom} + 2 + + AND COUNT(*) #{schCrdnCntTo} + @@ -297,11 +324,12 @@ SELECT C.CRDN_ID , C.CRDN_STDG_NM , C.CRDN_PLC , C.CRDN_STTS_CD - - - + , C.FFNLG_AMT + , P.RTPYR_NM + , P.RTPYR_NO FROM TB_CRDN C LEFT OUTER JOIN TB_TEAM_INFO TI ON (C.TEAM_ID = TI.TEAM_ID) + LEFT OUTER JOIN TB_PAYER P ON (C.RTPYR_ID = P.RTPYR_ID) WHERE C.DEL_YN = 'N' AND C.TASK_SE_CD = #{taskSeCd} AND C.CRDN_ID IN (#{CRDN_ID}) diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp index 5b1883fc..e0f523cf 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp @@ -45,7 +45,7 @@ -
+
-
- +
+
+
+ + + + ~ + +
- - - + + + + + +
@@ -137,7 +157,7 @@ 단속일시 차량번호 - 단속건수? + 위반횟수 검사결과 처리방법 위반동 @@ -154,7 +174,7 @@ {CRDN_YMD_TM} {VHRNO} - {CRDN_CNT} + {VLTN_NMTM} {unknown} {unknown} {CRDN_STDG_NM} @@ -276,8 +296,8 @@ 처리상태 금액 성명 - 주민번호(전체) - 주민번호(마스크) + 주민번호(전체) + 주민번호(마스크) @@ -290,10 +310,10 @@ {CRDN_STDG_NM} {CRDN_PLC} {CRDN_STTS_CD} - {unknown} - {성명} - {주민번호} - {주민번호마스크} + {FFNLG_AMT} + {RTPYR_NM} + {RTPYR_NO} + ************