답변 미리보기 조회 수정

src/main/java/cokr/xit/fims/crdn/CrdnQuery.java

@@ -51,6 +51,8 @@ public class CrdnQuery extends CmmnQuery {
 	private String crdnInptSeCd;
 	private String cvlcptPrcsCd;
 	private String crdnSttsCd;
+	private String ansSeCd;
+	private String ansRsnCd;
 
 	//포함, 제외, 특정 자료
 	private String schOnlySamePlace;
@@ -58,6 +60,9 @@ public class CrdnQuery extends CmmnQuery {
 	private String schExclEnd;
 	private String schExclOvtime;
 
+	//YN
+	private String dstrbncYn;
+
 	//기타
 	private String vhrno;
 	private String cvlcptPrcsPicNm;
@@ -125,6 +130,15 @@ public class CrdnQuery extends CmmnQuery {
 		return self();
 	}
 
+	public String getDstrbncYn() {
+		return ifEmpty(dstrbncYn, () -> null);
+	}
+
+	public <T extends CrdnQuery> T setDstrbncYn(String dstrbncYn) {
+		this.dstrbncYn = dstrbncYn;
+		return self();
+	}
+
 	public String getVhrno() {
 		return ifEmpty(vhrno, () -> null);
 	}
@@ -278,6 +292,24 @@ public class CrdnQuery extends CmmnQuery {
 		return self();
 	}
 
+	public String getAnsSeCd() {
+		return ifEmpty(ansSeCd, () -> null);
+	}
+
+	public <T extends CrdnQuery> T setAnsSeCd(String ansSeCd) {
+		this.ansSeCd = ansSeCd;
+		return self();
+	}
+
+	public String getAnsRsnCd() {
+		return ifEmpty(ansRsnCd, () -> null);
+	}
+
+	public <T extends CrdnQuery> T setAnsRsnCd(String ansRsnCd) {
+		this.ansRsnCd = ansRsnCd;
+		return self();
+	}
+
 	public String getAplcnYmd() {
 		return ifEmpty(aplcnYmd, () -> null);
 	}

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

@@ -11,6 +11,11 @@ import lombok.Setter;
 @Getter
 @Setter
 public class CrdnCvlcpt extends AbstractEntity {
+
+  public static String MACRO_SEQ = "\\[@일련번호\\]";
+
+  public static String MACRO_TELNO = "\\[@전화번호\\]";
+
   /**
    * 민원 연계 ID
    */

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

@@ -71,6 +71,18 @@ public interface CrdnCvlcptMapper extends AbstractMapper {
 	 */
 	int updateCrdnAddition(Map<String, Object> params);
 
+	/** 지정한 단속자료로 단속대장을 복사 등록 처리한다.
+	 * @param params 단속정보 등록 파라미터
+	 * @return 저장된 정보 수
+	 */
+	int insertCrdnFromSelect(DataObject params);
+
+	/** 지정한 단속자료로 단속부가정보대장을 복사 등록 처리한다.
+	 * @param params 단속정보 등록 파라미터
+	 * @return 저장된 정보 수
+	 */
+	int insertCrdnAdditionFromSelect(DataObject params);
+
 	/**민원답변대상자료 목록을 조회한다.<br />
 	 * {@link cokr.xit.fims.cvlc.service.bean.CrdnCvlcptService#getCivilComplaintList(CrdnQuery)} 참고
 	 * @param query 민원답변대상자료 목록 조회 조건
@@ -95,18 +107,12 @@ public interface CrdnCvlcptMapper extends AbstractMapper {
 	 * @param params 답변문구 조회 파라미터
 	 * @return 답변문구 대장 정보
 	 */
-	DataObject selectCvlcptAnsWordsInfo(Map<String, Object> params);
+	DataObject selectCvlcptAnswerWordsInfo(CrdnQuery crdnQuery);
 
-	/**지정한 단속자료로 단속대장을 복사 등록 처리한다.
+	/**지정한 조건에 따라 민원 답변 문구 대장을 조회하여 반환한다.
-	 * @param params 단속정보 등록 파라미터
+	 * @param params 답변문구 조회 파라미터
-	 * @return 저장된 정보 수
+	 * @return 답변문구 대장 정보
-	 */
-	int insertCrdnFromSelect(DataObject params);
-
-	/**지정한 단속자료로 단속부가정보대장을 복사 등록 처리한다.
-	 * @param params 단속정보 등록 파라미터
-	 * @return 저장된 정보 수
 	 */
-	int insertCrdnAdditionFromSelect(DataObject params);
+	DataObject selectCvlcptAnswerBasicWordsInfo(CrdnQuery crdnQuery);
 
 }

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

@@ -6,8 +6,11 @@ import javax.annotation.Resource;
 
 import org.springframework.stereotype.Component;
 
+import cokr.xit.base.user.ManagedUser;
+import cokr.xit.base.user.dao.UserMapper;
 import cokr.xit.fims.crdn.Crdn;
 import cokr.xit.fims.crdn.CrdnQuery;
+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;
@@ -26,12 +29,18 @@ public class CrdnCvlcptBean extends AbstractComponent {
 	@Resource(name = "crdnCvlcptMapper")
 	private CrdnCvlcptMapper crdnCvlcptMapper;
 
+	@Resource(name = "crdnInfoMapper")
+	private CrdnInfoMapper crdnInfoMapper;
+
 	@Resource(name = "crdnInstMapper")
 	private CrdnInstMapper crdnInstMapper;
 
 	@Resource(name = "crdnUpdtMapper")
 	private CrdnUpdtMapper crdnUpdtMapper;
 
+	@Resource(name = "userMapper")
+	private UserMapper userMapper;
+
 	@Resource(name="globalStngMapper")
 	protected GlobalStngMapper globalStngMapper;
 
@@ -93,26 +102,12 @@ public class CrdnCvlcptBean extends AbstractComponent {
 		return crdnCvlcptMapper.initCvlcptPrcsRsltCn(crdnCvlcpt) == 1 ? true : false;
 	}
 
-	/**지정한 조건에 따라 민원답변문구 대장을 조회하여 반환한다.
-	 * @param taskSeCd 업무구분코드, ansRsnCd 답변 사유 코드
-	 * @return 답변문구
-	 */
-	DataObject selectCvlcptAnsWordsInfo(String taskSeCd, String ansRsnCd) {
-		DataObject params = new DataObject();
-
-		params.set("sggCd", globalStngMapper.selectSggCdForCurrentUser());
-		params.set("taskSeCd", taskSeCd);
-		params.set("ansRsnCd", ansRsnCd);
-
-		return crdnCvlcptMapper.selectCvlcptAnsWordsInfo(params);
-	}
-
 	/**지정한 단속자료로 복사 등록 처리한다.
 	 * @param crdnId 단속 ID
 	 * @return 복사자료의 단속 ID
 	 */
 	public String insertCrdnFromSelect(String crdnId) {
-		//Crdn crdn = new Crdn();
+
 		DataObject params = new DataObject();
 		UserInfo userInfo = currentUser();
 		params.set("currentUser", userInfo);
@@ -128,4 +123,75 @@ public class CrdnCvlcptBean extends AbstractComponent {
 
 		return (String)params.get("newCrdnId");
 	}
+
+	/**지정한 민원 자료의 답변 예정 문구를 반환한다.
+	 * @param crdnId 단속 ID
+	 * @return 답변 예정 문구
+	 */
+	public String mappingAnswerWords(String crdnId) {
+
+		DataObject dataInfo = crdnInfoMapper.selectCrdnInfo(crdnId);
+
+		CrdnQuery crdnQuery = new CrdnQuery();
+		crdnQuery.setTaskSeCd(dataInfo.string("TASK_SE_CD"));
+		crdnQuery.setSggCd(dataInfo.string("SGG_CD"));
+
+		if(dataInfo.string("CVLCPT_PRCS_CD").equals("02")) {
+			crdnQuery.setAnsSeCd("3");
+			crdnQuery.setAnsRsnCd("3"+dataInfo.string("VLTN_CD"));
+
+			if(dataInfo.string("DSTRBNC_YN").equals("Y")) {
+				crdnQuery.setDstrbncYn("Y");
+			}
+
+		} else if(dataInfo.string("CVLCPT_PRCS_CD").equals("03")
+				|| dataInfo.string("CVLCPT_PRCS_CD").equals("04")){
+			crdnQuery.setAnsSeCd(dataInfo.string("LEVY_EXCL_SE_CD"));
+			crdnQuery.setAnsRsnCd(dataInfo.string("LEVY_EXCL_RSN_CD"));
+		} else {
+			return "";
+		}
+
+		DataObject bodyWordsInfo = crdnCvlcptMapper.selectCvlcptAnswerWordsInfo(crdnQuery);
+		DataObject basicWordsInfo = crdnCvlcptMapper.selectCvlcptAnswerBasicWordsInfo(crdnQuery);
+
+		String body = bodyWordsInfo.string("PRCS_RSLT_CN");
+		String head = basicWordsInfo.string("HEADER_CN");
+		String tail = basicWordsInfo.string("FOOTER_CN");
+
+		if(body.equals("")) {
+			return "";
+		}
+
+		String joinWords = head + "\n\n" + body + "\n\n" + tail;
+
+		ManagedUser currentUser = userMapper.getUser(UserInfo.current().getAccount(), UserInfo.current().getInstitute());
+
+		String completeWords = this.replaceMacroString(joinWords , currentUser.getPhoneNo());
+
+		return completeWords;
+	}
+
+	/**문구의 매크로 문자열을 치환한다.
+	 * @param joinWords 전체 문구, telNo 담당자 전화번호
+	 * @return 치환된 문구
+	 */
+	private String replaceMacroString(String joinWords, String telNo) {
+
+		int seq = 1;
+
+		joinWords = joinWords.replaceAll("＠", "@");
+		String[] splited = joinWords.split(CrdnCvlcpt.MACRO_SEQ);
+		var seqCount = splited.length - 1;
+		if(seqCount > 0){
+			for(; seq <= seqCount; seq++){
+				joinWords = joinWords.replaceFirst(CrdnCvlcpt.MACRO_SEQ, Integer.toString(seq));
+			}
+		}
+
+		joinWords = joinWords.replace(CrdnCvlcpt.MACRO_TELNO, telNo);
+		return joinWords;
+	}
+
+
 }

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

@@ -227,7 +227,15 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv
 
 	@Override
 	public DataObject getAnswerPreview(CrdnQuery query) {
-		return crdnCvlcptMapper.selectAnswerPreview(query);
+		DataObject dataObject = crdnCvlcptMapper.selectAnswerPreview(query);
+
+		//저장된 답변이 없으면
+		if(ifEmpty(dataObject.string("CVLCPT_PRCS_RSLT_CN"), () -> "").equals("")) {
+			String resultWords = crdnCvlcptBean.mappingAnswerWords(query.getCrdnId());
+			dataObject.set("CVLCPT_PRCS_RSLT_CN", resultWords);
+		}
+
+		return dataObject;
 	}
 
 	@Override
@@ -311,7 +319,14 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv
 					ansRsnCd = "3"+crdn.getVltnCd();
 				}
 
-				DataObject infoCvlcptAnsWords = crdnCvlcptBean.selectCvlcptAnsWordsInfo(crdn.getTaskSeCd(), ansRsnCd);
+				CrdnQuery crdnQuery = new CrdnQuery();
+				crdnQuery.setSggCd(globalStngMapper.selectSggCdForCurrentUser());
+				crdnQuery.setTaskSeCd(crdn.getTaskSeCd());
+				crdnQuery.setAnsRsnCd(ansRsnCd);
+				if(ifEmpty(crdnCvlcpt.getDstrbncYn(), () -> "").equals("Y")) {
+					crdnQuery.setDstrbncYn("Y");
+				}
+				DataObject infoCvlcptAnsWords = crdnCvlcptMapper.selectCvlcptAnswerWordsInfo(crdnQuery);
 
 				if(acceptType.equals("someAccept") || acceptType.equals("nonAccept")) { //일부수용,불수용
 					// 비부과(서손)사유가 민원 답변대상인가? 민원 답변 문구(TB_CVLCPT_ANS_WORDS) 대장에 답변 사유 코드가 존재한다면..
@@ -323,17 +338,19 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv
 						newCvlcptTrsmCd = "03";									// 민원 전송 코드 - 비부과(서손)사유가 전송 미대상
 					}
 				} else { //수용일 때
-					if(infoCvlcptAnsWords == null) {
+
-						throw new RuntimeException("단속민원답변 수정에 실패하였습니다.");
-					}
 					newCvlcptPrcsCd = "02";									// 민원 처리 코드 - 수용
 					newCvlcptTrsmCd = "01";									// 민원 전송 코드 - 전송 대상
 				}
 
 		        crdnCvlcpt.setCvlcptPrcsCd(newCvlcptPrcsCd);									// 민원 처리 코드
 
-		        if (infoCvlcptAnsWords != null) {
+		        if (acceptType.equals("someAccept")) {
-		        	crdnCvlcpt.setCvlcptPrcsSumry(infoCvlcptAnsWords.string("PRCS_SUMRY"));			// 민원 처리 요약
+		        	crdnCvlcpt.setCvlcptPrcsSumry("과태료 계고");			// 민원 처리 요약
+		        } else if(acceptType.equals("accept")) {
+		        	crdnCvlcpt.setCvlcptPrcsSumry("과태료부과");			// 민원 처리 요약
+		        } else if(acceptType.equals("nonAccept")) {
+		        	crdnCvlcpt.setCvlcptPrcsSumry("과태료 미부과");			// 민원 처리 요약
 		        }
 
 		        crdnCvlcpt.setCvlcptPrcsPic(UserInfo.current().getId());						// 민원 처리 담당자

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

@@ -88,6 +88,7 @@
 <select id="selectCrdnInfo" parameterType="string">
 /* 단속정보 조회(crdnInfoMapper.selectCrdnInfo) */
 SELECT C.CRDN_ID                <!-- 단속 ID -->
+     , C.SGG_CD                 <!-- 시군구 코드 -->
      , C.TASK_SE_CD             <!-- 업무 구분 코드 -->
      , C.CRDN_REG_SE_CD         <!-- 단속 등록 구분 코드 -->
      , C.CRDN_STTS_CD           <!-- 단속 상태 코드 -->
@@ -97,6 +98,8 @@ SELECT C.CRDN_ID                <!-- 단속 ID -->
      , C.FFNLG_AMT              <!-- 과태료 금액 -->
      , C.CRDN_YMD               <!-- 단속 일자 -->
      , C.CRDN_TM                <!-- 단속 시간 -->
+     , C.VLTN_ID                <!-- 위반 ID -->
+     , (SELECT VLTN_CD FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) AS VLTN_CD
      , CA.OVTIME_YN             <!-- 시간외 여부 -->
      , CA.OVTIME_PRTTN_YN       <!-- 시간외 분할 여부 -->
      , CA.CRDN_SPAREA_CD        <!-- 단속 특별구역 코드 -->
@@ -104,10 +107,15 @@ SELECT C.CRDN_ID                <!-- 단속 ID -->
      , P.RTPYR_ID               <!-- 납부자 ID -->
      , CC.CVLCPT_LINK_ID        <!-- 민원 연계 ID -->
      , CC.CVLCPT_TRSM_CD        <!-- 민원 전송 코드 -->
+     , CC.CVLCPT_PRCS_CD        <!-- 민원 처리 코드 -->
+     , CC.DSTRBNC_YN            <!-- 방해 여부 -->
+     , LE.LEVY_EXCL_SE_CD       <!-- 부과 제외 구분 코드 -->
+     , LE.LEVY_EXCL_RSN_CD      <!-- 부과 제외 사유 코드 -->
   FROM TB_CRDN C
   INNER JOIN TB_CRDN_ADI CA ON (C.CRDN_ID = CA.CRDN_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_PAYER P ON (C.RTPYR_ID = P.RTPYR_ID)
+  LEFT OUTER JOIN TB_LEVY_EXCL LE ON (C.CRDN_ID = LE.CRDN_ID AND LE.DEL_YN = 'N')
  WHERE C.DEL_YN = 'N'
    AND C.CRDN_ID = #{crdnId}
 </select>

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

@@ -96,7 +96,7 @@ FROM TB_CRDN C
 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)
+LEFT OUTER JOIN TB_LEVY_EXCL LE ON (C.CRDN_ID = LE.CRDN_ID AND LE.DEL_YN = 'N')
 LEFT OUTER JOIN TB_LEVY L ON (C.LEVY_ID = L.LEVY_ID)
 WHERE C.DEL_YN = 'N'
 <if test="by != null and by != '' and term != null">

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

@@ -160,7 +160,7 @@ FROM TB_CRDN C
 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)
 INNER 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)
+LEFT OUTER JOIN TB_LEVY_EXCL LE ON (C.CRDN_ID = LE.CRDN_ID AND LE.DEL_YN = 'N')
 LEFT OUTER JOIN TB_LEVY L ON (C.LEVY_ID = L.LEVY_ID)
 WHERE C.DEL_YN = 'N'
 <if test="by != null and by != '' and term != null">
@@ -326,22 +326,6 @@ SELECT C.CRDN_ID                <!-- 단속 ID -->
        AND DEL_YN                   = 'N'    
 </update>
 
-<select id="selectCvlcptAnsWordsInfo" parameterType="map" resultType="dataobject">
-/* 민원답변문구 대장 객체 가져오기(crdnCvlcptMapper.selectCvlcptAnsWordsInfo) */
-SELECT A.ANS_WORDS_ID                                                                   /* 답변 문구 ID */
-     , A.ANS_SE_CD                                                                      /* 답변 구분 코드 */
-     , (SELECT FN_GET_CODE_NM('FIM060', A.ANS_SE_CD) FROM DUAL) AS ANS_SE_NM            /* 답변 구분 명 */
-     , A.ANS_RSN_CD                                                                                     /* 답변 사유 코드 */
-     , A.ANS_RSN_NM                                                                                     /* 답변 사유 명 */
-     , A.PRCS_SUMRY                                                                                     /* 처리 요약 */
-     , A.PRCS_RSLT_CN                                                                                   /* 처리 결과 내용 */
-  FROM TB_CVLCPT_ANS_WORDS A
- WHERE A.SGG_CD                 = #{sggCd}                                                              /* 시군구 코드 */
-   AND A.TASK_SE_CD             = #{taskSeCd}                                                           /* 업무 구분 코드 */
-   AND A.ANS_RSN_CD             = #{ansRsnCd}                                                           /* 답변 사유 코드 */
-   AND A.USE_YN                 = 'Y'                                                                   /* 사용 여부 */
-</select>
-
 <update id="updateCrdn" parameterType="map">
     /* 단속정보 수정(crdnCvlcptMapper.updateCrdn) */
     UPDATE TB_CRDN
@@ -579,7 +563,7 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
         END) AS COPY_EXIST_YN                         <!-- 복사 자료 존재 여부 -->
   FROM TB_CRDN C
   INNER 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)
+  LEFT OUTER JOIN TB_LEVY_EXCL LE ON (C.CRDN_ID = LE.CRDN_ID AND LE.DEL_YN = 'N')
  WHERE C.DEL_YN = 'N'
    AND C.TASK_SE_CD = #{taskSeCd}
    AND C.CRDN_STTS_CD IN ('21','81','83')
@@ -620,6 +604,34 @@ AND (SELECT VLTN_ARTCL FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) LIKE CONCAT(
 <include refid="utility.paging-suffix"/>
 </select>
 
+<select id="selectCvlcptAnswerWordsInfo" parameterType="cokr.xit.fims.crdn.CrdnQuery" resultType="dataobject">
+/* 민원답변문구 대장 객체 가져오기(crdnCvlcptMapper.selectCvlcptAnswerWordsInfo) */
+SELECT A.ANS_WORDS_ID                                                                   /* 답변 문구 ID */
+     , A.PRCS_RSLT_CN                                                                   /* 처리 결과 내용 */
+  FROM TB_CVLCPT_ANS_WORDS A
+ WHERE A.SGG_CD                 = #{sggCd}                                                              /* 시군구 코드 */
+   AND A.TASK_SE_CD             = #{taskSeCd}                                                           /* 업무 구분 코드 */
+   AND A.ANS_RSN_CD             = #{ansRsnCd}                                                           /* 답변 사유 코드 */
+   <choose>
+       <when test='dstrbncYn == "Y"'>
+   AND A.DSTRBNC_YN             = 'Y'                                                           /* 방해 여부 */
+       </when>
+       <otherwise>
+   AND A.DSTRBNC_YN             = 'N'                                                           /* 방해 여부 */
+       </otherwise>
+   </choose>
+   AND A.USE_YN                 = 'Y'                                                                   /* 사용 여부 */
+</select>
+
+<select id="selectCvlcptAnswerBasicWordsInfo" parameterType="cokr.xit.fims.crdn.CrdnQuery" resultType="dataobject">
+/* 민원답변기본문구 대장 객체 가져오기(crdnCvlcptMapper.selectCvlcptAnswerBasicWordsInfo) */
+SELECT A.HEADER_CN
+     , A.FOOTER_CN
+  FROM TB_CVLCPT_BSC_WORDS A
+ WHERE A.SGG_CD                 = #{sggCd}                                                              /* 시군구 코드 */
+   AND A.TASK_SE_CD             = #{taskSeCd}                                                           /* 업무 구분 코드 */
+</select>
+
 <select id="selectAnswerPreview" parameterType="map" resultType="dataobject">
 /* 민원답변 미리보기(crdnCvlcptMapper.selectAnswerPreview) */
 SELECT C.CRDN_ID                <!-- 단속 ID -->