From 321b90c2ffaa6a56fb38dcccd1968660c07961bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=84=B1=EC=98=81?= Date: Tue, 23 Sep 2025 17:43:55 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B6=80=EA=B3=BC=EC=98=88=EA=B3=A0=20?= =?UTF-8?q?=EA=B0=95=EC=A0=9C=EC=9D=B4=ED=96=89=EA=B8=88,=20=EC=9D=B4?= =?UTF-8?q?=ED=96=89=EC=A0=95=EB=B3=B4=20=EB=93=B1=EB=A1=9D=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC,=20=EC=A7=84=ED=96=89=EC=A4=91....=20=EC=9D=B4?= =?UTF-8?q?=ED=96=89=EC=A0=95=EB=B3=B4=20=EC=88=98=EC=A0=95=EC=8B=9C=20?= =?UTF-8?q?=EC=97=90=EB=9F=AC=20=EB=B0=9C=EC=83=9D=20=EC=B2=98=EB=A6=AC?= =?UTF-8?q?=EC=A4=91....?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CrdnImpltTaskServiceImpl.java | 2 ++ .../main/CrdnRegistAndViewMapper_maria.xml | 24 +++++++++++++++++++ .../main/crdnImpltTask/impltTaskPopup.jsp | 4 ++++ .../main/crdnLevyPrvntc/levyPrvntcPopup.jsp | 4 ++-- 4 files changed, 32 insertions(+), 2 deletions(-) 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},