From ec53ce06b14bc7c42cf02e9ec3cc77c96024dbb6 Mon Sep 17 00:00:00 2001 From: hylee Date: Fri, 11 Nov 2022 16:27:07 +0900 Subject: [PATCH 1/7] =?UTF-8?q?feat:=EC=A1=B0=EC=A0=95=EC=A2=85=EA=B2=B0?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20-=20solr=20=EA=B5=AC=ED=98=84=EC=99=84?= =?UTF-8?q?=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjclsmgr/web/AdjClsMgrController.java | 12 +- .../solr/search/impl/SearchServiceImpl.java | 25 +- .../spring/com/context-common.xml | 2 +- .../kccadr/adjclsmgr/adjCloseMangeList.jsp | 192 +++++++------ .../adjclsmgr/adjCloseMangeList_backup.jsp | 259 ++++++++++++++++++ 5 files changed, 394 insertions(+), 96 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList_backup.jsp 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} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

    +     		+

    +     		+

    +     		+ 송달정보가 있으면 조회, 없으면 입력 버튼 노출 + + + 조정조서종결 + + + 취하종결 + + + 불성립종결 + + + 직권조정 성립 + + + - + + + +
    +
    + + + +
    + <%----%> +
    + + + +
    + +
    + +
    +
    + +
    + + From fc474aec1d8cdb5eac62ecdeb00de553e23708e1 Mon Sep 17 00:00:00 2001 From: LJH Date: Fri, 11 Nov 2022 18:12:13 +0900 Subject: [PATCH 2/7] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?= =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?= =?UTF-8?q?=EA=B3=A0=EB=8F=84=ED=99=94=20=EC=BB=A4=EB=B0=8B=20=20-=20?= =?UTF-8?q?=EC=A1=B0=EC=A0=95=EB=B6=80=EC=9E=A5=20=EB=8C=80=EC=84=9D=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjPgrMgr/apm/web/ApmController.java | 3 +- .../adjPgrMgr/cmm/service/PgrCmmVO.java | 12 ++++ .../adjPgrMgr/drt/web/DrtController.java | 56 ++++++++++++++++--- .../kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml | 35 +++++++++--- .../jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp | 6 +- .../jsp/kccadr/adjPgrMgr/drt/drtReg.jsp | 6 +- 6 files changed, 100 insertions(+), 18 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java index 43fdcaf7..6074a3c1 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -281,11 +281,12 @@ public class ApmController { cmmVO.setLastIndex(paginationInfo.getLastRecordIndex()); cmmVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); + cmmVO.setReqOlCdPst("2"); + paginationInfo.setTotalRecordCount(cmmService.selectPgrCmmListCnt(cmmVO)); model.addAttribute("paginationInfo", paginationInfo); // reqOlCdPst 값이 있으면 과거사건 조회하지 않음 - cmmVO.setReqOlCdPst("2"); model.addAttribute("list", cmmService.selectPgrCmmList(cmmVO)); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java index 28a78bab..0e070406 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java @@ -131,6 +131,8 @@ public class PgrCmmVO extends ComDefaultVO implements Serializable { private String assSeq0; private String assSeq1; private String assSeq2; + + private String assSeq2SelectYn; private String addUsrNm0; private String addUsrNm1; @@ -1154,6 +1156,16 @@ public class PgrCmmVO extends ComDefaultVO implements Serializable { public void setReqOlCdPst(String reqOlCdPst) { this.reqOlCdPst = reqOlCdPst; } + + public String getAssSeq2SelectYn() { + return assSeq2SelectYn; + } + + public void setAssSeq2SelectYn(String assSeq2SelectYn) { + this.assSeq2SelectYn = assSeq2SelectYn; + } + + diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java b/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java index b217395a..1e8f27ec 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/drt/web/DrtController.java @@ -12,6 +12,7 @@ import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; @@ -37,6 +38,7 @@ import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO; import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoService; import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoVO; import kcc.kccadr.adjPgrMgr.dnt.service.DntService; +import kcc.kccadr.adjPgrMgr.dnt.service.DntVO; import kcc.kccadr.adjPgrMgr.drt.service.AgntVO; import kcc.kccadr.adjPgrMgr.drt.service.AssVO; import kcc.kccadr.adjPgrMgr.drt.service.DrtService; @@ -112,6 +114,10 @@ public class DrtController { @Resource(name = "egovCryptoUtil") private EgovCryptoUtil egovCryptoUtil; + + //조정사건 이력관리 일련번호 + @Resource(name="adrHstryMgrSeqGnrService") + private EgovIdGnrService adrHstryMgrSeqGnrService; // 실서버 개발서버 구분 private static String islocal; // /pdf/out/ @@ -129,6 +135,9 @@ public class DrtController { @RequestMapping(value = "drtReg.do") public String drtReg(PgrCmmVO cmmVO, DrtVO drtVO, ModelMap model) throws Exception { + //조정부장 ass_seq select 여부 + cmmVO.setAssSeq2SelectYn("Y"); + // drtService.selectAssList(cmmVO); //수정용 List assList = drtService.selectAssRegList(drtVO); model.addAttribute("assList", assList); @@ -243,7 +252,6 @@ public class DrtController { drtVO.setFrstRegisterId(userId); drtVO.setLastUpdusrId(userId); - /* String statCd = KccadrConstants.ADR_KJOSU_APPR_COMP; // = "302050"; // 기일조서 결재완료 @@ -264,11 +272,21 @@ public class DrtController { , "" ); + ///이력관리를 위한 adr_hstry_mgr_detail - 2022-09-07 controller #1 + String s_adrHstryMgrSeq = adrHstryMgrSeqGnrService.getNextStringId(); + + DntVO dntVO = new DntVO(); + BeanUtils.copyProperties(drtVO, dntVO); //대석 등록 - dntService.updateDistribution2(drtVO + /*dntService.updateDistribution2(dntVO , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-수정" //String p_code_desc - CC199 - , "A450" //String p_stat_cd + , "A450" //String p_stat_cd + );*/ + dntService.updateDistribution(dntVO + , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-수정" //String p_code_desc - CC199 + , "A450" //String p_stat_cd + , s_adrHstryMgrSeq ); /* @@ -300,6 +318,9 @@ public class DrtController { @RequestMapping(value = "drtDetail.do") public String drtDetail(PgrCmmVO cmmVO, DrtVO drtVO, ModelMap model) throws Exception { + //조정부장 ass_seq select 여부 + cmmVO.setAssSeq2SelectYn("Y"); + List assList = drtService.selectAssList(drtVO); PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); @@ -356,11 +377,30 @@ public class DrtController { , "" ); - //대석 등록 - dntService.updateDistribution2(drtVO - , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-수정" //String p_code_desc - CC199 - , "A450" //String p_stat_cd - ); +// //대석 등록 +// dntService.updateDistribution2(drtVO +// , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-수정" //String p_code_desc - CC199 +// , "A450" //String p_stat_cd +// ); + + + ///이력관리를 위한 adr_hstry_mgr_detail - 2022-09-07 controller #1 + String s_adrHstryMgrSeq = adrHstryMgrSeqGnrService.getNextStringId(); + + DntVO dntVO = new DntVO(); + BeanUtils.copyProperties(drtVO, dntVO); + + //대석 등록 + /*dntService.updateDistribution2(dntVO + , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-수정" //String p_code_desc - CC199 + , "A450" //String p_stat_cd + );*/ + dntService.updateDistribution(dntVO + , "사용자>>나의사건관리>조정진행 상황>조정진행 상세>조정대리신청-수정" //String p_code_desc - CC199 + , "A450" //String p_stat_cd + , s_adrHstryMgrSeq + ); + modelAndView.addObject("result", "success"); diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml index 947a7e4f..d7b646bf 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml @@ -153,10 +153,24 @@ , D.MEM_DEPT_SEQ AS memDeptSeq /* 조정부 */ , DM.MEM_DEPT_NM AS memDeptNm /* 조정부명 */ - , DMN.MEM_NAME AS memName /* 조정부장명 */ - , DMN.MEM_SEQ AS memSeq /* 조정부장 일련번호*/ - - + , ( SELECT AMM.MEM_NAME SEPARATOR + FROM ADR_ASS_MGR S1 + LEFT JOIN ADR_MEM_MGR AMM + ON S1.ADD_USR_ID = AMM.MEM_SEQ + WHERE S1.ADR_SEQ = M.ADR_SEQ + AND S1.ADR_SN = '1' + AND S1.ASS_USR_TY = '01' + LIMIT 1 + ) AS memName /* 조정부장명 */ + , ( SELECT AMM.MEM_SEQ SEPARATOR + FROM ADR_ASS_MGR S1 + LEFT JOIN ADR_MEM_MGR AMM + ON S1.ADD_USR_ID = AMM.MEM_SEQ + WHERE S1.ADR_SEQ = M.ADR_SEQ + AND S1.ADR_SN = '1' + AND S1.ASS_USR_TY = '01' + LIMIT 1 + ) AS memSeq /* 조정부장 일련번호*/ , ( SELECT GROUP_CONCAT ( AMM.MEM_NAME SEPARATOR ', ' ) FROM ADR_ASS_MGR S1 LEFT JOIN ADR_MEM_MGR AMM ON S1.ADD_USR_ID = AMM.MEM_SEQ @@ -183,9 +197,16 @@ AND S1.ASS_USR_TY = '02' GROUP BY S1.ADR_SEQ, ADR_SN ORDER BY S1.ADD_USR_ID ) AS assSeqes /* 조정위원들배석일련벉호 */ - - - + , ( SELECT NVL(S1.ASS_SEQ, '') + FROM ADR_ASS_MGR S1 + LEFT JOIN ADR_MEM_MGR AMM + ON S1.ADD_USR_ID = AMM.MEM_SEQ + WHERE S1.ADR_SEQ = M.ADR_SEQ + AND S1.ADR_SN = '1' + AND S1.ASS_USR_TY = '01' + limit 1 + ) AS assSeq2 + /* 조정부장일련번호 */ , D.ADR_ADM_ID AS adrAdmId /* 조정조사관ID */ , AU.USER_NM AS adrAdmNm /* 조정조사관명 */ , AU.OFFM_TELNO AS adrAdmOffmTel /* 조정조사관 내선번호 */ diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp index cdbc3417..1b8613f8 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp @@ -701,7 +701,11 @@ 조정부장 - +<%-- --%> +   + + + <%-- diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtReg.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtReg.jsp index 3db92c69..f9048be0 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtReg.jsp @@ -507,7 +507,11 @@ 조정부장 - +<%-- --%> +   + + + <%-- From 30b2ceb32480e8f27d155b05b26eff93c60aeb4b Mon Sep 17 00:00:00 2001 From: hylee Date: Fri, 11 Nov 2022 18:13:58 +0900 Subject: [PATCH 3/7] =?UTF-8?q?refactor:=EC=B2=B4=ED=97=98=ED=95=98?= =?UTF-8?q?=EA=B8=B0=20=ED=95=98=EB=8B=A8=20=EB=B2=84=ED=8A=BC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kccadr/adjstExp/adjstReqRegistStep1.jsp | 21 ++++++++++++++++--- .../kccadr/adjstExp/adjstReqRegistStep2.jsp | 21 +++++++++++++++---- .../kccadr/adjstExp/adjstReqRegistStep3.jsp | 14 +++++++++++++ 3 files changed, 49 insertions(+), 7 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep1.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep1.jsp index 7547efc6..f13ef209 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep1.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep1.jsp @@ -60,6 +60,20 @@ $( document ).ready(function(){ } }); } + + $('.temporaryBtn').click(function(){ + console.log($(this).hasClass('udpate')); + if(confirm("신청인 정보 임시저장을 진행하시겠습니까?")) + { + if(confirm("신청인 정보 임시저장이 완료되었습니다.\n다음 페이지로 이동하시겠습니까?")) + { + document.STEP7.action = "/web/kccadr/adjstExp/adjstReqRegistStep2.do"; + document.STEP7.submit(); + } + } + + }); + }); @@ -547,11 +561,12 @@ $( document ).ready(function(){
    - + + -<%-- --%> - + +
    diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep2.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep2.jsp index 576ab0a2..cb0c4c47 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep2.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep2.jsp @@ -65,6 +65,19 @@ if ($("button.delPerson").length>0){ //$("button.delPerson:eq(0)").hide(); } + + $('.temporaryBtn').click(function(){ + console.log($(this).hasClass('udpate')); + if(confirm("피신청인 정보 임시저장을 진행하시겠습니까?")) + { + if(confirm("피신청인 정보 임시저장이 완료되었습니다.\n다음 페이지로 이동하시겠습니까?")) + { + document.STEP8.action = "/web/kccadr/adjstExp/adjstReqRegistStep3.do"; + document.STEP8.submit(); + } + } + + }); }); @@ -492,15 +505,15 @@
    - - + +
    -<%-- --%> - + +
    diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp index 9a05a40a..78696673 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp @@ -77,6 +77,19 @@ $( document ).ready(function(){ alert("체험하기 기능 입니다."); }); + $('.temporaryBtn').click(function(){ + console.log($(this).hasClass('udpate')); + if(confirm("신청인 취지/원인 정보 임시저장을 진행하시겠습니까?")) + { + if(confirm("신청인 취지/원인 정보 임시저장이 완료되었습니다.\n다음 페이지로 이동하시겠습니까?")) + { + document.STEP9.action = "/web/kccadr/adjstExp/adjstReqRegistStep3.do"; + document.STEP9.submit(); + } + } + + }); + }); function fncGoList(status) { @@ -220,6 +233,7 @@ function fncGoList(status) {
    +
    From eb344102a3e614b3828404df8e9a2be315906032 Mon Sep 17 00:00:00 2001 From: hylee Date: Mon, 14 Nov 2022 10:20:27 +0900 Subject: [PATCH 4/7] =?UTF-8?q?refactor:=EC=B2=B4=ED=97=98=ED=95=98?= =?UTF-8?q?=EA=B8=B0=20>=20=ED=95=98=EB=8B=A8=20=EC=9E=84=EC=8B=9C?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EB=B0=8F=20=EC=9D=B4=EC=A0=84=EB=8B=A8?= =?UTF-8?q?=EA=B3=84=EC=9D=B4=EB=8F=99=EB=B2=84=ED=8A=BC=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kcc/kccadr/adjstExp/web/AdjstExpController.java | 12 ++++++++++-- .../jsp/web/kccadr/adjstExp/adjstReqRegistStep2.jsp | 10 +++++++++- .../jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp | 12 +++++++++--- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java index f803a328..649039e0 100644 --- a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java +++ b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java @@ -227,8 +227,11 @@ public class AdjstExpController { adjstReqVO.setStep(KccadrConstants.STEP7); // 신청인 , 대리인 목록 초기화 - List list = null; + List list = new ArrayList<>(); + /* + System.out.println("adjstReqVO.getRpplTy() :: "+ adjstReqVO.getRpplTy()); + // 조정일련번호와 카피 조정일련번호가 있다면 수정상태로 본다.. if(StringUtils.isNotBlank(adjstReqVO.getAdrSeq()) || StringUtils.isNotBlank(adjstReqVO.getCopyAdrSeq())){ @@ -267,7 +270,12 @@ public class AdjstExpController { list.add(req); } } - model.addAttribute("list", list); // 조정사건폼 + */ + // 기존 화면 로직을 따르기 위한 처리 + AdjstReqVO req = new AdjstReqVO(); // 신청인 + req.setRpplTy(KccadrConstants.ADR_RPPL_TY_REQ); + list.add(req); + model.addAttribute("list", list); // 조정사건폼 return "/web/kccadr/adjstExp/adjstReqRegistStep1"; } diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep2.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep2.jsp index cb0c4c47..fe8c697c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep2.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep2.jsp @@ -78,6 +78,14 @@ } }); + + + $('.btn_move').click(function(){ + + document.STEP8.action = "/web/kccadr/adjstExp/adjstReqRegistStep1.do"; + document.STEP8.submit(); + }); + }); @@ -500,7 +508,7 @@
    -
    +
    diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp index 78696673..b7da4542 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp @@ -83,12 +83,18 @@ $( document ).ready(function(){ { if(confirm("신청인 취지/원인 정보 임시저장이 완료되었습니다.\n다음 페이지로 이동하시겠습니까?")) { - document.STEP9.action = "/web/kccadr/adjstExp/adjstReqRegistStep3.do"; - document.STEP9.submit(); +// document.STEP9.action = "/web/kccadr/adjstExp/adjstIncidentList.do"; + expGoDetail.submit(); } } }); + + $('.btn_move').click(function(){ + + document.STEP9.action = "/web/kccadr/adjstExp/adjstReqRegistStep2.do"; + document.STEP9.submit(); + }); }); @@ -231,7 +237,7 @@ function fncGoList(status) {
    -
    +
    From d4d91519b99269222e9f4310ffe2e1aff7863c35 Mon Sep 17 00:00:00 2001 From: hylee Date: Mon, 14 Nov 2022 10:50:39 +0900 Subject: [PATCH 5/7] =?UTF-8?q?refacotr:=20=EC=B2=B4=ED=97=98=ED=95=98?= =?UTF-8?q?=EA=B8=B0=20>=20=EC=A1=B0=EC=A0=95=EA=B2=B0=EA=B3=BC=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=A7=81=ED=81=AC=20=EC=97=B0?= =?UTF-8?q?=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/jsp/web/kccadr/adjstExp/mainExpPage.jsp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/mainExpPage.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/mainExpPage.jsp index e8451120..a65862ef 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/mainExpPage.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/mainExpPage.jsp @@ -111,8 +111,9 @@ function goExpPage(num) { frm.searchStatus.value = 'C'; } else if(num==5) - { - return false; + {// 열랍 발급 + goUrl = ""; + frm.searchStatus.value = 'C'; } else { From 87382b3cd605089437f082d04e1302eab11c2d1e Mon Sep 17 00:00:00 2001 From: hylee Date: Mon, 14 Nov 2022 10:51:58 +0900 Subject: [PATCH 6/7] =?UTF-8?q?refactor:=20=EC=A1=B0=EC=A0=95=EC=82=AC?= =?UTF-8?q?=EA=B1=B4=20=EB=AA=A9=EB=A1=9D=20=ED=83=80=EC=9E=85=EB=85=B8?= =?UTF-8?q?=EC=B6=9C=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentList.jsp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentList.jsp index f6fbbe78..ad97b467 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentList.jsp @@ -111,7 +111,8 @@
    -

    [체험] 조정사건 목록

    +<%--

    [체험] 조정사건 목록

    --%> +

    [체험] 조정사건 목록

    From 92a6da1734d4c5ea749de0d5cc0d33c62ae6a8ce Mon Sep 17 00:00:00 2001 From: hylee Date: Mon, 14 Nov 2022 11:29:49 +0900 Subject: [PATCH 7/7] =?UTF-8?q?refactor:=EC=A1=B0=EC=A0=95=EC=8B=A0?= =?UTF-8?q?=EC=B2=AD=20Step.3=20=EB=AF=B8=EB=A6=AC=EB=B3=B4=EA=B8=B0=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kccadr/adjst/web/AdjstReqWebController.java | 16 ++++++++-------- .../web/kccadr/adjstExp/adjstReqRegistStep3.jsp | 4 ++++ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java index 6488a458..4482089e 100644 --- a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java +++ b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java @@ -1551,11 +1551,10 @@ public class AdjstReqWebController { public String adjstReqReport(@ModelAttribute("adjstReqVO") AdjstReqVO adjstReqVO, ModelMap model, RedirectAttributes redirectAttributes, HttpServletRequest req) throws Exception { //로그인 권한정보 불러오기 - LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; - String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); - //System.out.println("adjstReqVO.getAdrSeq()"); - //System.out.println(adjstReqVO.getAdrSeq()); - //String userId = "123"; + // 체험하기 조정신청 3Step의 미리보기를 위함 login 체크 제거 + // +// LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; +// String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); AdjstReqVO adjstMsrMasterVO = new AdjstReqVO(); //adjstMsrMasterVO.setAdrSeq("ADR_0000000000000381"); @@ -1565,8 +1564,9 @@ public class AdjstReqWebController { JSONObject jsReqInfo = new JSONObject(); JSONArray jsRespInfo = new JSONArray(); JSONArray jsAtchFileInfo = new JSONArray(); - - if(!userId.equals("")) { + + // 체험하기 조정신청 3Step의 미리보기를 위함 login 체크 제거 +// if(!userId.equals("")) { //임시 저장중인 데이터가 있는지 확인 //조정사건 번호 조회하기 @@ -1646,7 +1646,7 @@ public class AdjstReqWebController { } - } +// } JSONObject jsObjData = new JSONObject(); diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp index b7da4542..72491e4b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp @@ -104,6 +104,9 @@ function fncGoList(status) { linkForm.action = ""; linkForm.submit(); } +function fn_adjstReq_preview() { + window.open("/web/kccadr/adjst/report/adjstReqReportAjax.do?adrSeq=ADR_0000000000003430"); +} @@ -239,6 +242,7 @@ function fncGoList(status) {
    +