From 43511af8f3038e6996c46316a8451719a19b7e57 Mon Sep 17 00:00:00 2001 From: jjh Date: Wed, 25 Oct 2023 10:47:31 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B0=9C=EB=B3=84=EC=B4=9D=EC=A0=95=EB=B3=B4?= =?UTF-8?q?=20=EC=88=98=EC=A0=95.=201.=20=EB=8B=A8=EC=86=8D=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=88=98=EC=A0=95.=202.=20=EB=8B=A8=EC=86=8D=20?= =?UTF-8?q?=EC=9E=AC=EB=93=B1=EB=A1=9D=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cokr/xit/fims/cmmn/web/TaskInfoController.java | 2 +- .../cokr/xit/fims/excl/service/bean/CrdnReRegBean.java | 6 +----- .../resources/sql/mapper/fims/cmmn/taskInfo-mapper.xml | 4 ++-- .../resources/sql/mapper/fims/excl/crdnReReg-mapper.xml | 8 -------- src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-info.jsp | 6 ++++-- src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02010-main.jsp | 2 ++ src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp | 8 +++++--- src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp | 2 +- 8 files changed, 16 insertions(+), 22 deletions(-) diff --git a/src/main/java/cokr/xit/fims/cmmn/web/TaskInfoController.java b/src/main/java/cokr/xit/fims/cmmn/web/TaskInfoController.java index 7a5d8c46..97c130d6 100644 --- a/src/main/java/cokr/xit/fims/cmmn/web/TaskInfoController.java +++ b/src/main/java/cokr/xit/fims/cmmn/web/TaskInfoController.java @@ -20,7 +20,7 @@ import cokr.xit.fims.cmmn.service.TaskInfoService; * * 
  * ============ 변경 이력 ============
- * 2023-10-24	mjkhan 최초 작성
+ * 2023-10-24	JoJH 최초 작성
  * ================================
  *
*/ diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/CrdnReRegBean.java b/src/main/java/cokr/xit/fims/excl/service/bean/CrdnReRegBean.java index 76da118e..8a6acea9 100644 --- a/src/main/java/cokr/xit/fims/excl/service/bean/CrdnReRegBean.java +++ b/src/main/java/cokr/xit/fims/excl/service/bean/CrdnReRegBean.java @@ -82,11 +82,7 @@ public class CrdnReRegBean extends AbstractComponent { String retMessage = "[F] "; // 처리 결과 메시지 // 단속 ID로 단속(TB_CRDN) 정보 조회 - LevyExclQuery req = new LevyExclQuery(); - - req.setCrdnId(crdnReReg.getBfrCrdnId()); - - DataObject infoCrdn = crdnReRegMapper.selectCrdn(req); + DataObject infoCrdn = crdnReRegMapper.selectCrdn(new LevyExclQuery().setCrdnId(crdnReReg.getBfrCrdnId())); // 단속 ID로 파일(TB_FILE) 정보 조회 List infoCrdnFileList = fileBean.getFileList(new FileQuery().setInfoType(CrdnReReg.INF_TYPE) diff --git a/src/main/resources/sql/mapper/fims/cmmn/taskInfo-mapper.xml b/src/main/resources/sql/mapper/fims/cmmn/taskInfo-mapper.xml index 1b07274c..c43454b4 100644 --- a/src/main/resources/sql/mapper/fims/cmmn/taskInfo-mapper.xml +++ b/src/main/resources/sql/mapper/fims/cmmn/taskInfo-mapper.xml @@ -114,8 +114,8 @@ /* 업무 정보 삭제(taskInfoMapper.deleteTaskInfo) */ - UPDATE TB_TASK_INFO SET - USE_YN = 'N' + UPDATE TB_TASK_INFO + SET USE_YN = 'N' , MDFCN_DT = , MDFR = #{currentUser.id} WHERE SGG_CD = #{taskInfo.sggCd} diff --git a/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml b/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml index 30d00e15..69d63499 100644 --- a/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml @@ -254,7 +254,6 @@ , C.ADVNTCE_AMT , C.OPNN_SBMSN_YN , C.ETC_CN - , C.LEVY_ID , C.CRDN_STTS_CD , C.CRDN_STTS_CHG_DT , C.ADTN_AMT @@ -282,14 +281,7 @@ FROM TB_CRDN C INNER JOIN TB_CRDN_ADI CA ON (C.CRDN_ID = CA.CRDN_ID) WHERE C.CRDN_ID = #{crdnId} - - - AND C.DEL_YN = #{delYn} - - AND C.DEL_YN = 'N' - - diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-info.jsp index 09b6a419..6ff6bb0e 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-info.jsp @@ -240,11 +240,13 @@ }); ${pageName}Control.onCurrentChange = item => { - // Dataset 셋팅 - ${pageName}Fields.set(item); + if (!item) return; // 업무별 입력 항목 renderTask${pageName}(item.data.TASK_SE_CD); + + // Dataset 셋팅 + ${pageName}Fields.set(item); } /************************************************************************** diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02010-main.jsp index 6bf87d5c..acfb309d 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02010-main.jsp @@ -129,6 +129,8 @@ }); ${pageName}Control.onCurrentChange = item => { + if (!item) return; + // Dataset 셋팅 ${pageName}Fields.set(item); diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp index d72c800e..85c544fa 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp @@ -353,6 +353,8 @@ **************************************************************************/ // 현재 선택 자료 변경 이벤트 ${pageName}Control.onCurrentChange = item => { + if (!item) return; + ${pageName}Fields.set(item); // Dataset 셋팅 } @@ -938,16 +940,16 @@ // 단속 재등록 fnCreateCrdnReReg${pageName} = () => { - let crdnId = ${pageName}Control.dataset.getValue("CRDN_ID"); + let bfrCrdnId = ${pageName}Control.dataset.getValue("CRDN_ID"); // 단속 ID 가 없다면.. return - if (crdnId == undefined || crdnId == "") { + if (bfrCrdnId == null || bfrCrdnId == "") { return; } let params = { callPurpose : "create" - , crdnId : crdnId // 단속 ID + , bfrCrdnId : bfrCrdnId // 단속 ID , sggCd : ${pageName}Control.dataset.getValue("SGG_CD") // 시군구 코드 , taskSeCd : ${pageName}Control.dataset.getValue("TASK_SE_CD") // 업무 구분 코드 }; diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp index a05265cc..6534737c 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp @@ -199,7 +199,7 @@ 등록일시 등록사용자 - 전체주소 + 전체주소 우편번호