diff --git a/src/main/java/kcc/ve/aplct/cmdTrgt/service/impl/CmdTrgtServiceImpl.java b/src/main/java/kcc/ve/aplct/cmdTrgt/service/impl/CmdTrgtServiceImpl.java index e35affe5..bed395f4 100644 --- a/src/main/java/kcc/ve/aplct/cmdTrgt/service/impl/CmdTrgtServiceImpl.java +++ b/src/main/java/kcc/ve/aplct/cmdTrgt/service/impl/CmdTrgtServiceImpl.java @@ -136,6 +136,7 @@ public class CmdTrgtServiceImpl implements CmdTrgtService { String id=""; String next=""; //? String smsYn = ""; //휴대폰 인증 번호 발송 여부 + String reqStateCd = ""; //의뢰상태 try { result=""; // @@ -170,6 +171,9 @@ public class CmdTrgtServiceImpl implements CmdTrgtService { }else { //대상자 있음 id = cndtnTrgtMngVOList.get(0).getCmdTrgtInfoOrd(); + //의뢰 상태가 의뢰취소(40)라면 스텝4에서 fail 처리 + reqStateCd = cndtnTrgtMngVOList.get(0).getReqStateCd(); + //step2.대상이 완료 상태인지 확인 cndtnTrgtMngVOList = cmdTrgtMngDAO.checkSspnIdtmtStep2(cmdTrgtMngVO); @@ -201,13 +205,20 @@ public class CmdTrgtServiceImpl implements CmdTrgtService { msg = "이미 신청한 교육이 있습니다."; next = ""; //? }else {//신청한 과정이 없다. - result = "success"; - msg = ""; - //id = cndtnTrgtMngVOList.get(0).getSspnIdtmtTrgtOrd(); - //id = ""; - next = "Y"; - smsYn = "Y"; - //next = Integer.toString(cndtnTrgtMngVOList.size()); //대상자 수 + + if("40".equals(reqStateCd)) { + result = "fail"; + msg = "의뢰 취소 상태로 과정대상자가 아닙니다. 관리자에게 문의 바랍니다."; + next = "Y"; //? + }else { + result = "success"; + msg = ""; + //id = cndtnTrgtMngVOList.get(0).getSspnIdtmtTrgtOrd(); + //id = ""; + next = "Y"; + smsYn = "Y"; + //next = Integer.toString(cndtnTrgtMngVOList.size()); //대상자 수 + } } } diff --git a/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java b/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java index 1d5b1f6f..951ab964 100644 --- a/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java +++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java @@ -137,6 +137,7 @@ public class SspnIdtmtServiceImpl implements SspnIdtmtService { String id=""; String next=""; //? String smsYn = ""; //휴대폰 인증 번호 발송 여부 + String reqStateCd = ""; //의뢰상태 try { result=""; // @@ -171,8 +172,11 @@ public class SspnIdtmtServiceImpl implements SspnIdtmtService { }else { //대상자 있음 id = cndtnTrgtMngVOList.get(0).getSspnIdtmtTrgtOrd(); + //의뢰 상태가 의뢰취소(40)라면 스텝4에서 fail 처리 + reqStateCd = cndtnTrgtMngVOList.get(0).getReqStateCd(); + //step2.대상이 완료 상태인지 확인 - cndtnTrgtMngVOList = cndtnTrgtInfoMngDAO.checkSspnIdtmtStep2(cndtnTrgtInfoMngVO); + cndtnTrgtMngVOList = cndtnTrgtInfoMngDAO.checkSspnIdtmtStep2(cndtnTrgtInfoMngVO); int i_cnt = 0; @@ -202,13 +206,20 @@ public class SspnIdtmtServiceImpl implements SspnIdtmtService { msg = "이미 신청한 교육이 있습니다."; next = ""; //? }else {//신청한 과정이 없다. - result = "success"; - msg = ""; - //id = cndtnTrgtMngVOList.get(0).getSspnIdtmtTrgtOrd(); - //id = ""; - next = "Y"; - smsYn = "Y"; - //next = Integer.toString(cndtnTrgtMngVOList.size()); //대상자 수 + + if("40".equals(reqStateCd)) { + result = "fail"; + msg = "의뢰 취소 상태로 과정대상자가 아닙니다. 관리자에게 문의 바랍니다."; + next = "Y"; //? + }else { + result = "success"; + msg = ""; + //id = cndtnTrgtMngVOList.get(0).getSspnIdtmtTrgtOrd(); + //id = ""; + next = "Y"; + smsYn = "Y"; + //next = Integer.toString(cndtnTrgtMngVOList.size()); //대상자 수 + } } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java index 1b67c846..461086fa 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java @@ -52,6 +52,7 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { private String eduAplctOrd; //교육신청순번 private List eduAplctOrdList; //교육신청순번 private List sspnIdtmtTrgtOrdList; + private List cmdTrgtInfoOrdList; private String eduChasiOrd; //교육차시순번 private String cnt; @@ -1120,5 +1121,11 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable { public void setDdlnCdNm(String ddlnCdNm) { this.ddlnCdNm = ddlnCdNm; } + public List getCmdTrgtInfoOrdList() { + return cmdTrgtInfoOrdList; + } + public void setCmdTrgtInfoOrdList(List cmdTrgtInfoOrdList) { + this.cmdTrgtInfoOrdList = cmdTrgtInfoOrdList; + } } diff --git a/src/main/java/kcc/ve/oprtn/cmdTrgt/trgtMng/service/CmdTrgtMngVO.java b/src/main/java/kcc/ve/oprtn/cmdTrgt/trgtMng/service/CmdTrgtMngVO.java index 7db6bcca..77d77e09 100644 --- a/src/main/java/kcc/ve/oprtn/cmdTrgt/trgtMng/service/CmdTrgtMngVO.java +++ b/src/main/java/kcc/ve/oprtn/cmdTrgt/trgtMng/service/CmdTrgtMngVO.java @@ -47,6 +47,7 @@ public class CmdTrgtMngVO extends ComDefaultVO implements Serializable { private List searchSelStatusList; private List sspnIdtmtTrgtOrdList; + private List cmdTrgtInfoOrdList; private String eduAplctOrd; //신청한 교육 순번 private String rmrks; //비고 @@ -362,5 +363,11 @@ public class CmdTrgtMngVO extends ComDefaultVO implements Serializable { public void setSexNm(String sexNm) { this.sexNm = sexNm; } + public List getCmdTrgtInfoOrdList() { + return cmdTrgtInfoOrdList; + } + public void setCmdTrgtInfoOrdList(List cmdTrgtInfoOrdList) { + this.cmdTrgtInfoOrdList = cmdTrgtInfoOrdList; + } } diff --git a/src/main/java/kcc/ve/oprtn/cmdTrgt/web/CmdPrcsInfoMngController.java b/src/main/java/kcc/ve/oprtn/cmdTrgt/web/CmdPrcsInfoMngController.java index bd6d3ef9..631e52bb 100644 --- a/src/main/java/kcc/ve/oprtn/cmdTrgt/web/CmdPrcsInfoMngController.java +++ b/src/main/java/kcc/ve/oprtn/cmdTrgt/web/CmdPrcsInfoMngController.java @@ -2567,7 +2567,7 @@ public class CmdPrcsInfoMngController { //VEPrcsDetailVO info = vEPrcsAplctPrdService.findByCnclInfo(vEPrcsDetailVO); System.out.println("====================="); - System.out.println("===================== :: "+ vEPrcsDetailVO.getSspnIdtmtTrgtOrdList().toString()); + System.out.println("===================== :: "+ vEPrcsDetailVO.getCmdTrgtInfoOrdList().toString()); //파일 정보 가져오기 // FileVO fileVO = new FileVO(); diff --git a/src/main/java/kcc/ve/oprtn/cmdTrgtInfo/trgtMng/web/CmdTrgtMngController.java b/src/main/java/kcc/ve/oprtn/cmdTrgtInfo/trgtMng/web/CmdTrgtMngController.java index 11cd2653..9e7d0202 100644 --- a/src/main/java/kcc/ve/oprtn/cmdTrgtInfo/trgtMng/web/CmdTrgtMngController.java +++ b/src/main/java/kcc/ve/oprtn/cmdTrgtInfo/trgtMng/web/CmdTrgtMngController.java @@ -299,11 +299,11 @@ public class CmdTrgtMngController { // 대괄호 제거 List resultList = new ArrayList<>(); - for (String list : cndtnTrgtMngVO.getSspnIdtmtTrgtOrdList()) { + for (String list : cndtnTrgtMngVO.getCmdTrgtInfoOrdList()) { resultList.add(list.replace("[","").replace("]","")); // 내부 리스트의 모든 요소를 resultList에 추가 } - cndtnTrgtMngVO.setSspnIdtmtTrgtOrdList(resultList); + cndtnTrgtMngVO.setCmdTrgtInfoOrdList(resultList); try { cmdTrgtInfoMngService.updateEduStateCdAndReqStateCdAjax(cndtnTrgtMngVO); diff --git a/src/main/resources/egovframework/sqlmap/ve/cmd/cmdTrgtInfoMng_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/cmd/cmdTrgtInfoMng_SQL_Postgresql.xml index e9a6b1c2..db90589d 100644 --- a/src/main/resources/egovframework/sqlmap/ve/cmd/cmdTrgtInfoMng_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/ve/cmd/cmdTrgtInfoMng_SQL_Postgresql.xml @@ -756,6 +756,7 @@ a.cmd_trgt_info_ord AS cmdTrgtInfoOrd , a.req_nmbr AS reqNmbr , a.prsctr_nm AS prsctrNm + , a.req_state_cd AS reqStateCd FROM a WHERE @@ -937,7 +938,7 @@ , LAST_UPDUSR_ID = #lastUpdusrId# - , rmrks = rmrks || #rmrks# + , rmrks = COALESCE(rmrks, '') || #rmrks# WHERE cmd_trgt_info_ord IN diff --git a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Postgresql.xml index 01872086..ee9bd8a3 100644 --- a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Postgresql.xml @@ -756,6 +756,7 @@ a.sspn_idtmt_trgt_ord AS sspnIdtmtTrgtOrd , a.req_nmbr AS reqNmbr , a.prsctr_nm AS prsctrNm + , a.req_state_cd AS reqStateCd FROM a WHERE @@ -938,7 +939,7 @@ , LAST_UPDUSR_ID = #lastUpdusrId# - , rmrks = rmrks || #rmrks# + , rmrks = COALESCE(rmrks, '') || #rmrks# WHERE SSPN_IDTMT_TRGT_ORD IN diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/popup/cnclStatusPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/popup/cnclStatusPopup.jsp new file mode 100644 index 00000000..36fb905b --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/popup/cnclStatusPopup.jsp @@ -0,0 +1,142 @@ + +<%@ 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="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<% + /** + * @Class Name : instrAsgnmPopup.jsp + * @Description : 강사배치 팝업 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.09 김봉호 최초 생성 + * @author 안주영 + * @since 2022.1.8 + * @version 1.0 + * @see + * + */ +%> + + + + +<%-- --%> + + + 강사배치 팝업 + + + + +
+
+ + + + " /> + " /> + " /> + + +
+
+
+

비공개 메모(의뢰취소 담당자 이름 기입)

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

메모(100자)

 + +
+
+ + +
+
+
+
+ + + +
+
+
+
+
+
+ + +
+
+ + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/trgtList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/trgtList.jsp index 5c205cc3..c1d99b44 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/trgtList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/trgtList.jsp @@ -285,13 +285,13 @@ // 교육상태가 대기/ 연기 인지 확인 // 그 외에 값이면 loop 나온 뒤 경고 alert 실행 후 function 종료 - if($(this).data('eduinfo') != 10 + /* if($(this).data('eduinfo') != 10 && $(this).data('eduinfo') != 50 && $(this).data('eduinfo') != '' ){ chk = true; return; - } + } */ }); if(chk){