From d3cc667db293bac5d59d87c3186adabf0411b37b Mon Sep 17 00:00:00 2001 From: jiwoo Date: Thu, 11 Jan 2024 09:52:01 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90=20=EA=B8=B0=EC=86=8C=EC=9C=A0=EC=98=88?= =?UTF-8?q?=EC=97=90=20=EB=A9=94=EB=AA=A8=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EB=B0=8F=20=EB=AA=A9=EB=A1=9D=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EB=A9=94=EB=AA=A8=20=EC=9D=BC=EA=B4=84=EC=98=A4=ED=94=88=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 --- .../service/impl/NotifyManageServiceImpl.java | 4 +- .../let/utl/fcc/service/EgovCryptoUtil.java | 1 + .../eduInfo/service/VEEduAplctVO.java | 7 +++ .../trgtMng/service/CndtnTrgtMngService.java | 4 +- .../trgtMng/service/impl/CndtnTrgtMngDAO.java | 5 +- .../service/impl/CndtnTrgtMngServiceImpl.java | 7 +++ .../trgtMng/web/CndtnTrgtMngController.java | 44 +++++++++++++++ .../ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml | 13 ++++- .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml | 12 +++-- .../cndtnEduPrcsAplctPrdMngDetail.jsp | 7 ++- .../oprtn/cndtnSspnIdtmt/trgtCmpltDetail.jsp | 54 +++++++++++++++++++ .../oprtn/cndtnSspnIdtmt/trgtCmpltList.jsp | 30 +++++++++++ .../jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp | 54 +++++++++++++++++++ .../jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp | 31 +++++++++++ .../oprtn/cndtnSspnIdtmt/trgtMngDetail.jsp | 54 ++++++++++++++++++- .../jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp | 32 ++++++++++- 16 files changed, 348 insertions(+), 11 deletions(-) diff --git a/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageServiceImpl.java b/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageServiceImpl.java index 414e07f7..81038897 100644 --- a/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageServiceImpl.java +++ b/src/main/java/kcc/let/uss/notify/service/impl/NotifyManageServiceImpl.java @@ -215,7 +215,9 @@ public class NotifyManageServiceImpl extends EgovAbstractServiceImpl implements // 상태값 text String aprvlNm = this.getCodeNm(aprvlCd, "VE0003"); - notifyManageVO.setNotifyCn("["+lctrDivNm+"]교육 상태값이 "+aprvlNm+"(으)로 변경되었습니다."); + //24.1.10 기소유예 담당자 요청으로 문구 변경 + //notifyManageVO.setNotifyCn("["+lctrDivNm+"]교육 상태값이 "+aprvlNm+"(으)로 변경되었습니다."); + notifyManageVO.setNotifyCn("["+lctrDivNm+"]교육 상태값이 "+aprvlNm+"되었습니다."); String notifyPath = ""; diff --git a/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java b/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java index 14d3ddfd..9fcba00c 100644 --- a/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java +++ b/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java @@ -645,6 +645,7 @@ public class EgovCryptoUtil { vo.setChrgNm(this.decrypt(vo.getChrgNm())); vo.setUserNm(this.decrypt(vo.getUserNm())); vo.setPhone(this.decrypt(vo.getPhone())); + if (StringUtils.isNotEmpty( vo.getTrgtNm()) ) vo.setTrgtNm(this.decrypt(vo.getTrgtNm().trim())); // } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java index 8678e739..d7b53884 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java @@ -471,6 +471,7 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { private List rsltList; //결과보고 타겟ORD 목록 private String prfsnFld; //강사 전문분야 + private String mberId; //사용자 로그인 ID public String getSpecialWorkAllow() { @@ -2051,6 +2052,12 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable { public void setPrfsnFld(String prfsnFld) { this.prfsnFld = prfsnFld; } + public String getMberId() { + return mberId; + } + public void setMberId(String mberId) { + this.mberId = mberId; + } } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java index 4b72d175..5d138b48 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java @@ -2,6 +2,7 @@ package kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service; import java.util.List; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; @@ -25,7 +26,8 @@ public interface CndtnTrgtMngService { List selectDuplChk(CndtnTrgtMngVO cndtnTrgtInfoMngVO); - + //비공개메모 update + int memoUpdate(CndtnTrgtMngVO cndtnTrgtInfoMngVO) throws Exception; diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java index 62d88c8c..3a167572 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java @@ -5,6 +5,7 @@ import java.util.List; import org.springframework.stereotype.Repository; import egovframework.rte.psl.dataaccess.EgovAbstractDAO; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngVO; @Repository("cndtnTrgtInfoMngDAO") @@ -144,6 +145,8 @@ public class CndtnTrgtMngDAO extends EgovAbstractDAO { public List selectDuplChk(CndtnTrgtMngVO cndtnTrgtInfoMngVO) { return (List) list("cndtnTrgtInfoMngDAO.selectDuplChk", cndtnTrgtInfoMngVO); } - + public int memoUpdate(CndtnTrgtMngVO cndtnTrgtInfoMngVO) throws Exception { + return update("cndtnTrgtInfoMngDAO.memoUpdate", cndtnTrgtInfoMngVO); + } } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java index a9a24f0a..9161d8f8 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java @@ -8,6 +8,7 @@ import javax.annotation.Resource; import org.springframework.stereotype.Service; import egovframework.rte.fdl.idgnr.EgovIdGnrService; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngService; import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngVO; @@ -74,4 +75,10 @@ public class CndtnTrgtMngServiceImpl implements CndtnTrgtMngService { return cndtnTrgtInfoMngDAO.selectDuplChk(cndtnTrgtInfoMngVO); } + //비공개메모 update + @Override + public int memoUpdate(CndtnTrgtMngVO cndtnTrgtInfoMngVO) throws Exception { + return cndtnTrgtInfoMngDAO.memoUpdate(cndtnTrgtInfoMngVO); + } + } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java index 51d06c58..1d1fca93 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java @@ -39,6 +39,7 @@ import kcc.com.utl.user.service.CheckFileUtil; import kcc.com.utl.user.service.CheckLoginUtil; import kcc.let.uat.uia.service.SsoLoginVO; import kcc.let.utl.fcc.service.EgovCryptoUtil; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsAplctPrdService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsCntntVO; @@ -1741,6 +1742,49 @@ public class CndtnTrgtMngController { return modelAndView; } + /** + * 특이사항 등록/수정 처리 + */ + @RequestMapping("/oprtn/cndtnSspnIdtmt/updateRmrksAjax.do") + public ModelAndView updateRmrksAjax( + @ModelAttribute("cndtnTrgtInfoMngVO") CndtnTrgtMngVO cndtnTrgtInfoMngVO + , ModelMap model + , HttpServletRequest request + ) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + //로그인 처리==================================== + //로그인 정보 가져오기 + String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model); + if (!"".equals(s_oprtnLoginCheckNInfo)) { + modelAndView.addObject("result", "loginFail"); + return modelAndView; + } + //로그인 처리==================================== + + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + + int successCnt = 0; + try { + + cndtnTrgtInfoMngVO.setLastUpdusrId(loginVO.getUniqId()); //esntl_id + cndtnTrgtInfoMngService.memoUpdate(cndtnTrgtInfoMngVO); + + successCnt = successCnt+1; + + } catch (Exception ex) { + ex.printStackTrace(); + } + if (successCnt == 0) { + modelAndView.addObject("result", "fail"); + } else { + modelAndView.addObject("result", "success"); + } + + return modelAndView; + } ////////////////////////////////////////////////////////////////////////////////////////////////////////////// // diff --git a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml index 117ecfaf..e3027ea4 100644 --- a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml @@ -68,6 +68,7 @@ , a.req_state_cd AS reqStateCd , a.atch_file_id AS atchFileId , a.prcs_aplct_prd_ord_cmplt AS prcsAplctPrdOrdCmplt + , a.rmrks AS rmrks , a.edu_aplct_ord AS eduAplctOrd @@ -413,5 +414,15 @@ AND b.D_BIRTH = #dBirth# AND b.SEX = #sex# )bb - + + + + /* cndtnTrgtInfoMngDAO.memoUpdate */ + UPDATE + SET + LAST_UPDT_PNTTM = SYSDATE + ,LAST_UPDUSR_ID = #lastUpdusrId# + ,RMRKS = #rmrks# + WHERE SSPN_IDTMT_TRGT_ORD = #sspnIdtmtTrgtOrd# + diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml index b8d0fd17..9b120caf 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml @@ -260,7 +260,7 @@ AND a.use_yn = 'Y' AND a.aprvl_cd != '40' /* 취소된 내역 안 보여줌 */ - AND le.MBER_NM IS NOT NULL + @@ -271,6 +271,7 @@ vadi.CNCL_ATCH_FILE_ID AS cnclAtchFileId, vadi.CNCL_CN AS cnclCn, le.MBER_NM AS userNm, + le.mber_id AS mberId, , CASE WHEN EXISTS (/* 설문조사 */ @@ -282,7 +283,8 @@ lersltD.respond_id = a.USER_ID AND a.edu_aplct_ord = lersltD.edu_aplct_ord ) THEN 1 ELSE 0 - END AS qestRsltExists + END AS qestRsltExists, + vsit.TRGT_NM AS trgtNm FROM a JOIN ve_prcs_aplct_prd vpap ON @@ -292,6 +294,8 @@ /* AND vpap.PRCS_APLCT_PRD_ORD = vadi.PRCS_APLCT_PRD_ORD */ JOIN LETTNGNRLMBER le ON a.USER_ID = le.ESNTL_ID + LEFT JOIN VEA_SSPN_IDMT_TRGT vsit ON + a.USER_ID = vsit.USER_ID WHERE 1=1 @@ -318,7 +322,7 @@ AND a.use_yn = 'Y' - AND le.MBER_NM IS NOT NULL + /* 취소된 내역 안 보여줌 */ /* @@ -5833,7 +5837,7 @@ VALUES INNER JOIN lettngnrlmber b ON a.scrty_dtrmn_trget_id = b.mber_id WHERE a.author_code = 'ROLE_USER_MEMBER' - AND b.MBER_NM IS NOT NULL + AND b.MBER_NM LIKE '%'||#searchKeyword#||'%' diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp index ccd90aa6..56edb82b 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp @@ -507,6 +507,7 @@ + @@ -518,6 +519,7 @@ + @@ -542,7 +544,10 @@ + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp index b4a62dd0..7dc785ea 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp @@ -143,10 +143,40 @@ } } + + function updateHiddenMemo(){ + $("#rmrks").val($("#hiddenMemo").val()); + + var data1 = new FormData(document.getElementById("hiddenMemoForm")); + + $.ajax({ + type:"POST", + url:"${pageContext.request.contextPath}/oprtn/cndtnSspnIdtmt/updateRmrksAjax.do", + data:data1, + dataType:'json', + async: false, + processData: false, + contentType: false, + cache: false, + success:function(returnData){ + if(returnData.result == "success"){ + alert("저장 되었습니다."); + location.reload(); + } + }, + error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); + } + + " /> + + @@ -567,6 +597,30 @@ + +
+

비공개 메모

+
+
+
신청자아이디 이메일 핸드폰 신청일 - + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtCmpltDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtCmpltDetail.jsp index cc7ef0f8..e475bff1 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtCmpltDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtCmpltDetail.jsp @@ -132,10 +132,40 @@ } + function updateHiddenMemo(){ + $("#rmrks").val($("#hiddenMemo").val()); + + var data1 = new FormData(document.getElementById("hiddenMemoForm")); + + $.ajax({ + type:"POST", + url:"${pageContext.request.contextPath}/oprtn/cndtnSspnIdtmt/updateRmrksAjax.do", + data:data1, + dataType:'json', + async: false, + processData: false, + contentType: false, + cache: false, + success:function(returnData){ + if(returnData.result == "success"){ + alert("저장 되었습니다."); + location.reload(); + } + }, + error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); + } +
+ " /> + +
+
@@ -537,6 +567,30 @@ + +
+

비공개 메모

+
+
+ + + + + + + + + + +
+

내용

+ 		+
+ + +
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtCmpltList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtCmpltList.jsp index 712f96cc..4056a929 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtCmpltList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtCmpltList.jsp @@ -34,6 +34,18 @@ input:read-only{ background-color: #ededed; } + button.memoBtn{ + height: 40px; + font-size: 18px; + text-align: center; + vertical-align: middle; + letter-spacing: -0.8px; + border-radius: 5px; + box-sizing: border-box; + border: 1px solid #888; + background-color: #131de14a; + color: #888; + } 교육과정관리 @@ -163,6 +184,7 @@

건의 접수가 검색되었습니다.

+
+ + + + + + + + + +
+

내용

+ 		+
+ + +
+
+ diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp index a69cbb46..3ef057f4 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp @@ -34,6 +34,18 @@ input:read-only{ background-color: #ededed; } + button.memoBtn{ + height: 40px; + font-size: 18px; + text-align: center; + vertical-align: middle; + letter-spacing: -0.8px; + border-radius: 5px; + box-sizing: border-box; + border: 1px solid #888; + background-color: #131de14a; + color: #888; + } 교육과정관리 @@ -336,6 +358,7 @@

건의 접수가 검색되었습니다.

+ " /> + +
@@ -566,7 +595,30 @@ - + +
+

비공개 메모

+
+
+ + + + + + + + + + +
+

내용

+ 		+
+ + +
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp index 84236ca2..6dd71041 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp @@ -38,6 +38,18 @@ input:read-only{ background-color: #ededed; } + button.memoBtn{ + height: 40px; + font-size: 18px; + text-align: center; + vertical-align: middle; + letter-spacing: -0.8px; + border-radius: 5px; + box-sizing: border-box; + border: 1px solid #888; + background-color: #131de14a; + color: #888; + } 교육과정관리 @@ -406,6 +427,7 @@

건의 접수가 검색되었습니다.

+