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 
Conflicts:
	src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml
This commit is contained in:
hylee 2023-11-30 14:51:04 +09:00
commit 5ee7874d04
6 changed files with 61 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -223,7 +223,7 @@ public class SspnIdtmtController {
});
Map<String,Object> countMap = vEPrcsAplctPrdService.findAllDashboardCnt(vEPrcsDetailVO);
Map<String,Object> countMap = vEPrcsAplctPrdService.findAllSspnldtmtDashboardCnt(vEPrcsDetailVO);
// 리스트 row마다 신청 확인하기
//대상 리스트, 페이징 정보 전달
model.addAttribute("list", vEPrcsDetailVOList);

2
src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsAplctPrdService.java
View File

@ -57,4 +57,6 @@ public interface VEPrcsAplctPrdService {
List<VEPrcsDetailVO> selectSchduleManagerList(VEPrcsDetailVO vEPrcsDetailVO);
Map<String, Object> findAllSspnldtmtDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO);
}

4
src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdDAO.java
View File

@ -99,6 +99,10 @@ public class VEPrcsAplctPrdDAO extends EgovAbstractDAO {
public Map<String, Object> findAllDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO) {
return (Map<String, Object>) select("VEPrcsAplctPrdDAO.findAllDashboardCnt", vEPrcsDetailVO);
}
public Map<String, Object> findAllSspnldtmtDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO) {
return (Map<String, Object>) select("VEPrcsAplctPrdDAO.findAllSspnldtmtDashboardCnt", vEPrcsDetailVO);
}
public VEPrcsDetailVO selectDetailByOrd(VEPrcsDetailVO vEPrcsDetailVO) throws Exception {
return (VEPrcsDetailVO) select("VEPrcsAplctPrdDAO.selectDetailByOrd", vEPrcsDetailVO);

5
src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/impl/VEPrcsAplctPrdServiceImpl.java
View File

@ -99,6 +99,11 @@ public class VEPrcsAplctPrdServiceImpl implements VEPrcsAplctPrdService {
public Map<String, Object> findAllDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO) {
return vEPrcsAplctPrdDAO.findAllDashboardCnt(vEPrcsDetailVO);
}
@Override
public Map<String, Object> findAllSspnldtmtDashboardCnt(VEPrcsDetailVO vEPrcsDetailVO) {
return vEPrcsAplctPrdDAO.findAllSspnldtmtDashboardCnt(vEPrcsDetailVO);
}
public VEPrcsDetailVO selectDetailByOrd(VEPrcsDetailVO vEPrcsDetailVO) throws Exception {
return vEPrcsAplctPrdDAO.selectDetailByOrd(vEPrcsDetailVO);

39
src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml
View File

@ -627,6 +627,7 @@
<select id="VEPrcsAplctPrdDAO.findByAprvlList" parameterClass="VEPrcsDetailVO" resultClass="VEPrcsDetailVO">
/* VEPrcsAplctPrdDAO.findByAprvlList */
select
COUNT(1) OVER() AS totCnt ,
a.edu_aplct_ord AS eduAplctOrd ,
vpap.PRCS_APLCT_PRD_ORD AS prcsAplctPrdOrd ,
vp.prcs_nm AS prcsNm ,
@ -672,7 +673,8 @@
AND vpap.edu_strt_pnttm <![CDATA[ <= ]]> #searchEndDt#
</isNotEmpty>
ORDER BY vpap.edu_strt_pnttm
/*AND a.aprvl_cd != '100' 찜하기 제거*/
ORDER BY vpap.edu_strt_pnttm desc
OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY
</select>
@ -685,8 +687,39 @@
*/
SELECT
SUM(CASE WHEN a.aprvl_cd = '10' THEN 1 ELSE 0 END) AS count_aprvl_cd_10
, SUM(CASE WHEN a.aprvl_cd = '20'
AND TO_DATE(c.edu_ddln_pnttm, 'YYYY.MM.DD') > CURRENT_DATE THEN 1 ELSE 0 END) AS count_aprvl_cd_20
, SUM(CASE
WHEN a.aprvl_cd = '20'
AND TO_DATE(c.edu_ddln_pnttm, 'YYYY.MM.DD') &gt;= CURRENT_DATE
AND TO_DATE(c.edu_strt_pnttm, 'YYYY.MM.DD') &lt;= CURRENT_DATE
THEN 1
ELSE 0
END) AS count_aprvl_cd_20
, SUM(CASE WHEN a.aprvl_cd = '20' AND b.aplct_state_cd = '20' THEN 1 ELSE 0 END) AS count_end_cd
FROM
ve_edu_aplct a
LEFT JOIN vea_aplct_detail_info b
ON a.edu_aplct_ord = b.edu_aplct_ord
LEFT JOIN ve_prcs_aplct_prd c
ON c.prcs_aplct_prd_ord = b.prcs_aplct_prd_ord
WHERE
a.lctr_div_cd = #lctrDivCd#
AND a.user_id = #userId#
</select>
<select id="VEPrcsAplctPrdDAO.findAllSspnldtmtDashboardCnt" parameterClass="VEPrcsDetailVO" resultClass="java.util.HashMap">
/*
기소유예
VEPrcsAplctPrdDAO.findAllSspnldtmtDashboardCnt
count_end_cd 는 조건이 b.aplct_state_cd = '20' (VEA003 - 이수완료)
*/
SELECT
SUM(CASE WHEN a.aprvl_cd = '10' THEN 1 ELSE 0 END) AS count_aprvl_cd_10
, SUM(CASE
WHEN a.aprvl_cd = '20'
AND TO_DATE(c.edu_strt_pnttm, 'YYYY.MM.DD') = CURRENT_DATE
THEN 1
ELSE 0
END) AS count_aprvl_cd_20
, SUM(CASE WHEN a.aprvl_cd = '20' AND b.aplct_state_cd = '20' THEN 1 ELSE 0 END) AS count_end_cd
FROM
ve_edu_aplct a

17
src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp
View File

@ -52,7 +52,7 @@ $(document).ready(function(){
function linkPage(pageNo){
var listForm = document.listForm ;
listForm.pageIndex.value = pageNo ;
listForm.action = "<c:url value='/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.do'/>";
listForm.action = "<c:url value='/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.do'/>";
listForm.submit();
}
@ -362,15 +362,24 @@ $(document).ready(function(){
<td>
<c:out value="${list.eduStrtPnttm}"/>~<c:out value="${list.eduDdlnPnttm}"/>
</td>
<td><kc:code codeId="VE0003" code="${list.aprvlCd}"/></td>
<td>
<c:choose>
<c:when test="${not empty list.aplctStateCd }">
<kc:code codeId="VEA003" code="${list.aplctStateCd}"/>
</c:when>
<c:otherwise>
<kc:code codeId="VE0003" code="${list.aprvlCd}"/>
</c:otherwise>
</c:choose>
</td>
<td>
<!-- 신청 승인상태 20 and 현재가 교육종료보다 이후 체크 1 -->
<c:choose>
<c:when test="${list.aprvlCd eq 20 and list.dateChk eq 1 and not list.qestRsltExists }">
<c:when test="${list.aplctStateCd eq 20 and list.dateChk eq 1 and not list.qestRsltExists }">
<button type="button" class="btnType01" data-tooltip="sub37_pop01" onclick="selectQestnInfo('${list.eduAplctOrd}','insert')" title="팝업 열림">설문등록</button>
<!-- <button type="button" title="설문등록" class="btnType04" data-tooltip="edu_in">설문등록</button> -->
</c:when>
<c:when test="${list.aprvlCd eq 20 and list.dateChk eq 1 and list.qestRsltExists }">
<c:when test="${list.aplctStateCd eq 20 and list.dateChk eq 1 and list.qestRsltExists }">
<button type="button" class="btnType01" data-tooltip="sub37_pop01" onclick="selectQestnInfo('${list.eduAplctOrd}','update')" title="팝업 열림">설문수정</button>
</c:when>
<c:otherwise>