tolag3/koipa_edu_2025-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jiwoo'

Browse Source
This commit is contained in:
JIWOO 2025-10-29 18:31:52 +09:00
commit 35c3637aa4
6 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/kcc/ve/aplct/prevent/service/impl/PreventServiceImpl.java
View File

@ -155,7 +155,7 @@ public class PreventServiceImpl implements PreventService {
} }
*/ */
/*
// step1.신청 가능한 대상이 있는지 찾는다.-대상자 존재 여부만 확인 // step1.신청 가능한 대상이 있는지 찾는다.-대상자 존재 여부만 확인
List<CmdTrgtMngVO> cndtnTrgtMngVOList = cmdTrgtMngDAO.checkSspnIdtmtStep1(cmdTrgtMngVO); List<CmdTrgtMngVO> cndtnTrgtMngVOList = cmdTrgtMngDAO.checkSspnIdtmtStep1(cmdTrgtMngVO);
@ -212,6 +212,13 @@ public class PreventServiceImpl implements PreventService {
} }
} }
*/
/* 예방교육의 경우 대상자 목록, 대상자 체크가 불필요 */
result = "success";
msg = "";
next = "Y";
smsYn = "Y";
//핸드폰으로 인증번호 발송 //핸드폰으로 인증번호 발송
if ("Y".equals(smsYn) && !"Y".equals(cmdTrgtMngVO.getChkYn())) { if ("Y".equals(smsYn) && !"Y".equals(cmdTrgtMngVO.getChkYn())) {

2
src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml
View File

@ -1934,7 +1934,7 @@
</isEqual> </isEqual>
ORDER BY vpap.edu_strt_pnttm desc ORDER BY vpap.edu_strt_pnttm desc
LIMIT #recordCountPerPage# OFFSET #firstIndex# <!-- LIMIT #recordCountPerPage# OFFSET #firstIndex# -->
</select> </select>

2
src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp
View File

@ -218,7 +218,7 @@
<div class="t_best">교육 신청 목록</div> <div class="t_best">교육 신청 목록</div>
</div> </div>
<div class="btn_wrap1"> <div class="btn_wrap1">
<button type="button" title="교육 신청 목록 더보기" class="con_more" onclick="location.href='<c:url value="/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.do"/>'">더보기</button> <%-- <button type="button" title="교육 신청 목록 더보기" class="con_more" onclick="location.href='<c:url value="/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.do"/>'">더보기</button> --%>
</div> </div>
</div> </div>

6
src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/eduAplctDetail.jsp
View File

@ -36,6 +36,8 @@
regForm.prcsAplctPrdOrd.value = $(this).data('info'); regForm.prcsAplctPrdOrd.value = $(this).data('info');
}); });
//교육 상태(10:신청마감 or 20:교육확정)
var prcsDdlnCd = "${info.ddlnCd}";
}); });
function ddlnCdSttsChk(){ function ddlnCdSttsChk(){
@ -45,8 +47,8 @@
var regStatus = true; var regStatus = true;
// 텍스트가 비어있는지 확인 // 텍스트가 비어있는지 확인
if ($ddlnCdStts.text().trim() === "" if (($ddlnCdStts.text().trim() === ""
|| $ddlnCdStts.text().trim() === "반려") { || $ddlnCdStts.text().trim() === "반려") && (prcsDdlnCd !== '20'&& prcsDdlnCd !== '10')) {
var dateText = $ddlnCdStts.closest('table').find("td:eq(3)").text().trim(); var dateText = $ddlnCdStts.closest('table').find("td:eq(3)").text().trim();
var strtPnttm = new Date(dateText.split("~")[0].trim().replace(/\./g, '-')); var strtPnttm = new Date(dateText.split("~")[0].trim().replace(/\./g, '-'));

7
src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/eduAplctDetail.jsp
View File

@ -36,6 +36,9 @@
regForm.prcsAplctPrdOrd.value = $(this).data('info'); regForm.prcsAplctPrdOrd.value = $(this).data('info');
}); });
//교육 상태(10:신청마감 or 20:교육확정)
var prcsDdlnCd = "${info.ddlnCd}";
}); });
function ddlnCdSttsChk(){ function ddlnCdSttsChk(){
@ -45,8 +48,8 @@
var regStatus = true; var regStatus = true;
// 텍스트가 비어있는지 확인 // 텍스트가 비어있는지 확인
if ($ddlnCdStts.text().trim() === "" if (($ddlnCdStts.text().trim() === ""
|| $ddlnCdStts.text().trim() === "반려") { || $ddlnCdStts.text().trim() === "반려") && (prcsDdlnCd !== '20'&& prcsDdlnCd !== '10')) {
var dateText = $ddlnCdStts.closest('table').find("td:eq(3)").text().trim(); var dateText = $ddlnCdStts.closest('table').find("td:eq(3)").text().trim();
var strtPnttm = new Date(dateText.split("~")[0].trim().replace(/\./g, '-')); var strtPnttm = new Date(dateText.split("~")[0].trim().replace(/\./g, '-'));

6
src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp
View File

@ -36,6 +36,8 @@
regForm.prcsAplctPrdOrd.value = $(this).data('info'); regForm.prcsAplctPrdOrd.value = $(this).data('info');
}); });
//교육 상태(10:신청마감 or 20:교육확정)
var prcsDdlnCd = "${info.ddlnCd}";
}); });
function ddlnCdSttsChk(){ function ddlnCdSttsChk(){
@ -45,8 +47,8 @@
var regStatus = true; var regStatus = true;
// 텍스트가 비어있는지 확인 // 텍스트가 비어있는지 확인
if ($ddlnCdStts.text().trim() === "" if (($ddlnCdStts.text().trim() === ""
|| $ddlnCdStts.text().trim() === "반려") { || $ddlnCdStts.text().trim() === "반려") && (prcsDdlnCd !== '20'&& prcsDdlnCd !== '10')) {
var dateText = $ddlnCdStts.closest('table').find("td:eq(3)").text().trim(); var dateText = $ddlnCdStts.closest('table').find("td:eq(3)").text().trim();
var strtPnttm = new Date(dateText.split("~")[0].trim().replace(/\./g, '-')); var strtPnttm = new Date(dateText.split("~")[0].trim().replace(/\./g, '-'));