From 9dd90bfc94ad8763bc0236d66e089cf14616c048 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Wed, 26 Jul 2023 16:26:18 +0900 Subject: [PATCH] =?UTF-8?q?=EB=8B=B5=EB=B3=80=EB=82=B4=EC=9A=A9=20?= =?UTF-8?q?=EB=AF=B8=EB=A6=AC=EB=B3=B4=EA=B8=B0=20=ED=8C=9D=EC=97=85=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cokr/xit/fims/crdn/CrdnQuery.java | 11 ++ .../cokr/xit/fims/crdn/dao/Crdn01Mapper.java | 26 +-- .../fims/crdn/service/bean/Crdn01Bean.java | 10 +- .../crdn/service/bean/Crdn01ServiceBean.java | 4 + .../xit/fims/crdn/web/Crdn01Controller.java | 20 +++ .../sql/mapper/fims/crdn/crdn01-mapper.xml | 18 +- .../WEB-INF/jsp/fims/crdn/crdn01060-info.jsp | 155 ++++++++++++++++++ 7 files changed, 228 insertions(+), 16 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01060-info.jsp diff --git a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java index 17f9b4f3..ab0cd22d 100644 --- a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java +++ b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java @@ -22,6 +22,7 @@ public class CrdnQuery extends QueryRequest { private String grid; private String thisDay; private String currentUserId; + private String currentInstitute; private String inspectionDataType; private String crdnId; private String[] crdnIDs; @@ -30,6 +31,7 @@ public class CrdnQuery extends QueryRequest { private String schDateFrom; private String schDateTo; private String vhrno; + private String cvlcptPrcsPicNm; private String schCvlcptRcptYmdFrom; private String schCvlcptRcptYmdTo; @@ -106,6 +108,15 @@ public class CrdnQuery extends QueryRequest { return self(); } + public String getCurrentInstitute() { + return ifEmpty(currentInstitute, () -> null); + } + + public T setCurrentInstitute(String currentInstitute) { + this.currentInstitute = currentInstitute; + return self(); + } + public String getInspectionDataType() { return ifEmpty(inspectionDataType, () -> null); } diff --git a/src/main/java/cokr/xit/fims/crdn/dao/Crdn01Mapper.java b/src/main/java/cokr/xit/fims/crdn/dao/Crdn01Mapper.java index d45c48a5..9cc55abc 100644 --- a/src/main/java/cokr/xit/fims/crdn/dao/Crdn01Mapper.java +++ b/src/main/java/cokr/xit/fims/crdn/dao/Crdn01Mapper.java @@ -17,24 +17,24 @@ public interface Crdn01Mapper extends AbstractMapper { /**민원자료 목록을 조회한다.
* {@link cokr.xit.fims.crdn.service.bean.Crdn01ServiceBean#getCrackdownList(CrdnQuery)} 참고 - * @param req 민원자료 목록 조회 조건 + * @param query 민원자료 목록 조회 조건 * @return 민원자료 목록 */ - List selectCivilComplaintList(CrdnQuery req); + List selectCivilComplaintList(CrdnQuery query); /**민원접수자료 목록을 조회한다.
* {@link cokr.xit.fims.crdn.service.bean.Crdn01ServiceBean#getCrackdownList(CrdnQuery)} 참고 - * @param req 민원접수자료 목록 조회 조건 + * @param query 민원접수자료 목록 조회 조건 * @return 민원접수자료 목록 */ - List selectCivilComplaintReceiptDataList(CrdnQuery req); + List selectCivilComplaintReceiptDataList(CrdnQuery query); /**민원답변대상자료 목록을 조회한다.
* {@link cokr.xit.fims.crdn.service.bean.Crdn01ServiceBean#getCrackdownList(CrdnQuery)} 참고 - * @param req 민원답변대상자료 목록 조회 조건 + * @param query 민원답변대상자료 목록 조회 조건 * @return 민원답변대상자료 목록 */ - List selectCivilComplaintAnswerTargetDataList(CrdnQuery req); + List selectCivilComplaintAnswerTargetDataList(CrdnQuery query); /** 민원 자료를 삭제한다. * @param params 파라미터 @@ -46,15 +46,21 @@ public interface Crdn01Mapper extends AbstractMapper { int removeCivilComplaint(Crdn crdn); /** 민원 원본을 조회한다. - * @param req 민원원본 조회 조건 + * @param query 민원원본 조회 조건 * @return 민원원본 */ - DataObject selectCivilComplaintOriginalInfo(CrdnQuery req); + DataObject selectCivilComplaintOriginalInfo(CrdnQuery query); /** 민원 원본을 조회한다. - * @param req 민원원본 조회 조건 + * @param query 민원원본 조회 조건 * @return 민원원본 */ - DataObject selectCivilComplaintOriginalInfoHwp(CrdnQuery req); + DataObject selectCivilComplaintOriginalInfoHwp(CrdnQuery query); + + /** 민원 예정 답변을 조회한다. + * @param query 민원원본 조회 조건 + * @return 민원 예정 답변 + */ + DataObject selectAnswerPreview(CrdnQuery query); } diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01Bean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01Bean.java index 43b266dd..8bdbebc8 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01Bean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01Bean.java @@ -28,11 +28,13 @@ public class Crdn01Bean extends AbstractComponent { return crdn01Mapper.removeCivilComplaint(crdn) == 1 ? true : false; } - public DataObject getCivilComplaintOriginalInfo(CrdnQuery req) { - if(ifEmpty(req.getView(), () -> "").equals("hwp")) { - return crdn01Mapper.selectCivilComplaintOriginalInfoHwp(req); + public DataObject getCivilComplaintOriginalInfo(CrdnQuery crdnQuery) { + if(ifEmpty(crdnQuery.getView(), () -> "").equals("hwp")) { + return crdn01Mapper.selectCivilComplaintOriginalInfoHwp(crdnQuery); } - return crdn01Mapper.selectCivilComplaintOriginalInfo(req); + return crdn01Mapper.selectCivilComplaintOriginalInfo(crdnQuery); } + + } diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01ServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01ServiceBean.java index f029cdb9..1ce6e94c 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01ServiceBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn01ServiceBean.java @@ -145,6 +145,10 @@ public class Crdn01ServiceBean extends AbstractServiceBean implements CrdnServic } } + public DataObject getAnswerPreview(CrdnQuery req) { + return crdn01Mapper.selectAnswerPreview(req); + } + } diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java index 3ddfe187..41dfba9c 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java @@ -186,4 +186,24 @@ public class Crdn01Controller extends ApplicationController { return crdn01Service.makeFileFromHwpFormat(crdnQuery, baseFormatFilePath, attachFormatFilePath); } + + /** 민원답변내용 미리보기 화면을 연다. + * @return + */ + @RequestMapping(name="민원답변내용 미리보기", value="/060/info.do") + public ModelAndView answerPreviewInfo(CrdnQuery req, HttpServletRequest request) { + boolean json = jsonResponse(); + ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/crdn/crdn01060-info"); + + mav.addObject("pageName", "crdn01060-info"); + String urlTaskSeCd = request.getServletPath().split("/")[1]; + mav.addObject("taskSeCd", urlTaskSeCd); + + req.setTaskSeCd(urlTaskSeCd); + DataObject cvlcptInfo = crdn01Service.getAnswerPreview(req); + mav.addObject("cvlcptInfo", json ? cvlcptInfo : toJson(cvlcptInfo)); + + return mav; + } + } diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml index aa7c31b4..725547ea 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml @@ -277,7 +277,7 @@ AND (SELECT VLTN_ARTCL FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) LIKE CONCAT( ) - /* 민원내역 원본 보기(crdn01Mapper.selectCivilComplaintOriginalInfo) */ SELECT C.CRDN_ID , CC.CVLCPT_RCPT_NO @@ -292,7 +292,7 @@ SELECT C.CRDN_ID AND C.CRDN_ID = #{crdnId} - /* 민원내역 원본 보기(한글 파일)(crdn01Mapper.selectCivilComplaintOriginalInfoHwp) */ SELECT C.CRDN_ID , CC.CVLCPT_RCPT_NO @@ -305,4 +305,18 @@ SELECT C.CRDN_ID WHERE C.DEL_YN = 'N' AND CC.DEL_YN = 'N' AND C.CRDN_ID = #{crdnId} + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01060-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01060-info.jsp new file mode 100644 index 00000000..f44a3829 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01060-info.jsp @@ -0,0 +1,155 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> +<%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> +민원 답변내용 미리보기 + +
+
+
+ + +
+
+ +
+
+ + + +
+
+
+ +
+
+ +
+ +
+
+
+ +
+
+ +
+ 변경할내용이있으면 수정하시오. +
+
+ +
+
+
+
+
+ + \ No newline at end of file