이준호 전자조정시스템 커밋

- 법원연계 종결목록 수정

src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java

@@ -73,6 +73,8 @@ public class AdjCourtCnctnVO  extends ComDefaultVO implements Serializable {
 	
 	private String deptNm;
 	
+	private String searchStatCd;
+	
 	public String getCrtSeq() {
 		return crtSeq;
 	}
@@ -349,6 +351,14 @@ public class AdjCourtCnctnVO  extends ComDefaultVO implements Serializable {
 	public void setDeptNm(String deptNm) {
 		this.deptNm = deptNm;
 	}
+	public String getSearchStatCd() {
+		return searchStatCd;
+	}
+	public void setSearchStatCd(String searchStatCd) {
+		this.searchStatCd = searchStatCd;
+	}
+	
+	
 	
 	
 	

src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 
 import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
@@ -53,6 +54,8 @@ public class AdjCourtCnctnController {
 	
 	@RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnList.do")
 	public String adjCourtCnctnList(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO, ModelMap model) throws Exception {
+		
+		adjCourtCnctnVO.setSearchStatCd("list");
 
 		if(adjCourtCnctnVO.getPageUnit() != 10) {
 			adjCourtCnctnVO.setPageUnit(adjCourtCnctnVO.getPageUnit());
@@ -74,16 +77,18 @@ public class AdjCourtCnctnController {
 		adjCourtCnctnVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
 		paginationInfo.setTotalRecordCount(adjCourtCnctnService.adjCourtCnctnListCount(adjCourtCnctnVO));
 		model.addAttribute("paginationInfo", paginationInfo);
+		
+		
 		List<AdjCourtCnctnVO> list = adjCourtCnctnService.adjCourtCnctnList(adjCourtCnctnVO);
 		
-		try {
+//		try {
-		list = list.stream()
+//		list = list.stream()
-			.filter(t -> t.getCrtStatCd() != null)
+//			.filter(t -> t.getCrtStatCd() != null)
-			.filter(t -> Integer.parseInt(t.getCrtStatCd()) <= 201050)
+//			.filter(t -> Integer.parseInt(t.getCrtStatCd()) <= 201050)
-			.collect(Collectors.toList());
+//			.collect(Collectors.toList());
-		} catch (Exception e) {
+//		} catch (Exception e) {
-			System.out.println(e.getMessage());
+//			System.out.println(e.getMessage());
-		}
+//		}
 		// 복호화
 		model.addAttribute("list", list);
 
@@ -202,8 +207,9 @@ public class AdjCourtCnctnController {
 	}
 	
 	@RequestMapping(value = "/kccadr/adjCourtCnctn/popup/adjCourtCnctnAppPop.do")
-    public String adjCourtCnctnAppPop(@ModelAttribute("adjCourtAppVO") AdjCourtAppVO adjCourtAppVO, ModelMap model) throws Exception {
+    public String adjCourtCnctnAppPop(@RequestParam(value = "endFlag" , required = false) String endFlag, @ModelAttribute("adjCourtAppVO") AdjCourtAppVO adjCourtAppVO, ModelMap model) throws Exception {
 		
+		model.addAttribute("endFlag", endFlag);
         model.addAttribute("list", adjCourtCnctnService.selectAdjCourtCnctnAppList(adjCourtAppVO));
         return "kccadr/adjCourtCnctn/pop/adjCourtCnctnAppPop";
     }
@@ -291,6 +297,8 @@ public class AdjCourtCnctnController {
 	@RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnEndList.do")
 	public String adjCourtCnctnEndList(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO, ModelMap model) throws Exception {
 
+		adjCourtCnctnVO.setSearchStatCd("endList");
+		
 		if(adjCourtCnctnVO.getPageUnit() != 10) {
 			adjCourtCnctnVO.setPageUnit(adjCourtCnctnVO.getPageUnit());
 		}
@@ -313,14 +321,14 @@ public class AdjCourtCnctnController {
 		model.addAttribute("paginationInfo", paginationInfo);
 		List<AdjCourtCnctnVO> list = adjCourtCnctnService.adjCourtCnctnList(adjCourtCnctnVO);
 		
-		try {
+//		try {
-		list = list.stream()
+//		list = list.stream()
-			.filter(t -> t.getCrtStatCd() != null)
+//			.filter(t -> t.getCrtStatCd() != null)
-			.filter(t -> Integer.parseInt(t.getCrtStatCd()) > 201050)
+//			.filter(t -> Integer.parseInt(t.getCrtStatCd()) > 201050)
-			.collect(Collectors.toList());
+//			.collect(Collectors.toList());
-		} catch (Exception e) {
+//		} catch (Exception e) {
-			System.out.println(e.getMessage());
+//			System.out.println(e.getMessage());
-		}
+//		}
 		// 복호화
 		model.addAttribute("list", list);
 		model.addAttribute("endFlag", "end");

src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml

@@ -97,6 +97,16 @@
 				TO_CHAR(DCSN_DE,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#diffMonth#, '-' , '')
 			</isNotEmpty>
 		</isEqual> -->
+		<isNotEmpty prepend="AND" property="searchStatCd">
+			crt_stat_cd
+			<isEqual property="searchStatCd" compareValue="list">
+				<![CDATA[ <= ]]> 201050
+			</isEqual>
+			<isEqual property="searchStatCd" compareValue="endList">
+				<![CDATA[ > ]]> 201050
+			</isEqual>
+		</isNotEmpty>
+		AND    crt_stat_cd IS NOT NULL
 	 
 		LIMIT #recordCountPerPage# OFFSET #firstIndex#
 	</select>
@@ -155,8 +165,18 @@
 				TO_CHAR(DCSN_DE,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#diffMonth#, '-' , '')
 			</isNotEmpty>
 		</isEqual> -->
+		
+		<isNotEmpty prepend="AND" property="searchStatCd">
+			crt_stat_cd
+			<isEqual property="searchStatCd" compareValue="list">
+				<![CDATA[ <= ]]> 201050
+			</isEqual>
+			<isEqual property="searchStatCd" compareValue="endList">
+				<![CDATA[ > ]]> 201050
+			</isEqual>
+		</isNotEmpty>
+		AND    crt_stat_cd IS NOT NULL
 	 
-		LIMIT #recordCountPerPage# OFFSET #firstIndex#
 	</select>
 	
 	

src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnEndDetailTab0.jsp

@@ -90,7 +90,7 @@ function endAfterPop(){
 </style>
 </head>
 <body>          
-<c:url var="list_url"  value="/kccadr/adjCourtCnctn/adjCourtCnctnList.do" />
+<c:url var="list_url"  value="/kccadr/adjCourtCnctn/adjCourtCnctnEndList.do" />
 <c:url var="modify_url"  value="/kccadr/adjCourtCnctn/adjCourtCnctnModify.do" />
 <form id="goListForm" name="goListForm" method="post" action="${list_url }">
 	<input type="hidden" name="searchKeyword" value=""/>
@@ -107,6 +107,7 @@ function endAfterPop(){
 	<input type="hidden" name="crtDeptKng" value="<c:out value="${courtVO.crtDeptKng}" />" />
 	<input type="hidden" name="crtStatCd" id="crtStatCd" value=""/>
 	<input type="hidden" name="esntlId" value="<c:out value="${courtVO.esntlId}" />" />
+	<input type="hidden" name="endFlag" value="end" />
 </form>
 
 
@@ -242,26 +243,32 @@ function endAfterPop(){
 							</tr>
 							<tr>
 								<th>합의금</th>
-								<td colspan="3">
+								<td>
 									<c:out value="${courtVO.crtAgrment}"/>
 								</td>
-							</tr>
-							<tr>
 								<th>종결일자</th>
-								<td colspan="3">
+								<td>
 									<c:out value="${fn:substring(courtVO.crtEndDe, 0, 10)}"/>
 								</td>
 							</tr>
 							<tr>
 								<th>수당금액</th>
-								<td colspan="3">
+								<td>
 									<c:out value="${adjCourtDeptVO.crtAllwanc}"/>
 								</td>
+								<th>지급일자</th>
+								<td>
+									<c:out value="${fn:substring(adjCourtDeptVO.crtPayDe, 0, 10)}"/>
+								</td>
 							</tr>
 							<tr>
-								<th>지급일자</th>
+								<th>결과</th>
-								<td colspan="3">
+								<td>
-									<c:out value="${fn:substring(adjCourtDeptVO.crtPayDe, 0, 10)}"/>
+									<c:out value="${courtVO.crtEndRslt}"/>
+								</td>
+								<th>세부결과</th>
+								<td>
+									<c:out value="${courtVO.crtEndRsltDetail}"/>
 								</td>
 							</tr>
 						</tbody>
@@ -272,18 +279,8 @@ function endAfterPop(){
 					<div class="area_left"></div>
 					<div class="area_right">
 						<!-- 프로세스 시간 순서대로 버튼 나열  -->
-						
+						<c:if test="${courtVO.crtStatCd*1 eq 300000}">
-						<!-- 접수 결재 승인 전까지만 -->
-						<c:if test="${courtVO.crtStatCd*1 < 101010}">
-							<button type="button" class="btnType06" onclick="fn_modyfi(); return false;">수정</button>
-							<button type="button" class="btnType06" onclick="aprvlPop('101010');">접수결재</button>
-						</c:if>
-
-						<c:if test="${courtVO.crtStatCd*1 >= 101050
-									  && courtVO.crtStatCd*1 < 201010}">
-							<button type="button" class="btnType06" onclick="endPop();">결과보고</button>
 							<button type="button" class="btnType06" onclick="appPop();">기일지정</button>
-							<button type="button" class="btnType06" onclick="aprvlPop('201010')">종결결재</button>
 						</c:if>
 						<c:if test="${courtVO.crtStatCd*1 eq 300000}">
 							<button type="button" class="btnType06" onclick="endAfterPop();">사후관리</button>

src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp

@@ -63,7 +63,12 @@ function fn_goEndDetail(crtSeq){
 		<div class="cont_wrap">
 			<div class="box">
 				<div class="cont_tit">
-					<h2>법원연계조정목록</h2>
+					<c:if test="${empty endFlag}">
+						<h2>법원연계조정목록</h2>
+					</c:if>
+					<c:if test="${!empty endFlag}">
+						<h2>법원연계조정종결목록</h2>
+					</c:if>
 					<ul class="cont_nav">
 						<li class="home"><a href="/"><i></i></a></li>
 						<li><span class="cur_nav">법원연계조정 목록</span></li>

src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/pop/adjCourtCnctnAppPop.jsp

@@ -89,7 +89,9 @@
 				</tbody>
 			</table>
 			<div class="btn_wrap btn_layout04">
-				<button class="btnType06" onclick="fncReg(); return false;">기일지정등록</button>
+				<c:if test="${endFlag ne 'end'}">
+					<button class="btnType06" onclick="fncReg(); return false;">기일지정등록</button>
+				</c:if>
 				<button class="btnType06" onclick="fncClose(); return false;">닫기</button>
 			</div>
 		</div>