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 1560454..213a352 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 @@ -93,6 +93,7 @@ public class CrdnImpltTaskVO extends PagingVO { private String lotnoAddr; // 지번주소 private String lotnoMno; // 지번본번 private String lotnoSno; // 지번부번 + private String rrno; // ==================== 조인 컬럼 (코드명) ==================== diff --git a/src/main/java/go/kr/project/crdn/crndRegistAndView/main/model/CrdnImpltTrprInfoVO.java b/src/main/java/go/kr/project/crdn/crndRegistAndView/main/model/CrdnImpltTrprInfoVO.java index 0b5e98e..ac7da08 100644 --- a/src/main/java/go/kr/project/crdn/crndRegistAndView/main/model/CrdnImpltTrprInfoVO.java +++ b/src/main/java/go/kr/project/crdn/crndRegistAndView/main/model/CrdnImpltTrprInfoVO.java @@ -94,6 +94,9 @@ public class CrdnImpltTrprInfoVO { private String actTypeCd; private String actTypeCdNm; + // 주민번호 + private String rrno; + // ==================== 추가 필드 (체크박스 선택용) ==================== /** 체크박스 선택 여부 */ diff --git a/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/main/CrdnImpltTaskMapper_maria.xml b/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/main/CrdnImpltTaskMapper_maria.xml index 71bacd0..6b3047c 100644 --- a/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/main/CrdnImpltTaskMapper_maria.xml +++ b/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/main/CrdnImpltTaskMapper_maria.xml @@ -137,11 +137,13 @@ iti.DLTR, -- 코드성 데이터 조인 (코드명) impltTrprSe.CD_NM as IMPLT_TRPR_SE_CD_NM, - sggCd.CD_NM as SGG_CD_NM + sggCd.CD_NM as SGG_CD_NM, + ECL_DECRYPT(ow.RRNO) as RRNO FROM TB_IMPLT_TRPR_INFO iti -- 코드성 데이터 조인 LEFT JOIN tb_cd_detail impltTrprSe ON impltTrprSe.CD_GROUP_ID = 'IMPLT_TRPR_SE_CD' AND impltTrprSe.CD_ID = iti.IMPLT_TRPR_SE_CD LEFT JOIN tb_cd_detail sggCd ON sggCd.CD_GROUP_ID = 'SGG_CD' AND sggCd.CD_ID = iti.SGG_CD + LEFT JOIN tb_ownr ow ON ow.OWNR_ID = iti.OWNR_ACTR_INFO_ID WHERE iti.IMPLT_INFO_ID = #{impltInfoId} AND iti.DEL_YN = 'N' ORDER BY iti.IMPLT_TRPR_SE_CD, iti.IMPLT_TRPR_FLNM @@ -213,10 +215,11 @@ ) > 0 THEN true ELSE false END as selected, aio.ACT_NO, aio.ACT_TYPE_CD, - act.VLTN_BDST AS ACT_TYPE_CD_NM + act.VLTN_BDST AS ACT_TYPE_CD_NM, + ECL_DECRYPT(o.RRNO) as RRNO FROM tb_act_info aio inner JOIN tb_ownr_info oi ON aio.CRDN_YR = oi.CRDN_YR AND aio.CRDN_NO = oi.CRDN_NO AND oi.DEL_YN = 'N' - INNER JOIN tb_ownr o ON o.OWNR_ID = oi.OWNR_ID AND o.DEL_YN = 'N' + INNER JOIN tb_ownr o ON o.OWNR_ID = oi.OWNR_ID LEFT JOIN tb_cd_detail impltTrprSe ON impltTrprSe.CD_GROUP_ID = 'IMPLT_TRPR_SE_CD' AND impltTrprSe.CD_ID = '1' LEFT JOIN TB_ACT_TYPE act ON act.ACT_TYPE_CD = aio.ACT_TYPE_CD WHERE aio.CRDN_YR = #{crdnYr} @@ -245,10 +248,11 @@ ) > 0 THEN true ELSE false END as selected, aio.ACT_NO, aio.ACT_TYPE_CD, - act.VLTN_BDST AS ACT_TYPE_CD_NM + act.VLTN_BDST AS ACT_TYPE_CD_NM, + ECL_DECRYPT(o.RRNO) as RRNO FROM tb_act_info aio INNER JOIN tb_actr_info ai ON ai.ACT_INFO_ID = aio.ACT_INFO_ID AND ai.DEL_YN = 'N' - INNER JOIN tb_ownr o ON o.OWNR_ID = ai.OWNR_ID AND o.DEL_YN = 'N' + INNER JOIN tb_ownr o ON o.OWNR_ID = ai.OWNR_ID LEFT JOIN tb_cd_detail impltTrprSe ON impltTrprSe.CD_GROUP_ID = 'IMPLT_TRPR_SE_CD' AND impltTrprSe.CD_ID = '2' LEFT JOIN TB_ACT_TYPE act ON act.ACT_TYPE_CD = aio.ACT_TYPE_CD WHERE aio.CRDN_YR = #{crdnYr} diff --git a/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/crdnImpltTask/impltTaskPopup.jsp b/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/crdnImpltTask/impltTaskPopup.jsp index 76299bf..f660b38 100644 --- a/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/crdnImpltTask/impltTaskPopup.jsp +++ b/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/crdnImpltTask/impltTaskPopup.jsp @@ -186,6 +186,7 @@ { header: '소유자 행위자 정보 ID', name: 'ownrActrInfoId', align: 'center', width: 120, hidden: true }, { header: '이행 대상자 정보 ID', name: 'impltTrprInfoId', align: 'center', width: 120, hidden: true }, { header: '체크박스여부', name: 'selected', align: 'center', width: 120, hidden: true }, + { header: '주민번호', name: 'rrno', align: 'center', width: 120, hidden: true }, ]; }, @@ -247,11 +248,13 @@ var allRows = self.instance.getData(); var rowKey = null; allRows.forEach(function(row) { - if (row.selected) { - rowKey = row.rowKey + if (row.selected && row.rrno !== '0000000000000' ) { + self.instance.check(row.rowKey); } - // 1. 체크박스 선택 - self.instance.check(rowKey); + if( row.rrno === '0000000000000' ){ + self.instance.disableRowCheck(row.rowKey); + } + }); });