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

Merge branch 'hylee' into advc

Browse Source
This commit is contained in:
hylee 2023-10-12 15:37:30 +09:00
commit 81637f1d2b
8 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java
View File

@ -485,10 +485,14 @@ public class SspnIdtmtController {
String id = sspnIdtmtService.findByTrgtNm(cndtnTrgtInfoMngVO);
modelAndView.addObject("result", "success");
String result="";
if(StringUtils.isNotEmpty(id)) {
result = "success";
}
modelAndView.addObject("result", result);
modelAndView.addObject("id", id);
return modelAndView;
}

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

@ -174,7 +174,6 @@ public class CndtnTrgtMngController {
//3.pageing step3
paginationInfo = this.setCndtnPagingStep3(cndtnTrgtInfoMngVOList, paginationInfo);
System.out.println("paginationInfo :: "+ paginationInfo.getTotalRecordCount());
model.addAttribute("paginationInfo", paginationInfo);

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

@ -72,7 +72,7 @@
#sspnIdtmtTrgtOrd#
, #userId#
, #eduStateCd#
, now()
, SYSDATE
, #frstRegisterId#
, #lastUpdtPnttm#
, #lastUpdusrId#

6
src/main/resources/egovframework/sqlmap/ve/prcs/VEAPrcsAplctPrdInstrAsgnm_SQL_Tibero.xml
View File

@ -121,8 +121,7 @@
UPDATE VE_EDU_APLCT
SET aprvl_cd = #aprvlCd#
WHERE prcs_aplct_prd_ord = #prcsAplctPrdOrd#
AND edu_aplct_ord IN
WHERE edu_aplct_ord IN
<iterate property="eduAplctOrdList" open="(" close=")" conjunction=",">
#eduAplctOrdList[]#
</iterate>
@ -134,8 +133,7 @@
UPDATE VEA_APLCT_DETAIL_INFO
SET aplct_state_cd = #aplctStateCd#
WHERE prcs_aplct_prd_ord = #prcsAplctPrdOrd#
AND edu_aplct_ord IN
WHERE edu_aplct_ord IN
<iterate property="eduAplctOrdList" open="(" close=")" conjunction=",">
#eduAplctOrdList[]#
</iterate>

4
src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp
View File

@ -342,9 +342,9 @@
<!-- //list -->
<!-- page -->
<%-- <div class="page">
<div class="page">
<ui:pagination paginationInfo = "${paginationInfo}" type="image" jsFunction="linkPage" />
</div> --%>
</div>
<div class="btn_wrap btn_layout01">
<div class="btn_left">
</div>

6
src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtReg.jsp
View File

@ -31,7 +31,7 @@
<script type="text/javascript">
//세부과정 추가 버튼 클릭 시 세부과정 추가
$(document).ready(function() {
$('#dBirth').on('input', function() {
/* $('#dBirth').on('input', function() {
var input = $(this).val();
var length = input.length;
var lastChar = input.charAt(length - 1);
@ -46,7 +46,7 @@
if (length === 4 || length === 7) {
$(this).val(input + '-');
}
});
}); */
});
function fncSave(){
@ -185,7 +185,7 @@
<!-- cont_tit -->
<div class="cont_tit">
<h2>대상자 목록</h2>
<h2>대상자 등록</h2>
<ul class="cont_nav">
<li class="home"><a href="/"><i></i></a></li>
<li>

4
src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctList.jsp
View File

@ -132,6 +132,7 @@ $(document).ready(function(){
function fn_confirm(){
console.log('??');
var form = document.confirmForm;
var dBirth = $('#dBirth').val().replace(/\./g, '');
@ -154,6 +155,7 @@ $(document).ready(function(){
contentType: false,
cache: false,
success:function(returnData){
console.log('returnData : ', returnData);
if(returnData.result == "success"){
// 대상자 테이블 pk 값
var sspnIdtmtTrgtOrd = returnData.id;
@ -166,6 +168,8 @@ $(document).ready(function(){
} else {
alert("대상자에 없습니다.");
}
}else{
alert("대상자에 없습니다.");
}
fn_target_confirm_clean();

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

@ -54,9 +54,9 @@
<h2>기소유예 대시보드</h2>
</div>
<ul class="edu_process">
<li class="edu_apply"><i></i><div class="text_area">신청중 강의<p><span><c:out value="${countMap['COUNT_APRVL_CD_10']}" /></span>건</p></div></li>
<li class="edu_register"><i></i><div class="text_area">수강중 강의<p><span><c:out value="${countMap['COUNT_APRVL_CD_20']}" /></span>건</p></div></li>
<li class="edu_close"><i></i><div class="text_area">종료된 강의<p><span><c:out value="${countMap['COUNT_END_CD']}" /></span>건</p></div></li>
<li class="edu_apply"><i></i><div class="text_area">신청중 강의<p><span><c:out value="${empty countMap['COUNT_APRVL_CD_10'] ? '0' : countMap['COUNT_APRVL_CD_10']}" /></span>건</p></div></li>
<li class="edu_register"><i></i><div class="text_area">수강중 강의<p><span><c:out value="${empty countMap['COUNT_APRVL_CD_20'] ? '0' : countMap['COUNT_APRVL_CD_20']} " /></span>건</p></div></li>
<li class="edu_close"><i></i><div class="text_area">종료된 강의<p><span><c:out value="${empty countMap['COUNT_END_CD'] ? '0' : countMap['COUNT_END_CD']}" /></span>건</p></div></li>
</ul>
<div class="tb_tit02">