From 3e850f0040362c4f12a3502cdb49ef65821f735c Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Fri, 21 Jul 2023 09:33:51 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AF=BC=EC=9B=90=20=EC=9B=90=EB=B3=B8=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EC=BF=BC=EB=A6=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cokr/xit/fims/crdn/dao/Crdn01Mapper.java | 6 ++++++ .../xit/fims/crdn/service/bean/Crdn01Bean.java | 6 ++++++ .../xit/fims/crdn/service/bean/Crdn05Bean.java | 16 ++++++---------- .../cokr/xit/fims/crdn/web/Crdn01Controller.java | 11 ++++++++--- .../sql/mapper/fims/crdn/crdn01-mapper.xml | 14 ++++++++++++++ .../WEB-INF/jsp/fims/crdn/crdn01050-info.jsp | 3 +++ 6 files changed, 43 insertions(+), 13 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01050-info.jsp 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 1d66d3f9..95698656 100644 --- a/src/main/java/cokr/xit/fims/crdn/dao/Crdn01Mapper.java +++ b/src/main/java/cokr/xit/fims/crdn/dao/Crdn01Mapper.java @@ -45,4 +45,10 @@ public interface Crdn01Mapper extends AbstractMapper { */ int removeCivilComplaint(Crdn crdn); + /** 민원 원본을 조회한다. + * @param req 민원원본 조회 조건 + * @return 민원원본 + */ + DataObject selectCivilComplaintOriginalInfo(CrdnQuery req); + } 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 48c93513..6dc0561a 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 @@ -5,9 +5,11 @@ import javax.annotation.Resource; import org.springframework.stereotype.Component; import cokr.xit.fims.crdn.Crdn; +import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.crdn.dao.Crdn01Mapper; import cokr.xit.foundation.AbstractComponent; import cokr.xit.foundation.UserInfo; +import cokr.xit.foundation.data.DataObject; /** 민원 관리 Bean * @author leebj @@ -26,4 +28,8 @@ public class Crdn01Bean extends AbstractComponent { return crdn01Mapper.removeCivilComplaint(crdn) == 1 ? true : false; } + public DataObject getCivilComplaintOriginalInfo(CrdnQuery req) { + return crdn01Mapper.selectCivilComplaintOriginalInfo(req); + } + } diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn05Bean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn05Bean.java index e5784555..d03cf85b 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn05Bean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn05Bean.java @@ -16,11 +16,7 @@ import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.dao.Crdn05Mapper; import cokr.xit.fims.excl.Excl01; import cokr.xit.fims.excl.service.bean.Excl01Bean; -import cokr.xit.fims.task.service.bean.BpvServiceBean; -import cokr.xit.fims.task.service.bean.DpvServiceBean; -import cokr.xit.fims.task.service.bean.EcaServiceBean; -import cokr.xit.fims.task.service.bean.PvsServiceBean; -import cokr.xit.fims.task.service.bean.TpvServiceBean; +import cokr.xit.fims.task.service.TaskService; import cokr.xit.foundation.AbstractComponent; import cokr.xit.foundation.UserInfo; @@ -44,15 +40,15 @@ public class Crdn05Bean extends AbstractComponent { private Crdn05Mapper crdn05Mapper; @Resource(name = "pvsService") - private PvsServiceBean pvsService; + private TaskService pvsService; @Resource(name = "bpvService") - private BpvServiceBean bpvService; + private TaskService bpvService; @Resource(name = "dpvService") - private DpvServiceBean dpvService; + private TaskService dpvService; @Resource(name = "ecaService") - private EcaServiceBean ecaService; + private TaskService ecaService; @Resource(name = "tpvService") - private TpvServiceBean tpvService; + private TaskService tpvService; public boolean create(Crdn crdn, List fileInfoList) { crdn.setAtchFileCnt(fileInfoList.size()); 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 5f52b3a5..5cf95609 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java @@ -16,6 +16,7 @@ import cokr.xit.fims.crdn.service.CrdnService; import cokr.xit.fims.crdn.service.bean.Crdn01Bean; import cokr.xit.fims.crdn.service.bean.Crdn01ServiceBean; import cokr.xit.foundation.UserInfo; +import cokr.xit.foundation.data.DataObject; /**민원 관리 서비스 웹 컨트롤러.
* {웹 컨텍스트}/crdn/crdn01 로 접근할 수 있다. @@ -79,11 +80,15 @@ public class Crdn01Controller extends ApplicationController { * @return fims/crdn/crdn01050-info */ @RequestMapping(name="민원내역 원본 보기", value="/050/info.do") - public ModelAndView getCivilComplaintOrgnlInfo() { - ModelAndView mav = new ModelAndView(); - mav.setViewName("fims/crdn/crdn01050-info"); + public ModelAndView getCivilComplaintOriginalInfo(CrdnQuery req) { + + boolean json = jsonResponse(); + ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/crdn/crdn01050-info"); mav.addObject("pageName", "crdn01050-info"); + DataObject info = crdn01Bean.getCivilComplaintOriginalInfo(req); + + mav.addObject("cvlcptInfo", json ? info : toJson(info)); 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 e4bbec0e..4497b7b4 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml @@ -253,4 +253,18 @@ SELECT C.CRDN_ID #{crdnId} ) + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01050-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01050-info.jsp new file mode 100644 index 00000000..70c34e65 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01050-info.jsp @@ -0,0 +1,3 @@ +<%@ 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