From 31ec4c40ab06ce85b258d0e0d70613de05a20631 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Mon, 4 Sep 2023 16:32:14 +0900
Subject: [PATCH] =?UTF-8?q?=EC=86=8C=EC=8A=A4=20=EC=A0=95=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cokr/xit/fims/crdn/CrdnQuery.java     | 18 +++++++++---------
 .../xit/fims/cvlc/dao/CrdnCvlcptMapper.java    |  6 ------
 .../cvlc/service/bean/CrdnCvlcptMainBean.java  |  3 ---
 .../service/bean/CrdnCvlcptServiceBean.java    |  1 -
 .../sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml | 15 ---------------
 5 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java
index 122a5b21..c06df93c 100644
--- a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java
+++ b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java
@@ -17,7 +17,6 @@ public class CrdnQuery extends CmmnQuery {
 	private static final long serialVersionUID = 1L;
 
 	//조회유형
-	private String viewType;
 	private String gridType;
 	private String inspectionDataType;
 
@@ -71,14 +70,6 @@ public class CrdnQuery extends CmmnQuery {
 	private String vhrno;
 	private String cvlcptPrcsPicNm;
 
-	public String getViewType() {
-		return ifEmpty(viewType, () -> null);
-	}
-
-	public <T extends CrdnQuery> T setViewType(String viewType) {
-		this.viewType = viewType;
-		return self();
-	}
 
 	public String getGridType() {
 		return ifEmpty(gridType, () -> null);
@@ -242,6 +233,15 @@ public class CrdnQuery extends CmmnQuery {
 		return self();
 	}
 
+	public String getSchDmndYmdTo() {
+		return ifEmpty(schDmndYmdTo, () -> null);
+	}
+
+	public <T extends CrdnQuery> T setSchDmndYmdTo(String schDmndYmdTo) {
+		this.schDmndYmdTo = schDmndYmdTo;
+		return self();
+	}
+
 	public Integer getSchCrdnCntFrom() {
 		return ifEmpty(schCrdnCntFrom, () -> null);
 	}
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 5280cfae..b34889f8 100644
--- a/src/main/java/cokr/xit/fims/cvlc/dao/CrdnCvlcptMapper.java
+++ b/src/main/java/cokr/xit/fims/cvlc/dao/CrdnCvlcptMapper.java
@@ -35,12 +35,6 @@ public interface CrdnCvlcptMapper extends AbstractMapper {
 	 */
 	DataObject selectCivilComplaintOriginalInfo(CrdnQuery query);
 
-	/** 한글파일 생성을 위한 민원 원본을 조회한다.
-	 * @param query 민원원본 조회 조건
-	 * @return 민원원본
-	 */
-	DataObject selectCivilComplaintOriginalInfoHwp(CrdnQuery query);
-
 	/** 민원접수 초기자료 상세 정보를 조회한다.
 	 * @param query 민원접수 초기자료 조회 조건
 	 * @return 민원접수 초기자료
diff --git a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptMainBean.java b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptMainBean.java
index 88827548..fb0d6721 100644
--- a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptMainBean.java
+++ b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptMainBean.java
@@ -71,9 +71,6 @@ public class CrdnCvlcptMainBean extends AbstractComponent {
 	 * @return 민원 원본 정보
 	 */
 	public DataObject getCivilComplaintOriginalInfo(CrdnQuery query) {
-		if(ifEmpty(query.getViewType(), () -> "").equals("hwp")) {
-			return crdnCvlcptMapper.selectCivilComplaintOriginalInfoHwp(query);
-		}
 		return crdnCvlcptMapper.selectCivilComplaintOriginalInfo(query);
 	}
 
diff --git a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java
index 49451d97..f404b23e 100644
--- a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java
+++ b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java
@@ -126,7 +126,6 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv
 		String baseFormatFilePath = ("classpath:format/cvlcptOrgnl_text.hwp");
 		String attachFormatFilePath = ("classpath:format/cvlcptOrgnl_photo.hwp");
 
-		query.setViewType("hwp");
 		DataObject dataObject = crdnCvlcptMainBean.getCivilComplaintOriginalInfo(query);
 		SimpleDateFormat ymdhmsFormat = new SimpleDateFormat("yyyyMMddHHmmss");
 		SimpleDateFormat ymdFormat = new SimpleDateFormat("yyyyMMdd");
diff --git a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml
index ca4310f8..a13a4f82 100644
--- a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml
@@ -283,21 +283,6 @@ SELECT C.CRDN_ID                <!-- 단속 ID -->
      , CC.CVLCPT_PRCS_PRNMNT_DT <!-- 민원 처리 예정 일시 -->
      , CC.CVLCPT_APLY_CN        <!-- 민원 신청 내용 -->
      , CC.CVLCPT_APLY_SE_CD     <!-- 민원 신청 구분코드 -->
-  FROM TB_CRDN C
-  INNER JOIN TB_CRDN_CVLCPT CC ON (C.CVLCPT_LINK_YN = 'Y' AND C.LINK_ID = CC.CVLCPT_LINK_ID)
- WHERE C.DEL_YN = 'N' AND CC.DEL_YN = 'N'
-   AND C.CRDN_ID = #{crdnId} 
-</select>
-
-<select id="selectCivilComplaintOriginalInfoHwp" parameterType="map" resultType="dataobject">
-/* 민원내역 원본 보기(한글 파일)(crdnCvlcptMapper.selectCivilComplaintOriginalInfoHwp) */
-SELECT C.CRDN_ID                <!-- 단속 ID -->
-     , CC.CVLCPT_RCPT_NO        <!-- 민원 접수 번호 -->
-     , CC.CVLCPT_LIST_NO        <!-- 민원 목록 번호 -->
-     , CC.CVLCPT_APLCNT_NM      <!-- 민원 신청인 명 -->
-     , CC.CVLCPT_RCPT_YMD       <!-- 민원 접수 일자 -->
-     , CC.CVLCPT_PRCS_PRNMNT_DT <!-- 민원 처리 예정 일시 -->
-     , CC.CVLCPT_APLY_CN        <!-- 민원 신청 내용 -->
      , C.LINK_TBL_NM            <!-- 연계 테이블 명 -->
      , C.LINK_ID                <!-- 연계 ID -->
   FROM TB_CRDN C