2022-11-29 14:07 조정종결목록 상세에서 리스트로 이동시 페이지 오류 수정

2022-11-29 14:07:35 +09:00 · 2022-11-29 14:07:35 +09:00 · 026f66f827
commit 026f66f827
parent f2169f87e2
9 changed files with 221 additions and 61 deletions
--- a/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java
+++ b/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java
@ -124,64 +124,101 @@ public class AdjClsMgrController {
 	@RequestMapping(value = "/kccadr/adjclsmgr/adjCloseMangeList.do")
 //	public String adjCloseMangeList(@ModelAttribute("adjClsMgrVO") AdjClsMgrVO adjClsMgrVO, ModelMap model) throws Exception {
 	public String search(@RequestParam Map<String, Object> 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");
-		
-		log.info(" + searchWrd ::  [{}]", searchWrd);
-		if (searchWrd!= null && !("").equals(searchWrd)) {
-			searchService.search(commandMap, model);
-		}
-
-		PaginationInfo paginationInfo = new PaginationInfo();
-		int totalRecordCount = 0;
-		
-		
-		String rangeView = (String)commandMap.get("rangeView");
-		if ( StringUtils.isNotBlank(rangeView) ) {
-			Map<String, Long> resultCntMap = (Map<String, Long>)model.get("resultCntMap");
-			Long total = resultCntMap.get(rangeView);
-			if (total != null) {
-				totalRecordCount = total.intValue();
-			}
-			log.debug("totalRecordCount : {}", totalRecordCount);
+		try{
+			log.debug("commandMap : {}", commandMap);
+			log.debug("commandMap.isEmpty() : {}", commandMap.isEmpty());
 			
-			String pi = (String)commandMap.get("pageIndex");
-			if ( StringUtils.isBlank(pi) ) {
-				pi = "1";
+			//기본값설정
+			commandMap.put("rangeView", "kcc_adr_advc");
+			String searchWrd =  (String) commandMap.get("q");
+			
+			if (searchWrd==null) {
+				commandMap.put("q", ":");
+				searchWrd =  (String) commandMap.get("q");
+			}
+			
+			
+			if(commandMap.isEmpty()) {
+				commandMap.put("q", ":");
+				commandMap.put("rangeView", "kcc_adr_advc");
+				commandMap.put("searchKeyword", "");
+				commandMap.put("footerSite", "");
+			}
+			
+			
+			log.info(" + searchWrd ::  [{}]", searchWrd);
+			if (searchWrd!= null && !("").equals(searchWrd)) {
+				searchService.search(commandMap, model);
 			}
-			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);
-		}

-		String q = (String) commandMap.get("q");
-		if(q.length() == 1 && ":".equals(q))
-		{
-			commandMap.put("q", "");
+			PaginationInfo paginationInfo = new PaginationInfo();
+			int totalRecordCount = 0;
+			
+			
+			String rangeView = (String)commandMap.get("rangeView");
+			if ( StringUtils.isNotBlank(rangeView) ) {
+				Map<String, Long> resultCntMap = (Map<String, Long>)model.get("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);
+			}
+
+			String q = (String) commandMap.get("q");
+			try {
+				if(q.length() == 1 && ":".equals(q))
+				{
+					commandMap.put("q", "");
+				}				
+			}catch(Exception ex) {
+				commandMap.put("q", "");
+			}
+
+			
+			
+			model.addAttribute("commandMap", commandMap);
+			model.addAttribute("totalRecordCount", totalRecordCount);	
+		}catch(Exception ex) {
+			ex.printStackTrace();
 		}
 		
-		
-		model.addAttribute("commandMap", commandMap);
-		model.addAttribute("totalRecordCount", totalRecordCount);

 		return "/kccadr/adjclsmgr/adjCloseMangeList";
 	}

+    /**
+	 *
+	 * 서류 발급 요청 승인/반려
+	 */
+    //@RequestMapping("/kccadr/adjclsmgr/docIssReqSave.do")
+	@RequestMapping(value = "/kccadr/adjclsmgr/solrDataImportAjax.do")
+	public ModelAndView solrDataImport(
+			HttpServletRequest request 
+			) throws Exception {
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.setViewName("jsonView");

+		//core name data import 
+		searchService.coreImport("kcc_adr_advc");		
+
+		modelAndView.addObject("result", KccadrConstants.SUCCESS);
+		
+		return modelAndView;
+	}
+	
 	@RequestMapping(value = "/kccadr/adjclsmgr/adjCloseMangeDetail.do")
 	public String adjCloseMangeDetail(@ModelAttribute("info") PgrCmmVO cmmVO, ModelMap model) throws Exception {
 		
--- a/src/main/java/kcc/let/solr/search/impl/SearchServiceImpl.java
+++ b/src/main/java/kcc/let/solr/search/impl/SearchServiceImpl.java
@ -183,6 +183,12 @@ public class SearchServiceImpl implements InitializingBean, SearchService {

 	}

+	@Override
+	public void coreImport(String p_coreName) throws Exception {
+		this.solrDataImport(p_coreName);
+
+	}
+	
 	private List<Map<String, Object>> getResultList(SOLR_CORE core, Set<String> fieldSet, Map<String, Object> commandMap){
 		List<Map<String, Object>> resultList = new ArrayList<Map<String, Object>>();

@ -241,6 +247,37 @@ public class SearchServiceImpl implements InitializingBean, SearchService {
 		return resultList;
 	}

+	//solr dataimport 용
+	private void solrDataImport(
+			String p_coreName
+			){
+		//Globals.Solr.url=http://localhost:8983/solr
+		String serverUrl = SERVER_URL.endsWith("/") ? SERVER_URL : SERVER_URL + "/";
+		serverUrl =	serverUrl	+	p_coreName;
+		
+		HttpSolrClient client = null;	
+		SolrQuery query = new SolrQuery();
+		query.set("qt", "/dataimport"); 
+		query.set("command", "full-import"); 
+				
+		log.debug(" ++ serverUrl :: {} , query :: {}", serverUrl, query);
+		try {
+			client = new HttpSolrClient(serverUrl);
+			client.setConnectionTimeout(1000);
+			QueryResponse rsp = client.query(query);
+			
+			System.out.println("rsp.getElapsedTime()");
+			System.out.println(rsp.getElapsedTime());
+			
+		} catch (Exception e) {
+			System.out.println("Exception Occured!!!");
+			e.printStackTrace();
+		} finally {
+			IOUtils.closeQuietly(client);
+		}
+		
+	}
+	
 	private SolrQuery makeQuery(SOLR_CORE core, Map<String, Object> commandMap, Set<String> fieldSet){
 		SolrQuery query = new SolrQuery();
 		
--- a/src/main/java/kcc/let/solr/search/service/SearchService.java
+++ b/src/main/java/kcc/let/solr/search/service/SearchService.java
@ -34,4 +34,6 @@ public interface SearchService {
 	
 	public void search(Map<String, Object> commandMap, ModelMap model) throws Exception;
 	
+	public void coreImport(String p_coreName) throws Exception;
+	
 }
--- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp
@ -1045,7 +1045,8 @@
 						<!-- <td><p>접수연월일 + 3개월</p></td> -->
 					</tr>
 					
-					<c:if test="${info.statCd eq '309010' }">
+					
+					<c:if test="${info.statCd eq '400000'}">
 						<tr>
 							<th scope="row" class=""><p>조정부</p></th>
 							<td>
@ -1063,8 +1064,32 @@
 							<th scope="row" class=""><p>장소</p></th>
 							<td><p><c:out value="${info.appPlace}"/></p></td>
 						</tr>
+
+
+						<tr>
+							<th>조정 조사관</th>
+							<td>
+								<p>
+									<c:out value="${info.adrAdmNm }"></c:out>
+								</p>
+							</td>
+							<th>진행상태</th>
+							<td>
+								<p>
+									<kc:code codeId="CC013" code="${info.sbmtTy}"/>
+									 
+<!-- 									<kc:code codeId="CC041" code="${info.statCd}"/> -->
+<!-- 									<c:out value="${info.statCd }"></c:out> -->
+<!-- 									<c:if test="${not empty sbmtStatus}"> -->
+<!-- 										(<kc:code codeId="CC041" code="${sbmtStatus}"/> 결재 대기 중) -->
+<!-- 									</c:if> -->
+									 
+								</p>
+							</td>							
+						</tr>
 					</c:if>

+
 					<c:if test="${info.sbmtTy eq KccadrConstants.ADR_CLOSE_APPR_REQ}">
 						<tr>
 							<th scope="row" class=""><p>조정결과</p></th>
--- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageEndDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageEndDetail.jsp
@ -973,6 +973,16 @@ function getPageUrl(idx) {
 						<%-- <th scope="row" class=""><p>장소</p></th>
 						<td><p><c:out value="${info.appPlace}"/></p></td> --%>
 					</tr>
+					
+						<tr>
+							<th colspan="2">조정 조사관</th>
+							<td colspan="3">
+								<p>
+									<c:out value="${info.adrAdmNm }"></c:out>
+								</p>
+							</td>				
+						</tr>					
+					
 					<%-- 조정기일 통지서요청(205010) 이후 결재 요청일 경우 조정기일 정보 노출_이준호_220222 --%>
 					<c:if test="${info.sbmtTy*1 ge KccadrConstants.ADR_APP_NTC_REQ*1}"><%-- 205010 --%>
 						<c:forEach var="list" begin="0" end="4" varStatus="listStatus">
@ -1037,14 +1047,14 @@ function getPageUrl(idx) {
 					</c:if>
 					<c:if test="${info.sbmtTy eq KccadrConstants.ADR_CLOSE_APPR_REQ}">
 						<tr>
-							<th scope="row" class=""><p>조정결과</p></th>
-							<th>
+							<th colspan="2" scope="row" class=""><p>조정결과</p></th>
+							<td>
 								<p>
 									<%-- <c:out value='${info.adrResult}' /> --%>
 									<%-- <kc:code codeId="CC023" code="${info.adrResult}"/> --%>
 									${endResult}
 								</p>
-							</th>
+							</td>
 							<td colspan="3">
 								<p>
 									${memoVO.adrAdmMemo}
--- a/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeDetail.jsp
@ -52,9 +52,9 @@
 	}

 	function fncGoList(){
-		var detailForm = document.detailForm ;
-		detailForm.action = "<c:url value='/kccadr/adjclsmgr/adjCloseMangeList.do'/>";
-		detailForm.submit();
+		var listForm = document.listForm ;
+		listForm.action = "<c:url value='/kccadr/adjclsmgr/adjCloseMangeList.do'/>";
+		listForm.submit();
 	}

 	// 기일통지서, 기일변경통지서 상세페이지 이동
@ -129,6 +129,14 @@
 </script>
 </head>
 <body>
+<form:form id="listForm" name="listForm" commandName="cmmVO"  method="post" >
+
+	<input type="hidden" name="searchKeyword" value=""/>
+	<input type="hidden" name="pageIndex" value="<c:out value='${info.pageIndex}'/>"/>
+	<input type="hidden" name="searchSortCnd" value="<c:out value="${info.searchSortCnd}" />" />
+	<input type="hidden" name="searchSortOrd" value="<c:out value="${info.searchSortOrd}" />" />
+	<input type="hidden" name="pageUnit" value="<c:out value="${info.pageUnit}" />" />
+</form:form>
 <form:form id="detailForm" name="detailForm" commandName="cmmVO"  method="post" >

 	<input type="hidden" name="searchKeyword" value=""/>
--- a/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp
@ -275,9 +275,13 @@
            <!-- //하단 버튼 -->

            <!-- page -->
-            <div class="page">
-                <ui:pagination paginationInfo = "${paginationInfo}"  type="image" jsFunction="linkPage" />
-            </div>
+            <c:if test="${not empty paginationInfo}">
+            
+	            <div class="page">
+	                <ui:pagination paginationInfo = "${paginationInfo}"  type="image" jsFunction="linkPage" />
+	            </div>            
+            
+            </c:if>
            <!-- //page -->
        </div>
    </div>
--- a/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseTab0.jsp
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseTab0.jsp
@ -131,11 +131,12 @@ function goToEntDetailNotice(){
 								<p><c:out value="${info.adrCost}" />
 								</p>
 							</td>
-							<th>종결상태</th>
+							<th>장소</th>
 							<td>
-								<p><kc:code codeId="CC013" code="${info.finalStatCd}"/>
+								<p><c:out value="${info.appPlace}"/>
 								</p>
 							</td>
+							
 						</tr>
 						<tr>
 							<th>조정부</th>
@ -153,11 +154,16 @@ function goToEntDetailNotice(){
 						</tr>
 						<tr>
 							<th>조정 조사관</th>
-							<td colspan="3">
+							<td>
 								<p>
 									<c:out value="${info.adrAdmNm}" />
 								</p>
 							</td>
+							<th>종결상태</th>
+							<td>
+								<p><kc:code codeId="CC013" code="${info.finalStatCd}"/>
+								</p>
+							</td>							
 						</tr>
 					</tbody>
 				</table>
--- a/src/main/webapp/WEB-INF/jsp/main/EgovMainView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/main/EgovMainView.jsp
@ -33,6 +33,13 @@
 		<link rel="stylesheet" href="/kccadrPb/adm/css/dashboard.css">
 		<script type="text/javaScript" language="javascript">

+		$(document).ready(function(){
+			
+			fncAvoideReg();
+						
+		});
+		
+		
 			//상세화면 - 조정진행관리, 조정종결관리 구분
 			function fncGoDetail(adrSeq, adrSn, type) {
 				if(type == 'C'){ //조정 처리 현황
@ -53,6 +60,30 @@
 					listForm.submit();
 				}
 			}
+			
+			function fncAvoideReg() {
+				//var data = new FormData();
+				//data.append('avoidReqYn', chk)
+				$.ajax({
+					type : "POST",
+					url : "/kccadr/adjclsmgr/solrDataImportAjax.do",
+					data : {"aaa":"bbb"},
+					dataType : 'json',
+					async : false,
+					/*
+					processData : false,
+					contentType : false,
+					cache : false,
+					*/
+					success : function(returnData, status) {
+						console.log("DO WELL : data import");
+						
+					},
+					error : function(e) {
+						console.log("ERROR : data import", e);						
+					}
+				});
+			}			
 		</script>
 </head>
 <body>