diff --git a/src/main/java/kcc/kccadr/cmm/innorix/service/AdrInnorixFileVO.java b/src/main/java/kcc/kccadr/cmm/innorix/service/AdrInnorixFileVO.java index 9bcb9e18..ea6341cc 100644 --- a/src/main/java/kcc/kccadr/cmm/innorix/service/AdrInnorixFileVO.java +++ b/src/main/java/kcc/kccadr/cmm/innorix/service/AdrInnorixFileVO.java @@ -37,6 +37,7 @@ public class AdrInnorixFileVO extends ComDefaultVO implements Serializable { // 파일 등록 후 리턴 메세지 jsp에서 넘겨줌 public String successMsg = ""; public String eduAplctOrd = ""; + public String prcsAplctPrdOrd = ""; //기반강화 강의계획서용 // 컨트롤 엘리먼트 ID - 멀티 업로드 시 jsp에서 사용하는 el 값 public String controlId = ""; @@ -131,6 +132,14 @@ public class AdrInnorixFileVO extends ComDefaultVO implements Serializable { this.trgtPrsnlReal = trgtPrsnlReal; } + public String getPrcsAplctPrdOrd() { + return prcsAplctPrdOrd; + } + + public void setPrcsAplctPrdOrd(String prcsAplctPrdOrd) { + this.prcsAplctPrdOrd = prcsAplctPrdOrd; + } + diff --git a/src/main/java/kcc/kccadr/cmm/innorix/service/InnorixFileService.java b/src/main/java/kcc/kccadr/cmm/innorix/service/InnorixFileService.java index 777a765c..0c384109 100644 --- a/src/main/java/kcc/kccadr/cmm/innorix/service/InnorixFileService.java +++ b/src/main/java/kcc/kccadr/cmm/innorix/service/InnorixFileService.java @@ -31,4 +31,7 @@ public interface InnorixFileService { RestResponse updateRprtInnorixFile(AdrInnorixFileVO adrInnorixFileVO); + //기반강화 강의계획서 저장 + RestResponse insertInnorixLctrPlanFile(AdrInnorixFileVO adrInnorixFileVO); + } diff --git a/src/main/java/kcc/kccadr/cmm/innorix/service/impl/InnorixFileServiceImpl.java b/src/main/java/kcc/kccadr/cmm/innorix/service/impl/InnorixFileServiceImpl.java index c9669212..65d096d8 100644 --- a/src/main/java/kcc/kccadr/cmm/innorix/service/impl/InnorixFileServiceImpl.java +++ b/src/main/java/kcc/kccadr/cmm/innorix/service/impl/InnorixFileServiceImpl.java @@ -30,6 +30,8 @@ import kcc.let.utl.fcc.service.EgovStringUtil; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctService; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduMIXService; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEAPrcsAplctPrdInstrAsgnmService; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEAPrcsAplctPrdInstrAsgnmVO; /** * @Class Name : EgovCmmUseServiceImpl.java @@ -72,6 +74,10 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I //교육과정신청 @Resource(name = "vEEduMIXService") private VEEduMIXService vEEduMIXService; + + //과정차시 관리 + @Resource(name = "vEAPrcsAplctPrdInstrAsgnmService") + private VEAPrcsAplctPrdInstrAsgnmService vEAPrcsAplctPrdInstrAsgnmService; /** * @methodName : fileDataUpload * @author : 이호영 @@ -366,4 +372,33 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I return new RestResponse(HttpStatus.OK, adrInnorixFileVO.getSuccessMsg(), LocalDateTime.now()); } + + @Override + public RestResponse insertInnorixLctrPlanFile(AdrInnorixFileVO adrInnorixFileVO) { + + List result = null; + try { + // 파일 저장 후 저장할 file 정보를 받아옴 + result = this.insertFileData(adrInnorixFileVO); + + // 파일 정보 insert + String atchFileId = fileManageDAO.insertFileInfs(result); + + + VEAPrcsAplctPrdInstrAsgnmVO vEAPrcsAplctPrdInstrAsgnmVO = new VEAPrcsAplctPrdInstrAsgnmVO(); + vEAPrcsAplctPrdInstrAsgnmVO.setLctrPlanAtchFileId(atchFileId); + + vEAPrcsAplctPrdInstrAsgnmVO.setLastUpdusrId(adrInnorixFileVO.getUniqId()); + vEAPrcsAplctPrdInstrAsgnmVO.setPrcsAplctPrdOrd(adrInnorixFileVO.getPrcsAplctPrdOrd()); + + //저장 + vEAPrcsAplctPrdInstrAsgnmService.updatLctrPlanAtchFileId(vEAPrcsAplctPrdInstrAsgnmVO); + + } catch (Exception e) { + e.printStackTrace(); + return new RestResponse(HttpStatus.BAD_REQUEST, "등록에 실패하였습니다.", LocalDateTime.now()); + } + + return new RestResponse(HttpStatus.OK, adrInnorixFileVO.getSuccessMsg(), LocalDateTime.now()); + } } diff --git a/src/main/java/kcc/kccadr/cmm/innorix/web/InnorixFileController.java b/src/main/java/kcc/kccadr/cmm/innorix/web/InnorixFileController.java index 5c6ee42f..906b82f2 100644 --- a/src/main/java/kcc/kccadr/cmm/innorix/web/InnorixFileController.java +++ b/src/main/java/kcc/kccadr/cmm/innorix/web/InnorixFileController.java @@ -136,4 +136,27 @@ public class InnorixFileController { return ResponseEntity.ok(innorixService.updateRprtInnorixFile(adrInnorixFileVO)); } + /** + * @methodName : insertInnorixFile + * @author : 이호영 + * @date : 2023.07.20 + * @description : 파일 insert 전용 + * @param adrInnorixFileVO + * @return + * @throws Exception + */ + @RequestMapping(value = {"/web/common/insertInnorixLctrPlanFileAjax.do"}, method = RequestMethod.POST) + public ResponseEntity insertInnorixLctrPlanFile(@RequestBody AdrInnorixFileVO adrInnorixFileVO) throws Exception { + + //로그인 권한정보 불러오기 + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + + if(userId.equals("")) { + return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now())); + } + adrInnorixFileVO.setUniqId(userId); + + return ResponseEntity.ok(innorixService.insertInnorixLctrPlanFile(adrInnorixFileVO)); + } } \ No newline at end of file diff --git a/src/main/java/kcc/ve/instr/fndtnVisitEdu/asgnmInfo/web/VEFndtnAsgnmController.java b/src/main/java/kcc/ve/instr/fndtnVisitEdu/asgnmInfo/web/VEFndtnAsgnmController.java index bfcaaa7e..3bc7fe63 100644 --- a/src/main/java/kcc/ve/instr/fndtnVisitEdu/asgnmInfo/web/VEFndtnAsgnmController.java +++ b/src/main/java/kcc/ve/instr/fndtnVisitEdu/asgnmInfo/web/VEFndtnAsgnmController.java @@ -113,6 +113,7 @@ public class VEFndtnAsgnmController { vEPrcsDetailVO.setUserId(loginVO.getUniqId()); vEPrcsDetailVO.setInstrDiv("20"); vEPrcsDetailVO.setAprvlCd("20"); + vEPrcsDetailVO.setLctrDivCd("50"); //기반강화50. 기소유예 60 vEPrcsDetailVO.setSearchDiv("ING"); // 강의내역 END 종료내역 try { diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java index a0dbbfe2..d90532c2 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java @@ -148,6 +148,8 @@ public class VEInstrAsgnmVO extends ComDefaultVO implements Serializable { private String eduPlace; //교육장소 + private String prcsAplctPrdOrd; //과정신청기간순번 + public String getMemoCn() { return memoCn; @@ -734,6 +736,12 @@ public class VEInstrAsgnmVO extends ComDefaultVO implements Serializable { public String getPnltyOrd() { return pnltyOrd; } + public String getPrcsAplctPrdOrd() { + return prcsAplctPrdOrd; + } + public void setPrcsAplctPrdOrd(String prcsAplctPrdOrd) { + this.prcsAplctPrdOrd = prcsAplctPrdOrd; + } public void setPnltyOrd(String pnltyOrd) { this.pnltyOrd = pnltyOrd; } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmService.java index d9708200..2151f404 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEAPrcsAplctPrdInstrAsgnmService.java @@ -2,8 +2,6 @@ package kcc.ve.instr.tngrVisitEdu.prcsInfo.service; import java.util.List; -import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; - public interface VEAPrcsAplctPrdInstrAsgnmService { void instrInsert(VEAPrcsAplctPrdInstrAsgnmVO vEAPrcsAplctPrdInstrAsgnmVO); @@ -19,4 +17,6 @@ public interface VEAPrcsAplctPrdInstrAsgnmService { void updateAprvlCdEduAplctDetail(VEPrcsDetailVO vEDetailVO); void updateAplctStateCdListAjax(VEPrcsDetailVO vEPrcsDetailVO); + + void updatLctrPlanAtchFileId(VEAPrcsAplctPrdInstrAsgnmVO vEAPrcsAplctPrdInstrAsgnmVO); } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmDAO.java index e800dde6..3e3a76d4 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmDAO.java @@ -41,6 +41,11 @@ public class VEAPrcsAplctPrdInstrAsgnmDAO extends EgovAbstractDAO { public void updateAplctStateCdListAjax(VEPrcsDetailVO vEPrcsDetailVO) { update("VEAPrcsAplctPrdInstrAsgnmDAO.updateAplctStateCdListAjax", vEPrcsDetailVO); + } + + public void updatLctrPlanAtchFileId(VEAPrcsAplctPrdInstrAsgnmVO vEAPrcsAplctPrdInstrAsgnmVO) { + update("VEAPrcsAplctPrdInstrAsgnmDAO.updatLctrPlanAtchFileId", vEAPrcsAplctPrdInstrAsgnmVO); + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmServiceImpl.java index e244db0e..4b4f7cbb 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEAPrcsAplctPrdInstrAsgnmServiceImpl.java @@ -64,4 +64,10 @@ public class VEAPrcsAplctPrdInstrAsgnmServiceImpl implements VEAPrcsAplctPrdInst vEAPrcsAplctPrdInstrAsgnmDAO.updateAplctStateCdListAjax(vEPrcsDetailVO); } + + @Override + public void updatLctrPlanAtchFileId(VEAPrcsAplctPrdInstrAsgnmVO vEAPrcsAplctPrdInstrAsgnmVO) { + vEAPrcsAplctPrdInstrAsgnmDAO.updatLctrPlanAtchFileId(vEAPrcsAplctPrdInstrAsgnmVO); + + } } diff --git a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml index ba30ca84..0d667e5e 100644 --- a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml @@ -4904,12 +4904,12 @@ vpap.prcs_aplct_prd_ord = a.prcs_aplct_prd_ord LEFT JOIN ve_prcs vp ON vp.prcs_ord = vpap.prcs_ord - WHERE + WHERE 1 = 1 AND vid.aprvl_cd = #aprvlCd# /* 강의 승인 20 */ AND vid.instr_div = #instrDiv# /* 성인 20 */ AND vid.use_yn = 'Y' - + AND vpap.lctr_div_cd = #lctrDivCd# /*진행 중 : 진행 예정*/ AND TO_CHAR(CURRENT_DATE, 'YYYYMMDD') REPLACE(vpap.edu_ddln_pnttm, '.' , '') diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEAPrcsAplctPrdInstrAsgnm_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEAPrcsAplctPrdInstrAsgnm_SQL_Tibero.xml index ae7f8e87..2cb400b0 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEAPrcsAplctPrdInstrAsgnm_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEAPrcsAplctPrdInstrAsgnm_SQL_Tibero.xml @@ -158,7 +158,16 @@ AND vid.use_yn ='Y' - + + + /* VEAPrcsAplctPrdInstrAsgnmDAO.updatLctrPlanAtchFileId */ + + UPDATE VEA_PRCS_APLCT_PRD_INSTR_ASGNM + SET lctr_plan_atch_file_id = #lctrPlanAtchFileId# + , last_updusr_id = #lastUpdusrId# + , last_updt_pnttm = sysdate + WHERE prcs_aplct_prd_ord = #prcsAplctPrdOrd# + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctDetail.jsp index 0d7fd711..c8dfaca5 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctDetail.jsp @@ -13,6 +13,9 @@ <% pageContext.setAttribute("replaceChar", "\n"); %> + + + @@ -99,6 +131,8 @@ + /> + " />

강의내역상세

@@ -155,7 +189,7 @@

기간

- ~ + ~ @@ -211,13 +245,14 @@

신청자수

+

신청자수

- + @@ -233,6 +268,28 @@ + +

강의계획서

+ +
+ + + <%-- + + --%> +
+

+
+
+

최대 1개

+
+
+

등록된 파일 0개

+ 0MB +
+
+ +
@@ -242,118 +299,51 @@
-

강사정보

+

강사 배치 정보

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

성명

- 		- 성인강사2 - -

구분

- 		- 성인 강사 -
-

성명

- 		- 성인강사2 -
-

구분

- 		- 성인 강사 -
-

거주지

- 		- 광주광역시(동구 계림동) -
-

강사료(a)

- 		- 0 - -

출장비(b)

- 		- 0 -
-

강사료(a)

- 		0
-

출장비(b)

- 		0
-

여비(c)

- 		- 0 - -

총액(a)+(b)+(c)

- 		- 0 -
-

여비(c)

- 		0
-

총액(a)+(b)+(c)

- 		0
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
강사명연락처확정여부
+ + + + + +
강사 배치 정보가 없습니다.
+
@@ -361,92 +351,6 @@ -
- -

필수입력 항목*

강의계획서
-
-
- - -
-
- - - - - - - - - - - - - - - - - -
첨부파일 파일 명, 종류, 크기 정보 제공
파일 명종류크기
-

첨부하실 파일을 마우스끌어서 넣어주세요.

-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
첨부파일 파일 명, 종류, 크기, 삭제 정보 제공
파일 명종류크기삭제
- ${fileList.orignlFileNm} - - "> - - "> - - -
-
-
-
-

최대 1개

-

500MB제한

-
-
- -
-
-
- - - - - - - - -
-
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmList.jsp index e7f3bc15..baea3ae6 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/fndtnVisitEdu/asgnmInfo/instrAsgnmList.jsp @@ -112,7 +112,7 @@ - + @@ -183,7 +183,7 @@ -
+