From a98b8efb896c4b118c432fbcc9e57d73eac6d007 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=84=B1=EC=98=81?= Date: Thu, 13 Nov 2025 12:59:46 +0900 Subject: [PATCH] =?UTF-8?q?###=20Commit=20=EB=A9=94=EC=8B=9C=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #### feat: 조사일자 및 적발방법 개선 - **조사일자**로 필드명 변경: VO, MyBatis Mapper, JSP 포함 전역 수정 - UI에서 적발방법과 지역구분 필드 교체 및 관련 리스트 연동 로직 변경 - 진행단계 코드 없이도 모든 단계 검색 가능한 OR 조건 추가 #### fix: 일자 검색 관련 쿼리 정렬 문제 수정 - 쿼리 정렬 조건 수정: CRDN_YR을 DESC로 변경 #### refactor: 불필요한 필드와 주석 정리 - 사용되지 않는 필드, 주석 제거 및 중복 코드 주석 처리 #### style: 주소 입력 필드 순서 조정 - JSP에서 상세주소 입력 필드 위치 조정, 가독성 및 UI 일관성 개선 --- .../main/model/CrdnImpltTaskVO.java | 2 +- .../main/model/CrdnRegistAndViewExcelVO.java | 4 +- .../levy/levy/model/LevyNotiImpltInfoVO.java | 2 +- .../project/noti/model/NotiImpltInfoVO.java | 2 +- .../main/CrdnRegistAndViewMapper_maria.xml | 52 +++++++++++++++++-- .../main/CrdnRelevyHistoryMapper_maria.xml | 2 +- .../main/crdnRegistPopup.jsp | 2 +- .../main/crdnRelevy/relevyPopup.jsp | 2 +- .../crdnRelevyHistory/relevyHistoryPopup.jsp | 10 ++-- .../main/detailView-main.jsp | 32 ++++++------ .../crdn/crndRegistAndView/main/list.jsp | 4 +- .../main/list_clientSide.jsp | 2 +- .../WEB-INF/views/levy/levyRelevy/list.jsp | 4 +- .../views/levy/levyRelevy/relevyPopup.jsp | 2 +- 14 files changed, 83 insertions(+), 39 deletions(-) diff --git a/src/main/java/go/kr/project/crdn/crndRegistAndView/main/model/CrdnImpltTaskVO.java b/src/main/java/go/kr/project/crdn/crndRegistAndView/main/model/CrdnImpltTaskVO.java index 213a352..87596c6 100644 --- a/src/main/java/go/kr/project/crdn/crndRegistAndView/main/model/CrdnImpltTaskVO.java +++ b/src/main/java/go/kr/project/crdn/crndRegistAndView/main/model/CrdnImpltTaskVO.java @@ -87,7 +87,7 @@ public class CrdnImpltTaskVO extends PagingVO { private String mode; /** 단속 정보 (조인용) */ - private String dsclYmd; // 적발일자 + private String dsclYmd; // 조사일자 private String exmnr; // 조사원 private String lotnoWholAddr; // 지번전체주소 private String lotnoAddr; // 지번주소 diff --git a/src/main/java/go/kr/project/crdn/crndRegistAndView/main/model/CrdnRegistAndViewExcelVO.java b/src/main/java/go/kr/project/crdn/crndRegistAndView/main/model/CrdnRegistAndViewExcelVO.java index 7a61bf4..cdd3e48 100644 --- a/src/main/java/go/kr/project/crdn/crndRegistAndView/main/model/CrdnRegistAndViewExcelVO.java +++ b/src/main/java/go/kr/project/crdn/crndRegistAndView/main/model/CrdnRegistAndViewExcelVO.java @@ -35,8 +35,8 @@ public class CrdnRegistAndViewExcelVO { @ExcelColumn(headerName = "세움터 관리번호", headerWidth = 20) private String sewmtrMngNo; - /** 적발일자 */ - @ExcelColumn(headerName = "적발일자", headerWidth = 15, align = ExcelColumn.Align.CENTER) + /** 조사일자 */ + @ExcelColumn(headerName = "조사일자", headerWidth = 15, align = ExcelColumn.Align.CENTER) private String dsclYmd; /** 행위일자 (현재 DB에 없음 - 필요시 추가) */ diff --git a/src/main/java/go/kr/project/levy/levy/model/LevyNotiImpltInfoVO.java b/src/main/java/go/kr/project/levy/levy/model/LevyNotiImpltInfoVO.java index da37252..2d8a417 100644 --- a/src/main/java/go/kr/project/levy/levy/model/LevyNotiImpltInfoVO.java +++ b/src/main/java/go/kr/project/levy/levy/model/LevyNotiImpltInfoVO.java @@ -88,7 +88,7 @@ public class LevyNotiImpltInfoVO extends PagingVO { private String mode; /** 단속 정보 (조인용) */ - private String dsclYmd; // 적발일자 + private String dsclYmd; // 조사일자 private String exmnr; // 조사원 private String lotnoWholAddr; // 지번전체주소 private String lotnoAddr; // 지번주소 diff --git a/src/main/java/go/kr/project/noti/model/NotiImpltInfoVO.java b/src/main/java/go/kr/project/noti/model/NotiImpltInfoVO.java index 43f74b0..45bf2df 100644 --- a/src/main/java/go/kr/project/noti/model/NotiImpltInfoVO.java +++ b/src/main/java/go/kr/project/noti/model/NotiImpltInfoVO.java @@ -87,7 +87,7 @@ public class NotiImpltInfoVO extends PagingVO { private String mode; /** 단속 정보 (조인용) */ - private String dsclYmd; // 적발일자 + private String dsclYmd; // 조사일자 private String exmnr; // 조사원 private String lotnoWholAddr; // 지번전체주소 private String lotnoAddr; // 지번주소 diff --git a/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/main/CrdnRegistAndViewMapper_maria.xml b/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/main/CrdnRegistAndViewMapper_maria.xml index b1353f6..677fb46 100644 --- a/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/main/CrdnRegistAndViewMapper_maria.xml +++ b/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/main/CrdnRegistAndViewMapper_maria.xml @@ -119,9 +119,19 @@ AND c.CRDN_PRCS_STTS_CD = #{schCrdnPrcsSttsCd} - + + + AND ( + c.DSPS_BFHD_BGNG_YMD =]]> REPLACE(#{schPrcsSttsStartDt}, '-', '') + OR c.CRC_CMD_BGNG_YMD =]]> REPLACE(#{schPrcsSttsStartDt}, '-', '') + OR c.CRC_URG_BGNG_YMD =]]> REPLACE(#{schPrcsSttsStartDt}, '-', '') + OR c.LEVY_PRVNTC_BGNG_YMD =]]> REPLACE(#{schPrcsSttsStartDt}, '-', '') + OR c.LEVY_BGNG_YMD =]]> REPLACE(#{schPrcsSttsStartDt}, '-', '') + OR c.PAY_URG_BGNG_YMD =]]> REPLACE(#{schPrcsSttsStartDt}, '-', '') + ) + AND c.DSPS_BFHD_BGNG_YMD =]]> REPLACE(#{schPrcsSttsStartDt}, '-', '') @@ -144,6 +154,16 @@ + + AND ( + c.DSPS_BFHD_END_YMD REPLACE(#{schPrcsSttsEndDt}, '-', '') + OR c.CRC_CMD_END_YMD REPLACE(#{schPrcsSttsEndDt}, '-', '') + OR c.CRC_URG_END_YMD REPLACE(#{schPrcsSttsEndDt}, '-', '') + OR c.LEVY_PRVNTC_END_YMD REPLACE(#{schPrcsSttsEndDt}, '-', '') + OR c.LEVY_END_YMD REPLACE(#{schPrcsSttsEndDt}, '-', '') + OR c.PAY_URG_END_YMD REPLACE(#{schPrcsSttsEndDt}, '-', '') + ) + AND c.DSPS_BFHD_END_YMD REPLACE(#{schPrcsSttsEndDt}, '-', '') @@ -247,9 +267,19 @@ AND c.CRDN_PRCS_STTS_CD = #{schCrdnPrcsSttsCd} - + + + AND ( + c.DSPS_BFHD_BGNG_YMD =]]> REPLACE(#{schPrcsSttsStartDt}, '-', '') + OR c.CRC_CMD_BGNG_YMD =]]> REPLACE(#{schPrcsSttsStartDt}, '-', '') + OR c.CRC_URG_BGNG_YMD =]]> REPLACE(#{schPrcsSttsStartDt}, '-', '') + OR c.LEVY_PRVNTC_BGNG_YMD =]]> REPLACE(#{schPrcsSttsStartDt}, '-', '') + OR c.LEVY_BGNG_YMD =]]> REPLACE(#{schPrcsSttsStartDt}, '-', '') + OR c.PAY_URG_BGNG_YMD =]]> REPLACE(#{schPrcsSttsStartDt}, '-', '') + ) + AND c.DSPS_BFHD_BGNG_YMD =]]> REPLACE(#{schPrcsSttsStartDt}, '-', '') @@ -272,6 +302,16 @@ + + AND ( + c.DSPS_BFHD_END_YMD REPLACE(#{schPrcsSttsEndDt}, '-', '') + OR c.CRC_CMD_END_YMD REPLACE(#{schPrcsSttsEndDt}, '-', '') + OR c.CRC_URG_END_YMD REPLACE(#{schPrcsSttsEndDt}, '-', '') + OR c.LEVY_PRVNTC_END_YMD REPLACE(#{schPrcsSttsEndDt}, '-', '') + OR c.LEVY_END_YMD REPLACE(#{schPrcsSttsEndDt}, '-', '') + OR c.PAY_URG_END_YMD REPLACE(#{schPrcsSttsEndDt}, '-', '') + ) + AND c.DSPS_BFHD_END_YMD REPLACE(#{schPrcsSttsEndDt}, '-', '') @@ -479,12 +519,16 @@ /* CrdnRegistAndViewMapper.update : 단속 수정 */ UPDATE tb_crdn - SET RGN_SE_CD = #{rgnSeCd}, - DSCL_MTHD_CD = #{dsclMthdCd}, + SET DSCL_MTHD_CD = #{dsclMthdCd}, DSCL_YMD = REPLACE(#{dsclYmd}, '-', ''), EXMNR = #{exmnr}, RMRK = #{rmrk}, + + RGN_SE_CD = #{rgnSeCd}, + + RELEVY_YN = #{relevyYn}, + AGRVTN_LEVY_TRGT_YN = #{agrvtnLevyTrgtYn} WHERE CRDN_YR = #{crdnYr} AND CRDN_NO = #{crdnNo} diff --git a/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/main/CrdnRelevyHistoryMapper_maria.xml b/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/main/CrdnRelevyHistoryMapper_maria.xml index f50f21c..5ad91cf 100644 --- a/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/main/CrdnRelevyHistoryMapper_maria.xml +++ b/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/main/CrdnRelevyHistoryMapper_maria.xml @@ -110,7 +110,7 @@ or (c.CRDN_YR = #{frstCrdnYr} AND c.CRDN_NO = #{frstCrdnNo}) ) - ORDER BY c.CRDN_YR ASC, c.CRDN_NO ASC + ORDER BY c.CRDN_YR DESC, c.CRDN_NO ASC diff --git a/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/crdnRegistPopup.jsp b/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/crdnRegistPopup.jsp index 61f61ab..3066089 100644 --- a/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/crdnRegistPopup.jsp +++ b/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/crdnRegistPopup.jsp @@ -62,7 +62,7 @@ - * 적발일자 + * 조사일자 diff --git a/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/crdnRelevy/relevyPopup.jsp b/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/crdnRelevy/relevyPopup.jsp index 81b6ad3..fd21114 100644 --- a/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/crdnRelevy/relevyPopup.jsp +++ b/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/crdnRelevy/relevyPopup.jsp @@ -39,7 +39,7 @@ 적발방법 - 적발일자 + 조사일자 diff --git a/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/crdnRelevyHistory/relevyHistoryPopup.jsp b/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/crdnRelevyHistory/relevyHistoryPopup.jsp index 408e0e8..a32578f 100644 --- a/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/crdnRelevyHistory/relevyHistoryPopup.jsp +++ b/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/crdnRelevyHistory/relevyHistoryPopup.jsp @@ -129,12 +129,12 @@ getGridColumns: function() { return [ { header: '단속년도', name: 'crdnYr', align: 'center', width: 80 }, - { header: '단속번호', name: 'crdnNo', align: 'center', width: 90 }, + /*{ header: '단속번호', name: 'crdnNo', align: 'center', width: 90 }, { header: '법정동', name: 'stdgEmdCdNm', align: 'center', width: 90 }, { header: '지역구분', name: 'rgnSeCdNm', align: 'center', width: 100 }, { header: '적발방법', name: 'dsclMthdCdNm', align: 'center', width: 120 }, { - header: '적발일자', + header: '조사일자', name: 'dsclYmd', align: 'center', width: 100, @@ -142,7 +142,7 @@ return e.value ? moment(e.value).format('YYYY-MM-DD') : ''; } }, - { header: '조사원', name: 'exmnr', align: 'left', width: 130 }, + { header: '조사원', name: 'exmnr', align: 'left', width: 130 },*/ { header: '재부과여부', name: 'relevyYn', @@ -153,7 +153,7 @@ } }, { header: '진행단계', name: 'crdnPrcsSttsCdNm', align: 'center', width: 100 }, - { + /*{ header: '위치', name: 'lotnoWholAddr', align: 'left', @@ -161,7 +161,7 @@ formatter: function(e) { return e.value; } - }, + },*/ { header: '처분사전 일자', name: 'dspsBfhdBgngYmd', align: 'center', width: 120, formatter: function (e) { return e.value ? moment(e.value).format('YYYY-MM-DD') : ''; diff --git a/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/detailView-main.jsp b/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/detailView-main.jsp index a4fdc1f..384abb1 100644 --- a/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/detailView-main.jsp +++ b/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/detailView-main.jsp @@ -36,27 +36,27 @@ - * 지역구분 + * 적발방법 - - + - * 적발방법 + <%--* 지역구분 - - + - + --%> - * 적발일자 + * 조사일자 @@ -65,14 +65,6 @@ - * 재부과여부 - - - * 가중부과대상 + <%--* 재부과여부 + + + --%> 비고 diff --git a/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/list.jsp b/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/list.jsp index 357ffc6..f9619b5 100644 --- a/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/list.jsp +++ b/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/list.jsp @@ -102,9 +102,9 @@
  • - +
    • @@ -295,7 +295,7 @@ { header: '지역구분', name: 'rgnSeCdNm', align: 'center', width: 100 }, { header: '적발방법', name: 'dsclMthdCdNm', align: 'center', width: 120 }, { - header: '적발일자', + header: '조사일자', name: 'dsclYmd', align: 'center', width: 100, diff --git a/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/list_clientSide.jsp b/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/list_clientSide.jsp index 965041c..87075d8 100644 --- a/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/list_clientSide.jsp +++ b/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/list_clientSide.jsp @@ -252,7 +252,7 @@ width: 120 }, { - header: '적발일자', + header: '조사일자', name: 'dsclYmd', align: 'center', width: 100, diff --git a/src/main/webapp/WEB-INF/views/levy/levyRelevy/list.jsp b/src/main/webapp/WEB-INF/views/levy/levyRelevy/list.jsp index f938dc9..f7ef9f9 100644 --- a/src/main/webapp/WEB-INF/views/levy/levyRelevy/list.jsp +++ b/src/main/webapp/WEB-INF/views/levy/levyRelevy/list.jsp @@ -264,7 +264,7 @@ { header: '지역구분', name: 'rgnSeCdNm', align: 'center', width: 100 }, { header: '적발방법', name: 'dsclMthdCdNm', align: 'center', width: 120 }, { - header: '적발일자', + header: '조사일자', name: 'dsclYmd', align: 'center', width: 100, @@ -570,7 +570,7 @@ { header: '지역구분', name: 'rgnSeCdNm', align: 'center', width: 100 }, { header: '적발방법', name: 'dsclMthdCdNm', align: 'center', width: 120 }, { - header: '적발일자', + header: '조사일자', name: 'dsclYmd', align: 'center', width: 100, diff --git a/src/main/webapp/WEB-INF/views/levy/levyRelevy/relevyPopup.jsp b/src/main/webapp/WEB-INF/views/levy/levyRelevy/relevyPopup.jsp index e3ffcbb..778506a 100644 --- a/src/main/webapp/WEB-INF/views/levy/levyRelevy/relevyPopup.jsp +++ b/src/main/webapp/WEB-INF/views/levy/levyRelevy/relevyPopup.jsp @@ -37,7 +37,7 @@ 적발방법 - 적발일자 + 조사일자