단속민원 관련 매퍼 이름 변경

src/main/java/cokr/xit/fims/crdn/dao/Crdn02Mapper.java

@@ -1,13 +0,0 @@
-package cokr.xit.fims.crdn.dao;
-
-import org.egovframe.rte.psl.dataaccess.mapper.Mapper;
-
-import cokr.xit.foundation.component.AbstractMapper;
-
-/**민원 개별 등록 DAO
- * @author leebj
- */
-@Mapper("crdn02Mapper")
-public interface Crdn02Mapper extends AbstractMapper {
-
-}

src/main/java/cokr/xit/fims/crdn/dao/CrdnCvlcptMapper.java

@@ -13,8 +13,8 @@ import cokr.xit.foundation.data.DataObject;
 /**민원 관리 DAO
  * @author leebj
  */
-@Mapper("crdn01Mapper")
+@Mapper("crdnCvlcptMapper")
-public interface Crdn01Mapper extends AbstractMapper {
+public interface CrdnCvlcptMapper extends AbstractMapper {
 
 	/**민원자료 목록을 조회한다.<br />
 	 * {@link cokr.xit.fims.crdn.service.bean.CrdnService#getCrackdownList(CrdnQuery)} 참고

src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01Bean.java

@@ -12,8 +12,8 @@ import org.springframework.stereotype.Component;
 import cokr.xit.fims.crdn.Crdn;
 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.fims.crdn.dao.CrdnCvlcptMapper;
 import cokr.xit.foundation.AbstractComponent;
 import cokr.xit.foundation.UserInfo;
 import cokr.xit.foundation.data.DataObject;
@@ -24,8 +24,8 @@ import cokr.xit.foundation.data.DataObject;
 @Component("crdn01Bean")
 public class Crdn01Bean extends AbstractComponent {
 
-	@Resource(name = "crdn01Mapper")
+	@Resource(name = "crdnCvlcptMapper")
-	private Crdn01Mapper crdn01Mapper;
+	private CrdnCvlcptMapper crdnCvlcptMapper;
 
 	@Resource(name = "crdn05Mapper")
 	private Crdn05Mapper crdn05Mapper;
@@ -43,17 +43,17 @@ public class Crdn01Bean extends AbstractComponent {
 
 	public DataObject getCivilComplaintOriginalInfo(CrdnQuery crdnQuery) {
 		if(ifEmpty(crdnQuery.getViewType(), () -> "").equals("hwp")) {
-			return crdn01Mapper.selectCivilComplaintOriginalInfoHwp(crdnQuery);
+			return crdnCvlcptMapper.selectCivilComplaintOriginalInfoHwp(crdnQuery);
 		}
-		return crdn01Mapper.selectCivilComplaintOriginalInfo(crdnQuery);
+		return crdnCvlcptMapper.selectCivilComplaintOriginalInfo(crdnQuery);
 	}
 
 	public boolean accept(CrdnCvlcpt cvlcpt) {
-		return crdn01Mapper.acceptCvlcpt(cvlcpt) == 1 ? true : false;
+		return crdnCvlcptMapper.acceptCvlcpt(cvlcpt) == 1 ? true : false;
 	}
 
 	public boolean update(Crdn crdn) {
-		return crdn01Mapper.updateCrdn(crdn) == 1 ? true : false;
+		return crdnCvlcptMapper.updateCrdn(crdn) == 1 ? true : false;
 	}
 
 }

src/main/java/cokr/xit/fims/crdn/service/bean/Crdn02Bean.java

@@ -1,10 +1,7 @@
 package cokr.xit.fims.crdn.service.bean;
 
-import javax.annotation.Resource;
-
 import org.springframework.stereotype.Component;
 
-import cokr.xit.fims.crdn.dao.Crdn02Mapper;
 import cokr.xit.foundation.AbstractComponent;
 
 /** 민원 개별 등록 Bean
@@ -12,8 +9,7 @@ import cokr.xit.foundation.AbstractComponent;
  */
 @Component("crdn02Bean")
 public class Crdn02Bean extends AbstractComponent {
-	
+
-	@Resource(name = "crdn02Mapper")
+
-	private Crdn02Mapper crdn02Mapper;
+
-	
 }

src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java

@@ -26,9 +26,9 @@ import cokr.xit.fims.cmmn.service.bean.CrdnSttsHstryBean;
 import cokr.xit.fims.crdn.Crdn;
 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.fims.crdn.dao.Crdn06Mapper;
+import cokr.xit.fims.crdn.dao.CrdnCvlcptMapper;
 import cokr.xit.fims.crdn.service.CrdnService;
 import cokr.xit.fims.excl.Excl01;
 import cokr.xit.fims.excl.service.bean.Excl01Bean;
@@ -44,8 +44,8 @@ import kr.dogfoot.hwplib.writer.HWPWriter;
 @Service("crdnService")
 public class CrdnServiceBean extends AbstractServiceBean implements CrdnService {
 
-	@Resource(name="crdn01Mapper")
+	@Resource(name="crdnCvlcptMapper")
-	protected Crdn01Mapper crdn01Mapper;
+	protected CrdnCvlcptMapper crdnCvlcptMapper;
 
 	@Resource(name="crdn05Mapper")
 	protected Crdn05Mapper crdn05Mapper;
@@ -95,10 +95,10 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService
 	        	dataObjectList = crdn06Mapper.selectSameVehicleSubList(req.setOrderBy("CRDN_ID"));
 	        	break;
 	        case "receiptData":
-	        	dataObjectList = crdn01Mapper.selectCivilComplaintReceiptDataList(req.setOrderBy("CVLCPT_RCPT_YMD"));
+	        	dataObjectList = crdnCvlcptMapper.selectCivilComplaintReceiptDataList(req.setOrderBy("CVLCPT_RCPT_YMD"));
 	        	break;
 	        case "answerTargetData":
-	        	dataObjectList = crdn01Mapper.selectCivilComplaintAnswerTargetDataList(req.setOrderBy("CRDN_ID"));
+	        	dataObjectList = crdnCvlcptMapper.selectCivilComplaintAnswerTargetDataList(req.setOrderBy("CRDN_ID"));
 	        	break;
 	        case "todayInsert":
 	        	req.setCurrentUserId(currentUser().getId());
@@ -273,13 +273,13 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService
 
 	@Override
 	public DataObject getAnswerPreview(CrdnQuery req) {
-		return crdn01Mapper.selectAnswerPreview(req);
+		return crdnCvlcptMapper.selectAnswerPreview(req);
 	}
 
 	@Override
 	public DataObject getCivilComplaintReceiptInitialDataInfo(CrdnQuery req) {
 		//민원조회
-		DataObject dataObject = crdn01Mapper.selectCivilComplaintReceiptInitialDataInfo(req);
+		DataObject dataObject = crdnCvlcptMapper.selectCivilComplaintReceiptInitialDataInfo(req);
 
 		//첨부파일 조회
 		FileQuery fileQuery = new FileQuery();

src/main/java/cokr/xit/fims/sprt/service/bean/Sprt03ServiceBean.java

@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
 import cokr.xit.base.file.service.FileQuery;
 import cokr.xit.base.file.service.FileService;
 import cokr.xit.fims.crdn.CrdnQuery;
-import cokr.xit.fims.crdn.dao.Crdn01Mapper;
+import cokr.xit.fims.crdn.dao.CrdnCvlcptMapper;
 import cokr.xit.fims.sprt.Sprt;
 import cokr.xit.fims.sprt.service.Sprt03Service;
 import cokr.xit.foundation.component.AbstractServiceBean;
@@ -22,8 +22,8 @@ import cokr.xit.foundation.data.DataObject;
 @Service("sprt03Service")
 public class Sprt03ServiceBean extends AbstractServiceBean implements Sprt03Service {
 
-	@Resource(name = "crdn01Mapper")
+	@Resource(name = "crdnCvlcptMapper")
-	private Crdn01Mapper crdn01Mapper;
+	private CrdnCvlcptMapper crdnCvlcptMapper;
 
 	@Resource(name="fileService")
 	FileService fileService;
@@ -34,7 +34,7 @@ public class Sprt03ServiceBean extends AbstractServiceBean implements Sprt03Serv
 
 		CrdnQuery crdnQuery = new CrdnQuery();
 		crdnQuery.setCrdnId(crdnId);
-		DataObject cvlcptInfo = crdn01Mapper.selectCivilComplaintReceiptInitialDataInfo(crdnQuery);
+		DataObject cvlcptInfo = crdnCvlcptMapper.selectCivilComplaintReceiptInitialDataInfo(crdnQuery);
 		String linkNm = cvlcptInfo.string("LINK_TBL_NM");
 		if(!linkNm.equals("")) {
 			FileQuery fileQuery = new FileQuery();

src/main/resources/sql/mapper/fims/crdn/crdn02-mapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cokr.xit.fims.crdn.dao.Crdn02Mapper">
-
-</mapper>

src/main/resources/sql/mapper/fims/crdn/crdnCvlcpt-mapper.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cokr.xit.fims.crdn.dao.Crdn01Mapper">
+<mapper namespace="cokr.xit.fims.crdn.dao.CrdnCvlcptMapper">
 
 <resultMap id="crdnRow" type="cokr.xit.fims.crdn.Crdn">
 	<result property="crdnId"              column="CRDN_ID" />               <!-- 단속 ID -->
 </resultMap>
 
 <select id="selectCivilComplaintList" parameterType="map" resultType="dataobject">
-/* 민원자료 목록 조회(crdn01Mapper.selectCivilComplaintList) */
+/* 민원자료 목록 조회(crdnCvlcptMapper.selectCivilComplaintList) */
 <include refid="utility.paging-prefix"/>
 SELECT C.CRDN_ID               <!-- 단속 ID -->
      , C.SGG_CD                <!-- 시군구 코드 -->
@@ -136,7 +136,7 @@ AND C.${by} LIKE CONCAT('%', #{term}, '%')
 </select>
 
 <select id="selectCivilComplaintReceiptDataList" parameterType="map" resultType="dataobject">
-/* 민원접수자료 목록 조회(crdn01Mapper.selectCivilComplaintReceiptDataList) */
+/* 민원접수자료 목록 조회(crdnCvlcptMapper.selectCivilComplaintReceiptDataList) */
 <include refid="utility.paging-prefix"/>
 SELECT C.CRDN_ID                                      <!-- 단속 ID -->
      , C.CRDN_REG_SE_CD                               <!-- 단속 등록 구분 코드 -->
@@ -193,7 +193,7 @@ AND (SELECT VLTN_ARTCL FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) LIKE CONCAT(
 </select>
 
 <select id="selectCivilComplaintAnswerTargetDataList" parameterType="map" resultType="dataobject">
-/* 민원답변대상자료 목록 조회(crdn01Mapper.selectCivilComplaintAnswerTargetDataList) */
+/* 민원답변대상자료 목록 조회(crdnCvlcptMapper.selectCivilComplaintAnswerTargetDataList) */
 <include refid="utility.paging-prefix"/>
 SELECT C.CRDN_ID                                      <!-- 단속 ID -->
      , C.CRDN_REG_SE_CD        <!-- 단속 등록 구분 코드 -->
@@ -252,7 +252,7 @@ AND (SELECT VLTN_ARTCL FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) LIKE CONCAT(
 </select>
 
 <select id="selectCivilComplaintOriginalInfo" parameterType="map" resultType="dataobject">
-/* 민원내역 원본 보기(crdn01Mapper.selectCivilComplaintOriginalInfo) */
+/* 민원내역 원본 보기(crdnCvlcptMapper.selectCivilComplaintOriginalInfo) */
 SELECT C.CRDN_ID                <!-- 단속 ID -->
      , CC.CVLCPT_RCPT_NO        <!-- 민원 접수 번호 -->
      , CC.CVLCPT_APLCNT_NM      <!-- 민원 신청인 명 -->
@@ -267,7 +267,7 @@ SELECT C.CRDN_ID                <!-- 단속 ID -->
 </select>
 
 <select id="selectCivilComplaintOriginalInfoHwp" parameterType="map" resultType="dataobject">
-/* 민원내역 원본 보기(한글 파일)(crdn01Mapper.selectCivilComplaintOriginalInfoHwp) */
+/* 민원내역 원본 보기(한글 파일)(crdnCvlcptMapper.selectCivilComplaintOriginalInfoHwp) */
 SELECT C.CRDN_ID                <!-- 단속 ID -->
      , CC.CVLCPT_RCPT_NO        <!-- 민원 접수 번호 -->
      , CC.CVLCPT_APLCNT_NM      <!-- 민원 신청인 명 -->
@@ -283,7 +283,7 @@ SELECT C.CRDN_ID                <!-- 단속 ID -->
 </select>
 
 <select id="selectAnswerPreview" parameterType="map" resultType="dataobject">
-/* 민원답변 미리보기(crdn01Mapper.selectAnswerPreview) */
+/* 민원답변 미리보기(crdnCvlcptMapper.selectAnswerPreview) */
 SELECT C.CRDN_ID                <!-- 단속 ID -->
      , CC.CVLCPT_APLY_CN        <!-- 민원 신청 내용 -->
      , CC.CVLCPT_PRCS_RSLT_CN
@@ -294,7 +294,7 @@ SELECT C.CRDN_ID                <!-- 단속 ID -->
 </select>
 
 <select id="selectCivilComplaintReceiptInitialDataInfo" parameterType="map" resultType="dataobject">
-/* 민원접수 초기자료 상세조회(crdn01Mapper.selectCivilComplaintReceiptInitialDataInfo) */
+/* 민원접수 초기자료 상세조회(crdnCvlcptMapper.selectCivilComplaintReceiptInitialDataInfo) */
 SELECT C.CRDN_ID                <!-- 단속 ID -->
      , C.CRDN_REG_SE_CD         <!-- 단속 등록 구분 코드 -->
      , C.CRDN_YMD               <!-- 단속 일자 -->
@@ -334,7 +334,7 @@ SELECT C.CRDN_ID                <!-- 단속 ID -->
    AND C.CRDN_ID = #{crdnId}
 </select>
 
-<insert id="insertCvlcpt" parameterType="cokr.xit.fims.crdn.CrdnCvlcpt">/* 단속 민원 대장 등록(crdn01Mapper.insertCvlcpt) */
+<insert id="insertCvlcpt" parameterType="cokr.xit.fims.crdn.CrdnCvlcpt">/* 단속 민원 대장 등록(crdnCvlcptMapper.insertCvlcpt) */
 INSERT INTO TB_CRDN_CVLCPT (
        CVLCPT_LINK_ID        <!-- 민원 연계 ID -->
      , CVLCPT_INPT_SE_CD     <!-- 민원 입력 구분 코드 -->
@@ -400,7 +400,7 @@ INSERT INTO TB_CRDN_CVLCPT (
 )</insert>
 
 <update id="acceptCvlcpt" parameterType="cokr.xit.fims.crdn.CrdnCvlcpt">
-    /* 단속민원 수용(crdn01Mapper.acceptCvlcpt) */
+    /* 단속민원 수용(crdnCvlcptMapper.acceptCvlcpt) */
     UPDATE TB_CRDN_CVLCPT
        SET CVLCPT_PRCS_CMPTN_DT = <include refid="utility.now" />
          , CVLCPT_PRCS_CD = '01'
@@ -414,21 +414,18 @@ INSERT INTO TB_CRDN_CVLCPT (
 </update>
 
 <update id="updateCrdn" parameterType="cokr.xit.fims.crdn.Crdn">
-    /* 단속정보 수정(crdn01Mapper.updateCrdn) */
+    /* 단속정보 수정(crdnCvlcptMapper.updateCrdn) */
     UPDATE TB_CRDN
-       SET MDFCN_DT = <include refid="utility.now" /> /* 수정일시 */
+       SET MDFCN_DT         = <include refid="utility.now" /> /* 수정일시 */
-         , MDFR = #{modifiedBy}                   /* 수정자 */
+         , MDFR             = #{modifiedBy}                   /* 수정자 */
          , ATCH_FILE_CNT    = ATCH_FILE_CNT + (#{fileChgCnt})
          , RTPYR_ID         = #{rtpyrId}        <!-- 납부자 ID -->
          , CRDN_YMD         = #{crdnYmd}        <!-- 단속 일자 -->
          , CRDN_TM          = #{crdnTm}         <!-- 단속 시각 -->
          , VHRNO            = #{vhrno}          <!-- 차량번호 -->
          , CRDN_STDG_NM     = #{crdnStdgNm}     <!-- 단속 법정동 명 -->
-         , CRDN_ROAD_NM     = #{crdnRoadNm}     <!-- 단속 도로 명 -->
          , CRDN_PLC         = #{crdnPlc}        <!-- 단속 장소 -->
          , VLTN_ID          = #{vltnId}         <!-- 위반 ID -->
-         , GPS_X            = #{gpsX}           <!-- GPS X -->
-         , GPS_Y            = #{gpsY}           <!-- GPS Y -->
          , VIN              = #{vin}            <!-- 차대번호 -->
          , VHCL_NM          = #{vhclNm}         <!-- 차량 명 -->
          , VHCL_COLOR       = #{vhclColor}      <!-- 차량 색상 -->