2023-11-30 12:11 감리 내용 수정

src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java

@@ -31,7 +31,6 @@ import kcc.com.utl.user.service.QustnrCommonUtil;
 import kcc.let.uat.uia.service.SsoLoginVO;
 import kcc.let.uss.olp.qri.service.EgovQustnrRespondInfoService;
 import kcc.let.uss.olp.qri.service.QustnrRespondInfoVO;
-import kcc.let.uss.olp.qrm.service.QustnrRespondManageVO;
 import kcc.let.utl.fcc.service.EgovCryptoUtil;
 import kcc.ve.adv.tngr.stngInfo.service.VEACmpltCrtfcMixService;
 import kcc.ve.aplct.adultVisitEdu.eduAplct.service.EduAplctAdultService;
@@ -48,7 +47,6 @@ import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsMIXService;
 import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsOnlnCntntService;
 import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsService;
 import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngService;
-import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngVO;
 import kcc.ve.oprtn.qestnr.service.VEALettnQestnrMIXService;
 
 /**
@@ -640,6 +638,7 @@ public class FndtnEnhanceTrnController {
 			List<VEPrcsDetailVO> vEPrcsDetailVOList = vEPrcsAplctPrdService.selectPagingList4Fndth(vEPrcsDetailVO);
 			
 	    	modelAndView.addObject("data", vEPrcsDetailVOList);
+	    	modelAndView.addObject("dataSize", vEPrcsDetailVOList.size());
 			modelAndView.addObject("result", "success");
 			
 			return modelAndView;

src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml

@@ -663,6 +663,15 @@
 		where 
 			a.lctr_div_cd = #lctrDivCd#
 			and a.user_id = #userId#
+			
+		<isNotEmpty property="searchStartDt">
+			AND vpap.edu_strt_pnttm <![CDATA[ >= ]]> #searchStartDt#
+		</isNotEmpty>
+
+		<isNotEmpty property="searchEndDt">
+			AND vpap.edu_strt_pnttm <![CDATA[ <= ]]> #searchEndDt#
+		</isNotEmpty>			
+			
 		ORDER BY vpap.edu_strt_pnttm
 		OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY
 	

src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp

@@ -236,6 +236,9 @@ $(document).ready(function(){
 				if(returnData.result == "success"){
 					console.log('returnData : ', returnData);
 					returnVal = returnData.data;
+					
+					$("#dataSize").text(returnData.dataSize);
+					
 				}
 			},
 			error:function(request , status, error){
@@ -552,7 +555,7 @@ $(document).ready(function(){
 			</div>
 	
 			<div class="edup_result">
-			    <div>총 <span>6</span>개의 검색결과가 있습니다.</div>
+			    <div>총 <span id="dataSize">6</span>개의 검색결과가 있습니다.</div>
 			    <ul>
 			        <li class="pass">지난교육일정</li>
 			        <li class="this">당월교육일정</li>

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

@@ -543,12 +543,12 @@ $(document).ready(function(){
 				<div class="btn_wrap">
 					<div class="calendar_wrap">
 						<%-- <input type="text" class="calendar" id="searchStartDt" name="searchStartDt" title="시작일 선택" value="${vEEduAplctVO.searchStartDt}"> --%>
-						<duet-date-picker identifier="date" name="searchStartDt" class="startDate" value="${vEEduAplctVO.searchStartDt}"></duet-date-picker>
+						<duet-date-picker identifier="date" id="searchStartDt" name="searchStartDt" class="startDate" value="${vEPrcsDetailVO.searchStartDt}"></duet-date-picker>
 					</div>
 					~
 					<div class="calendar_wrap">
 						<%-- <input type="text" class="calendar" id="searchEndDt" name="searchEndDt" title="종료일 선택" value="${vEEduAplctVO.searchEndDt}"> --%>
-						<duet-date-picker identifier="date" name="searchEndDt" class="endDate" value="${vEEduAplctVO.searchEndDt}"></duet-date-picker>
+						<duet-date-picker identifier="date" id="searchEndDt" name="searchEndDt" class="endDate" value="${vEPrcsDetailVO.searchEndDt}"></duet-date-picker>
 					</div>
 					<script src="${pageContext.request.contextPath}/visitEdu/usr/publish/script/duetdatepicker.js"></script>
 					<button type="button" class="btnType01" onclick="fncGoList();">검색</button>

src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp

@@ -561,7 +561,7 @@ $(document).ready(function(){
 					</tr>
 				</c:forEach>
 				<c:if test="${empty list}">
-					<tr><td colspan="5"><spring:message code="common.nodata.msg" /></td></tr>
+					<tr><td colspan="4"><spring:message code="common.nodata.msg" /></td></tr>
 				</c:if>
 				</tbody>
 			</table>