diff --git a/src/main/java/go/kr/project/crdn/crndRegistAndView/crdnActInfo/controller/CrdnActInfoController.java b/src/main/java/go/kr/project/crdn/crndRegistAndView/crdnActInfo/controller/CrdnActInfoController.java index 7418435..7c4243c 100644 --- a/src/main/java/go/kr/project/crdn/crndRegistAndView/crdnActInfo/controller/CrdnActInfoController.java +++ b/src/main/java/go/kr/project/crdn/crndRegistAndView/crdnActInfo/controller/CrdnActInfoController.java @@ -129,7 +129,8 @@ public class CrdnActInfoController { // 필요한 공통코드 조회 model.addAttribute("actTypeCdList", commonCodeService.selectCodeDetailList(CmmnCodeSearchVO.builder().searchCdGroupId("ACT_TYPE_CD").build())); model.addAttribute("crdnPhotoCdList", commonCodeService.selectCodeDetailList(CmmnCodeSearchVO.builder().searchCdGroupId("CRDN_PHOTO_SE_CD").build())); - + model.addAttribute("actnPrcsSttsCdList", commonCodeService.selectCodeDetailList(CmmnCodeSearchVO.builder().searchCdGroupId("ACTN_PRCS_STTS_CD").build())); + return mav; } diff --git a/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/crdnActInfo/CrdnActInfoMapper_maria.xml b/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/crdnActInfo/CrdnActInfoMapper_maria.xml index 84f07bb..40be4ce 100644 --- a/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/crdnActInfo/CrdnActInfoMapper_maria.xml +++ b/src/main/resources/mybatis/mapper/crdn/crndRegistAndView/crdnActInfo/CrdnActInfoMapper_maria.xml @@ -101,6 +101,7 @@ VRTC, AREA, RMRK, + ACTN_PRCS_STTS_CD, REG_DT, RGTR, MDFCN_DT, @@ -128,6 +129,7 @@ #{vrtc}, #{area}, #{rmrk}, + IFNULL(#{actnPrcsSttsCd},'1'), NOW(), #{rgtr}, NOW(), @@ -207,6 +209,7 @@ VRTC = #{vrtc}, AREA = #{area}, RMRK = #{rmrk}, + ACTN_PRCS_STTS_CD = #{actnPrcsSttsCd}, MDFCN_DT = NOW(), MDFR = #{mdfr} WHERE ACT_INFO_ID = #{actInfoId} 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 cacbe96..aaa1113 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 @@ -312,16 +312,16 @@ DSPS_BFHD_END_YMD = #{dspsBfhdEndYmd}, /* 시정명령 */ - DSPS_BFHD_BGNG_YMD = #{dspsBfhdBgngYmd}, - DSPS_BFHD_END_YMD = #{dspsBfhdEndYmd}, + CRC_CMD_BGNG_YMD = #{crcCmdBgngYmd}, + CRC_CMD_END_YMD = #{crcCmdEndYmd}, /* 시정촉구 */ - DSPS_BFHD_BGNG_YMD = #{dspsBfhdBgngYmd}, - DSPS_BFHD_END_YMD = #{dspsBfhdEndYmd}, + CRC_URG_BGNG_YMD = #{crcUrgBgngYmd}, + CRC_URG_END_YMD = #{crcUrgEndYmd}, /* 부과예고 */ - DSPS_BFHD_BGNG_YMD = #{dspsBfhdBgngYmd}, - DSPS_BFHD_END_YMD = #{dspsBfhdEndYmd}, + LEVY_PRVNTC_BGNG_YMD = #{levyPrvntcBgngYmd}, + LEVY_PRVNTC_END_YMD = #{levyPrvntcEndYmd}, CRDN_PRCS_STTS_CD = #{crdnPrcsSttsCd}, CRDN_PRCS_YMD = (DATE_FORMAT(CURRENT_DATE(), '%Y%m%d')) @@ -339,16 +339,16 @@ DSPS_BFHD_END_YMD = #{dspsBfhdEndYmd} /* 시정명령 */ - DSPS_BFHD_BGNG_YMD = #{dspsBfhdBgngYmd}, - DSPS_BFHD_END_YMD = #{dspsBfhdEndYmd} + CRC_CMD_BGNG_YMD = #{crcCmdBgngYmd}, + CRC_CMD_END_YMD = #{crcCmdEndYmd} /* 시정촉구 */ - DSPS_BFHD_BGNG_YMD = #{dspsBfhdBgngYmd}, - DSPS_BFHD_END_YMD = #{dspsBfhdEndYmd} + CRC_URG_BGNG_YMD = #{crcUrgBgngYmd}, + CRC_URG_END_YMD = #{crcUrgEndYmd} /* 부과예고 */ - DSPS_BFHD_BGNG_YMD = #{dspsBfhdBgngYmd}, - DSPS_BFHD_END_YMD = #{dspsBfhdEndYmd} + LEVY_PRVNTC_BGNG_YMD = #{levyPrvntcBgngYmd}, + LEVY_PRVNTC_END_YMD = #{levyPrvntcEndYmd} WHERE CRDN_YR = #{crdnYr} AND CRDN_NO = #{crdnNo} diff --git a/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/crdnActInfo/crdnActInfoRegistPopup.jsp b/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/crdnActInfo/crdnActInfoRegistPopup.jsp index 06c329e..4da6021 100644 --- a/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/crdnActInfo/crdnActInfoRegistPopup.jsp +++ b/src/main/webapp/WEB-INF/views/crdn/crndRegistAndView/crdnActInfo/crdnActInfoRegistPopup.jsp @@ -124,7 +124,12 @@ 조치처리상태 - + + <%----%> <%--${data.actnPrcsSttsCdNm}--%>