조회성 쿼리에서 기준DATA는 DEL_YN='N' 제거

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

@@ -105,7 +105,7 @@ public class CrdnRegistAndViewExcelVO {
     private String strctNm;
 
     /** 남은일 (서식에서 today - 처분내용별 종료일자, =X3-TODAY(), X3 은 deadline 열과 행 ) */
-    @ExcelColumn(headerName = "남은일", headerWidth = 10, formula = true, formulaRefField = "deadline", align = ExcelColumn.Align.RIGHT)
+    @ExcelColumn(headerName = "남은일", headerWidth = 10, formula = true, formulaRefField = "deadline", align = ExcelColumn.Align.CENTER)
     private String remainDays;
 
     /** 처분내용 (진행단계) */

src/main/resources/mybatis/mapper/crdn/crndRegistAndView/crdnActInfo/CrdnActInfoMapper_maria.xml

@@ -49,10 +49,10 @@
         FROM tb_act_info a
         LEFT JOIN tb_cd_detail sgg ON sgg.CD_GROUP_ID = 'ORG_CD' AND sgg.CD_ID = a.SGG_CD
         LEFT JOIN TB_ACT_TYPE act ON  act.ACT_TYPE_CD = a.ACT_TYPE_CD
-        LEFT JOIN tb_vltn_lwrg vltn1 ON vltn1.VLTN_LWRG_CD = a.VLTN_LWRG_CD_1 AND vltn1.DEL_YN = 'N'
-        LEFT JOIN tb_vltn_lwrg vltn2 ON vltn2.VLTN_LWRG_CD = a.VLTN_LWRG_CD_2 AND vltn2.DEL_YN = 'N'
-        LEFT JOIN tb_strct_idx strct ON strct.STRCT_IDX_CD = a.STRCT_IDX_CD AND strct.DEL_YN = 'N'
-        LEFT JOIN tb_usg_idx usg ON usg.USG_IDX_CD = a.USG_IDX_CD AND usg.DEL_YN = 'N'
+        LEFT JOIN tb_vltn_lwrg vltn1 ON vltn1.VLTN_LWRG_CD = a.VLTN_LWRG_CD_1
+        LEFT JOIN tb_vltn_lwrg vltn2 ON vltn2.VLTN_LWRG_CD = a.VLTN_LWRG_CD_2
+        LEFT JOIN tb_strct_idx strct ON strct.STRCT_IDX_CD = a.STRCT_IDX_CD
+        LEFT JOIN tb_usg_idx usg ON usg.USG_IDX_CD = a.USG_IDX_CD
         LEFT JOIN tb_cd_detail actnPrcs ON actnPrcs.CD_GROUP_ID = 'ACTN_PRCS_STTS_CD' AND actnPrcs.CD_ID = a.ACTN_PRCS_STTS_CD
         LEFT JOIN tb_user regUser ON regUser.USER_ID = a.RGTR
         LEFT JOIN tb_user modUser ON modUser.USER_ID = a.MDFR
@@ -183,10 +183,10 @@
         FROM tb_act_info a
         LEFT JOIN tb_cd_detail sgg ON sgg.CD_GROUP_ID = 'ORG_CD' AND sgg.CD_ID = a.SGG_CD
         LEFT JOIN TB_ACT_TYPE act ON  act.ACT_TYPE_CD = a.ACT_TYPE_CD
-        LEFT JOIN tb_vltn_lwrg vltn1 ON vltn1.VLTN_LWRG_CD = a.VLTN_LWRG_CD_1 AND vltn1.DEL_YN = 'N'
-        LEFT JOIN tb_vltn_lwrg vltn2 ON vltn2.VLTN_LWRG_CD = a.VLTN_LWRG_CD_2 AND vltn2.DEL_YN = 'N'
-        LEFT JOIN tb_strct_idx strct ON strct.STRCT_IDX_CD = a.STRCT_IDX_CD AND strct.DEL_YN = 'N'
-        LEFT JOIN tb_usg_idx usg ON usg.USG_IDX_CD = a.USG_IDX_CD AND usg.DEL_YN = 'N'
+        LEFT JOIN tb_vltn_lwrg vltn1 ON vltn1.VLTN_LWRG_CD = a.VLTN_LWRG_CD_1
+        LEFT JOIN tb_vltn_lwrg vltn2 ON vltn2.VLTN_LWRG_CD = a.VLTN_LWRG_CD_2
+        LEFT JOIN tb_strct_idx strct ON strct.STRCT_IDX_CD = a.STRCT_IDX_CD
+        LEFT JOIN tb_usg_idx usg ON usg.USG_IDX_CD = a.USG_IDX_CD
         LEFT JOIN tb_cd_detail actnPrcs ON actnPrcs.CD_GROUP_ID = 'ACTN_PRCS_STTS_CD' AND actnPrcs.CD_ID = a.ACTN_PRCS_STTS_CD
         LEFT JOIN tb_user regUser ON regUser.USER_ID = a.RGTR
         LEFT JOIN tb_user modUser ON modUser.USER_ID = a.MDFR

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
-        INNER 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
         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,7 +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'
+        INNER JOIN tb_ownr o ON o.OWNR_ID = ar.OWNR_ID
         WHERE ar.DEL_YN = 'N'
         AND ar.CRDN_YR = #{crdnYr}
         AND ar.CRDN_NO = #{crdnNo}
@@ -110,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
-        INNER 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
         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'

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

@@ -73,14 +73,15 @@
                  LEFT JOIN tb_cd_detail ld  ON ld.CD_GROUP_ID  = 'LDCG_CD' AND ld.CD_ID = t2.LDCG_CD
                  LEFT JOIN tb_cd_detail aps  ON aps.CD_GROUP_ID  = 'ACTN_PRCS_STTS_CD' AND aps.CD_ID = t3.ACTN_PRCS_STTS_CD
                  LEFT JOIN TB_ACT_TYPE act ON  act.ACT_TYPE_CD = t3.ACT_TYPE_CD
-                 LEFT JOIN tb_vltn_lwrg vltn1 ON vltn1.VLTN_LWRG_CD = t3.VLTN_LWRG_CD_1 AND vltn1.DEL_YN = 'N'
-                 LEFT JOIN tb_vltn_lwrg vltn2 ON vltn2.VLTN_LWRG_CD = t3.VLTN_LWRG_CD_2 AND vltn2.DEL_YN = 'N'
-                 LEFT JOIN tb_strct_idx strct ON strct.STRCT_IDX_CD = t3.STRCT_IDX_CD AND strct.DEL_YN = 'N'
-                 LEFT JOIN tb_usg_idx usg ON usg.USG_IDX_CD = t3.USG_IDX_CD AND usg.DEL_YN = 'N'
+                 LEFT JOIN tb_vltn_lwrg vltn1 ON vltn1.VLTN_LWRG_CD = t3.VLTN_LWRG_CD_1
+                 LEFT JOIN tb_vltn_lwrg vltn2 ON vltn2.VLTN_LWRG_CD = t3.VLTN_LWRG_CD_2
+                 LEFT JOIN tb_strct_idx strct ON strct.STRCT_IDX_CD = t3.STRCT_IDX_CD
+                 LEFT JOIN tb_usg_idx usg ON usg.USG_IDX_CD = t3.USG_IDX_CD
                  LEFT JOIN tb_bldg_new_prc_crtr_amt bnpca on bnpca.YR = t1.CRDN_YR and bnpca.no = SUBSTRING(t3.USG_IDX_CD,1,1) -- 용도지수 첫자리
                  LEFT JOIN tb_pstn_idx pi on T2.OALP between pi.BLDG_ANX_LAND_BGNG_PRC and pi.BLDG_ANX_LAND_END_PRC -- 공시지가 범위에서 찾음
         where t1.CRDN_YR = #{crdnYr}
           and t1.CRDN_NO = #{crdnNo}
+          and t1.DEL_YN = 'N'
         ORDER BY t3.ACT_BGNG_YMD ASC, t3.REG_DT ASC, t3.ACT_INFO_ID ASC
     </select>
 
@@ -326,12 +327,12 @@
           FROM tb_levy_info tli
                INNER JOIN tb_act_info tai ON tli.ACT_INFO_ID = tai.ACT_INFO_ID AND tai.DEL_YN = 'N'
                INNER JOIN tb_pstn_info tpi ON tai.PSTN_INFO_ID = tpi.PSTN_INFO_ID AND tpi.DEL_YN = 'N'
-               LEFT JOIN tb_strct_idx strct ON strct.STRCT_IDX_CD = tli.STRCT_IDX_CD AND strct.DEL_YN = 'N'
-               LEFT JOIN tb_usg_idx usg ON usg.USG_IDX_CD = tli.USG_IDX_CD AND usg.DEL_YN = 'N'
+               LEFT JOIN tb_strct_idx strct ON strct.STRCT_IDX_CD = tli.STRCT_IDX_CD
+               LEFT JOIN tb_usg_idx usg ON usg.USG_IDX_CD = tli.USG_IDX_CD
                LEFT JOIN tb_bldg_new_prc_crtr_amt bnpca ON bnpca.YR = tli.CRDN_YR AND bnpca.no = tli.BLDG_NEW_PRC_CRTR_AMT_NO
                LEFT JOIN tb_cd_detail bscs_cd ON bscs_cd.CD_GROUP_ID = 'BSCS_CSTRN_SE_CD' AND bscs_cd.CD_ID = tli.BSCS_CSTRN_SE_CD
                LEFT JOIN TB_ACT_TYPE act ON act.ACT_TYPE_CD = tli.CMPTTN_RT_CD
-               LEFT JOIN tb_cmpttn_rt_2 cmpttn2 ON cmpttn2.CMPTTN_RT_2_CD = tli.CMPTTN_RT_2_CD AND cmpttn2.USE_YN = 'Y'
+               LEFT JOIN tb_cmpttn_rt_2 cmpttn2 ON cmpttn2.CMPTTN_RT_2_CD = tli.CMPTTN_RT_2_CD
          WHERE tli.CRDN_YR = #{crdnYr}
            AND tli.CRDN_NO = #{crdnNo}
            AND tli.IMPLT_TASK_SE_CD = #{impltTaskSeCd}

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

@@ -93,7 +93,7 @@
                           ) act_cnt ON act_cnt.CRDN_YR = c.CRDN_YR AND act_cnt.CRDN_NO = c.CRDN_NO
                           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'
+                          LEFT JOIN tb_usg_idx usg ON usg.USG_IDX_CD = a.USG_IDX_CD
                  WHERE c.DEL_YN = 'N'
                    <if test='schCrdnYr != null and schCrdnYr != ""'>
                    AND c.CRDN_YR = #{schCrdnYr}

src/main/resources/mybatis/mapper/levy/levyRelevy/LevyRelevyMapper_maria.xml

@@ -96,7 +96,7 @@
         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'
+        LEFT JOIN tb_usg_idx usg ON usg.USG_IDX_CD = a.USG_IDX_CD
         WHERE c.DEL_YN = 'N'
         <if test='schCrdnYr != null and schCrdnYr != ""'>
             AND c.CRDN_YR = #{schCrdnYr}
@@ -321,7 +321,7 @@
         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'
+        LEFT JOIN tb_usg_idx usg ON usg.USG_IDX_CD = a.USG_IDX_CD
         WHERE c.DEL_YN = 'N'
           AND (
                 (c.FRST_CRDN_YR = #{frstCrdnYr} AND c.FRST_CRDN_NO = #{frstCrdnNo})