From 1067bc9af0b2c8d1732f0fab7b20676352c5dc0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=84=B1=EC=98=81?= <xitpsy@xit.co.kr>
Date: Thu, 13 Nov 2025 12:43:53 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=BC=EC=9E=90=EA=B2=80=EC=83=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CrdnRegistAndViewController.java          |  3 +-
 .../main/CrdnRegistAndViewMapper_maria.xml    | 90 +++++++++++++++++++
 .../main/crdnRegistPopup.jsp                  |  2 +-
 3 files changed, 93 insertions(+), 2 deletions(-)

diff --git a/src/main/java/go/kr/project/crdn/crndRegistAndView/main/controller/CrdnRegistAndViewController.java b/src/main/java/go/kr/project/crdn/crndRegistAndView/main/controller/CrdnRegistAndViewController.java
index df0f689..e39a871 100644
--- a/src/main/java/go/kr/project/crdn/crndRegistAndView/main/controller/CrdnRegistAndViewController.java
+++ b/src/main/java/go/kr/project/crdn/crndRegistAndView/main/controller/CrdnRegistAndViewController.java
@@ -202,7 +202,8 @@ public class CrdnRegistAndViewController {
         // 적발방법 코드 조회
         CmmnCodeSearchVO dsclMthdCdSearchVO = CmmnCodeSearchVO.builder()
                 .searchCdGroupId("DSCL_MTHD_CD")
-                .sortColumn("CD_NM")
+                .searchUseYn("Y")
+                .sortColumn("SORT_ORDR")
                 .sortAscending(true)
                 .build();
         model.addAttribute("dsclMthdCdList", commonCodeService.selectCodeDetailList(dsclMthdCdSearchVO));
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 6bfaac8..b1353f6 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,6 +119,51 @@
                    <if test='schCrdnPrcsSttsCd != null and schCrdnPrcsSttsCd != ""'>
                    AND c.CRDN_PRCS_STTS_CD = #{schCrdnPrcsSttsCd}
                    </if>
+                   <!-- 중요로직: 진행단계 코드에 따라 해당 일자 컬럼과 비교 -->
+                   <if test='schPrcsSttsStartDt != null and schPrcsSttsStartDt != ""'>
+                       <choose>
+                           <when test='schCrdnPrcsSttsCd == "1"'>
+                               AND c.DSPS_BFHD_BGNG_YMD <![CDATA[>=]]> REPLACE(#{schPrcsSttsStartDt}, '-', '')
+                           </when>
+                           <when test='schCrdnPrcsSttsCd == "2"'>
+                               AND c.CRC_CMD_BGNG_YMD <![CDATA[>=]]> REPLACE(#{schPrcsSttsStartDt}, '-', '')
+                           </when>
+                           <when test='schCrdnPrcsSttsCd == "3"'>
+                               AND c.CRC_URG_BGNG_YMD <![CDATA[>=]]> REPLACE(#{schPrcsSttsStartDt}, '-', '')
+                           </when>
+                           <when test='schCrdnPrcsSttsCd == "4"'>
+                               AND c.LEVY_PRVNTC_BGNG_YMD <![CDATA[>=]]> REPLACE(#{schPrcsSttsStartDt}, '-', '')
+                           </when>
+                           <when test='schCrdnPrcsSttsCd == "5"'>
+                               AND c.LEVY_BGNG_YMD <![CDATA[>=]]> REPLACE(#{schPrcsSttsStartDt}, '-', '')
+                           </when>
+                           <when test='schCrdnPrcsSttsCd == "6"'>
+                               AND c.PAY_URG_BGNG_YMD <![CDATA[>=]]> REPLACE(#{schPrcsSttsStartDt}, '-', '')
+                           </when>
+                       </choose>
+                   </if>
+                   <if test='schPrcsSttsEndDt != null and schPrcsSttsEndDt != ""'>
+                       <choose>
+                           <when test='schCrdnPrcsSttsCd == "1"'>
+                               AND c.DSPS_BFHD_END_YMD <![CDATA[<=]]> REPLACE(#{schPrcsSttsEndDt}, '-', '')
+                           </when>
+                           <when test='schCrdnPrcsSttsCd == "2"'>
+                               AND c.CRC_CMD_END_YMD <![CDATA[<=]]> REPLACE(#{schPrcsSttsEndDt}, '-', '')
+                           </when>
+                           <when test='schCrdnPrcsSttsCd == "3"'>
+                               AND c.CRC_URG_END_YMD <![CDATA[<=]]> REPLACE(#{schPrcsSttsEndDt}, '-', '')
+                           </when>
+                           <when test='schCrdnPrcsSttsCd == "4"'>
+                               AND c.LEVY_PRVNTC_END_YMD <![CDATA[<=]]> REPLACE(#{schPrcsSttsEndDt}, '-', '')
+                           </when>
+                           <when test='schCrdnPrcsSttsCd == "5"'>
+                               AND c.LEVY_END_YMD <![CDATA[<=]]> REPLACE(#{schPrcsSttsEndDt}, '-', '')
+                           </when>
+                           <when test='schCrdnPrcsSttsCd == "6"'>
+                               AND c.PAY_URG_END_YMD <![CDATA[<=]]> REPLACE(#{schPrcsSttsEndDt}, '-', '')
+                           </when>
+                       </choose>
+                   </if>
                    <if test='schAgrvtnLevyTrgtYn != null and schAgrvtnLevyTrgtYn != ""'>
                    AND c.AGRVTN_LEVY_TRGT_YN = #{schAgrvtnLevyTrgtYn}
                    </if>
@@ -202,6 +247,51 @@
                  <if test='schCrdnPrcsSttsCd != null and schCrdnPrcsSttsCd != ""'>
                      AND c.CRDN_PRCS_STTS_CD = #{schCrdnPrcsSttsCd}
                  </if>
+                 <!-- 중요로직: 진행단계 코드에 따라 해당 일자 컬럼과 비교 -->
+                 <if test='schPrcsSttsStartDt != null and schPrcsSttsStartDt != ""'>
+                     <choose>
+                         <when test='schCrdnPrcsSttsCd == "1"'>
+                             AND c.DSPS_BFHD_BGNG_YMD <![CDATA[>=]]> REPLACE(#{schPrcsSttsStartDt}, '-', '')
+                         </when>
+                         <when test='schCrdnPrcsSttsCd == "2"'>
+                             AND c.CRC_CMD_BGNG_YMD <![CDATA[>=]]> REPLACE(#{schPrcsSttsStartDt}, '-', '')
+                         </when>
+                         <when test='schCrdnPrcsSttsCd == "3"'>
+                             AND c.CRC_URG_BGNG_YMD <![CDATA[>=]]> REPLACE(#{schPrcsSttsStartDt}, '-', '')
+                         </when>
+                         <when test='schCrdnPrcsSttsCd == "4"'>
+                             AND c.LEVY_PRVNTC_BGNG_YMD <![CDATA[>=]]> REPLACE(#{schPrcsSttsStartDt}, '-', '')
+                         </when>
+                         <when test='schCrdnPrcsSttsCd == "5"'>
+                             AND c.LEVY_BGNG_YMD <![CDATA[>=]]> REPLACE(#{schPrcsSttsStartDt}, '-', '')
+                         </when>
+                         <when test='schCrdnPrcsSttsCd == "6"'>
+                             AND c.PAY_URG_BGNG_YMD <![CDATA[>=]]> REPLACE(#{schPrcsSttsStartDt}, '-', '')
+                         </when>
+                     </choose>
+                 </if>
+                 <if test='schPrcsSttsEndDt != null and schPrcsSttsEndDt != ""'>
+                     <choose>
+                         <when test='schCrdnPrcsSttsCd == "1"'>
+                             AND c.DSPS_BFHD_END_YMD <![CDATA[<=]]> REPLACE(#{schPrcsSttsEndDt}, '-', '')
+                         </when>
+                         <when test='schCrdnPrcsSttsCd == "2"'>
+                             AND c.CRC_CMD_END_YMD <![CDATA[<=]]> REPLACE(#{schPrcsSttsEndDt}, '-', '')
+                         </when>
+                         <when test='schCrdnPrcsSttsCd == "3"'>
+                             AND c.CRC_URG_END_YMD <![CDATA[<=]]> REPLACE(#{schPrcsSttsEndDt}, '-', '')
+                         </when>
+                         <when test='schCrdnPrcsSttsCd == "4"'>
+                             AND c.LEVY_PRVNTC_END_YMD <![CDATA[<=]]> REPLACE(#{schPrcsSttsEndDt}, '-', '')
+                         </when>
+                         <when test='schCrdnPrcsSttsCd == "5"'>
+                             AND c.LEVY_END_YMD <![CDATA[<=]]> REPLACE(#{schPrcsSttsEndDt}, '-', '')
+                         </when>
+                         <when test='schCrdnPrcsSttsCd == "6"'>
+                             AND c.PAY_URG_END_YMD <![CDATA[<=]]> REPLACE(#{schPrcsSttsEndDt}, '-', '')
+                         </when>
+                     </choose>
+                 </if>
                  <if test='schAgrvtnLevyTrgtYn != null and schAgrvtnLevyTrgtYn != ""'>
                      AND c.AGRVTN_LEVY_TRGT_YN = #{schAgrvtnLevyTrgtYn}
                  </if>
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 d12fb8b..61f61ab 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
@@ -153,7 +153,7 @@
                     sortColumn: "SORT_ORDR"
                 });
                 commonCodeSelectAjax('DSCL_MTHD_CD', 'dsclMthdCd', '선택하세요', "${data.dsclMthdCd}", {
-                    sortColumn: "CD_NM"
+                    sortColumn: "SORT_ORDR"
                 });
             },