diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cclt/web/ConciliatorManageController.java b/src/main/java/kcc/kccadr/adjPgrMgr/cclt/web/ConciliatorManageController.java index ac6cba30..a2848cf7 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cclt/web/ConciliatorManageController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cclt/web/ConciliatorManageController.java @@ -1,5 +1,6 @@ package kcc.kccadr.adjPgrMgr.cclt.web; +import java.util.Date; import java.util.List; import java.util.Map; @@ -7,6 +8,8 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.time.DateFormatUtils; +import org.apache.commons.lang.time.DateUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; @@ -26,6 +29,7 @@ import kcc.com.cmm.service.EgovFileMngService; import kcc.com.cmm.service.EgovFileMngUtil; import kcc.com.cmm.service.FileVO; import kcc.com.cmm.util.RedirectUrlMaker; +import kcc.com.cmm.util.StringUtil; import kcc.kccadr.adjPgrMgr.adjDept.service.AdjustDeptManageService; import kcc.kccadr.adjPgrMgr.adjDept.service.AdjustDeptManageVO; import kcc.kccadr.adjPgrMgr.cclt.service.ConciliatorManageService; @@ -106,6 +110,18 @@ public class ConciliatorManageController { if(StringUtils.isNotBlank(conciliatorManageVO.getSearchKeyword())){ conciliatorManageVO.setSearchKeyword(egovCryptoUtil.decrypt(conciliatorManageVO.getSearchKeyword())); } + + if (StringUtil.isEmpty(conciliatorManageVO.getSearchStartDt())) { // 조회일시가 null인경우 + Date today = new Date(); + //조정진행목록 보이는 화면 수정 요청_230524 + int month = -1; + if(StringUtil.isNotEmpty(conciliatorManageVO.getSearchMonth())) { + month = -(Integer.valueOf(conciliatorManageVO.getSearchMonth())); + } + conciliatorManageVO.setSearchStartDt(DateFormatUtils.format(DateUtils.addMonths(today, month), "yyyyMMdd")); + conciliatorManageVO.setSearchEndDt(DateFormatUtils.format(today, "yyyyMMdd")); + + } return "kccadr/adjPgrMgr/cclt/ConciliatorManageList"; } diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cclt/ConciliatorManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cclt/ConciliatorManage_SQL_Mysql.xml index 137b78bc..46fbdece 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cclt/ConciliatorManage_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cclt/ConciliatorManage_SQL_Mysql.xml @@ -59,21 +59,25 @@ T1.FRST_REGISTER_ID AS frstRegisterId, DATE_FORMAT(T1.LAST_UPDT_PNTTM, '%Y-%m-%d') AS lastUpdtPnttm, T1.LAST_UPDUSR_ID AS lastUpdusrId, - ( - SELECT - CASE - WHEN COUNT(*) 1 THEN GROUP_CONCAT(MEM_DEPT_NM SEPARATOR ',') - ELSE MEM_DEPT_NM || '(' || (COUNT(*)-1) || ')' - END MEM_DEPT_NMS - FROM ADR_MEM_DEPT_MGR S1 INNER JOIN ADR_MEM_DEPT_MAP S2 - ON S1.MEM_DEPT_SEQ = S2.MEM_DEPT_SEQ - WHERE 1=1 - AND S2.MEM_SEQ = T1.MEM_SEQ - GROUP BY S2.MEM_SEQ - ORDER BY S2.MEM_SEQ - ) AS memDeptNms, + DECODE(T2.MEM_DEPT_NMS, NULL , '-', REPLACE(T2.MEM_DEPT_NMS, '부', '')) AS memDeptNms, (SELECT COUNT(1) FROM ADR_MEM_DEPT_MAP WHERE MEM_SEQ = T1.MEM_SEQ) AS memDeptTot FROM ADR_MEM_MGR T1 + LEFT JOIN + ( SELECT S2.MEM_SEQ, + CASE + WHEN COUNT(*) > 1 + THEN GROUP_CONCAT(MEM_DEPT_NM SEPARATOR ',') + ELSE '-' + END MEM_DEPT_NMS + FROM ADR_MEM_DEPT_MGR S1 + INNER JOIN ADR_MEM_DEPT_MAP S2 + ON S1.MEM_DEPT_SEQ = S2.MEM_DEPT_SEQ + WHERE 1 =1 + GROUP BY S2.MEM_SEQ + ORDER BY S2.MEM_SEQ + ) + T2 + ON T2.MEM_SEQ = T1.MEM_SEQ WHERE 1=1 diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cclt/ConciliatorManageList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cclt/ConciliatorManageList.jsp index 22bddef9..05db793c 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cclt/ConciliatorManageList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cclt/ConciliatorManageList.jsp @@ -7,6 +7,8 @@ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + <% /** * @Class Name : ConciliatorManageList.jsp @@ -34,6 +36,7 @@ //해당 페이지에 대한 권한 체크 _admin_fn_check_authority("ConciliatorManageList", "div.cont", "ALL"); + setSearchMonthDate(1); }); //권한 체크 결과값으로 후속처리 @@ -94,7 +97,17 @@ } function fnSearchClear(){ - $('#searchKeyword').val('') + $('#searchKeyword').val(''); + setSearchMonthDate(1); + setSearchCondition(); + } + + function setSearchMonthDate(month) { + $("input[name=searchStartDt]").val(moment('').format('YYYY-MM-DD')); + } + + function setSearchCondition(){ + } @@ -127,33 +140,85 @@
-

총 건수 : 건

- - - +
+
    +
  • +

    구분

    + + + + <%-- 위원임기 --%> + + <%-- 기준일자 --%> +
    +
    + +
    + + +
    +
    +
    +
    • + <%--
  • +

    신청일자

    +
    +
    + +
    + + +
    +
    +
    +
    • --%> +
+
+
- +
+

총 건수 : 건

+
<%----%> - - - - - + - + + - + + + + @@ -185,14 +250,15 @@
- + <%-- - 조정부(${list.memDeptTot}) - + --%> +