diff --git a/src/main/java/go/kr/project/crdn/crndRegistAndView/main/service/impl/CrdnImpltTaskServiceImpl.java b/src/main/java/go/kr/project/crdn/crndRegistAndView/main/service/impl/CrdnImpltTaskServiceImpl.java
index 331faf1..be27448 100644
--- a/src/main/java/go/kr/project/crdn/crndRegistAndView/main/service/impl/CrdnImpltTaskServiceImpl.java
+++ b/src/main/java/go/kr/project/crdn/crndRegistAndView/main/service/impl/CrdnImpltTaskServiceImpl.java
@@ -188,6 +188,8 @@ public class CrdnImpltTaskServiceImpl extends EgovAbstractServiceImpl implements
crdnRegistAndViewVO.setCrdnPrcsSttsCd(CRDN_PRCS_STTS_CD_30_CRC_CMD); //단속 처리 상태 코드 - 30: 시정명령
}else if( vo.getImpltTaskSeCd().equals(ImpltTaskSeConstants.IMPLT_TASK_SE_CD_3_CRC_URG) ){ //시정촉구
crdnRegistAndViewVO.setCrdnPrcsSttsCd(CRDN_PRCS_STTS_CD_40_CRC_URG); //단속 처리 상태 코드 - 40: 시정촉구
+ }else if( vo.getImpltTaskSeCd().equals(ImpltTaskSeConstants.IMPLT_TASK_SE_CD_4_LEVY_PRVNTC) ){ //부과예고
+ crdnRegistAndViewVO.setCrdnPrcsSttsCd(CRDN_PRCS_STTS_CD_50_LEVY_PRVNTC); //단속 처리 상태 코드 - 50: 부과예고
}else{
throw new MessageException("이행정보 코드가 없습니다.");
}
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 cdd4ea1..9032cdd 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
@@ -302,6 +302,18 @@
DSPS_BFHD_BGNG_YMD = #{dspsBfhdBgngYmd},
DSPS_BFHD_END_YMD = #{dspsBfhdEndYmd},
+ /* 시정명령 */
+ DSPS_BFHD_BGNG_YMD = #{dspsBfhdBgngYmd},
+ DSPS_BFHD_END_YMD = #{dspsBfhdEndYmd},
+
+ /* 시정촉구 */
+ DSPS_BFHD_BGNG_YMD = #{dspsBfhdBgngYmd},
+ DSPS_BFHD_END_YMD = #{dspsBfhdEndYmd},
+
+ /* 부과예고 */
+ DSPS_BFHD_BGNG_YMD = #{dspsBfhdBgngYmd},
+ DSPS_BFHD_END_YMD = #{dspsBfhdEndYmd},
+
CRDN_PRCS_STTS_CD = #{crdnPrcsSttsCd},
CRDN_PRCS_YMD = (DATE_FORMAT(CURRENT_DATE(), '%Y%m%d'))
WHERE CRDN_YR = #{crdnYr}
@@ -317,6 +329,18 @@
DSPS_BFHD_BGNG_YMD = #{dspsBfhdBgngYmd},
DSPS_BFHD_END_YMD = #{dspsBfhdEndYmd}
+ /* 시정명령 */
+ DSPS_BFHD_BGNG_YMD = #{dspsBfhdBgngYmd},
+ DSPS_BFHD_END_YMD = #{dspsBfhdEndYmd}
+
+ /* 시정촉구 */
+ DSPS_BFHD_BGNG_YMD = #{dspsBfhdBgngYmd},
+ DSPS_BFHD_END_YMD = #{dspsBfhdEndYmd}
+
+ /* 부과예고 */
+ DSPS_BFHD_BGNG_YMD = #{dspsBfhdBgngYmd},
+ DSPS_BFHD_END_YMD = #{dspsBfhdEndYmd}
+
WHERE CRDN_YR = #{crdnYr}
AND CRDN_NO = #{crdnNo}
AND DEL_YN = 'N'
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 c0837a3..8db59df 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
@@ -445,6 +445,10 @@
console.log(window.opener);
console.log(window.opener.refreshCrdnList);
window.opener.refreshCrdnList();
+ }else if (window.opener.parent && window.opener.parent.refreshCrdnList) {
+ console.log(window.opener);
+ console.log(window.opener.refreshCrdnList);
+ window.opener.refreshCrdnList();
}
window.close();
} else {
diff --git a/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/crdnLevyPrvntc/levyPrvntcPopup.jsp b/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/crdnLevyPrvntc/levyPrvntcPopup.jsp
index 16c0f52..ae5b3be 100644
--- a/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/crdnLevyPrvntc/levyPrvntcPopup.jsp
+++ b/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/main/crdnLevyPrvntc/levyPrvntcPopup.jsp
@@ -78,7 +78,7 @@
@@ -323,7 +323,7 @@
getGridColumns: function() {
var self = this;
return [
- {header: '지적', name: 'levyCnt', align: 'center', width: 100, formatter: function(e){
+ {header: '이행강제금산출', name: 'levyCnt', align: 'center', width: 120, formatter: function(e){
return e.value > 0 ? '등록':'미등록'; }
},
{ header: '행위유형코드', name: 'actTypeCd', align: 'center', width: 60, hidden: true},