From 9f97ac74a9eb50dbb512acb2543217445c3e0d3f Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Wed, 9 Aug 2023 14:40:34 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8B=A8=EC=86=8D=20=EA=B4=80=EB=A6=AC=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

---
 .../cokr/xit/fims/crdn/dao/Crdn01Mapper.java  |  2 +-
 .../cokr/xit/fims/crdn/dao/Crdn06Mapper.java  | 28 +++++++++----------
 .../fims/crdn/service/bean/Crdn01Bean.java    |  5 +++-
 .../fims/crdn/service/bean/Crdn06Bean.java    |  2 +-
 .../crdn/service/bean/CrdnServiceBean.java    |  7 ++++-
 .../sql/mapper/fims/crdn/crdn01-mapper.xml    | 16 +++++++----
 .../sql/mapper/fims/crdn/crdn06-mapper.xml    | 16 +++--------
 7 files changed, 39 insertions(+), 37 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 11f78424..dba2aa12 100644
--- a/src/main/java/cokr/xit/fims/crdn/dao/Crdn01Mapper.java
+++ b/src/main/java/cokr/xit/fims/crdn/dao/Crdn01Mapper.java
@@ -71,6 +71,6 @@ public interface Crdn01Mapper extends AbstractMapper {
 	 * @param crdn 민원정보
 	 * @return 저장된 정보 수
 	 */
-	int save(Crdn crdn);
+	int updateCvlcpt(Crdn crdn);
 
 }
diff --git a/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java b/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java
index cf3bfc92..9680b465 100644
--- a/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java
+++ b/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java
@@ -18,38 +18,38 @@ public interface Crdn06Mapper extends AbstractMapper {
 
 	/**단속자료 목록을 조회한다.<br />
 	 * {@link cokr.xit.fims.crdn.service.bean.CrdnService#getCrackdownList(CrdnQuery)} 참고
-	 * @param req 단속자료 목록 조회 조건
+	 * @param query 단속자료 목록 조회 조건
 	 * @return 단속자료 목록
 	 */
-	List<DataObject> selectCrackdownList(CrdnQuery req);
+	List<DataObject> selectCrackdownList(CrdnQuery crdnQuery);
 
 	/**단속사진 검사 자료 목록을 조회한다.<br />
 	 * {@link cokr.xit.fims.crdn.service.bean.CrdnService#getCrackdownList(CrdnQuery)} 참고
-	 * @param req 단속사진 검사 자료 목록 조회 조건
+	 * @param query 단속사진 검사 자료 목록 조회 조건
 	 * @return 단속사진 검사 자료 목록
 	 */
-	List<DataObject> selectPhotoInspectionDataList(CrdnQuery setOrderBy);
+	List<DataObject> selectPhotoInspectionDataList(CrdnQuery crdnQuery);
 
 	/**동일 차량 단속 그룹 목록을 조회한다.<br />
 	 * {@link cokr.xit.fims.crdn.service.bean.CrdnService#getCrackdownList(CrdnQuery)} 참고
-	 * @param req 동일 차량 단속 그룹 목록 조회 조건
+	 * @param query 동일 차량 단속 그룹 목록 조회 조건
 	 * @return 동일 차량 단속 그룹 목록
 	 */
-	List<DataObject> selectSameVehicleMainList(CrdnQuery setOrderBy);
+	List<DataObject> selectSameVehicleMainList(CrdnQuery crdnQuery);
 
 	/**동일 차량 단속 자료 목록을 조회한다.<br />
 	 * {@link cokr.xit.fims.crdn.service.bean.CrdnService#getCrackdownList(CrdnQuery)} 참고
-	 * @param req 동일 차량 단속 자료 목록 조회 조건
+	 * @param query 동일 차량 단속 자료 목록 조회 조건
 	 * @return 동일 차량 단속 자료 목록
 	 */
-	List<DataObject> selectSameVehicleSubList(CrdnQuery setOrderBy);
+	List<DataObject> selectSameVehicleSubList(CrdnQuery crdnQuery);
 
 	/**표지정보 미확인 자료 목록을 조회한다.<br />
 	 * {@link cokr.xit.fims.crdn.service.bean.CrdnService#getCrackdownList(CrdnQuery)} 참고
-	 * @param req 표지정보 미확인 자료 목록 조회 조건
+	 * @param query 표지정보 미확인 자료 목록 조회 조건
 	 * @return 표지정보 미확인 자료 목록
 	 */
-	List<DataObject> selectTagInformationUndefinedDataList(CrdnQuery req);
+	List<DataObject> selectTagInformationUndefinedDataList(CrdnQuery crdnQuery);
 
 	/**표지정보 미확인 자료를 확인 자료로 수정한다.
 	 * @param crdn 단속 대장
@@ -59,19 +59,17 @@ public interface Crdn06Mapper extends AbstractMapper {
 
 	/**과태료 감경 자료 목록을 조회한다.<br />
 	 * {@link cokr.xit.fims.crdn.service.bean.CrdnService#getCrackdownList(CrdnQuery)} 참고
-	 * @param req 과태료 감경 자료 목록 조회 조건
+	 * @param query 과태료 감경 자료 목록 조회 조건
 	 * @return 과태료 감경 자료 목록
 	 */
-	List<DataObject> selectFineReductionDataList(QueryRequest setOrderBy);
-
-	List<DataObject> selectCrackdowns(CrdnQuery req);
+	List<DataObject> selectFineReductionDataList(QueryRequest crdnQuery);
 
 	/**단속정보를 변경한다.<br />
 	 * {@link cokr.xit.fims.crdn.service.bean.Crdn06Bean#update(Crdn)} 참고
 	 * @param crdn 단속정보
 	 * @return 저장된 정보수
 	 */
-	int update(Crdn crdn);
+	int updateCrdn(Crdn crdn);
 
 
 }
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 8635a8b5..28b36950 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
@@ -9,6 +9,7 @@ import javax.annotation.Resource;
 
 import org.springframework.stereotype.Component;
 
+import cokr.xit.fims.crdn.Crdn;
 import cokr.xit.fims.crdn.CrdnQuery;
 import cokr.xit.fims.crdn.dao.Crdn01Mapper;
 import cokr.xit.foundation.AbstractComponent;
@@ -42,6 +43,8 @@ public class Crdn01Bean extends AbstractComponent {
 		return crdn01Mapper.selectCivilComplaintOriginalInfo(crdnQuery);
 	}
 
-
+	public boolean update(Crdn crdn) {
+		return crdn01Mapper.updateCvlcpt(crdn) == 1 ? true : false;
+	}
 
 }
diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java
index 699de2b1..1afa4dc0 100644
--- a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java
+++ b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java
@@ -29,7 +29,7 @@ public class Crdn06Bean extends AbstractComponent {
 			case "tagInformationUndefinedData":
 				return crdn06Mapper.updateTagInformation(crdn) == 1 ? true : false;
 			default:
-				return crdn06Mapper.update(crdn) == 1 ? true : false;
+				return crdn06Mapper.updateCrdn(crdn) == 1 ? true : false;
 		}
 	}
 
diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java
index 552b7bf2..1ffba405 100644
--- a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java
+++ b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java
@@ -44,6 +44,7 @@ import kr.dogfoot.hwplib.writer.HWPWriter;
 
 @Service("crdnService")
 public class CrdnServiceBean extends AbstractServiceBean implements CrdnService {
+
 	@Resource(name="crdn01Mapper")
 	protected Crdn01Mapper crdn01Mapper;
 
@@ -318,6 +319,8 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService
 
 	@Override
 	public boolean save(Crdn crdn, List<FileInfo> newFileInfoList) {
+		boolean saved;
+
 		int fileInsertEffected = 0;
 		int fileDeleteEffected = 0;
 
@@ -331,7 +334,9 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService
 
 		crdn.setFileChgCnt(fileInsertEffected - fileDeleteEffected);
 
-		return crdn06Bean.update(crdn);
+		saved = crdn01Bean.update(crdn);
+		saved = crdn06Bean.update(crdn);
+		return saved;
 	}
 
 	@Override
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 70d7bf11..ac0e9846 100644
--- a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml
@@ -6,7 +6,8 @@
 	<result property="crdnId"              column="CRDN_ID" />               <!-- 단속 ID -->
 </resultMap>
 
-<sql id="selectCivilComplaint">
+<select id="selectCivilComplaintList" parameterType="map" resultType="dataobject">
+/* 민원자료 목록 조회(crdn01Mapper.selectCivilComplaintList) */
 <include refid="utility.paging-prefix"/>
 SELECT C.CRDN_ID               <!-- 단속 ID -->
      , C.SGG_CD                <!-- 시군구 코드 -->
@@ -142,11 +143,6 @@ AND C.${by} LIKE CONCAT('%', #{term}, '%')
 
 <include refid="utility.orderBy" />
 <include refid="utility.paging-suffix"/>
-</sql>
-
-<select id="selectCivilComplaintList" parameterType="map" resultType="dataobject">
-	/* 민원자료 목록 조회(crdn01Mapper.selectCivilComplaintList) */
-	<include refid="selectCivilComplaint"/>
 </select>
 
 <select id="selectCivilComplaintReceiptDataList" parameterType="map" resultType="dataobject">
@@ -359,4 +355,12 @@ SELECT C.CRDN_ID                <!-- 단속 ID -->
    AND C.CRDN_ID = #{crdnId}
 </select>
 
+<update id="updateCvlcpt" parameterType="cokr.xit.fims.crdn.Crdn">
+    /* 민원정보 수정(crdn01Mapper.updateCvlcpt) */
+    UPDATE TB_CRDN <!-- TODO : 컬럼 추가 -->
+       SET MDFCN_DT = <include refid="utility.now" /> /* 수정일시 */
+         , MDFR = #{modifiedBy}                   /* 수정자 */
+     WHERE CRDN_ID = #{crdnId}                   /* 단속 ID */
+</update>
+
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
index ecfcfbcd..b4a16456 100644
--- a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
@@ -96,7 +96,8 @@
     <result property="delRsn"              column="DEL_RSN" />               <!-- 삭제 사유 -->
 </resultMap>
 
-<sql id="selectCrackdown">
+<select id="selectCrackdownList" parameterType="map" resultType="dataobject">
+/* 단속자료 목록 조회(crdn06Mapper.selectCrackdownList) */
 <include refid="utility.paging-prefix"/>
 SELECT C.CRDN_ID               <!-- 단속 ID -->
      , C.SGG_CD                <!-- 시군구 코드 -->
@@ -232,11 +233,6 @@ AND C.${by} LIKE CONCAT('%', #{term}, '%')
 
 <include refid="utility.orderBy" />
 <include refid="utility.paging-suffix"/>
-</sql>
-
-<select id="selectCrackdownList" parameterType="map" resultType="dataobject">
-	/* 단속자료 목록 조회(crdn06Mapper.selectCrackdownList) */
-	<include refid="selectCrackdown"/>
 </select>
 
 <select id="selectPhotoInspectionDataList" parameterType="map" resultType="dataobject">
@@ -493,13 +489,9 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
 <include refid="utility.paging-suffix"/>
 </select>
 
-<select id="selectCrackdowns" parameterType="map" resultMap="crdnRow">
-	/* 단속자료 가져오기 (crdn06Mapper.selectCrackdowns) */
-	<include refid="selectCrackdown"/>
-</select>
 
-<update id="update" parameterType="cokr.xit.fims.crdn.Crdn">
-    /* 단속정보 수정(crdn06Mapper.update) */
+<update id="updateCrdn" parameterType="cokr.xit.fims.crdn.Crdn">
+    /* 단속정보 수정(crdn06Mapper.updateCrdn) */
     UPDATE TB_CRDN
        SET ATCH_FILE_CNT = ATCH_FILE_CNT + (#{fileChgCnt})
        <!-- TODO : 컬럼 추가 -->