diff --git a/src/main/java/kcc/kccadr/adjReqMgrOff/service/impl/AdjReqMgrOffLineServiceImpl.java b/src/main/java/kcc/kccadr/adjReqMgrOff/service/impl/AdjReqMgrOffLineServiceImpl.java index cdeadd56..e7f5f79b 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrOff/service/impl/AdjReqMgrOffLineServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrOff/service/impl/AdjReqMgrOffLineServiceImpl.java @@ -884,10 +884,12 @@ public String insertAdjReqMgrRpplReq(AdjReqMgrOffLineVO adjReqMgrOffLineVO) thro //신청인 이름 분리하기 - 개인, 법인, 개인사업자의 폼 이름이 동일하여 ',' 구분으로 넘어옴 String[] splitNm = rpplNm.split(","); + int rpplNmLen = rpplNm.length(); if(rpplUsrTy.equals("01")) { - - rpplNm = splitNm[0]; + +// rpplNm = splitNm[0]; + rpplNm = rpplNmLen==2 ? "" : splitNm[0]; }else if(rpplUsrTy.equals("02")) { @@ -960,21 +962,25 @@ public String insertAdjReqMgrRpplReq(AdjReqMgrOffLineVO adjReqMgrOffLineVO) thro //피신청인 이름 분리하기 - 개인, 법인, 개인사업자의 폼 이름이 동일하여 ',' 구분으로 넘어옴 splitNm = rpplNm.split(","); + rpplNmLen = rpplNm.length(); if(rpplUsrTy.equals("01")) { - - rpplNm = splitNm[0]; + +// rpplNm = splitNm[0]; + rpplNm = rpplNmLen==2 ? "" : splitNm[0]; }else if(rpplUsrTy.equals("02")) { - - rpplNm = splitNm[1]; + +// rpplNm = splitNm[1]; + rpplNm = rpplNmLen==2 ? "" : splitNm[1]; rpplBizId = rpplBizId.replaceAll("-", ""); adjReqMgrOffLineVO.getAdjReqMgrVoList().get(num).setRpplBizId(rpplBizId); adjReqMgrOffLineVO.getAdjReqMgrVoList().get(num).setRpplBizNo(""); }else { - - rpplNm = splitNm[2]; + +// rpplNm = splitNm[2]; + rpplNm = rpplNmLen==2 ? "" : splitNm[2]; rpplBizNo = rpplBizNo.replaceAll("-", ""); adjReqMgrOffLineVO.getAdjReqMgrVoList().get(num).setRpplBizNo(rpplBizNo); adjReqMgrOffLineVO.getAdjReqMgrVoList().get(num).setRpplBizId(""); diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java index d4727f29..82494199 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java @@ -55,5 +55,8 @@ public interface AdjReqMgrPastService { List fileFindById(AdjReqMgrPastVO adjReqMgrPastVO); void adjReqMgrPastDeleteAjax(AdjReqMgrPastVO adjReqMgrPastVO); + + void updateAdrEndDe(AdjReqMgrPastVO adjReqMgrPastVO); + } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java index 7a59968e..a1e87e3e 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -1084,7 +1084,12 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements adjReqMgrPastDAO.deleteById(adjReqMgrPastVO); } - + + @Override + public void updateAdrEndDe(AdjReqMgrPastVO adjReqMgrPastVO) { + adjReqMgrPastDAO.updateAdrEndDe(adjReqMgrPastVO); + + } } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index 9799ab81..3925bcc3 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -299,6 +299,25 @@ public class AdjReqMgrPastController { return ResponseEntity.ok(new RestResponse(HttpStatus.OK, fileListVO, LocalDateTime.now())); } + /** + * @methodName : selectAdjReqMgrPastFileListAjax + * @author : 이호영 + * @date : 2022.11.03 + * @description : 파일 조회 + * @param adjReqMgrPastVO + * @return + * @throws Exception + */ + @RequestMapping("/kccadr/adjReqMgOff/updateAdrEndDe.do") + public ResponseEntity updateAdrEndDe(@RequestBody AdjReqMgrPastVO adjReqMgrPastVO) throws Exception { + try { + adjReqMgrPastService.updateAdrEndDe(adjReqMgrPastVO); + } catch (Exception e) { + return ResponseEntity.ok(new RestResponse(HttpStatus.BAD_REQUEST, "실패하였습니다.", LocalDateTime.now())); + } + return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "완료처리 하였습니다.", LocalDateTime.now())); + } + /** * @methodName : adjReqMgrPastProgPop * @author : 이호영 @@ -602,25 +621,26 @@ public class AdjReqMgrPastController { } + /** - * @methodName : updateAdrMgrMasterAjax - * @author : 이호영 - * @date : 2022.09.28 - * @description : 과거사건 수정 - * @param multiRequest - * @param adjReqMgrPastVO - * @param redirectAttributes - * @param request - * @return - * @throws Exception - */ + * @methodName : updateAdrMgrMasterAjax + * @author : 이호영 + * @date : 2022.09.28 + * @description : 과거사건 수정 + * @param multiRequest + * @param adjReqMgrPastVO + * @param redirectAttributes + * @param request + * @return + * @throws Exception + */ @RequestMapping(value = {"/kccadr/adjReqMgOff/updateAdjReqMgrPastAjax.do"}) public ResponseEntity updateAdrMgrMasterAjax(@ModelAttribute("adrVO") AdjReqMgrOffLineVO adjReqMgrOffLineVO) throws Exception { - + //로그인 권한정보 불러오기 - LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; - String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); - + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + if(userId.equals("")) { return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now())); } @@ -628,19 +648,33 @@ public class AdjReqMgrPastController { //사용자 유니크 아이디 받아오기 adjReqMgrOffLineVO.setLastUpdusrId(userId); /* - * 오프라인 수정 로직 - * 수정 X - * */ - String resultSts = adjReqMgrOffLineService.updateAdjReqMgrRpplReq(adjReqMgrOffLineVO); - + * 오프라인 수정 로직 + * 수정 X + * */ + String resultSts = "updateSucc"; + try { + adjReqMgrOffLineService.updateAdjReqMgrRpplReq(adjReqMgrOffLineVO); + } catch (Exception e) { + resultSts = "updateFail"; + // TODO: handle exception + e.printStackTrace(); + } + + /* - * 기존 수정로직 후 기타사항 수정 - * 조정부, 조정조사관, 진행된 차수, 최종결과, 조정결과 - * */ - adjReqMgrPastService.updateAdjReqMgrEtc(adjReqMgrOffLineVO); - - + * 기존 수정로직 후 기타사항 수정 + * 조정부, 조정조사관, 진행된 차수, 최종결과, 조정결과 + * */ + try { + adjReqMgrPastService.updateAdjReqMgrEtc(adjReqMgrOffLineVO); + + } catch (Exception e) { + e.printStackTrace(); + // TODO: handle exception + } + + if(resultSts.equals("updateSucc")) { return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "정상적으로 수정하였습니다.", adjReqMgrOffLineVO.getAdrSeq(), LocalDateTime.now())); } @@ -648,6 +682,7 @@ public class AdjReqMgrPastController { } + @RequestMapping(value = {"/kccadr/adjReqMgOff/adjReqMgrPastDeleteAjax.do"}, method = RequestMethod.POST) public ResponseEntity adjReqMgrPastDeleteAjax(@RequestBody AdjReqMgrPastVO adjReqMgrPastVO) throws Exception { diff --git a/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java b/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java index d96f4f22..4db39bb6 100644 --- a/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java +++ b/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java @@ -2,6 +2,7 @@ package kcc.kccadr.adjclsmgr.web; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.Properties; import javax.annotation.Resource; @@ -25,9 +26,11 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.servlet.ModelAndView; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; +import egovframework.rte.fdl.string.EgovStringUtil; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.LoginVO; import kcc.com.cmm.util.StringUtil; @@ -41,6 +44,7 @@ import kcc.kccadr.adjclsmgr.service.AdjClsMgrVO; import kcc.kccadr.cmm.CmmUtil; import kcc.kccadr.cmm.KccadrConstants; import kcc.kccadr.cmm.service.SMSOracleService; +import kcc.let.solr.search.service.SearchService; import kcc.let.utl.fcc.service.EgovCryptoUtil; /** @@ -64,7 +68,7 @@ import kcc.let.utl.fcc.service.EgovCryptoUtil; @Controller public class AdjClsMgrController { - private static final Logger LOGGER = LoggerFactory.getLogger(AdjClsMgrController.class); + private static final Logger log = LoggerFactory.getLogger(AdjClsMgrController.class); @Resource(name="adjstReqStatusService") private AdjstReqStatusService adjstReqStatusService; @@ -86,17 +90,19 @@ public class AdjClsMgrController { @Resource(name = "SMSOracleService") private SMSOracleService sMSOracleService; - + @Resource(name = "searchService") + protected SearchService searchService; + /* @RequestMapping(value = "/kccadr/adjclsmgr/adjCloseMangeList.do") public String adjCloseMangeList(@ModelAttribute("adjClsMgrVO") AdjClsMgrVO adjClsMgrVO, ModelMap model) throws Exception { if ("".equals(adjClsMgrVO.getSearchSortCnd())) { // 최초조회시 최신것 조회List - /*adjClsMgrVO.setSearchSortCnd("RS.ADR_NO");*/ + adjClsMgrVO.setSearchSortCnd("RS.ADR_NO"); adjClsMgrVO.setSearchSortCnd("RS.ADR_NO"); //송달정보관리 정렬 순서 변경_사건번호 순 _220225_이준호 adjClsMgrVO.setSearchSortOrd("DESC"); } - /** paging */ + *//** paging *//* PaginationInfo paginationInfo = new PaginationInfo(); paginationInfo.setCurrentPageNo(adjClsMgrVO.getPageIndex()); paginationInfo.setRecordCountPerPage(adjClsMgrVO.getPageUnit()); @@ -114,6 +120,59 @@ public class AdjClsMgrController { return "/kccadr/adjclsmgr/adjCloseMangeList"; } +*/ + @RequestMapping(value = "/kccadr/adjclsmgr/adjCloseMangeList.do") +// public String adjCloseMangeList(@ModelAttribute("adjClsMgrVO") AdjClsMgrVO adjClsMgrVO, ModelMap model) throws Exception { + public String search(@RequestParam Map commandMap, ModelMap model) throws Exception { + log.debug("commandMap : {}", commandMap); + log.debug("commandMap.isEmpty() : {}", commandMap.isEmpty()); + + if(commandMap.isEmpty()) { + commandMap.put("q", ":"); + commandMap.put("rangeView", "kcc_adr_advc"); + commandMap.put("searchKeyword", ""); + commandMap.put("footerSite", ""); + } + + + String searchWrd = (String) commandMap.get("q"); + + if (searchWrd!= null && !("").equals(searchWrd)) { + searchService.search(commandMap, model); + } + + 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(); + } + log.debug("totalRecordCount : {}", totalRecordCount); + + String pi = (String)commandMap.get("pageIndex"); + if ( StringUtils.isBlank(pi) ) { + pi = "1"; + } + int pageIndex = EgovStringUtil.string2integer(pi); + log.debug("pageIndex : {}", pageIndex); + paginationInfo.setCurrentPageNo(pageIndex); + paginationInfo.setRecordCountPerPage(10); + paginationInfo.setPageSize(10); + paginationInfo.setTotalRecordCount(totalRecordCount); + model.addAttribute("paginationInfo", paginationInfo); + } + model.addAttribute("totalRecordCount", totalRecordCount); + + return "/kccadr/adjclsmgr/adjCloseMangeList"; + } + @RequestMapping(value = "/kccadr/adjclsmgr/adjCloseMangeDetail.do") public String adjCloseMangeDetail(@ModelAttribute("info") PgrCmmVO cmmVO, ModelMap model) throws Exception { 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 4dab3c56..b84df7e8 100644 --- a/src/main/java/kcc/let/solr/search/impl/SearchServiceImpl.java +++ b/src/main/java/kcc/let/solr/search/impl/SearchServiceImpl.java @@ -49,6 +49,7 @@ public class SearchServiceImpl implements InitializingBean, SearchService { private Set noticeFieldSet; private Set communityFieldSet; private Set infoFieldSet; + private Set searchFieldSet; private Set fileFieldSet; @SuppressWarnings("unused") @@ -77,12 +78,12 @@ public class SearchServiceImpl implements InitializingBean, SearchService { // fieldMap.put(SOLR_CORE.SAFETY.getValue(), safetyFieldSet); // fieldMap.put(SOLR_CORE.NOTICE.getValue(), noticeFieldSet); // fieldMap.put(SOLR_CORE.COMMUNITY.getValue(), communityFieldSet); - System.out.println(" :: SOLR_CORE.INFO.getValue() :: " + SOLR_CORE.INFO.getValue()); - System.out.println(" :: infoFieldSet :: " + infoFieldSet); - fieldMap.put(SOLR_CORE.INFO.getValue(), infoFieldSet); + + fieldMap.put(SOLR_CORE.INFO.getValue(), searchFieldSet); } -/* + + /* * q 가장 중요한 파라미터로 찾고자하는 필드와 값을 설정한다. * fq 검색 결과를 필터링하는 파라미터이다. 검색결과들 중 이 파라미터값에 매칭되는 것들만 리턴한다. * sort 검색 결과를 정렬할 때 사용한다. 숫자나 알파벳의 오름차순, 내림차순으로 정렬할 수 있다. @@ -144,13 +145,13 @@ public class SearchServiceImpl implements InitializingBean, SearchService { } } + System.out.println("commandMap :: "+ commandMap.toString()); Map>> resultMap = new HashMap>>(); Map resultCntMap = new HashMap(); long totalCount = 0; for (SOLR_CORE sc : SOLR_CORE.values()) { - log.debug(" :: sc.getValue() :: [{}]", sc.getValue()); resultCntMap.put(sc.getValue(), new Long(0)); resultMap.put(sc.getValue(), Collections.>emptyList()); @@ -168,6 +169,7 @@ public class SearchServiceImpl implements InitializingBean, SearchService { } } model.addAttribute("resultMap", resultMap); + log.info("resultMap :: [{}]", resultMap); model.addAttribute("resultCntMap", resultCntMap); model.addAttribute("totalCount", totalCount); @@ -178,8 +180,10 @@ public class SearchServiceImpl implements InitializingBean, SearchService { String serverUrl = SERVER_URL.endsWith("/") ? SERVER_URL : SERVER_URL + "/"; HttpSolrClient client = null; + log.debug(" ++ fieldSet :: {} ", fieldSet); + SolrQuery query = makeQuery(core, commandMap, fieldSet); - log.debug("{} {}", serverUrl, query); + log.debug(" ++ serverUrl :: {} , query :: {}", serverUrl, query); try { client = new HttpSolrClient(serverUrl+core.getValue()); client.setConnectionTimeout(1000); @@ -192,7 +196,7 @@ public class SearchServiceImpl implements InitializingBean, SearchService { for(String field : fieldSet){ resultMap.put(field, resultDoc.getFieldValue(field)); } - Object id = resultDoc.getFieldValue("id"); + Object id = resultDoc.getFieldValue("adrSeq"); Map>> highlighting = rsp.getHighlighting(); if( highlighting.get(id.toString()) != null ){ Map> highlightSnippetMap = highlighting.get(id); @@ -211,6 +215,7 @@ public class SearchServiceImpl implements InitializingBean, SearchService { } } catch (Exception e) { System.out.println("Exception Occured!!!"); + e.printStackTrace(); } finally { IOUtils.closeQuietly(client); } @@ -418,4 +423,13 @@ public class SearchServiceImpl implements InitializingBean, SearchService { this.infoFieldSet = infoFieldSet; } + public Set getSearchFieldSet() { + return searchFieldSet; + } + + public void setSearchFieldSet(Set searchFieldSet) { + this.searchFieldSet = searchFieldSet; + } + + } diff --git a/src/main/java/kcc/let/solr/search/web/SearchContorller.java b/src/main/java/kcc/let/solr/search/web/SearchContorller.java index 1f9bb04f..36b49033 100644 --- a/src/main/java/kcc/let/solr/search/web/SearchContorller.java +++ b/src/main/java/kcc/let/solr/search/web/SearchContorller.java @@ -41,6 +41,9 @@ public class SearchContorller { 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"); diff --git a/src/main/resources/egovframework/spring/com/context-common.xml b/src/main/resources/egovframework/spring/com/context-common.xml index 008e1829..b177d4b2 100644 --- a/src/main/resources/egovframework/spring/com/context-common.xml +++ b/src/main/resources/egovframework/spring/com/context-common.xml @@ -91,6 +91,46 @@ + + + adrSeq + adrNo + statCd + reqOlCd + reqCn1 + reqCn2 + reqTy + ccTy + sbmtYn + sbmtDe + adrCost + adrPayYn + apprSeq + apprDe + atchFileId + resPonDentNm + depuTyNms + appliCantNm + frstRegistPnttm + frstRegisterId + lastUpdtPnttm + lastUpdusrId + edtStatus + edtTy + edtSn + reqDetail + rejtReson + adrSn + adrAdmId + memDeptSeq + assSeq + appYn + memDeptNm + adrAdmNm + finalStatCd + + + id diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp index cc0cf5de..8ddbd520 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp @@ -93,6 +93,26 @@ function fn_goListPage(){ } +function fn_adjReqMgr_completion(){ + var resultData = {"adrSeq": $('#adrSeqHidden').val()} + $.ajax({ + type: "POST", + url: "", + data: JSON.stringify(resultData), + dataType:'json', + async: false, + processData: false, + contentType: "application/json", + cache: false, + success: function (returnData) { + alert(returnData.data); + fn_goListPage(); + }, + error: function (e) { alert("실패하였습니다."); console.log("ERROR : ", e); } + }); +} + + @@ -406,7 +426,7 @@ function fn_goListPage(){

법인등록번호

- + @@ -421,7 +441,7 @@ function fn_goListPage(){

사업자 등록번호

- + 주소 @@ -569,7 +589,7 @@ function fn_goListPage(){

피신청인 법인등록번호

- + @@ -583,7 +603,7 @@ function fn_goListPage(){

피신청인 사업자 등록번호

- + @@ -727,7 +747,7 @@ function fn_goListPage(){

피신청인 법인등록번호

- + @@ -742,7 +762,7 @@ function fn_goListPage(){

피신청인 사업자 등록번호

- + @@ -886,7 +906,7 @@ function fn_goListPage(){

피신청인 법인등록번호

- + @@ -901,7 +921,7 @@ function fn_goListPage(){

피신청인 사업자 등록번호

- + @@ -1045,7 +1065,7 @@ function fn_goListPage(){

피신청인 법인등록번호

- + @@ -1060,7 +1080,7 @@ function fn_goListPage(){

피신청인 사업자 등록번호

- + @@ -1204,7 +1224,7 @@ function fn_goListPage(){

피신청인 법인등록번호

- + @@ -1219,7 +1239,7 @@ function fn_goListPage(){

피신청인 사업자 등록번호

- + @@ -1410,7 +1430,8 @@ function fn_goListPage(){
- + +
@@ -1420,7 +1441,6 @@ function fn_goListPage(){ -<%--
--%> " />
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 37c49736..46a28c71 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp @@ -54,10 +54,10 @@ - -" /> -" /> -" /> +<%-- --%> +<%-- " /> --%> +<%-- " /> --%> +<%-- " /> --%> @@ -81,6 +81,8 @@
    +

    name="q" 검색어 :

    +

    name="rangeView" 카테고리 :

  • 구분${adjClsMgrVO.searchCondition}