From 00ba0428918689ceaf96afa2dbc96acb4bc4fe92 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Thu, 26 Oct 2023 17:12:23 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=84=B1?= =?UTF-8?q?=EC=9D=B8=20=EC=A0=80=EC=9E=91=EA=B6=8C=EA=B5=90=EC=9C=A1=20?= =?UTF-8?q?=EC=8B=A0=EC=B2=AD=20=EC=9E=84=EC=8B=9C=EC=A0=80=EC=9E=A5?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml | 3 +++ .../adultVisitEdu/eduAplct/eduAplctReg.jsp | 20 +++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml index 7d63c3b6..b11d35e2 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml @@ -838,6 +838,9 @@ , RNDS_ORD = #rndsOrd# + + , APLCT_CN = #aplctCn# + WHERE EDU_APLCT_ORD = #eduAplctOrd# diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp index f0594926..66670b5f 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp @@ -376,6 +376,13 @@ $("#mode").val(VeConstants.MODE_UPT); $("#eduAplctOrd").val(info.eduAplctOrd); $("#eduSlctCd").val(info.eduSlctCd); + //오프라인의 경우 교육장소 활성화 + if(info.eduSlctCd == '20'){ + $("#juso").show(); + $("#juso").find("input").removeAttr("disabled", "disabled"); + $("#mechae").hide(); + $("#mechae").find("input").attr("disabled", "disabled"); + } $("#eduMd").val(info.eduMd); $("#eduSlctAreaCd").val(info.eduSlctAreaCd); $("#insttNm").val(info.insttNm); @@ -385,7 +392,13 @@ $("#addrDetail").val(info.addrDetail); $("#chrgNm").val(info.chrgNm); $("#jobNm").val(info.jobNm); - + if(isNotEmpty(info.aplctCn)){ + var aplctCnList = info.aplctCn.split(','); + $.each(aplctCnList, function(idx, value){ + $('input[name=aplctCn][value='+value+']').prop('checked',true); + }); + } + if(!isEmpty(info.clphone)){ var clphone = info.clphone.split('-'); $("#clphone1").val(clphone[0]); @@ -416,12 +429,15 @@ } console.log("+++++++++++++++++++++++++++++++++"); var tr = $('.addClassRow').find('tbody > tr').not('.calendar_wrap tr').eq(idx); - tr.find('input[name=eduHopeDt]').val(dateFormat(value.eduHopeDt, 'date')); + //tr.find('input[name=eduHopeDt]').val(dateFormat(value.eduHopeDt, 'date')); + tr.find('input[name=eduHopeDt0]').val(dateFormat(value.eduHopeDt.replace(/\./g, ""), 'date')); + tr.find('input[name=eduHopeDt]').val(dateFormat(value.eduHopeDt.replace(/\./g, ""), 'date')); tr.find('input[name=strtTm]').val(timeFomat(value.strtTm)); tr.find('input[name=endTm]').val(timeFomat(value.endTm)); tr.find('input[name=lrnTm]').val(value.lrnTm); tr.find('input[name=trgt]').val(value.trgt); tr.find('input[name=prsnl]').val(value.prsnl); + }); } From 9c9cc98a37b0c05f413403d98ba9f784d77002a9 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Thu, 26 Oct 2023 17:47:06 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=84=B1?= =?UTF-8?q?=EC=9D=B8=20=EA=B5=90=EC=9C=A1=20=EB=93=B1=EB=A1=9D=20=EC=9E=84?= =?UTF-8?q?=EC=8B=9C=EC=A0=80=EC=9E=A5=20=EB=B6=88=EB=9F=AC=EC=98=A4?= =?UTF-8?q?=EA=B8=B0=20=EC=9E=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp index 66670b5f..c3e861c5 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp @@ -430,8 +430,10 @@ console.log("+++++++++++++++++++++++++++++++++"); var tr = $('.addClassRow').find('tbody > tr').not('.calendar_wrap tr').eq(idx); //tr.find('input[name=eduHopeDt]').val(dateFormat(value.eduHopeDt, 'date')); - tr.find('input[name=eduHopeDt0]').val(dateFormat(value.eduHopeDt.replace(/\./g, ""), 'date')); - tr.find('input[name=eduHopeDt]').val(dateFormat(value.eduHopeDt.replace(/\./g, ""), 'date')); + if(isNotEmpty(info.eduHopeDt)){ + tr.find('input[name=eduHopeDt0]').val(dateFormat(value.eduHopeDt.replace(/\./g, ""), 'date')); + tr.find('input[name=eduHopeDt]').val(dateFormat(value.eduHopeDt.replace(/\./g, ""), 'date')); + } tr.find('input[name=strtTm]').val(timeFomat(value.strtTm)); tr.find('input[name=endTm]').val(timeFomat(value.endTm)); tr.find('input[name=lrnTm]').val(value.lrnTm); From 78087cbd651db46fe588b11242d0afbd9471d958 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Thu, 26 Oct 2023 18:25:16 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90=20=EC=A0=80=EC=9E=91=EA=B6=8C=EC=B2=B4?= =?UTF-8?q?=ED=97=98=EA=B5=90=EC=8B=A4=20=EC=83=81=EC=84=B8=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=EC=B2=A8=EB=B6=80=ED=8C=8C=EC=9D=BC=EB=93=A4?= =?UTF-8?q?=EC=97=90=20=EC=97=85=EB=A1=9C=EB=93=9C=20=EB=82=A0=EC=A7=9C=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 --- .../com/cmm/web/EgovFileMngController.java | 19 +++- .../jsp/cmm/fms/selectRsltRprtFile.jsp | 4 +- .../cmm/fms/selectRsltRprtFileWithDelete.jsp | 96 +++++++++++++++++++ .../cpyrgExprnClsrm/oprtnAplctMngDetail.jsp | 2 +- .../cpyrgExprnClsrm/oprtnStateMngDetail.jsp | 16 ++-- 5 files changed, 126 insertions(+), 11 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/cmm/fms/selectRsltRprtFileWithDelete.jsp diff --git a/src/main/java/kcc/com/cmm/web/EgovFileMngController.java b/src/main/java/kcc/com/cmm/web/EgovFileMngController.java index bd13270d..c169c194 100644 --- a/src/main/java/kcc/com/cmm/web/EgovFileMngController.java +++ b/src/main/java/kcc/com/cmm/web/EgovFileMngController.java @@ -352,6 +352,23 @@ public class EgovFileMngController { * @return * @throws Exception */ + @RequestMapping("/cmm/fms/selectRsltRprtFileWithDelete.do") + public String selectRsltRprtFileWithDelete(@ModelAttribute("searchVO") FileVO fileVO, @RequestParam Map commandMap, ModelMap model) throws Exception { + String atchFileId = (String) commandMap.get("param_atchFileId"); + String eduAplctOrd = (String) commandMap.get("eduAplctOrd"); + String type = (String) commandMap.get("type"); + + fileVO.setAtchFileId(atchFileId); + List result = fileService.selectFileInfs(fileVO); + model.addAttribute("fileList", result); + model.addAttribute("updateFlag", "N"); + model.addAttribute("fileListCnt", result.size()); + model.addAttribute("atchFileId", atchFileId); + model.addAttribute("eduAplctOrd", eduAplctOrd); + model.addAttribute("type", type); + + return "cmm/fms/selectRsltRprtFileWithDelete"; + } @RequestMapping("/cmm/fms/selectRsltRprtFile.do") public String selectRsltRprtFile(@ModelAttribute("searchVO") FileVO fileVO, @RequestParam Map commandMap, ModelMap model) throws Exception { String atchFileId = (String) commandMap.get("param_atchFileId"); @@ -366,7 +383,7 @@ public class EgovFileMngController { model.addAttribute("atchFileId", atchFileId); model.addAttribute("eduAplctOrd", eduAplctOrd); model.addAttribute("type", type); - + return "cmm/fms/selectRsltRprtFile"; } } diff --git a/src/main/webapp/WEB-INF/jsp/cmm/fms/selectRsltRprtFile.jsp b/src/main/webapp/WEB-INF/jsp/cmm/fms/selectRsltRprtFile.jsp index 29fcced5..c8e9c21d 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/fms/selectRsltRprtFile.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/fms/selectRsltRprtFile.jsp @@ -4,6 +4,7 @@ <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> <% /** @@ -83,8 +84,9 @@ ','')" class="file_download_a" title="다운로드" style="display:inline-block;"> + + () - ','', ''); return false;" alt="첨부파일">
diff --git a/src/main/webapp/WEB-INF/jsp/cmm/fms/selectRsltRprtFileWithDelete.jsp b/src/main/webapp/WEB-INF/jsp/cmm/fms/selectRsltRprtFileWithDelete.jsp new file mode 100644 index 00000000..7faa38b6 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/cmm/fms/selectRsltRprtFileWithDelete.jsp @@ -0,0 +1,96 @@ +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> + +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<% + +/** + * @Class Name : selectScholSealInfs.jsp + * @Description : 파일 목록화면 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ---------- ------ --------------------------- + * @ 2009.03.26 이삼섭 최초 생성 + * @ 2011.07.20 옥찬우 Tag id속성 추가( Line : 68 ) + * + * @author 공통서비스 개발팀 이삼섭 + * @since 2009.03.26 + * @version 1.0 + * @see + * + */ +%> + + + + + + + + + + + + + ','')" class="file_download_a" title="다운로드" style="display:inline-block;"> + + + () + + ','', ''); return false;" alt="첨부파일"> +
+
+ + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp index 4e96ee7e..0a3e61ad 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp @@ -379,7 +379,7 @@

첨부파일

- + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngDetail.jsp index 401da052..ba0bc9d1 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngDetail.jsp @@ -248,7 +248,7 @@

첨부파일

- + @@ -260,7 +260,7 @@ - + @@ -275,7 +275,7 @@ - + @@ -336,7 +336,7 @@ - + @@ -363,7 +363,7 @@

결과보고서 원본

- + @@ -375,7 +375,7 @@

결과보고서 평가용

- + @@ -387,7 +387,7 @@

증빙사진

- + @@ -399,7 +399,7 @@

원격연수 이수증

- +