From 1426b1f4cd223083475da07a9ce55689ec0c9c85 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Mon, 14 Aug 2023 12:40:00 +0900
Subject: [PATCH] no message

---
 src/main/java/cokr/xit/fims/crdn/Crdn.java          |  5 +++++
 .../cokr/xit/fims/cvlc/dao/CrdnCvlcptMapper.java    |  6 +++---
 .../cokr/xit/fims/cvlc/web/Cvlc01Controller.java    | 13 +++++++++++--
 .../fims/excl/service/bean/Excl01ServiceBean.java   |  1 -
 .../sql/mapper/fims/crdn/crdn-info-mapper.xml       |  2 +-
 .../webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp |  2 +-
 6 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/crdn/Crdn.java b/src/main/java/cokr/xit/fims/crdn/Crdn.java
index de5c46fd..75ee8ab1 100644
--- a/src/main/java/cokr/xit/fims/crdn/Crdn.java
+++ b/src/main/java/cokr/xit/fims/crdn/Crdn.java
@@ -327,6 +327,11 @@ public class Crdn extends AbstractEntity {
 	 */
 	private String dtlAddr;
 
+	/**
+	 * 부과 제외 구분 코드
+	 */
+	private String levyExclSeCd;
+
 	/**
 	 * 부과 제외 사유 코드
 	 */
diff --git a/src/main/java/cokr/xit/fims/cvlc/dao/CrdnCvlcptMapper.java b/src/main/java/cokr/xit/fims/cvlc/dao/CrdnCvlcptMapper.java
index fe937a3c..1702aa6d 100644
--- a/src/main/java/cokr/xit/fims/cvlc/dao/CrdnCvlcptMapper.java
+++ b/src/main/java/cokr/xit/fims/cvlc/dao/CrdnCvlcptMapper.java
@@ -23,7 +23,7 @@ public interface CrdnCvlcptMapper extends AbstractMapper {
 	int insertCvlcpt(CrdnCvlcpt cvlcpt);
 
 	/**민원접수자료 목록을 조회한다.<br />
-	 * {@link cokr.xit.fims.crdn.service.bean.CrdnService#getCrackdownList(CrdnQuery)} 참고
+	 * {@link cokr.xit.fims.cvlc.service.bean.CrdnCvlcptService#getCivilComplaintList(CrdnQuery)} 참고
 	 * @param query 민원접수자료 목록 조회 조건
 	 * @return 민원접수자료 목록
 	 */
@@ -72,14 +72,14 @@ public interface CrdnCvlcptMapper extends AbstractMapper {
 	int updateCrdnAddition(Map<String, Object> params);
 
 	/**민원답변대상자료 목록을 조회한다.<br />
-	 * {@link cokr.xit.fims.crdn.service.bean.CrdnService#getCrackdownList(CrdnQuery)} 참고
+	 * {@link cokr.xit.fims.cvlc.service.bean.CrdnCvlcptService#getCivilComplaintList(CrdnQuery)} 참고
 	 * @param query 민원답변대상자료 목록 조회 조건
 	 * @return 민원답변대상자료 목록
 	 */
 	List<DataObject> selectCivilComplaintAnswerTargetDataList(CrdnQuery query);
 
 	/**민원자료 목록을 조회한다.<br />
-	 * {@link cokr.xit.fims.crdn.service.bean.CrdnService#getCrackdownList(CrdnQuery)} 참고
+	 * {@link cokr.xit.fims.cvlc.service.bean.CrdnCvlcptService#getCivilComplaintList(CrdnQuery)} 참고
 	 * @param query 민원자료 목록 조회 조건
 	 * @return 민원자료 목록
 	 */
diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java
index 57951375..f8fc80b7 100644
--- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java
+++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java
@@ -274,8 +274,17 @@ public class Cvlc01Controller extends ApplicationController {
 		Map<String, Object> nonQueryRequest = new HashMap<String, Object>();
 		nonQueryRequest.put("deleteFileKeyList", deleteFileKeyList);
 
-		String acceptType = hReq.getParameter("acceptType");
-		nonQueryRequest.put("acceptType", acceptType);
+		String acceptYn = hReq.getParameter("acceptYn");
+		if(ifEmpty(acceptYn, () -> "").equals("Y")) {
+			nonQueryRequest.put("acceptType", "accept");
+		} else {
+			if(crdn.getLevyExclSeCd().equals("2")) {
+				nonQueryRequest.put("acceptType", "someAccept");
+			} else if(crdn.getLevyExclSeCd().equals("1")) {
+				nonQueryRequest.put("acceptType", "nonAccept");
+			}
+		}
+
 		saved = crdnCvlcptService.updateCvlcptPrcsSe(nonQueryRequest, crdnCvlcpt, crdn, newFileInfoList);
 
 
diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/Excl01ServiceBean.java b/src/main/java/cokr/xit/fims/excl/service/bean/Excl01ServiceBean.java
index 6c5a088e..6033f10d 100644
--- a/src/main/java/cokr/xit/fims/excl/service/bean/Excl01ServiceBean.java
+++ b/src/main/java/cokr/xit/fims/excl/service/bean/Excl01ServiceBean.java
@@ -183,7 +183,6 @@ public class Excl01ServiceBean extends AbstractServiceBean implements Excl01Serv
         		updtCrdn.setCrdnId(excl01.getCrdnId());							// 단속 ID
             	updtCrdn.setParkngPsbltyRsltCd("9");							// 주차 가능 결과 코드
 
-            	// 단속민원 민원처리결과내용 수정
 				retSuccess = excl01Bean.updateParkngPsbltyRsltCd(updtCrdn);
 				if (!retSuccess) {
 					// 예외를 발생시켜서 오류메세지를 보내고 DB Rollback
diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn-info-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn-info-mapper.xml
index c71a5120..c6e7a67d 100644
--- a/src/main/resources/sql/mapper/fims/crdn/crdn-info-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/crdn/crdn-info-mapper.xml
@@ -1,6 +1,6 @@
 <?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.crdnInfoMapper">
+<mapper namespace="cokr.xit.fims.crdn.dao.CrdnInfoMapper">
 
 <resultMap id="crdnRow" type="cokr.xit.fims.crdn.Crdn">
 	<result property="crdnId"              column="CRDN_ID" />               <!-- 단속 ID -->
diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp
index e7e20038..2f0a7bda 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp
@@ -403,7 +403,7 @@ $(document).ready(function(){
 			}
 		}
 		
-		formData.append("acceptType", "accept");
+		formData.append("acceptYn", "Y");
 		
 		ajax.post({
 			url:!create ? $P.crdnControl.urls.update : $P.crdnControl.urls.create,