From a0e1207b2172d3220fa94dc79c41978d2227b3d9 Mon Sep 17 00:00:00 2001 From: myname Date: Tue, 2 Dec 2025 14:45:57 +0900 Subject: [PATCH] =?UTF-8?q?2025-12-02=2014:45=20=EB=8C=80=EC=83=81?= =?UTF-8?q?=EC=9E=90=20=EB=AA=A9=EB=A1=9D=20=EC=A0=95=EB=A0=AC=EA=B0=80?= =?UTF-8?q?=EB=8A=A5=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cmdTrgt/trgtMng/service/CmdTrgtMngVO.java | 8 ++++++ .../trgtMng/web/CmdTrgtMngController.java | 22 +++++++++++++++ .../trgtMng/service/CndtnTrgtMngVO.java | 8 ++++++ .../trgtMng/web/CndtnTrgtMngController.java | 28 ++++++++++++++++++- .../ve/cmd/cmdTrgtInfoMng_SQL_Postgresql.xml | 8 +++++- .../cndtn/cndtnTrgtInfoMng_SQL_Postgresql.xml | 7 +++++ .../WEB-INF/jsp/oprtn/cmdTrgt/trgtList.jsp | 16 ++++++----- .../jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp | 15 +++++----- 8 files changed, 96 insertions(+), 16 deletions(-) diff --git a/src/main/java/kcc/ve/oprtn/cmdTrgt/trgtMng/service/CmdTrgtMngVO.java b/src/main/java/kcc/ve/oprtn/cmdTrgt/trgtMng/service/CmdTrgtMngVO.java index 77d77e09..6b178a14 100644 --- a/src/main/java/kcc/ve/oprtn/cmdTrgt/trgtMng/service/CmdTrgtMngVO.java +++ b/src/main/java/kcc/ve/oprtn/cmdTrgt/trgtMng/service/CmdTrgtMngVO.java @@ -73,6 +73,8 @@ public class CmdTrgtMngVO extends ComDefaultVO implements Serializable { //private String cmptntAthrtNm; // 대상상태코드 VEA002 private String sexNm; // 성별명 + private String orderByQuery; + public String getTitle() { return title; @@ -369,5 +371,11 @@ public class CmdTrgtMngVO extends ComDefaultVO implements Serializable { public void setCmdTrgtInfoOrdList(List cmdTrgtInfoOrdList) { this.cmdTrgtInfoOrdList = cmdTrgtInfoOrdList; } + public String getOrderByQuery() { + return orderByQuery; + } + public void setOrderByQuery(String orderByQuery) { + this.orderByQuery = orderByQuery; + } } diff --git a/src/main/java/kcc/ve/oprtn/cmdTrgtInfo/trgtMng/web/CmdTrgtMngController.java b/src/main/java/kcc/ve/oprtn/cmdTrgtInfo/trgtMng/web/CmdTrgtMngController.java index c0ce6f29..bfe44d77 100644 --- a/src/main/java/kcc/ve/oprtn/cmdTrgtInfo/trgtMng/web/CmdTrgtMngController.java +++ b/src/main/java/kcc/ve/oprtn/cmdTrgtInfo/trgtMng/web/CmdTrgtMngController.java @@ -220,6 +220,13 @@ public class CmdTrgtMngController { //2. pageing step2 cndtnTrgtInfoMngVO = this.setCndtnPagingStep2(cndtnTrgtInfoMngVO, paginationInfo); + + //검색 기본 조건 설정 + if (cndtnTrgtInfoMngVO.getSearchEduStateCd() == null) { + cndtnTrgtInfoMngVO.setSearchEduStateCd("10"); + } + + //검색 조회 String selectCondition = ""; @@ -246,6 +253,21 @@ public class CmdTrgtMngController { cndtnTrgtInfoMngVO.setSearchQuery(selectCondition); + + //정렬 + System.out.println("cndtnTrgtInfoMngVO.getSearchSortCnd()"); + System.out.println(cndtnTrgtInfoMngVO.getSearchSortCnd()); + System.out.println(cndtnTrgtInfoMngVO.getSearchSortCnd()); + System.out.println(cndtnTrgtInfoMngVO.getOrderByQuery()); + System.out.println(cndtnTrgtInfoMngVO.getOrderByQuery()); + + if("prcs_ord".equals(cndtnTrgtInfoMngVO.getSearchSortCnd())){ //최초조회시 최신것 조회List + cndtnTrgtInfoMngVO.setOrderByQuery(""); + }else{ + cndtnTrgtInfoMngVO.setOrderByQuery(cndtnTrgtInfoMngVO.getSearchSortCnd() + " " +cndtnTrgtInfoMngVO.getSearchSortOrd()); + } + + // List cndtnTrgtInfoMngVOList = cndtnTrgtInfoMngService.selectPagingList(cndtnTrgtInfoMngVO); List cndtnTrgtInfoMngVOList = null; try { diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java index 67fd1280..7a5e0768 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java @@ -72,6 +72,8 @@ public class CndtnTrgtMngVO extends ComDefaultVO implements Serializable { //private String cmptntAthrtNm; // 대상상태코드 VEA002 private String sexNm; // 성별명 + private String orderByQuery; + public String getTitle() { return title; @@ -362,5 +364,11 @@ public class CndtnTrgtMngVO extends ComDefaultVO implements Serializable { public void setSexNm(String sexNm) { this.sexNm = sexNm; } + public String getOrderByQuery() { + return orderByQuery; + } + public void setOrderByQuery(String orderByQuery) { + this.orderByQuery = orderByQuery; + } } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java index da6ca2d2..9ab16459 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java @@ -191,6 +191,12 @@ public class CndtnTrgtMngController { , HttpServletRequest request ) throws Exception { + System.out.println("cndtnTrgtInfoMngVO.getSearchSortCnd()"); + System.out.println(cndtnTrgtInfoMngVO.getSearchSortCnd()); + System.out.println(cndtnTrgtInfoMngVO.getSearchSortCnd()); + System.out.println(cndtnTrgtInfoMngVO.getOrderByQuery()); + System.out.println(cndtnTrgtInfoMngVO.getOrderByQuery()); + //로그인 처리==================================== //로그인 정보 가져오기 // LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 @@ -215,6 +221,13 @@ public class CndtnTrgtMngController { //2. pageing step2 cndtnTrgtInfoMngVO = this.setCndtnPagingStep2(cndtnTrgtInfoMngVO, paginationInfo); + + //검색 기본 조건 설정 + if (cndtnTrgtInfoMngVO.getSearchEduStateCd() == null) { + cndtnTrgtInfoMngVO.setSearchEduStateCd("10"); + } + + //검색 조회 String selectCondition = ""; @@ -240,6 +253,19 @@ public class CndtnTrgtMngController { } cndtnTrgtInfoMngVO.setSearchQuery(selectCondition); + + //정렬 + System.out.println("cndtnTrgtInfoMngVO.getSearchSortCnd()"); + System.out.println(cndtnTrgtInfoMngVO.getSearchSortCnd()); + System.out.println(cndtnTrgtInfoMngVO.getSearchSortCnd()); + System.out.println(cndtnTrgtInfoMngVO.getOrderByQuery()); + System.out.println(cndtnTrgtInfoMngVO.getOrderByQuery()); + + if("prcs_ord".equals(cndtnTrgtInfoMngVO.getSearchSortCnd())){ //최초조회시 최신것 조회List + cndtnTrgtInfoMngVO.setOrderByQuery(""); + }else{ + cndtnTrgtInfoMngVO.setOrderByQuery(cndtnTrgtInfoMngVO.getSearchSortCnd() + " " +cndtnTrgtInfoMngVO.getSearchSortOrd()); + } // List cndtnTrgtInfoMngVOList = cndtnTrgtInfoMngService.selectPagingList(cndtnTrgtInfoMngVO); List cndtnTrgtInfoMngVOList = null; @@ -253,7 +279,7 @@ public class CndtnTrgtMngController { //3.pageing step3 paginationInfo = this.setCndtnPagingStep3(cndtnTrgtInfoMngVOList, paginationInfo); - + model.addAttribute("cndtnTrgtInfoMngVO", cndtnTrgtInfoMngVO); model.addAttribute("paginationInfo", paginationInfo); diff --git a/src/main/resources/egovframework/sqlmap/ve/cmd/cmdTrgtInfoMng_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/cmd/cmdTrgtInfoMng_SQL_Postgresql.xml index 11a34e06..ade8bc75 100644 --- a/src/main/resources/egovframework/sqlmap/ve/cmd/cmdTrgtInfoMng_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/ve/cmd/cmdTrgtInfoMng_SQL_Postgresql.xml @@ -701,11 +701,17 @@ ORDER BY - + + a.req_pnttm DESC , a.cmd_trgt_info_ord DESC , a.prcs_aplct_prd_ord_cmplt DESC , a.frst_regist_pnttm desc + + + $orderByQuery$ + + OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY; diff --git a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Postgresql.xml index 6aa82d2e..3eeebc14 100644 --- a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Postgresql.xml @@ -702,10 +702,17 @@ ORDER BY + a.req_pnttm DESC , a.sspn_idtmt_trgt_ord DESC , a.prcs_aplct_prd_ord_cmplt DESC , a.frst_regist_pnttm desc + + + $orderByQuery$ + + + OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY; diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/trgtList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/trgtList.jsp index c1d99b44..5f0cecbd 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/trgtList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/trgtList.jsp @@ -549,8 +549,9 @@ - " /> - " /> + " /> + " /> + " /> @@ -730,14 +731,15 @@ 의뢰일 사건번호 - 관할청 + 관할청 생년월일 성명 - 성별 - 의뢰번호 - 의뢰상태 - 교육상태 + 성별 + 의뢰번호 + 의뢰상태 + 교육상태 주소 + 검사명 diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp index 2f996cb1..cf9aec11 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp @@ -551,8 +551,9 @@ - " /> - " /> + " /> + " /> + " /> @@ -732,13 +733,13 @@ 의뢰일 사건번호 - 관할청 + 관할청 생년월일 성명 - 성별 - 의뢰번호 - 의뢰상태 - 교육상태 + 성별 + 의뢰번호 + 의뢰상태 + 교육상태 주소 검사명