From 4deeae46043e7bae5e14d279a72e2a46ca8b0576 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Thu, 10 Aug 2023 11:27:17 +0900
Subject: [PATCH] =?UTF-8?q?=EB=AF=BC=EC=9B=90=20=EC=82=AD=EC=A0=9C=20?=
 =?UTF-8?q?=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/crdn/dao/Crdn01Mapper.java    |  7 -------
 .../java/cokr/xit/fims/crdn/dao/Crdn05Mapper.java    |  7 +++++++
 .../cokr/xit/fims/crdn/service/bean/Crdn01Bean.java  |  6 +++++-
 .../resources/sql/mapper/fims/crdn/crdn01-mapper.xml | 12 ------------
 .../resources/sql/mapper/fims/crdn/crdn05-mapper.xml | 11 +++++++++++
 5 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/crdn/dao/Crdn01Mapper.java b/src/main/java/cokr/xit/fims/crdn/dao/Crdn01Mapper.java
index 864481c0..e00b9779 100644
--- a/src/main/java/cokr/xit/fims/crdn/dao/Crdn01Mapper.java
+++ b/src/main/java/cokr/xit/fims/crdn/dao/Crdn01Mapper.java
@@ -1,7 +1,6 @@
 package cokr.xit.fims.crdn.dao;
 
 import java.util.List;
-import java.util.Map;
 
 import org.egovframe.rte.psl.dataaccess.mapper.Mapper;
 
@@ -37,12 +36,6 @@ public interface Crdn01Mapper extends AbstractMapper {
 	 */
 	List<DataObject> selectCivilComplaintAnswerTargetDataList(CrdnQuery query);
 
-	/** 민원 자료를 삭제한다.
-	 * @param params 삭제 요청 파라미터
-	 * @return 저장된 정보수
-	 */
-	int remove(Map<String, Object> map);
-
 	/** 민원 원본을 조회한다.
 	 * @param query 민원원본 조회 조건
 	 * @return 민원원본
diff --git a/src/main/java/cokr/xit/fims/crdn/dao/Crdn05Mapper.java b/src/main/java/cokr/xit/fims/crdn/dao/Crdn05Mapper.java
index 9b40e4e2..2e371e53 100644
--- a/src/main/java/cokr/xit/fims/crdn/dao/Crdn05Mapper.java
+++ b/src/main/java/cokr/xit/fims/crdn/dao/Crdn05Mapper.java
@@ -1,6 +1,7 @@
 package cokr.xit.fims.crdn.dao;
 
 import java.util.List;
+import java.util.Map;
 
 import org.egovframe.rte.psl.dataaccess.mapper.Mapper;
 
@@ -40,6 +41,12 @@ public interface Crdn05Mapper extends AbstractMapper {
 	 */
 	int insertCrdnAddition(Crdn crdn);
 
+	/** 단속 자료를 삭제한다.
+	 * @param params 삭제 요청 파라미터
+	 * @return 저장된 정보수
+	 */
+	int removeCrdn(Map<String, Object> map);
+
 	/**기본금액을 조회한다.<br />
 	 * {@link cokr.xit.fims.crdn.service.bean.Crdn05Bean#getBasicAmt(CrdnQuery)} 참고
 	 * @param query 단속자료 정보
diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01Bean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01Bean.java
index 63f970bd..0cb9c607 100644
--- a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01Bean.java
+++ b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01Bean.java
@@ -12,6 +12,7 @@ import org.springframework.stereotype.Component;
 import cokr.xit.fims.crdn.CrdnCvlcpt;
 import cokr.xit.fims.crdn.CrdnQuery;
 import cokr.xit.fims.crdn.dao.Crdn01Mapper;
+import cokr.xit.fims.crdn.dao.Crdn05Mapper;
 import cokr.xit.foundation.AbstractComponent;
 import cokr.xit.foundation.UserInfo;
 import cokr.xit.foundation.data.DataObject;
@@ -25,6 +26,9 @@ public class Crdn01Bean extends AbstractComponent {
 	@Resource(name = "crdn01Mapper")
 	private Crdn01Mapper crdn01Mapper;
 
+	@Resource(name = "crdn05Mapper")
+	private Crdn05Mapper crdn05Mapper;
+
 	public boolean remove(String... crdnIDs) {
 		if (isEmpty(crdnIDs)) return false;
 
@@ -33,7 +37,7 @@ public class Crdn01Bean extends AbstractComponent {
 		paramMap.put("crdnIDs", crdnIdList);
 		paramMap.put("removedBy", UserInfo.current().getId());
 
-		return crdn01Mapper.remove(paramMap) == 1 ? true : false;
+		return crdn05Mapper.removeCrdn(paramMap) == 1 ? true : false;
 	}
 
 	public DataObject getCivilComplaintOriginalInfo(CrdnQuery crdnQuery) {
diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml
index 598a1b1e..bdfac5a7 100644
--- a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml
@@ -251,18 +251,6 @@ AND (SELECT VLTN_ARTCL FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) LIKE CONCAT(
 <include refid="utility.paging-suffix"/>
 </select>
 
-
-<update id="remove" parameterType="map">
-    /* 민원자료 삭제(crdn01Mapper.remove) */
-    UPDATE TB_CRDN
-       SET DEL_YN = 'Y'
-         , DEL_DT = <include refid="utility.now" /> /* 삭제일시 */
-         , DLTR = #{removedBy}                   /* 삭제자 */
-     WHERE CRDN_ID IN (
-     <foreach collection="crdnIDs" item="crdnId" separator=",">#{crdnId}</foreach>
-     )
-</update>
-
 <select id="selectCivilComplaintOriginalInfo" parameterType="map" resultType="dataobject">
 /* 민원내역 원본 보기(crdn01Mapper.selectCivilComplaintOriginalInfo) */
 SELECT C.CRDN_ID                <!-- 단속 ID -->
diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn05-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn05-mapper.xml
index f2b869b7..bd055602 100644
--- a/src/main/resources/sql/mapper/fims/crdn/crdn05-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/crdn/crdn05-mapper.xml
@@ -191,6 +191,17 @@ INSERT INTO TB_CRDN (
 )
 </insert>
 
+<update id="removeCrdn" parameterType="map">
+    /* 단속자료 삭제(crdn05Mapper.removeCrdn) */
+    UPDATE TB_CRDN
+       SET DEL_YN = 'Y'
+         , DEL_DT = <include refid="utility.now" /> /* 삭제일시 */
+         , DLTR = #{removedBy}                   /* 삭제자 */
+     WHERE CRDN_ID IN (
+     <foreach collection="crdnIDs" item="crdnId" separator=",">#{crdnId}</foreach>
+     )
+</update>
+
 <select id="selectBasicAmt" parameterType="cokr.xit.fims.crdn.CrdnQuery" resultType="int">
 SELECT AMT
   FROM TB_AMT_INFO