From c752f99b0b1a8027111372e472780609a198f479 Mon Sep 17 00:00:00 2001 From: myname Date: Tue, 17 Oct 2023 15:20:06 +0900 Subject: [PATCH] =?UTF-8?q?2023-10-17=2015:19=20=EC=B2=AD=EC=86=8C?= =?UTF-8?q?=EB=85=84=20=EC=82=AC=EC=9A=A9=EC=9E=90=20=ED=99=94=EB=A9=B4=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/VEAcmdtAplctService.java | 4 +- .../service/impl/VEAcmdtAplctDAO.java | 4 + .../service/impl/VEAcmdtAplctServiceImpl.java | 18 +++- .../asgnmInfo/web/VEAsgnmController.java | 5 +- .../pblc/sndMng/web/SndMngController.java | 95 +++++++++++------- .../ve/asgnm/VEAcmdtAplct_SQL_Tibero.xml | 26 ++++- .../oprtn/tngrVisitEdu/eduAplctMngList.jsp | 97 ++++++++++++++++++- .../oprtn/tngrVisitEdu/eduCnfrmMngList.jsp | 8 +- .../oprtn/tngrVisitEdu/eduInstrFeeMngList.jsp | 2 +- .../jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp | 48 ++++++++- .../jsp/oprtn/tngrVisitEdu/scholMngDetail.jsp | 20 +++- .../asgnmInfo/instrAsgnmDetail.jsp | 8 +- .../asgnmInfo/instrAsgnmList.jsp | 4 +- .../asgnmInfo/instrAsgnmDetail.jsp | 9 +- .../tngrVisitEdu/asgnmInfo/instrAsgnmList.jsp | 4 +- 15 files changed, 286 insertions(+), 66 deletions(-) diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEAcmdtAplctService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEAcmdtAplctService.java index 700a5624..c2adfa53 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEAcmdtAplctService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEAcmdtAplctService.java @@ -1,7 +1,5 @@ package kcc.ve.instr.tngrVisitEdu.asgnmInfo.service; -import java.util.List; - public interface VEAcmdtAplctService { //C : 숙박신청 등록 @@ -15,6 +13,8 @@ public interface VEAcmdtAplctService { VEInstrFeeAcmdtVO selectDetailByUser_r2(VEInstrFeeAcmdtVO paramVO) throws Exception; + VEInstrFeeAcmdtVO selectDetailByUser_r3(VEInstrFeeAcmdtVO paramVO) throws Exception; + VEInstrFeeAcmdtVO selectDcmdtAplctYesterday(VEInstrFeeAcmdtVO paramVO) throws Exception; diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctDAO.java index 84faf663..03976e43 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctDAO.java @@ -43,6 +43,10 @@ public class VEAcmdtAplctDAO extends EgovAbstractDAO { return (VEInstrFeeAcmdtVO) select("VEAcmdtAplctDAO.selectDetailByUser_r2", paramVO); } + public VEInstrFeeAcmdtVO selectDetailByUser_r3(VEInstrFeeAcmdtVO paramVO) throws Exception { + return (VEInstrFeeAcmdtVO) select("VEAcmdtAplctDAO.selectDetailByUser_r3", paramVO); + } + public VEInstrFeeAcmdtVO selectDcmdtAplctYesterday(VEInstrFeeAcmdtVO paramVO) throws Exception { return (VEInstrFeeAcmdtVO) select("VEAcmdtAplctDAO.selectDcmdtAplctYesterday", paramVO); } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctServiceImpl.java index f96a16e5..524714f3 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAcmdtAplctServiceImpl.java @@ -23,8 +23,17 @@ public class VEAcmdtAplctServiceImpl implements VEAcmdtAplctService { //C public void insert(VEInstrFeeAcmdtVO paramVO) throws Exception { - paramVO.setAcmdtAplctOrd(acmdtAplctGnrService.getNextStringId()); - vEAcmdtAplctDAO.insert(paramVO); + //기존 데이터 존재 여부 확인 + VEInstrFeeAcmdtVO vEInstrFeeAcmdtVO = new VEInstrFeeAcmdtVO(); + vEInstrFeeAcmdtVO.setEduAplctOrd(paramVO.getEduAplctOrd()); + vEInstrFeeAcmdtVO.setEduChasiOrd(paramVO.getEduChasiOrd()); + vEInstrFeeAcmdtVO = vEAcmdtAplctDAO.selectDetail(paramVO); + + //기존 값이 없으면 생성 + if (vEInstrFeeAcmdtVO==null) { + paramVO.setAcmdtAplctOrd(acmdtAplctGnrService.getNextStringId()); + vEAcmdtAplctDAO.insert(paramVO); + } } //R @@ -41,6 +50,11 @@ public class VEAcmdtAplctServiceImpl implements VEAcmdtAplctService { public VEInstrFeeAcmdtVO selectDetailByUser_r2(VEInstrFeeAcmdtVO paramVO) throws Exception { return vEAcmdtAplctDAO.selectDetailByUser_r2(paramVO); } + + //R + public VEInstrFeeAcmdtVO selectDetailByUser_r3(VEInstrFeeAcmdtVO paramVO) throws Exception { + return vEAcmdtAplctDAO.selectDetailByUser_r3(paramVO); + } @Override public VEInstrFeeAcmdtVO selectDcmdtAplctYesterday(VEInstrFeeAcmdtVO paramVO) throws Exception { diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java index 8c96a704..e4cd9966 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java @@ -478,11 +478,14 @@ public class VEAsgnmController { acmdtAplct.setInstrDiv("10"); acmdtAplct.setEduHopeDt(vEInstrAsgnmVOInfo.getEduHopeDt()); + acmdtAplct.setEduAplctOrd(vEInstrAsgnmVO.getEduAplctOrd()); + acmdtAplct.setEduChasiOrd(vEInstrAsgnmVO.getEduChasiOrd()); //=== 20230627 이호영 //=== 숙박신청 차시 제거 //=== 교육 key로만 select해서 진행 // acmdtAplct = vEAcmdtAplctService.selectDetailByUser(acmdtAplct); - acmdtAplct = vEAcmdtAplctService.selectDetailByUser_r2(acmdtAplct); + //acmdtAplct = vEAcmdtAplctService.selectDetailByUser_r2(acmdtAplct); + acmdtAplct = vEAcmdtAplctService.selectDetailByUser_r3(acmdtAplct); diff --git a/src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java b/src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java index 6489f318..99cae99e 100644 --- a/src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java +++ b/src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java @@ -1,5 +1,6 @@ package kcc.ve.oprtn.pblc.sndMng.web; +import java.util.ArrayList; import java.util.List; import java.util.Properties; @@ -225,9 +226,14 @@ public class SndMngController { try { String returnMsg = ""; if(!"".equals(vEEduAplctVO.getChk()) && vEEduAplctVO.getChk() != null) { + //MAIL String[] splitChk = vEEduAplctVO.getChk().split(","); String[] phones = vEEduAplctVO.getClphone().split(","); String[] emails = {}; + + //String[] sendChk = {}; //발송정보체크용 + List sendChk = new ArrayList<>(); + VeSendMail sendMail = new VeSendMail(); if("Z".equals(vEEduAplctVO.getSndFlag())) { emails = vEEduAplctVO.getEmail().split(","); @@ -235,48 +241,62 @@ public class SndMngController { for(int i=0; i 청소년>교육확정 메일본문 수정 메뉴에서 관리 - if("Z".equals(vEEduAplctVO.getSndFlag())) { - vEEduAplctVO.setEmail(emails[i]); - CntManageVO cntManageVO = new CntManageVO(); - //본문적용소스 - cntManageVO.setCntId("CNT_000000000001"); - cntManageVO.setCntDtId("CNTDT_0000000001"); - - cntManageVO = egovCntManageService.selectCntDtDetail(cntManageVO); - vEEduAplctVO.setSndCn(cntManageVO.getCntCn()); - - String result = sendMail.VeSendMail(vEEduAplctVO.getSndFlag(), vEEduAplctVO.getEmail(), vEEduAplctVO, loginVO); - if("success".equals(result)) { - //메일 발송 로그 - String snd_mail_ord = sndGnrService.getNextStringId(); - vEEduAplctVO.setSndHstryOrd(snd_mail_ord); - vEEduAplctVO.setSndCd("20"); //문자:10, 메일:20 - vEEduAplctSndHstryService.insert(vEEduAplctVO); - returnMsg = "succ"; + //동일한 신청에 대한 메일 발송이 있었는지 확인 한다.===시작 + boolean b_sendChk = true; + for (int c=0;c 청소년>교육확정 메일본문 수정 메뉴에서 관리 + if("Z".equals(vEEduAplctVO.getSndFlag())) { + vEEduAplctVO.setEmail(emails[i]); + CntManageVO cntManageVO = new CntManageVO(); + //본문적용소스 + cntManageVO.setCntId("CNT_000000000001"); + cntManageVO.setCntDtId("CNTDT_0000000001"); + + cntManageVO = egovCntManageService.selectCntDtDetail(cntManageVO); + vEEduAplctVO.setSndCn(cntManageVO.getCntCn()); + + String result = sendMail.VeSendMail(vEEduAplctVO.getSndFlag(), vEEduAplctVO.getEmail(), vEEduAplctVO, loginVO); + if("success".equals(result)) { + //메일 발송 로그 + String snd_mail_ord = sndGnrService.getNextStringId(); + vEEduAplctVO.setSndHstryOrd(snd_mail_ord); + vEEduAplctVO.setSndCd("20"); //문자:10, 메일:20 + vEEduAplctSndHstryService.insert(vEEduAplctVO); + returnMsg = "succ"; + } + } + } } } if(returnMsg == "fail") { @@ -287,6 +307,7 @@ public class SndMngController { } else { + //SMS String snd_ord = sndGnrService.getNextStringId(); vEEduAplctVO.setSndHstryOrd(snd_ord); diff --git a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Tibero.xml index f2546405..1749a317 100644 --- a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Tibero.xml @@ -50,9 +50,9 @@ a.aprvl_cn AS aprvlCn, - DATE_FORMAT(a.frst_regist_pnttm,'%Y-%m-%d') AS frstRegistPnttm, + TO_CHAR(a.frst_regist_pnttm,'YYYY-MM-DD') AS frstRegistPnttm, a.frst_register_id AS frstRegisterId, - DATE_FORMAT(a.last_updt_pnttm,'%Y-%m-%d') AS lastUpdtPnttm, + TO_CHAR(a.last_updt_pnttm,'YYYY-MM-DD') AS lastUpdtPnttm, a.last_updusr_id AS lastUpdusrId, a.aplct_cn AS aplctCn, @@ -178,7 +178,27 @@ - + + + @@ -318,8 +407,11 @@ - + @@ -448,6 +540,7 @@
+
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduCnfrmMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduCnfrmMngList.jsp index d4107a47..19e480e9 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduCnfrmMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduCnfrmMngList.jsp @@ -850,7 +850,7 @@ + title="Check" type="checkbox"/>${list.asgnmAprvlCd} @@ -949,9 +949,11 @@ -
- + +
- +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp index bed52e2a..2c2a1615 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp @@ -277,7 +277,43 @@ listForm.action = ""; listForm.submit(); } + + //숙박영수증 첨부파일 일괄 다운로드(zip) - 파일ID 다름, SN 동일 : type A + function fnAcmdtFileZipDownload(){ + var frm = document.listForm; + + var checkboxId = Array(); + var checkboxSn = Array(); + var checkboxCnt = 0; + var checkbox_check = false; + var checkbox_index = false; + $('input:checkbox[name="chk"]').each(function(){ + if($(this).is(":checked")){ + + checkbox_check = true; + if($(this).attr("class") != ""){ + checkboxId[checkboxCnt] = $(this).attr("class"); + checkboxSn[checkboxCnt] = "0" + checkboxCnt++; + checkbox_index = true; + } + } + }); + + if(!checkbox_check){ + alert("선택된 항목이 없습니다."); + return false; + }else if(!checkbox_index){ + alert("다운로드할 영수증이 없습니다."); + return false; + } + + frm.orgnZipNm.value="숙박영수증.zip"; + frm.downloadType.value="A"; + frm.action="${pageContext.request.contextPath}/cmm/fms/fileDownZip.do?atchFileId="+checkboxId+"&fileSn="+checkboxSn; + frm.submit(); + } 신청관리 @@ -288,6 +324,9 @@ " /> + + +
@@ -364,6 +403,7 @@ +
@@ -404,7 +444,9 @@ - + @@ -449,7 +491,7 @@
-
+
@@ -472,7 +514,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/scholMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/scholMngDetail.jsp index 7d36f539..138727ea 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/scholMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/scholMngDetail.jsp @@ -144,7 +144,10 @@

도서학교구분

- + + 예 + 아니오 + @@ -152,7 +155,10 @@

벽지학교구분

- + + 예 + 아니오 + @@ -160,7 +166,10 @@

접적학교구분

- + + 예 + 아니오 + @@ -168,7 +177,10 @@

인구감소지역여부

- + + 예 + 아니오 + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmDetail.jsp index 4c325b8b..de85f54d 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmDetail.jsp @@ -143,7 +143,8 @@

교육일시

- ${fn:substring(info.eduHopeDt,0,4)}년 ${fn:substring(info.eduHopeDt,4,6)}월 ${fn:substring(info.eduHopeDt,6,8)}일 +<%-- ${fn:substring(info.eduHopeDt,0,4)}년 ${fn:substring(info.eduHopeDt,4,6)}월 ${fn:substring(info.eduHopeDt,6,8)}일 --%> + ${info.eduHopeDt}

시간

@@ -161,7 +162,10 @@

교육일시

- ${fn:substring(info.eduHopeDt,0,4)}년 ${fn:substring(info.eduHopeDt,4,6)}월 ${fn:substring(info.eduHopeDt,6,8)}일 + +<%-- ${fn:substring(info.eduHopeDt,0,4)}년 ${fn:substring(info.eduHopeDt,4,6)}월 ${fn:substring(info.eduHopeDt,6,8)}일 --%> + ${info.eduHopeDt} + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmList.jsp index 39427c72..d6465678 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmList.jsp @@ -122,7 +122,7 @@

- ', '');">${fn:substring(list.eduHopeDt,0,4)}-${fn:substring(list.eduHopeDt,4,6)}-${fn:substring(list.eduHopeDt,6,8)} + ', '');">${list.eduHopeDt} ', '');"> ', '');"> @@ -170,7 +170,7 @@
  • 교육일자 - ${fn:substring(list.eduHopeDt,0,4)}-${fn:substring(list.eduHopeDt,4,6)}-${fn:substring(list.eduHopeDt,6,8)} + ${list.eduHopeDt}
  • 요일 diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.jsp index 3877c63a..1aaca1f4 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmDetail.jsp @@ -153,6 +153,7 @@

    강의일자

    + ${info.eduHopeDt} ${fn:substring(info.eduHopeDt,0,4)}년 ${fn:substring(info.eduHopeDt,4,6)}월 ${fn:substring(info.eduHopeDt,6,8)}일 @@ -343,7 +344,8 @@

    교육일시

    - ${fn:substring(info.eduHopeDt,0,4)}년 ${fn:substring(info.eduHopeDt,4,6)}월 ${fn:substring(info.eduHopeDt,6,8)}일 +<%-- ${fn:substring(info.eduHopeDt,0,4)}년 ${fn:substring(info.eduHopeDt,4,6)}월 ${fn:substring(info.eduHopeDt,6,8)}일 --%> + ${info.eduHopeDt}

    차시

    @@ -361,7 +363,10 @@

    교육일시

    - ${fn:substring(info.eduHopeDt,0,4)}년 ${fn:substring(info.eduHopeDt,4,6)}월 ${fn:substring(info.eduHopeDt,6,8)}일 + +<%-- ${fn:substring(info.eduHopeDt,0,4)}년 ${fn:substring(info.eduHopeDt,4,6)}월 ${fn:substring(info.eduHopeDt,6,8)}일 --%> + ${info.eduHopeDt} + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmList.jsp index 95d9a5c5..084549c3 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmList.jsp @@ -121,7 +121,7 @@

    -     ', '');">${fn:substring(list.eduHopeDt,0,4)}-${fn:substring(list.eduHopeDt,4,6)}-${fn:substring(list.eduHopeDt,6,8)} + ', '');">${list.eduHopeDt} ', '');"> ', '');"> @@ -181,7 +181,7 @@
  • 교육일자 - ${fn:substring(list.eduHopeDt,0,4)}-${fn:substring(list.eduHopeDt,4,6)}-${fn:substring(list.eduHopeDt,6,8)} + ${list.eduHopeDt}
  • 요일