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

2024-01-23 14:18 교육대상자 일자 넣기 수정 필요함

Browse Source
This commit is contained in:
myname 2024-01-23 14:19:29 +09:00
parent 25cc67aa10
commit e1584ca4ad
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java
View File

@ -753,16 +753,6 @@ public class CndtnTrgtMngController {
cndtnTrgtMngVO = egovCryptoUtil.encryptCndtnTrgtMngVOInfo(cndtnTrgtMngVO);
//병합이면 대상을 찾아서 넣는다.
System.out.println("cndtnTrgtMngVO.getMergeStatus()");
System.out.println(cndtnTrgtMngVO.getMergeStatus());
if (cndtnTrgtMngVO.getMergeStatus()!=null && !"".equals(cndtnTrgtMngVO.getMergeStatus())) {
CndtnTrgtMngVO cndtnTrgtMergeVO = cndtnTrgtInfoMngService.selectDetail4Merge(cndtnTrgtMngVO);
if (cndtnTrgtMergeVO!=null) {
cndtnTrgtMngVO.setPrcsAplctPrdOrdCmplt(cndtnTrgtMergeVO.getSspnIdtmtTrgtOrd());
}
}
LOGGER.info(cndtnTrgtMngVO.toString());
@ -785,6 +775,16 @@ public class CndtnTrgtMngController {
LOGGER.info(" 엑셀 insert :: [{}]건", trgtExcelVOList.size());
for(CndtnTrgtMngVO cndtnTrgtMngVO : trgtExcelVOList) {
//병합이면 대상을 찾아서 넣는다.
System.out.println("cndtnTrgtMngVO.getMergeStatus()");
System.out.println(cndtnTrgtMngVO.getMergeStatus());
if (cndtnTrgtMngVO.getMergeStatus()!=null && !"".equals(cndtnTrgtMngVO.getMergeStatus())) {
CndtnTrgtMngVO cndtnTrgtMergeVO = cndtnTrgtInfoMngService.selectDetail4Merge(cndtnTrgtMngVO);
if (cndtnTrgtMergeVO!=null && cndtnTrgtMergeVO.getTrgtNm().equals(cndtnTrgtMngVO.getTrgtNm())) {
cndtnTrgtMngVO.setPrcsAplctPrdOrdCmplt(cndtnTrgtMergeVO.getSspnIdtmtTrgtOrd());
}
}
i+=cndtnTrgtInfoMngService.insert4Merge(cndtnTrgtMngVO);
}

1
src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml
View File

@ -252,6 +252,7 @@
AND trgt_nm=#trgtNm#
AND sex=#sex#
AND d_birth=#dBirth#
AND prcs_aplct_prd_ord_cmplt IS null
ORDER BY req_pnttm
LIMIT 1
</select>

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

@ -400,7 +400,7 @@
<div class="btn_center">
</div>
<div class="btn_right" class="aplctBtn">
<button type="button" class="btnType04" id="regBtn" data-info="<c:out value="${info.prcsAplctPrdOrd}"/>" data-tooltip="target_confirm_popup" >신청</button>
<%-- <button type="button" class="btnType04" id="regBtn" data-info="<c:out value="${info.prcsAplctPrdOrd}"/>" data-tooltip="target_confirm_popup" >신청</button> --%>
<button type="button" class="btnType04" data-tooltip=""
onclick="fncAplctPopup('<c:out value="${list.prcsAplctPrdOrd}"/>','','','10','select'
,'','',''