단속 등록&열람: 행위번호 추가 및 소유자 정보 조회 쿼리 로직 수정

3 months ago · e116c9a9e8
parent 34c8c26dbe
commit e116c9a9e8
5 changed files with 59 additions and 44 deletions
--- a/src/main/java/go/kr/project/crdn/crndRegistAndView/crdnActInfo/model/CrdnActInfoVO.java
+++ b/src/main/java/go/kr/project/crdn/crndRegistAndView/crdnActInfo/model/CrdnActInfoVO.java
@ -27,6 +27,7 @@ public class CrdnActInfoVO extends PagingVO {
    private String pstnInfoId;          // 위치 정보 ID
    private String actBgngYmd;          // 행위 시작 일자
    private String actTypeCd;           // 행위 유형 코드
+    private String actNo;               // 행위 번호
    private String vltnLwrgCd1;         // 위반 법규 코드 1
    private String vltnLwrgCd2;         // 위반 법규 코드 2
    private String strctIdxCd;          // 구조 지수 코드
--- a/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/crdnActInfo/CrdnActInfoMapper_maria.xml
+++ b/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/crdnActInfo/CrdnActInfoMapper_maria.xml
@ -17,6 +17,7 @@
            a.ACT_BGNG_YMD,
            a.ACT_TYPE_CD,
            act.CD_NM AS ACT_TYPE_CD_NM,
+            a.ACT_NO,
            a.VLTN_LWRG_CD_1,
            vltn1.VLTN_LAW AS VLTN_LAW_1,
            a.VLTN_LWRG_CD_2,
@ -85,6 +86,7 @@
            PSTN_INFO_ID,
            ACT_BGNG_YMD,
            ACT_TYPE_CD,
+            ACT_NO,
            VLTN_LWRG_CD_1,
            VLTN_LWRG_CD_2,
            STRCT_IDX_CD,
@ -107,6 +109,11 @@
            #{pstnInfoId},
            replace(#{actBgngYmd},'-',''),
            #{actTypeCd},
+            (SELECT next_act_no
+               FROM (SELECT IFNULL(MAX(CAST(act_no AS UNSIGNED)), 0) + 1 AS next_act_no
+                       FROM tb_act_info
+                      WHERE PSTN_INFO_ID = #{pstnInfoId}) AS temp
+            ),
            #{vltnLwrgCd1},
            #{vltnLwrgCd2},
            #{strctIdxCd},
@ -137,6 +144,7 @@
            a.ACT_BGNG_YMD,
            a.ACT_TYPE_CD,
            act.CD_NM AS ACT_TYPE_CD_NM,
+            a.ACT_NO,
            a.VLTN_LWRG_CD_1,
            vltn1.VLTN_LAW AS VLTN_LAW_1,
            a.VLTN_LWRG_CD_2,
--- a/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/crdnActrInfo/CrdnActrInfoMapper_maria.xml
+++ b/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/crdnActrInfo/CrdnActrInfoMapper_maria.xml
@ -32,7 +32,7 @@
        FROM tb_actr_info ar
        LEFT JOIN tb_cd_detail sgg ON sgg.CD_GROUP_ID = 'ORG_CD' AND sgg.CD_ID = ar.SGG_CD
        LEFT JOIN tb_user regUser ON regUser.USER_ID = ar.RGTR
-        LEFT JOIN tb_ownr o ON o.OWNR_ID = ar.OWNR_ID AND o.DEL_YN = 'N'
+        INNER JOIN tb_ownr o ON o.OWNR_ID = ar.OWNR_ID AND o.DEL_YN = 'N'
        LEFT JOIN tb_cd_detail ownrSe ON ownrSe.CD_GROUP_ID = 'OWNR_SE_CD' AND ownrSe.CD_ID = o.OWNR_SE_CD
        WHERE ar.DEL_YN = 'N'
        AND ar.CRDN_YR = #{crdnYr}
@ -49,6 +49,7 @@
        /* ActrInfoMapper.selectActrInfoListTotalCount : 위반행위자정보 총 개수 조회 */
        SELECT COUNT(*)
        FROM tb_actr_info ar
+        INNER JOIN tb_ownr o ON o.OWNR_ID = ar.OWNR_ID AND o.DEL_YN = 'N'
        WHERE ar.DEL_YN = 'N'
        AND ar.CRDN_YR = #{crdnYr}
        AND ar.CRDN_NO = #{crdnNo}
@ -109,7 +110,7 @@
        FROM tb_actr_info ar
        LEFT JOIN tb_cd_detail sgg ON sgg.CD_GROUP_ID = 'ORG_CD' AND sgg.CD_ID = ar.SGG_CD
        LEFT JOIN tb_user regUser ON regUser.USER_ID = ar.RGTR
-        LEFT JOIN tb_ownr o ON o.OWNR_ID = ar.OWNR_ID AND o.DEL_YN = 'N'
+        INNER JOIN tb_ownr o ON o.OWNR_ID = ar.OWNR_ID AND o.DEL_YN = 'N'
        LEFT JOIN tb_cd_detail ownrSe ON ownrSe.CD_GROUP_ID = 'OWNR_SE_CD' AND ownrSe.CD_ID = o.OWNR_SE_CD
        WHERE ar.ACTR_INFO_ID = #{actrInfoId}
        AND ar.DEL_YN = 'N'
--- a/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/crdnOwnrInfo/CrdnOwnrInfoMapper_maria.xml
+++ b/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/crdnOwnrInfo/CrdnOwnrInfoMapper_maria.xml
@ -87,26 +87,27 @@
    <select id="selectOwnrInfoByPk" parameterType="String" resultType="CrdnOwnrInfoVO">
        /* OwnrInfoMapper.selectOwnrInfoByPk : 소유자정보 상세 조회 */
        SELECT 
-            o.OWNR_INFO_ID,
-            o.SGG_CD,
-            o.CRDN_YR,
-            o.CRDN_NO,
-            o.PSTN_INFO_ID,
-            o.OWNR_ID,
-            o.REG_DT,
-            o.RGTR,
+            oi.OWNR_INFO_ID,
+            oi.SGG_CD,
+            oi.CRDN_YR,
+            oi.CRDN_NO,
+            oi.PSTN_INFO_ID,
+            oi.OWNR_ID,
+            oi.REG_DT,
+            oi.RGTR,
            regUser.USER_ACNT AS RGTR_ACNT,
            regUser.USER_NM AS RGTR_NM,
-            o.DEL_YN,
-            o.DEL_DT,
-            o.DLTR,
+            oi.DEL_YN,
+            oi.DEL_DT,
+            oi.DLTR,
            delUser.USER_ACNT AS DLTR_ACNT,
            delUser.USER_NM AS DLTR_NM
-        FROM tb_ownr_info o
-        LEFT JOIN tb_user regUser ON regUser.USER_ID = o.RGTR
-        LEFT JOIN tb_user delUser ON delUser.USER_ID = o.DLTR
-        WHERE o.OWNR_INFO_ID = #{ownrInfoId}
-          AND o.DEL_YN = 'N'
+        FROM tb_ownr_info oi
+        INNER JOIN tb_ownr o ON o.OWNR_ID = oi.OWNR_ID AND o.DEL_YN = 'N'
+        LEFT JOIN tb_user regUser ON regUser.USER_ID = oi.RGTR
+        LEFT JOIN tb_user delUser ON delUser.USER_ID = oi.DLTR
+        WHERE oi.OWNR_INFO_ID = #{ownrInfoId}
+          AND oi.DEL_YN = 'N'
    </select>

    <!-- 소유자정보 수정 - 필요시 사용 -->
@ -147,30 +148,31 @@
    <!-- 중요로직: 중복된 소유자 정보 조회 (표출용) -->
    <select id="selectDuplicateOwnrInfo" resultType="CrdnOwnrInfoVO">
        /* OwnrInfoMapper.selectDuplicateOwnrInfo : 중복 소유자 정보 조회 */
-        SELECT 
-            o.OWNR_INFO_ID,
-            o.SGG_CD,
-            o.CRDN_YR,
-            o.CRDN_NO,
-            o.PSTN_INFO_ID,
-            o.OWNR_ID,
-            o.REG_DT,
-            o.RGTR,
+        SELECT
+            oi.OWNR_INFO_ID,
+            oi.SGG_CD,
+            oi.CRDN_YR,
+            oi.CRDN_NO,
+            oi.PSTN_INFO_ID,
+            oi.OWNR_ID,
+            oi.REG_DT,
+            oi.RGTR,
            regUser.USER_ACNT AS RGTR_ACNT,
            regUser.USER_NM AS RGTR_NM,
-            o.DEL_YN,
-            o.DEL_DT,
-            o.DLTR,
+            oi.DEL_YN,
+            oi.DEL_DT,
+            oi.DLTR,
            delUser.USER_ACNT AS DLTR_ACNT,
            delUser.USER_NM AS DLTR_NM
-        FROM tb_ownr_info o
-        LEFT JOIN tb_user regUser ON regUser.USER_ID = o.RGTR
-        LEFT JOIN tb_user delUser ON delUser.USER_ID = o.DLTR
-        WHERE o.CRDN_YR = #{crdnYr}
-          AND o.CRDN_NO = #{crdnNo}
-          AND o.PSTN_INFO_ID = #{pstnInfoId}
-          AND o.OWNR_ID = #{ownrId}
-          AND o.DEL_YN = 'N'
+        FROM tb_ownr_info oi
+        INNER JOIN tb_ownr o ON o.OWNR_ID = oi.OWNR_ID AND o.DEL_YN = 'N'
+        LEFT JOIN tb_user regUser ON regUser.USER_ID = oi.RGTR
+        LEFT JOIN tb_user delUser ON delUser.USER_ID = oi.DLTR
+        WHERE oi.CRDN_YR = #{crdnYr}
+          AND oi.CRDN_NO = #{crdnNo}
+          AND oi.PSTN_INFO_ID = #{pstnInfoId}
+          AND oi.OWNR_ID = #{ownrId}
+          AND oi.DEL_YN = 'N'
        LIMIT 1
    </select>

--- a/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/detailView-actInfoGrid.jsp
+++ b/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/detailView-actInfoGrid.jsp
@ -68,13 +68,16 @@
                            width: 120
                        },
                        {
-                            header: '위반법규',
-                            name: 'vltnLaw1',
+                            header: '행위유형',
+                            name: 'actTypeCdNm',
                            align: 'center',
-                            width: 120,
-                            formatter: function (e) {
-                                return e.row.vltnLaw1 || '';
-                            }
+                            width: 120
+                        },
+                        {
+                            header: '행위번호',
+                            name: 'actNo',
+                            align: 'center',
+                            width: 80,
                        },
                        {
                            header: '위반법규2',