Merge remote-tracking branch 'origin/dev' into dev

src/main/java/go/kr/project/crdn/crndRegistAndView/main/controller/CrdnRegistAndViewController.java

@@ -61,6 +61,14 @@ public class CrdnRegistAndViewController {
     public String list( Model model ) {
         log.debug("단속 목록 화면 요청");
 
+        //법정동 읍면동 코드 조회
+        CmmnCodeSearchVO stdgEmdCdSearchVO = CmmnCodeSearchVO.builder()
+            .searchCdGroupId("STDG_EMD_CD")
+            .sortColumn("SORT_ORDR")
+            .sortAscending(true)
+            .build();
+        model.addAttribute("stdgEmdCdList", commonCodeService.selectCodeDetailList(stdgEmdCdSearchVO));
+        
         //지역구분 코드 조회
         CmmnCodeSearchVO rgnSeCdSearchVO = CmmnCodeSearchVO.builder()
                 .searchCdGroupId("RGN_SE_CD")

src/main/java/go/kr/project/crdn/crndRegistAndView/main/model/CrdnRegistAndViewVO.java

@@ -108,6 +108,9 @@ public class CrdnRegistAndViewVO extends PagingVO {
     /* 단속 처리 일자 */
     private String crdnPrcsYmd;
     
+    /* 법정동 읍면동 코드 */
+    private String stdgEmdCd;
+    
     /* 행위 유형 코드 */
     private String actTypeCd;
     
@@ -159,6 +162,9 @@ public class CrdnRegistAndViewVO extends PagingVO {
 
     /** 행위자명들 (쉼표로 구분) */
     private String actrNams;
+
+    /** 법정동 읍면동 코드명 */
+    private String stdgEmdCdNm;
     
     /** 행위 유형 코드명 */
     private String actTypeCdNm;
@@ -183,6 +189,9 @@ public class CrdnRegistAndViewVO extends PagingVO {
     
     /** 검색 조건 - 단속 번호 */
     private String schCrdnNo;
+
+    /** 검색 조건 - 법정동 읍면동 코드 */
+    private String schStdgEmdCd;
     
     /** 검색 조건 - 지역 구분 코드 */
     private String schRgnSeCd;

src/main/resources/mybatis/mapper/crdn/crndRegistAndView/main/CrdnRegistAndViewMapper_maria.xml

@@ -42,6 +42,8 @@
             u.USER_ACNT AS RGTR_ACNT,
             u.USER_NM AS RGTR_NM,
             p.LOTNO_WHOL_ADDR,          /* 지번 전체 주소 */
+            p.STDG_EMD_CD,              /* 법정동 읍면동 코드 */
+            emd.CD_NM AS STDG_EMD_CD_NM,
             p.ZIP,
             (SELECT GROUP_CONCAT(DISTINCT o2.FLNM SEPARATOR ', ')
              FROM tb_ownr_info oi2
@@ -68,6 +70,7 @@
         LEFT JOIN tb_cd_detail stts ON stts.CD_GROUP_ID = 'CRDN_PRCS_STTS_CD' AND stts.CD_ID = c.CRDN_PRCS_STTS_CD
         LEFT JOIN tb_user u ON u.USER_ID = c.RGTR AND u.USE_YN = 'Y'
         LEFT JOIN tb_pstn_info p ON p.CRDN_YR = c.CRDN_YR AND p.CRDN_NO = c.CRDN_NO AND p.DEL_YN = 'N'
+        LEFT JOIN tb_cd_detail emd ON emd.CD_GROUP_ID = 'STDG_EMD_CD' AND emd.CD_ID = p.STDG_EMD_CD    
         LEFT Join tb_act_info a ON a.CRDN_YR = c.CRDN_YR and a.CRDN_NO = c.CRDN_NO AND a.DEL_YN = 'N' AND a.ACT_NO = (SELECT MIN(a1.ACT_NO) FROM tb_act_info a1 WHERE a1.CRDN_YR = a.CRDN_YR AND a1.CRDN_NO = a.CRDN_NO AND a1.DEL_YN='N')
         LEFT JOIN tb_act_type act ON  act.ACT_TYPE_CD = a.ACT_TYPE_CD
         LEFT JOIN tb_usg_idx usg ON usg.USG_IDX_CD = a.USG_IDX_CD AND usg.DEL_YN = 'N'
@@ -78,6 +81,9 @@
         <if test='schCrdnNo != null and schCrdnNo != ""'>
             AND c.CRDN_NO LIKE CONCAT('%', #{schCrdnNo}, '%')
         </if>
+        <if test='schStdgEmdCd != null and schStdgEmdCd != ""'>
+            AND p.STDG_EMD_CD = #{schStdgEmdCd}
+        </if>
         <if test='schRgnSeCd != null and schRgnSeCd != ""'>
             AND c.RGN_SE_CD = #{schRgnSeCd}
         </if>

src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/list.jsp

@@ -26,6 +26,17 @@
                 <li>
                     <input type="text" id="schCrdnNo" name="schCrdnNo" maxlength="6" class="input" style="width: 100px;" autocomplete="off"/>
                 </li>
+                <li class="th">법정동</li>
+                <li>
+                    <select id="schStdgEmdCd" name="schStdgEmdCd" class="input" style="width: 120px;">
+                        <option value="">전체</option>
+                        <c:forEach var="code" items="${stdgEmdCdList}">
+                            <option value="${code.cdId}" <c:if test="${param.schStdgEmdCd eq code.cdId}">selected</c:if>>
+                                    ${code.cdNm}
+                            </option>
+                        </c:forEach>
+                    </select>
+                </li>
                 <li class="th">지역 구분</li>
                 <li>
                     <select id="schRgnSeCd" name="schRgnSeCd" class="input" style="width: 120px;">
@@ -133,6 +144,7 @@
         var setSearchCond = function() {
             var schCrdnYr = $.trim(nvl($("#schCrdnYr").val(), ""));
             var schCrdnNo = $.trim(nvl($("#schCrdnNo").val(), ""));
+            var schStdgEmdCd = $.trim(nvl($("#schStdgEmdCd").val(), ""));
             var schRgnSeCd = $.trim(nvl($("#schRgnSeCd").val(), ""));
             var schDsclMthdCd = $.trim(nvl($("#schDsclMthdCd").val(), ""));
             var schExmnr = $.trim(nvl($("#schExmnr").val(), ""));
@@ -141,6 +153,7 @@
 
             SEARCH_COND.schCrdnYr = schCrdnYr;
             SEARCH_COND.schCrdnNo = schCrdnNo;
+            SEARCH_COND.schStdgEmdCd = schStdgEmdCd;
             SEARCH_COND.schRgnSeCd = schRgnSeCd;
             SEARCH_COND.schDsclMthdCd = schDsclMthdCd;
             SEARCH_COND.schExmnr = schExmnr;
@@ -224,6 +237,7 @@
                         },
                         { header: '단속년도', name: 'crdnYr', align: 'center', width: 80, sortingType: 'desc' },
                         { 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 },
                         {
@@ -596,6 +610,7 @@
                     // 모든 검색 조건 초기화
                     $("#schCrdnYr").val("${dateUtil:getCurrentDateTime('yyyy')}");  // 현재 년도로 초기화
                     $("#schCrdnNo").val("");
+                    $("#schStdgEmdCd").val("");
                     $("#schRgnSeCd").val("");
                     $("#schDsclMthdCd").val("");
                     $("#schExmnr").val("");