diff --git a/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java b/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java index 4db39bb6..ccb974e5 100644 --- a/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java +++ b/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java @@ -137,6 +137,7 @@ public class AdjClsMgrController { String searchWrd = (String) commandMap.get("q"); + log.info(" + searchWrd :: [{}]", searchWrd); if (searchWrd!= null && !("").equals(searchWrd)) { searchService.search(commandMap, model); } @@ -144,12 +145,10 @@ public class AdjClsMgrController { PaginationInfo paginationInfo = new PaginationInfo(); int totalRecordCount = 0; - log.info(" + commandMap :: [{}]", commandMap); String rangeView = (String)commandMap.get("rangeView"); if ( StringUtils.isNotBlank(rangeView) ) { Map resultCntMap = (Map)model.get("resultCntMap"); - log.debug("resultCntMap : {}", resultCntMap); Long total = resultCntMap.get(rangeView); if (total != null) { totalRecordCount = total.intValue(); @@ -168,6 +167,15 @@ public class AdjClsMgrController { paginationInfo.setTotalRecordCount(totalRecordCount); model.addAttribute("paginationInfo", paginationInfo); } + + String q = (String) commandMap.get("q"); + if(q.length() == 1 && ":".equals(q)) + { + commandMap.put("q", ""); + } + + + model.addAttribute("commandMap", commandMap); model.addAttribute("totalRecordCount", totalRecordCount); return "/kccadr/adjclsmgr/adjCloseMangeList"; diff --git a/src/main/java/kcc/let/solr/search/impl/SearchServiceImpl.java b/src/main/java/kcc/let/solr/search/impl/SearchServiceImpl.java index b84df7e8..cc86b8de 100644 --- a/src/main/java/kcc/let/solr/search/impl/SearchServiceImpl.java +++ b/src/main/java/kcc/let/solr/search/impl/SearchServiceImpl.java @@ -13,6 +13,8 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.annotation.Resource; + import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.math.NumberUtils; @@ -35,6 +37,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.ui.ModelMap; import kcc.let.solr.search.service.SearchService; +import kcc.let.utl.fcc.service.EgovCryptoUtil; public class SearchServiceImpl implements InitializingBean, SearchService { @@ -42,6 +45,10 @@ public class SearchServiceImpl implements InitializingBean, SearchService { @Value("${Globals.Solr.url}") private String SERVER_URL; + + //암복호화 유틸 + @Resource(name = "egovCryptoUtil") + EgovCryptoUtil egovCryptoUtil; private Set introFieldSet; private Set policyFieldSet; @@ -151,8 +158,8 @@ public class SearchServiceImpl implements InitializingBean, SearchService { Map resultCntMap = new HashMap(); long totalCount = 0; for (SOLR_CORE sc : SOLR_CORE.values()) { - - + + log.info(" + sc.getValue() :: [{}]", sc.getValue()); resultCntMap.put(sc.getValue(), new Long(0)); resultMap.put(sc.getValue(), Collections.>emptyList()); List> resultList = getResultList(sc, fieldMap.get(sc.getValue()), commandMap); @@ -168,8 +175,9 @@ public class SearchServiceImpl implements InitializingBean, SearchService { if ( sc.getValue().equals((String)commandMap.get("rangeView")) ) { } } + + model.addAttribute("resultMap", resultMap); - log.info("resultMap :: [{}]", resultMap); model.addAttribute("resultCntMap", resultCntMap); model.addAttribute("totalCount", totalCount); @@ -219,7 +227,16 @@ public class SearchServiceImpl implements InitializingBean, SearchService { } finally { IOUtils.closeQuietly(client); } - log.debug(" :: resultList :: [{}]", resultList); + + resultList.forEach(t-> { + t.put("resPonDentNm", egovCryptoUtil.decrypt((String) t.get("resPonDentNm"))); + t.put("appliCantNm", egovCryptoUtil.decrypt((String) t.get("appliCantNm"))); + }); + + +// log.debug(" :: resultList :: [{}]", resultList); + + return resultList; } diff --git a/src/main/resources/egovframework/spring/com/context-common.xml b/src/main/resources/egovframework/spring/com/context-common.xml index b177d4b2..d6bf2086 100644 --- a/src/main/resources/egovframework/spring/com/context-common.xml +++ b/src/main/resources/egovframework/spring/com/context-common.xml @@ -94,7 +94,7 @@ adrSeq - adrNo + adrNo statCd reqOlCd reqCn1 diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp index 46a28c71..acde90a6 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp @@ -29,6 +29,9 @@ function linkPage(pageNo){ var listForm = document.listForm ; listForm.pageIndex.value = pageNo ; + var q1 = form.q1.value; + if(q1 == "") q1 = ":" + listForm.q.value = q1 ; listForm.action = ""; listForm.submit(); } @@ -53,14 +56,18 @@ - -<%-- --%> -<%-- " /> --%> -<%-- " /> --%> -<%-- " /> --%> - - - +
+ <%-- --%> + + + + <%-- " /> --%> + <%-- " /> --%> + <%-- " /> --%> + + +
+
@@ -81,7 +88,8 @@
    -

    name="q" 검색어 :

    +<%-- +

    name="q" 검색어 :

    name="rangeView" 카테고리 :

  • 구분${adjClsMgrVO.searchCondition}

    @@ -117,6 +125,11 @@
+ --%> +
  • +

    검색어

    "/> + +
    • @@ -152,86 +165,87 @@ -<%-- --%> - - -<%--

    --%> - - -<%-- --%> -<%-- --%> -<%-- ${empty list.adrNo ? '-' : list.adrNo} --%> -<%-- --%> -<%-- --%> -<%-- ${empty list.adrNo ? '-' : list.adrNo} --%> -<%-- --%> -<%-- --%> - - -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> - - -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> - - -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> - - -<%--

    --%> - - -<%--

    --%> - - -<%--

    --%> - - - - -<%-- --%> -<%-- --%> - -<%-- --%> -<%-- --%> - -<%-- --%> -<%-- --%> - -<%-- --%> -<%-- --%> - -<%-- --%> -<%-- --%> - -<%-- --%> -<%-- --%> - - - -<%--     --%> - + + + +

    + +

    + + + + ${empty list.adrNo ? '-' : list.adrNo} + + + ${empty list.adrNo ? '-' : list.adrNo} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

    + + +

    + + +

    + + + + + + + 조정조서종결 + + + 취하종결 + + + 불성립종결 + + + 직권조정 성립 + + + - + + +<%-- --%> + + +     + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList_backup.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList_backup.jsp new file mode 100644 index 00000000..6c4e8359 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList_backup.jsp @@ -0,0 +1,259 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> + + + +조정사건 목록 + + + + + +<%-- --%> +<%-- " /> --%> +<%-- " /> --%> +<%-- " /> --%> + + + + +
    +
    + +
    +

    조정종결목록

    +
      +
      • +
    • +

      조정종결관리

      +
      • +
    • 조정종결목록
      • +
    +
    +
    + +
    +
    +
    +
      +

      name="q" 검색어 :

      +

      name="rangeView" 카테고리 :

      +
    • +

      구분${adjClsMgrVO.searchCondition}

      + + +
      • +
    • +

      종결일자

      +
      +
      + +
      + + +
      +
      + ~ +
      + +
      + + +
      +
      +
      + +
      • +
    +
    +
    +
    + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    조정신청 목록 : 번호, 접수일자, 신청인, 피신청인, 대리인, 신청내용, 종결상태등의 정보제공
    접수일자<%----%>조정번호<%----%>신청인<%----%>피신청인<%----%>신청내용<%----%>조정부<%----%>조정조사관<%----%>종결일자<%----%>종결상태<%----%>
    +

    + +

    +     		+ + ${empty list.adrNo ? '-' : list.adrNo} + + + ${empty list.adrNo ? '-' : list.adrNo} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

    +     		+

    +     		+

    +     		+ 송달정보가 있으면 조회, 없으면 입력 버튼 노출 + + + 조정조서종결 + + + 취하종결 + + + 불성립종결 + + + 직권조정 성립 + + + - + + + +
    +
    + + + +
    + <%----%> +
    + + + +
    + +
    + +
    +
    + +
    + +