From f298014c0f33b9978984d5bb8a3165ea8fa370e8 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Tue, 10 Oct 2023 14:26:55 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EB=8C=80?= =?UTF-8?q?=EC=9A=A9=EB=9F=89=20=EC=97=85=EB=A1=9C=EB=93=9C=20=EC=86=94?= =?UTF-8?q?=EB=A3=A8=EC=85=98=20=EA=B0=9C=EB=B0=9C=20=EB=9D=BC=EC=9D=B4?= =?UTF-8?q?=EC=84=A0=EC=8A=A4=20=EA=B0=B1=EC=8B=A0=20=EA=B4=80=EB=A6=AC?= =?UTF-8?q?=EC=9E=90=20=EC=B2=B4=ED=97=98=EA=B5=90=EC=8B=A4=20=EC=9A=B4?= =?UTF-8?q?=EC=98=81=20=EB=82=B4=EC=97=AD=20=EA=B4=80=EB=A6=AC=20=EB=82=A0?= =?UTF-8?q?=EC=A7=9C=20=EA=B2=80=EC=83=89=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/kcc/com/cmm/ComDefaultVO.java | 19 ++++++++++++++ .../web/OprtnStateMngController.java | 1 + .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml | 11 +++++++- .../cpyrgExprnClsrm/oprtnStateMngList.jsp | 16 +++++++++++- .../exprnClsrmEnd/exprnClsrmEndList.jsp | 26 +++++++------------ src/main/webapp/innorix/innorix_dev.js | 4 ++- 6 files changed, 57 insertions(+), 20 deletions(-) diff --git a/src/main/java/kcc/com/cmm/ComDefaultVO.java b/src/main/java/kcc/com/cmm/ComDefaultVO.java index 72df2360..fabc2e78 100644 --- a/src/main/java/kcc/com/cmm/ComDefaultVO.java +++ b/src/main/java/kcc/com/cmm/ComDefaultVO.java @@ -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; + } + } diff --git a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java index b2e60d5c..7fbc6902 100644 --- a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java +++ b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnStateMng/web/OprtnStateMngController.java @@ -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 vEEduAplctVOList = vEEduMIXService.selectPagingList(vEEduAplctVO); //List복호화 diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml index cf6c77f0..6b7d6e52 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml @@ -490,7 +490,9 @@ FROM ve_prcs_cmplt_detail 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 + 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 @@ AND TO_CHAR(A.SBMT_PNTTM,'YYYYMMDD') REPLACE(#searchEndSbmtPnttm#, '.' , '') + + AND TO_CHAR(A.FRST_REGIST_PNTTM,'YYYYMMDD') = ]]> REPLACE(#searchStartRegistPnttm#, '.' , '') + + + + AND TO_CHAR(A.FRST_REGIST_PNTTM,'YYYYMMDD') REPLACE(#searchEndRegistPnttm#, '.' , '') + AND TO_CHAR(A.APRVL_PNTTM, 'YYYYMMDD') = ]]> REPLACE(#searchStratAprvlPnttm#, '.' , '') diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngList.jsp index 23941201..984090b7 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngList.jsp @@ -140,7 +140,7 @@
+
+
+

처리상태

+
+
+
+ +
+ ~ +
+ +
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp index 6a65739b..966439da 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp @@ -129,33 +129,25 @@ - + 운영신청 - - 운영승인 - - - 운영반려 - - - 운영취소 - - - 선정완료 - - + 수정요청 - - 수정요청완료 + + 수정완료 - + 운영확정 + + 운영미확정 + - + diff --git a/src/main/webapp/innorix/innorix_dev.js b/src/main/webapp/innorix/innorix_dev.js index 3870c665..acc05cad 100644 --- a/src/main/webapp/innorix/innorix_dev.js +++ b/src/main/webapp/innorix/innorix_dev.js @@ -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';