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

이지우 - 대용량 업로드 솔루션 개발 라이선스 갱신 관리자 체험교실 운영 내역 관리 날짜 검색 추가

Browse Source
This commit is contained in:
jiwoo 2023-10-10 14:26:55 +09:00
parent ee29b4d3b7
commit f298014c0f
6 changed files with 57 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/kcc/com/cmm/ComDefaultVO.java
View File

@ -172,6 +172,9 @@ public class ComDefaultVO implements Serializable {
private String searchQuery;
private String searchStartRegistPnttm;
private String searchEndRegistPnttm;
public int getBeSort() {
return beSort;
}
@ -844,4 +847,20 @@ public class ComDefaultVO implements Serializable {
this.searchQuery = searchQuery;
}
public String getSearchStartRegistPnttm() {
return searchStartRegistPnttm;
}
public void setSearchStartRegistPnttm(String searchStartRegistPnttm) {
this.searchStartRegistPnttm = searchStartRegistPnttm;
}
public String getSearchEndRegistPnttm() {
return searchEndRegistPnttm;
}
public void setSearchEndRegistPnttm(String searchEndRegistPnttm) {
this.searchEndRegistPnttm = searchEndRegistPnttm;
}
}

1
src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java
View File

@ -151,6 +151,7 @@ public class OprtnStateMngController {
//2. pageing step2
vEEduAplctVO = this.setPagingStep2(vEEduAplctVO, paginationInfo);
vEEduAplctVO.setOrderByQuery("H.LAST_UPDT_PNTTM DESC, A.LAST_UPDT_PNTTM DESC , E.LAST_UPDT_PNTTM DESC");
List<VEEduAplctVO> vEEduAplctVOList = vEEduMIXService.selectPagingList(vEEduAplctVO);
//List복호화

9
src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
View File

@ -491,6 +491,8 @@
GROUP BY edu_aplct_ord, edu_strt_dt, edu_end_dt , TO_CHAR(sbmt_pnttm,'YYYYMMDD')
) G
ON A.EDU_APLCT_ORD = G.EDU_APLCT_ORD
LEFT OUTER JOIN ve_edu_rslt_rprt H
ON A.EDU_APLCT_ORD = H.EDU_APLCT_ORD
WHERE 1=1
/*
@ -542,6 +544,13 @@
<isNotEmpty property="searchEndSbmtPnttm">
AND TO_CHAR(A.SBMT_PNTTM,'YYYYMMDD') <![CDATA[ <= ]]> REPLACE(#searchEndSbmtPnttm#, '.' , '')
</isNotEmpty>
<isNotEmpty property="searchStartRegistPnttm">
AND TO_CHAR(A.FRST_REGIST_PNTTM,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#searchStartRegistPnttm#, '.' , '')
</isNotEmpty>
<isNotEmpty property="searchEndRegistPnttm">
AND TO_CHAR(A.FRST_REGIST_PNTTM,'YYYYMMDD') <![CDATA[ <= ]]> REPLACE(#searchEndRegistPnttm#, '.' , '')
</isNotEmpty>
<isNotEmpty property="searchStratAprvlPnttm">
AND TO_CHAR(A.APRVL_PNTTM, 'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#searchStratAprvlPnttm#, '.' , '')
</isNotEmpty>

16
src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngList.jsp
View File

@ -140,7 +140,7 @@
</div>
<div class="util_right">
<ve:select codeId="VE0029" name="searchStateYear" id="searchStateYear" css="class='sel_type1'"
selectedValue="${vEEduAplctVO.searchStateYear}"
selectedValue="${vEEduAplctVO.searchStateYear}" defaultText='전체'
/>
<ve:select codeId="VE0008" name="searchEduSlctAreaCd2" id="searchEduSlctAreaCd2" css="class='sel_type1'"
selectedValue="${vEEduAplctVO.searchEduSlctAreaCd2}" defaultText='전체'
@ -195,6 +195,20 @@
</div>
</div>
</div>
<div class="list_top_3">
<div class="util_left">
<p>처리상태</p>
</div>
<div class="util_right">
<div class="calendar_wrap">
<input type="text" class="calendar" title="시작일 선택" id="searchStartRegistPnttm" name="searchStartRegistPnttm" value="${vEEduAplctVO.searchStartRegistPnttm}">
</div>
~
<div class="calendar_wrap">
<input type="text" class="calendar" title="종료일 선택" id="searchEndRegistPnttm" name="searchEndRegistPnttm" value="${vEEduAplctVO.searchEndRegistPnttm}">
</div>
</div>
</div>
</div>
<!-- //list_top -->

26
src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp
View File

@ -129,33 +129,25 @@
</td>
<td>
<c:choose>
<c:when test="${list.aprvlCd eq VeConstants.STATUS_CD_SBMT}">
<c:when test="${list.aprvlCd eq VeConstants.APRVL_CD_10}">
<span class="app_status1">운영신청</span>
</c:when>
<c:when test="${list.aprvlCd eq VeConstants.STATUS_CD_CFRM}">
<span class="app_status2">운영승인</span>
</c:when>
<c:when test="${list.aprvlCd eq VeConstants.STATUS_CD_RJT}">
<span class="app_status4">운영반려</span>
</c:when>
<c:when test="${list.aprvlCd eq VeConstants.STATUS_CD_CAN}">
<span class="app_status4">운영취소</span>
</c:when>
<c:when test="${list.aprvlCd eq VeConstants.STATUS_CD_CHI_CMPT}">
<span class="app_status4">선정완료</span>
</c:when>
<c:when test="${list.aprvlCd eq VeConstants.STATUS_CD_EDT_REQ}">
<c:when test="${list.aprvlCd eq VeConstants.APRVL_CD_70}">
<span class="app_status3">수정요청</span>
</c:when>
<c:when test="${list.aprvlCd eq VeConstants.STATUS_CD_EDT_CMPT}">
<span class="app_status3">수정요청완료</span>
<c:when test="${list.aprvlCd eq VeConstants.APRVL_CD_80}">
<span class="app_status3">수정완료</span>
</c:when>
<c:when test="${list.aprvlCd eq VeConstants.STATUS_CD_EDU_SELCT}">
<c:when test="${list.aprvlCd eq VeConstants.APRVL_CD_60}">
<span class="app_status1">운영확정</span>
</c:when>
<c:when test="${list.aprvlCd eq VeConstants.APRVL_CD_90}">
<span class="app_status1">운영미확정</span>
</c:when>
<c:otherwise>
-
</c:otherwise>
</c:choose>
</td>
</tr>

4
src/main/webapp/innorix/innorix_dev.js
View File

@ -15,7 +15,9 @@
// 운영라이선스 적용
//var INNORIX_LICENSE = "FXA8KvVU99M9Ubbr3Yrz91zCNqyXdWCqUQ/OO1f7lj3nifVZZjuLqJIlHXjosrbPynCFJat5fwEgP/RVXftvXSsXmAHSnTVLYciyf8XmbxH8SLfUdCIEnFo+zL8=";
// 개발 라이센스 적용 (만료 23.09.30)
var INNORIX_LICENSE = "SdFY8+dBdt8IY1M4l8fQkBVO1kBmeR6G5LjSUlLcHuYKCGoA14dIM9d5x6nedAJC2YhgbYjAEsedB+RXglSXElTeOto=";
//var INNORIX_LICENSE = "SdFY8+dBdt8IY1M4l8fQkBVO1kBmeR6G5LjSUlLcHuYKCGoA14dIM9d5x6nedAJC2YhgbYjAEsedB+RXglSXElTeOto=";
// 개발 라이센스 적용 (만료 23.12.31)
var INNORIX_LICENSE = "DMhUDOx/+RoGojh0ECXphlfh5DGpLolyCxk7xMuNCAeJ0nqF8SQtKjJdL0jvHs4dgrMIaHrcSeNY+U28a3WFA5No4Pc=";
var INNORIX_VERSION = '1.1.3.458';
var INNORIX_WIN_VERSION = '1.1.3.458';