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 000d5461..a1638a0b 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 @@ -16,6 +16,7 @@ import cokr.xit.base.file.service.FileService; import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.cmmn.hwp.AddingParagraphBetweenHWPFile; import cokr.xit.fims.cmmn.hwp.InsertingImageCell; +import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.crdn.dao.Crdn01Mapper; import cokr.xit.fims.crdn.service.CrdnService; @@ -179,6 +180,15 @@ public class Crdn01ServiceBean extends AbstractServiceBean implements CrdnServic } else { dataObject.set("videoExist", "N"); } + + + fileQuery.setInfoType(Crdn.INF_TYPE); + fileList = fileService.getFileList(fileQuery); + + if(fileList != null && !fileList.isEmpty()) { + dataObject.set("fileList", fileList); + } + return dataObject; } diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt03Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt03Controller.java index aa876214..dcf8e851 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt03Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt03Controller.java @@ -52,4 +52,28 @@ public class Sprt03Controller extends ApplicationController { return mav; } + + /** 사진 편집 메인화면을 연다. + * @return fims/sprt/sprt03020-main + */ + public ModelAndView editPhotoMain(String openerPageName, String fileId) { + ModelAndView mav = new ModelAndView(); + + mav.setViewName("fims/sprt/sprt03020-main"); + mav.addObject("openerPageName", openerPageName); + + if(fileId != null && !fileId.equals("")) { + mav.addObject("fileId", fileId); + + FileQuery fileQuery = new FileQuery(); + fileQuery.setFileIDs(fileId); + List fileList = fileService.getFileList(fileQuery); + if(fileList != null && !fileList.isEmpty()) { + DataObject file = fileList.get(0); + mav.addObject("fileInfo", toJson(file)); + } + } + + return mav; + } } diff --git a/src/main/java/cokr/xit/fims/task/web/CmnController.java b/src/main/java/cokr/xit/fims/task/web/CmnController.java index 02b6c85a..fbe948e2 100644 --- a/src/main/java/cokr/xit/fims/task/web/CmnController.java +++ b/src/main/java/cokr/xit/fims/task/web/CmnController.java @@ -130,6 +130,15 @@ public class CmnController { public ModelAndView videoMain(String openerPageName, String crdnId) { return super.videoMain(openerPageName, crdnId); } + + /** 사진 편집 메인화면을 연다. + * @return fims/sprt/sprt03020-main + */ + @Override + @RequestMapping(name="사진 편집 메인", value="/020/main.do") + public ModelAndView editPhotoMain(String openerPageName, String fileId) { + return super.editPhotoMain(openerPageName, fileId); + } } @Controller diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp index e7d3367d..a67b8443 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp @@ -265,19 +265,27 @@
-
- +
+
등록된 사진
+
-
- +
-
+
+
추가한 사진
+ +
+
+
+ +
+
캡쳐 이미지
-
- +
+
@@ -426,6 +434,14 @@ $(document).ready(function(){ ,"width=1800,height=950" ); }); + $("#btnEditPhoto--${pageName}").on('click', () => { + var fileId = $("#display3--${pageName}").find("[name='editTarget']:checked").val(); + + window.open(wctx.url("/sprt/sprt03/020/main.do?openerPageName=${pageName}&fileId="+fileId) + ,"editPhoto" + ,"width=1800,height=950" + ); + }); /************************************************************************** @@ -471,9 +487,32 @@ $(document).ready(function(){ $P.crdnControl.setData([crdnInfo]); if(crdnInfo.videoExist == "N"){ - $("#btnOpenVideoCapture--${pageName}").hide(); + $("#cpatureTitleArea--${pageName}").hide(); $("#display2--${pageName}").hide(); } + + if(crdnInfo.fileList){ + var editPhotoArea = ""; + + crdnInfo.fileList.forEach(function(item, index){ + editPhotoArea += ""; + editPhotoArea += "
"; + }); + + $("#display3--${pageName}").append(editPhotoArea); + } else { + + $("#display3--${pageName}").append("등록된 사진이 없습니다."); + $("#btnEditPhoto--crdn01020-info").hide(); + + } }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03010-main.jsp index df025e1b..73a9f065 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03010-main.jsp @@ -42,7 +42,7 @@ -동영상 재생 +동영상 재생
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp new file mode 100644 index 00000000..60ed5c4c --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp @@ -0,0 +1,82 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> +<%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> + +" + data-template="vertical-menu-template-starter"> + + + 과태료통합관리시스템 + + + " /> + + + + + + + + " /> + " /> + " /> + " /> + + " /> + " /> + " /> + " /> + + + " /> + " /> + + "/> + " /> + " /> + + + + +사진 편집 +
+ +
+ + + + + + + + + + + + + + + + + \ No newline at end of file