소스 정리

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

@@ -1,7 +1,5 @@
 package cokr.xit.fims.crdn.dao;
 
-import java.util.Map;
-
 import org.egovframe.rte.psl.dataaccess.mapper.Mapper;
 
 import cokr.xit.fims.crdn.Crdn;
@@ -10,8 +8,8 @@ import cokr.xit.foundation.component.AbstractMapper;
 /**단속 자료 등록 DAO
  * @author leebj
  */
-@Mapper("crdn05Mapper")
+@Mapper("crdnInstMapper")
-public interface Crdn05Mapper extends AbstractMapper {
+public interface CrdnInstMapper extends AbstractMapper {
 
 	/**단속 대장 정보를 등록한다.
 	 * @param params 파라미터
@@ -31,10 +29,4 @@ public interface Crdn05Mapper extends AbstractMapper {
 	 */
 	int insertCrdnAddition(Crdn crdn);
 
-	/** 단속 자료를 삭제한다.
-	 * @param params 삭제 요청 파라미터
-	 * @return 저장된 정보수
-	 */
-	int removeCrdn(Map<String, Object> map);
-
 }

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

@@ -1,5 +1,7 @@
 package cokr.xit.fims.crdn.dao;
 
+import java.util.Map;
+
 import org.egovframe.rte.psl.dataaccess.mapper.Mapper;
 
 import cokr.xit.fims.crdn.Crdn;
@@ -8,8 +10,8 @@ import cokr.xit.foundation.component.AbstractMapper;
 /**단속 관리 DAO
  * @author leebj
  */
-@Mapper("crdn06Mapper")
+@Mapper("crdnUpdtMapper")
-public interface Crdn06Mapper extends AbstractMapper {
+public interface CrdnUpdtMapper extends AbstractMapper {
 
 	/**표지정보 미확인 자료를 확인 자료로 수정한다.
 	 * @param crdn 단속 대장
@@ -18,10 +20,15 @@ public interface Crdn06Mapper extends AbstractMapper {
 	int updateTagInformation(Crdn crdn);
 
 	/**단속정보를 변경한다.<br />
-	 * {@link cokr.xit.fims.crdn.service.bean.Crdn06Bean#update(Crdn)} 참고
+	 * {@link cokr.xit.fims.crdn.service.bean.CrdnBean#update(Crdn)} 참고
 	 * @param crdn 단속정보
 	 * @return 저장된 정보수
 	 */
 	int updateCrdn(Crdn crdn);
 
+	/** 단속 자료를 삭제한다.
+	 * @param params 삭제 요청 파라미터
+	 * @return 저장된 정보수
+	 */
+	int removeCrdn(Map<String, Object> map);
 }

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

@@ -1,48 +0,0 @@
-package cokr.xit.fims.crdn.service.bean;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Component;
-
-import cokr.xit.fims.crdn.Crdn;
-import cokr.xit.fims.crdn.dao.Crdn05Mapper;
-import cokr.xit.fims.crdn.dao.GlobalStngMapper;
-import cokr.xit.foundation.AbstractComponent;
-
-/** 단속 자료 등록 Bean
- * @author leebj
- */
-@Component("crdn05Bean")
-public class Crdn05Bean extends AbstractComponent {
-
-	@Resource(name = "crdn05Mapper")
-	private Crdn05Mapper crdn05Mapper;
-
-	@Resource(name = "globalStngMapper")
-	private GlobalStngMapper globalStngMapper;
-
-	/**단속 대장 정보를 등록한다.
-	 * @param crdn 단속 대장
-	 * @return 저장 여부
-	 * <ul><li>저장됐으면 true</li>
-	 *     <li>그렇지 않으면 false</li>
-	 * </ul>
-	 */
-	public boolean insertCrdn(Crdn crdn) {
-
-		int effected = crdn05Mapper.insertCrdn(crdn);
-		if(effected != 1) {
-			return false;
-		}
-
-		effected = crdn05Mapper.insertCrdnAddition(crdn);
-		if(effected != 1) {
-			return false;
-		}
-
-		return true;
-
-	}
-
-
-}

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

@@ -1,73 +0,0 @@
-package cokr.xit.fims.crdn.service.bean;
-
-import java.util.Map;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Component;
-
-import cokr.xit.fims.crdn.Crdn;
-import cokr.xit.fims.crdn.dao.Crdn06Mapper;
-import cokr.xit.foundation.AbstractComponent;
-
-/** 단속 관리 Bean
- * @author leebj
- */
-@Component("crdn06Bean")
-public class Crdn06Bean extends AbstractComponent {
-
-	@Resource(name = "crdn06Mapper")
-	private Crdn06Mapper crdn06Mapper;
-
-	/**단속 대장 정보를 수정한다.
-	 * @param nonQueryRequest 수정 요청, crdn 단속 대장
-	 * @return 저장 여부
-	 * <ul><li>저장됐으면 true</li>
-	 *     <li>그렇지 않으면 false</li>
-	 * </ul>
-	 */
-	public boolean update(Map<String,Object> nonQueryRequest, Crdn crdn) {
-		String updateInfomation = (String)ifEmpty(nonQueryRequest.get("updateInfomation"), "") ;
-
-		switch (ifEmpty(updateInfomation, () -> "")) {
-			case "tagInformationUndefinedData":
-				return crdn06Mapper.updateTagInformation(crdn) == 1 ? true : false;
-			default:
-				return crdn06Mapper.updateCrdn(crdn) == 1 ? true : false;
-		}
-	}
-
-	/**잔액을 계산한다.
-	 * @param state 대장 자료 상태
-	 * @param advntceLevyAmt 사전통지부과금액
-	 * @param levyAmt 부과금액
-	 * @param minusAmt 감경금액
-	 * @param adtnAmt 가산금액
-	 * @param rcvmtAmt 수납금액
-	 * @return 잔액
-	 */
-	public int getBalance(String state, int advntceLevyAmt, int levyAmt, int minusAmt, int adtnAmt, int rcvmtAmt) {
-		int result = 0;
-		if(Integer.parseInt(state) < Integer.parseInt("51")) {
-			result = advntceLevyAmt - rcvmtAmt - minusAmt;
-		} else if(state.equals("71") ||
-				state.equals("72") ||
-				state.equals("73") ||
-				state.equals("74") ||
-				state.equals("75") ||
-				state.equals("76") ||
-				state.equals("80") ||
-				state.equals("81") ||
-				state.equals("82") ||
-				state.equals("83") ||
-				state.equals("84") ||
-				state.equals("85")) {
-
-		} else {
-			result = levyAmt - rcvmtAmt - minusAmt + adtnAmt;
-		}
-
-		return result;
-	}
-
-}

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

@@ -0,0 +1,67 @@
+package cokr.xit.fims.crdn.service.bean;
+
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Component;
+
+import cokr.xit.fims.crdn.Crdn;
+import cokr.xit.fims.crdn.dao.CrdnInstMapper;
+import cokr.xit.fims.crdn.dao.CrdnUpdtMapper;
+import cokr.xit.foundation.AbstractComponent;
+
+/** 단속 관리 Bean
+ * @author leebj
+ */
+@Component("crdnBean")
+public class CrdnBean extends AbstractComponent {
+
+	@Resource(name = "crdnInstMapper")
+	private CrdnInstMapper crdnInstMapper;
+
+	@Resource(name = "crdnUpdtMapper")
+	private CrdnUpdtMapper crdnUpdtMapper;
+
+	/**단속 대장 정보를 등록한다.
+	 * @param crdn 단속 대장
+	 * @return 저장 여부
+	 * <ul><li>저장됐으면 true</li>
+	 *     <li>그렇지 않으면 false</li>
+	 * </ul>
+	 */
+	public boolean insertCrdn(Crdn crdn) {
+
+		int effected = crdnInstMapper.insertCrdn(crdn);
+		if(effected != 1) {
+			return false;
+		}
+
+		effected = crdnInstMapper.insertCrdnAddition(crdn);
+		if(effected != 1) {
+			return false;
+		}
+
+		return true;
+
+	}
+
+	/**단속 대장 정보를 수정한다.
+	 * @param nonQueryRequest 수정 요청, crdn 단속 대장
+	 * @return 저장 여부
+	 * <ul><li>저장됐으면 true</li>
+	 *     <li>그렇지 않으면 false</li>
+	 * </ul>
+	 */
+	public boolean update(Map<String,Object> nonQueryRequest, Crdn crdn) {
+		String updateInfomation = (String)ifEmpty(nonQueryRequest.get("updateInfomation"), "") ;
+
+		switch (ifEmpty(updateInfomation, () -> "")) {
+			case "tagInformationUndefinedData":
+				return crdnUpdtMapper.updateTagInformation(crdn) == 1 ? true : false;
+			default:
+				return crdnUpdtMapper.updateCrdn(crdn) == 1 ? true : false;
+		}
+	}
+
+}

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

@@ -17,9 +17,9 @@ import cokr.xit.fims.cmmn.CrdnSttsHstry;
 import cokr.xit.fims.cmmn.service.bean.CrdnSttsHstryBean;
 import cokr.xit.fims.crdn.Crdn;
 import cokr.xit.fims.crdn.CrdnQuery;
-import cokr.xit.fims.crdn.dao.Crdn05Mapper;
+import cokr.xit.fims.crdn.dao.CrdnInstMapper;
-import cokr.xit.fims.crdn.dao.Crdn06Mapper;
 import cokr.xit.fims.crdn.dao.CrdnListMapper;
+import cokr.xit.fims.crdn.dao.CrdnUpdtMapper;
 import cokr.xit.fims.crdn.dao.GlobalStngMapper;
 import cokr.xit.fims.crdn.service.CrdnService;
 import cokr.xit.fims.cvlc.dao.CrdnCvlcptMapper;
@@ -38,11 +38,11 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService
 	@Resource(name="crdnListMapper")
 	protected CrdnListMapper crdnListMapper;
 
-	@Resource(name="crdn05Mapper")
+	@Resource(name="crdnInstMapper")
-	protected Crdn05Mapper crdn05Mapper;
+	protected CrdnInstMapper crdnInstMapper;
 
-	@Resource(name="crdn06Mapper")
+	@Resource(name="crdnUpdtMapper")
-	protected Crdn06Mapper crdn06Mapper;
+	protected CrdnUpdtMapper crdnUpdtMapper;
 
 	@Resource(name="globalStngMapper")
 	protected GlobalStngMapper globalStngMapper;
@@ -56,11 +56,8 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService
 	@Resource(name="crdnCvlcptBean")
 	protected CrdnCvlcptBean crdnCvlcptBean;
 
-	@Resource(name="crdn05Bean")
+	@Resource(name="crdnBean")
-	protected Crdn05Bean crdn05Bean;
+	protected CrdnBean crdnBean;
-
-	@Resource(name="crdn06Bean")
-	protected Crdn06Bean crdn06Bean;
 
 	@Resource(name="excl01Bean")
 	protected Excl01Bean excl01Bean;
@@ -110,7 +107,7 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService
         		int adtnAmt = dataObject.number("ADTN_AMT").intValue();
         		int rcvmtAmt = dataObject.number("RCVMT_AMT").intValue();
 
-        		dataObject.set("BLNC", crdn06Bean.getBalance(state,advntceLevyAmt,levyAmt,minusAmt,adtnAmt,rcvmtAmt));
+        		dataObject.set("BLNC", crdnStngBean.getBalance(state,advntceLevyAmt,levyAmt,minusAmt,adtnAmt,rcvmtAmt));
             }
         } else if(ifEmpty(query.getGridType(), () -> "").equals("photo")) {
         	Iterator<DataObject> iterator = dataObjectList.iterator();
@@ -177,7 +174,7 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService
 
 		String currentSggCd = globalStngMapper.selectSggCdForCurrentUser();
 		crdn.setSggCd(currentSggCd);
-		boolean result = crdn05Bean.insertCrdn(crdn);
+		boolean result = crdnBean.insertCrdn(crdn);
 
 		SimpleDateFormat yyyyMMdd = new SimpleDateFormat("yyyyMMdd");
 		Date curTime = new Date();
@@ -229,7 +226,7 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService
 
 	@Override
 	public boolean update(Map<String, Object> nonQueryRequest, Crdn crdn, List<FileInfo> newFileInfoList) {
-		return crdn06Bean.update(nonQueryRequest, crdn);
+		return crdnBean.update(nonQueryRequest, crdn);
 	}
 
 

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

@@ -36,6 +36,39 @@ public class CrdnStngBean extends AbstractComponent {
 	@Resource(name = "exmptnVhclMapper")
 	private ExmptnVhclMapper exmptnVhclMapper;
 
+	/**잔액을 계산한다.
+	 * @param state 대장 자료 상태
+	 * @param advntceLevyAmt 사전통지부과금액
+	 * @param levyAmt 부과금액
+	 * @param minusAmt 감경금액
+	 * @param adtnAmt 가산금액
+	 * @param rcvmtAmt 수납금액
+	 * @return 잔액
+	 */
+	public int getBalance(String state, int advntceLevyAmt, int levyAmt, int minusAmt, int adtnAmt, int rcvmtAmt) {
+		int result = 0;
+		if(Integer.parseInt(state) < Integer.parseInt("51")) {
+			result = advntceLevyAmt - rcvmtAmt - minusAmt;
+		} else if(state.equals("71") ||
+				state.equals("72") ||
+				state.equals("73") ||
+				state.equals("74") ||
+				state.equals("75") ||
+				state.equals("76") ||
+				state.equals("80") ||
+				state.equals("81") ||
+				state.equals("82") ||
+				state.equals("83") ||
+				state.equals("84") ||
+				state.equals("85")) {
+
+		} else {
+			result = levyAmt - rcvmtAmt - minusAmt + adtnAmt;
+		}
+
+		return result;
+	}
+
 	/**기본금액을 계산한다.
 	 * @param crdn 단속 정보
 	 * @return 최초금액, 사전통지금액

src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java

@@ -19,7 +19,7 @@ import cokr.xit.base.file.web.FileInfoFactory;
 import cokr.xit.base.web.ApplicationController;
 import cokr.xit.fims.crdn.Crdn;
 import cokr.xit.fims.crdn.CrdnQuery;
-import cokr.xit.fims.crdn.dao.Crdn05Mapper;
+import cokr.xit.fims.crdn.dao.CrdnInstMapper;
 import cokr.xit.fims.crdn.dao.GlobalStngMapper;
 import cokr.xit.fims.crdn.service.CrdnService;
 import cokr.xit.fims.crdn.service.CrdnStngService;
@@ -37,8 +37,8 @@ public class Crdn05Controller extends ApplicationController {
 	@Resource(name="crdnStngService")
 	private CrdnStngService crdnStngService;
 
-	@Resource(name="crdn05Mapper")
+	@Resource(name="crdnInstMapper")
-	private Crdn05Mapper crdn05Mapper;
+	private CrdnInstMapper crdnInstMapper;
 
 	@Resource(name="globalStngMapper")
 	protected GlobalStngMapper globalStngMapper;

src/main/java/cokr/xit/fims/cvlc/CrdnCvlcpt.java

@@ -17,9 +17,9 @@ public class CrdnCvlcpt extends AbstractEntity {
   private java.lang.String cvlcptLinkId;
 
   /**
-   * 민원 입력 구분 코드
+   * 방해 여부
    */
-  private java.lang.String cvlcptInptSeCd;
+  private java.lang.String dstrbncYn;
 
   /**
    * 민원 접수 일자

src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptBean.java

@@ -11,7 +11,8 @@ import org.springframework.stereotype.Component;
 
 import cokr.xit.fims.crdn.Crdn;
 import cokr.xit.fims.crdn.CrdnQuery;
-import cokr.xit.fims.crdn.dao.Crdn05Mapper;
+import cokr.xit.fims.crdn.dao.CrdnInstMapper;
+import cokr.xit.fims.crdn.dao.CrdnUpdtMapper;
 import cokr.xit.fims.crdn.dao.GlobalStngMapper;
 import cokr.xit.fims.cvlc.CrdnCvlcpt;
 import cokr.xit.fims.cvlc.dao.CrdnCvlcptMapper;
@@ -28,8 +29,11 @@ public class CrdnCvlcptBean extends AbstractComponent {
 	@Resource(name = "crdnCvlcptMapper")
 	private CrdnCvlcptMapper crdnCvlcptMapper;
 
-	@Resource(name = "crdn05Mapper")
+	@Resource(name = "crdnInstMapper")
-	private Crdn05Mapper crdn05Mapper;
+	private CrdnInstMapper crdnInstMapper;
+
+	@Resource(name = "crdnUpdtMapper")
+	private CrdnUpdtMapper crdnUpdtMapper;
 
 	@Resource(name="globalStngMapper")
 	protected GlobalStngMapper globalStngMapper;
@@ -49,7 +53,7 @@ public class CrdnCvlcptBean extends AbstractComponent {
 		paramMap.put("crdnIDs", crdnIdList);
 		paramMap.put("removedBy", UserInfo.current().getId());
 
-		return crdn05Mapper.removeCrdn(paramMap) == 1 ? true : false;
+		return crdnUpdtMapper.removeCrdn(paramMap) == 1 ? true : false;
 	}
 
 	/**민원 원본 정보를 조회한다.

src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java

@@ -26,11 +26,10 @@ import cokr.xit.fims.cmmn.hwp.AddingParagraphBetweenHWPFile;
 import cokr.xit.fims.cmmn.hwp.InsertingImageCell;
 import cokr.xit.fims.crdn.Crdn;
 import cokr.xit.fims.crdn.CrdnQuery;
-import cokr.xit.fims.crdn.dao.Crdn05Mapper;
-import cokr.xit.fims.crdn.dao.Crdn06Mapper;
 import cokr.xit.fims.crdn.dao.CrdnInfoMapper;
+import cokr.xit.fims.crdn.dao.CrdnInstMapper;
+import cokr.xit.fims.crdn.dao.CrdnUpdtMapper;
 import cokr.xit.fims.crdn.dao.GlobalStngMapper;
-import cokr.xit.fims.crdn.service.bean.Crdn05Bean;
 import cokr.xit.fims.crdn.service.bean.CrdnStngBean;
 import cokr.xit.fims.cvlc.CrdnCvlcpt;
 import cokr.xit.fims.cvlc.dao.CrdnCvlcptMapper;
@@ -58,9 +57,6 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv
 	@Resource(name="crdnStngBean")
 	private CrdnStngBean crdnStngBean;
 
-	@Resource(name="crdn05Bean")
-	private Crdn05Bean crdn05Bean;
-
 	@Resource(name="excl01Bean")
 	private Excl01Bean excl01Bean;
 
@@ -76,11 +72,11 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv
 	@Resource(name="crdnInfoMapper")
 	private CrdnInfoMapper crdnInfoMapper;
 
-	@Resource(name="crdn05Mapper")
+	@Resource(name="crdnInstMapper")
-	protected Crdn05Mapper crdn05Mapper;
+	protected CrdnInstMapper crdnInstMapper;
 
-	@Resource(name="crdn06Mapper")
+	@Resource(name="crdnUpdtMapper")
-	protected Crdn06Mapper crdn06Mapper;
+	protected CrdnUpdtMapper crdnUpdtMapper;
 
 	@Resource(name="globalStngMapper")
 	protected GlobalStngMapper globalStngMapper;

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

@@ -54,7 +54,7 @@
     <result property="rcvmtAmt"            column="RCVMT_AMT" />             <!-- 수납 금액 -->
     <result property="bfrCrdnId"           column="BFR_CRDN_ID" />           <!-- 이전 단속 ID -->
 	<result property="cvlcptLinkId"        column="CVLCPT_LINK_ID" />        <!-- 민원 연계 ID -->
-    <result property="cvlcptInptSeCd"      column="CVLCPT_INPT_SE_CD" />     <!-- 민원 입력 구분 코드 -->
+    <result property="dstrbncYn"           column="DSTRBNC_YN" />            <!-- 방해 여부 -->
     <result property="cvlcptRcptYmd"       column="CVLCPT_RCPT_YMD" />       <!-- 민원 접수 일자 -->
     <result property="cvlcptAplySeCd"      column="CVLCPT_APLY_SE_CD" />     <!-- 민원 신청 구분 코드 -->
     <result property="cvlcptAplyNo"        column="CVLCPT_APLY_NO" />        <!-- 민원 신청 번호 -->

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

@@ -1,11 +1,9 @@
 <?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.Crdn05Mapper">
+<mapper namespace="cokr.xit.fims.crdn.dao.CrdnInstMapper">
-
-
 
 <insert id="insertCrdn" parameterType="cokr.xit.fims.crdn.Crdn">
-/* 단속 대장 등록(crdn05Mapper.insertCrdn) */
+/* 단속 대장 등록(crdnInstMapper.insertCrdn) */
 <selectKey resultType="string" keyProperty="crdnId" keyColumn="NEW_ID" order="BEFORE">
 SELECT
        CONCAT(DATE_FORMAT(CURRENT_DATE, '%Y'), LPAD(CAST(IFNULL(MAX(SUBSTRING(CRDN_ID,5)) + 1, 1) AS INT), 16, '0'))
@@ -110,7 +108,7 @@ INSERT INTO TB_CRDN (
 </insert>
 
 <insert id="insertCrdnAddition" parameterType="cokr.xit.fims.crdn.Crdn">
-/* 단속 부가 정보 등록(crdn05Mapper.insertCrdnAddition) */
+/* 단속 부가 정보 등록(crdnInstMapper.insertCrdnAddition) */
 INSERT INTO TB_CRDN_ADI (
        CRDN_ID               <!-- 단속 ID -->
      , CRDN_SE_CD            <!-- 단속 구분 코드 -->
@@ -164,15 +162,4 @@ INSERT INTO TB_CRDN_ADI (
 )
 </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>
-
 </mapper>

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

@@ -4,7 +4,7 @@
 
 
 <select id="selectCrackdownList" parameterType="map" resultType="dataobject">
-/* 단속자료 목록 조회(crdn06Mapper.selectCrackdownList) */
+/* 단속자료 목록 조회(crdnListMapper.selectCrackdownList) */
 <include refid="utility.paging-prefix"/>
 SELECT C.CRDN_ID               <!-- 단속 ID -->
      , C.SGG_CD                <!-- 시군구 코드 -->
@@ -60,7 +60,7 @@ SELECT C.CRDN_ID               <!-- 단속 ID -->
      , CA.VLTN_NMTM            <!-- 위반 횟수 -->
      , CA.OVTIME_YN            <!-- 시간외 여부 -->
 	 , CC.CVLCPT_LINK_ID        <!-- 민원 연계 ID -->
-     , CC.CVLCPT_INPT_SE_CD     <!-- 민원 입력 구분 코드 -->
+     , CC.DSTRBNC_YN            <!-- 방해 여부 -->
      , CC.CVLCPT_RCPT_YMD       <!-- 민원 접수 일자 -->
      , CC.CVLCPT_APLY_SE_CD     <!-- 민원 신청 구분 코드 -->
      , CC.CVLCPT_APLY_NO        <!-- 민원 신청 번호 -->
@@ -93,7 +93,7 @@ SELECT C.CRDN_ID               <!-- 단속 ID -->
      , C.DEL_DT
      , C.DEL_RSN
 FROM TB_CRDN C
-INNRT JOIN TB_CRDN_ADI CA ON (C.CRDN_ID = CA.CRDN_ID)
+INNER JOIN TB_CRDN_ADI CA ON (C.CRDN_ID = CA.CRDN_ID)
 LEFT OUTER JOIN TB_TEAM_INFO TI ON (CA.TEAM_ID = TI.TEAM_ID)
 LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.CVLCPT_LINK_YN = 'Y' AND C.LINK_ID = CC.CVLCPT_LINK_ID)
 LEFT OUTER JOIN TB_LEVY_EXCL LE ON (C.CRDN_ID = LE.CRDN_ID)
@@ -161,7 +161,7 @@ SELECT C.CRDN_ID               <!-- 단속 ID -->
 
 
 <select id="selectPhotoInspectionDataList" parameterType="map" resultType="dataobject">
-/* 단속사진 검사 자료 목록 조회(crdn06Mapper.selectPhotoInspectionDataList) */
+/* 단속사진 검사 자료 목록 조회(crdnListMapper.selectPhotoInspectionDataList) */
 <include refid="utility.paging-prefix"/>
 SELECT C.CRDN_ID                                      <!-- 단속 ID -->
      , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM <!-- 단속 일시 -->
@@ -222,7 +222,7 @@ AND C.CRDN_STTS_CD = #{crdnSttsCd}
 </select>
 
 <select id="selectSameVehicleMainList" parameterType="map" resultType="dataobject">
-/* 동일 차량 단속 그룹 목록 조회(crdn06Mapper.selectSameVehicleMainList) */
+/* 동일 차량 단속 그룹 목록 조회(crdnListMapper.selectSameVehicleMainList) */
 <include refid="utility.paging-prefix"/>
 SELECT GROUP_CONCAT(C.CRDN_ID) AS CRDN_ID_LIST        <!-- 단속 ID -->
      , C.VHRNO                                        <!-- 차량번호 -->
@@ -289,7 +289,7 @@ HAVING COUNT(*) <![CDATA[ >= ]]>
 </select>
 
 <select id="selectSameVehicleSubList" parameterType="map" resultType="dataobject">
-/* 동일 차량 단속 자료 목록 조회(crdn06Mapper.selectSameVehicleSubList) */
+/* 동일 차량 단속 자료 목록 조회(crdnListMapper.selectSameVehicleSubList) */
 SELECT C.CRDN_ID                                      <!-- 단속 ID -->
      , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM <!-- 단속일시 -->
      , C.CRDN_INPT_SE_CD                              <!-- 자료출처 -->
@@ -312,7 +312,7 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
 </select>
 
 <select id="selectTagInformationUndefinedDataList" parameterType="map" resultType="dataobject">
-/* 표지정보 미확인 자료 목록 조회(crdn06Mapper.selectTagInformationUndefinedDataList) */
+/* 표지정보 미확인 자료 목록 조회(crdnListMapper.selectTagInformationUndefinedDataList) */
 <include refid="utility.paging-prefix"/>
 SELECT C.CRDN_ID                                      <!-- 단속 ID -->
      , C.CRDN_INPT_SE_CD                              <!-- 단속 입력 구분 코드 -->
@@ -367,7 +367,7 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
 
 
 <select id="selectFineReductionDataList" parameterType="map" resultType="dataobject">
-/* 과태료 감경 자료 목록 조회(crdn06Mapper.selectFineReductionDataList) */
+/* 과태료 감경 자료 목록 조회(crdnListMapper.selectFineReductionDataList) */
 <include refid="utility.paging-prefix"/>
 SELECT C.CRDN_ID                                      <!-- 단속 ID -->
      , SUBSTR(RD.REG_DT,1,8) AS RDUCT_YMD             <!-- 감액일자 -->

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

@@ -1,9 +1,9 @@
 <?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.Crdn06Mapper">
+<mapper namespace="cokr.xit.fims.crdn.dao.CrdnUpdtMapper">
 
 <update id="updateTagInformation" parameterType="cokr.xit.fims.crdn.Crdn">
-    /* 표지정보확인 수정(crdn06Mapper.updateTagInformation) */
+    /* 표지정보확인 수정(crdnUpdtMapper.updateTagInformation) */
     UPDATE TB_CRDN_ADI
        SET PARKNG_PSBLTY_RSLT_CD = '1'
          , MDFCN_DT = <include refid="utility.now" /> /* 수정일시 */
@@ -12,7 +12,7 @@
 </update>
 
 <update id="updateCrdn" parameterType="cokr.xit.fims.crdn.Crdn">
-    /* 단속정보 수정(crdn06Mapper.updateCrdn) */
+    /* 단속정보 수정(crdnUpdtMapper.updateCrdn) */
     UPDATE TB_CRDN
        SET MDFCN_DT = <include refid="utility.now" /> /* 수정일시 */
          , MDFR = #{modifiedBy}                   /* 수정자 */
@@ -46,4 +46,15 @@
      WHERE CRDN_ID = #{crdnId}                   /* 단속 ID */
 </update>
 
+<update id="removeCrdn" parameterType="map">
+    /* 단속자료 삭제(crdnUpdtMapper.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>
+
 </mapper>

src/main/resources/sql/mapper/fims/crdn/global-stng-mapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="cokr.xit.fims.crdn.dao.GlobalStngMapper">
 
 <select id="selectBasicAmt" parameterType="cokr.xit.fims.crdn.CrdnQuery" resultType="int">
-/* 기본금액 조회(crdn05Mapper.selectBasicAmt) */
+/* 기본금액 조회(globalStngMapper.selectBasicAmt) */
 SELECT AMT
   FROM TB_AMT_INFO
  WHERE USE_YN = 'Y'
@@ -21,7 +21,7 @@ SELECT AMT
 </select>
 
 <select id="selectSggCd" parameterType="string" resultType="string">
-/* 시군구코드 조회(crdn05Mapper.selectSggCd) */
+/* 시군구코드 조회(globalStngMapper.selectSggCd) */
 SELECT SGG_CD
   FROM TB_SGG_INFO
  WHERE INST_CD = #{institute}

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

@@ -5,7 +5,7 @@
 <insert id="insertCvlcpt" parameterType="cokr.xit.fims.cvlc.CrdnCvlcpt">/* 단속 민원 대장 등록(crdnCvlcptMapper.insertCvlcpt) */
 INSERT INTO TB_CRDN_CVLCPT (
        CVLCPT_LINK_ID        <!-- 민원 연계 ID -->
-     , CVLCPT_INPT_SE_CD     <!-- 민원 입력 구분 코드 -->
+     , DSTRBNC_YN            <!-- 방해 여부 -->
      , CVLCPT_RCPT_YMD       <!-- 민원 접수 일자 -->
      , CVLCPT_APLY_SE_CD     <!-- 민원 신청 구분 코드 -->
      , CVLCPT_APLY_NO        <!-- 민원 신청 번호 -->
@@ -36,7 +36,7 @@ INSERT INTO TB_CRDN_CVLCPT (
      , DEL_RSN               <!-- 삭제 사유 -->
 ) VALUES (
        #{cvlcptLinkId}       <!-- 민원 연계 ID -->
-     , #{cvlcptInptSeCd}     <!-- 민원 입력 구분 코드 -->
+     , #{dstrbncYn}          <!-- 방해 여부 -->
      , #{cvlcptRcptYmd}      <!-- 민원 접수 일자 -->
      , #{cvlcptAplySeCd}     <!-- 민원 신청 구분 코드 -->
      , #{cvlcptAplyNo}       <!-- 민원 신청 번호 -->
@@ -124,7 +124,7 @@ SELECT C.CRDN_ID               <!-- 단속 ID -->
      , CA.VLTN_NMTM            <!-- 위반 횟수 -->
      , CA.OVTIME_YN            <!-- 시간외 여부 -->
 	 , CC.CVLCPT_LINK_ID        <!-- 민원 연계 ID -->
-     , CC.CVLCPT_INPT_SE_CD     <!-- 민원 입력 구분 코드 -->
+     , CC.DSTRBNC_YN            <!-- 방해 여부 -->
      , CC.CVLCPT_RCPT_YMD       <!-- 민원 접수 일자 -->
      , CC.CVLCPT_APLY_SE_CD     <!-- 민원 신청 구분 코드 -->
      , CC.CVLCPT_APLY_NO        <!-- 민원 신청 번호 -->