#3676 [개발] 법원연계 수정사항 - 240220 완료 1.접수결재 사건배당 벨류체크, 2.결재완료일 데이터 노출, 최신등록

위로, 조정총괄일 경우 해당 지역만 나오게 where 추가

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

@@ -98,6 +98,14 @@ public class AdjCourtCnctnController {
 			adjCourtCnctnVO.setDeptOrdinaryYn("Y");
 			adjCourtCnctnVO.setUniqId(loginVO.getUniqId());
 			
+		}else if(loginVO != null && (KccadrCourtConstants.CRT_DEPT_GENERAL).equals(loginVO.getOfcpsNm())) {
+			//총괄조정일경우
+			//insttCode 해당 법원 구하는 로직
+			UserManageVO userManageVO = new UserManageVO();
+			userManageVO = userManageService.selectUser(loginVO.getUniqId());
+			System.out.println("userManageVO.getInsttCode() :: "+userManageVO.getInsttCode());
+			adjCourtCnctnVO.setCrtLinkHouse(userManageVO.getInsttCode().trim());
+			
 		}
 		model.addAttribute("ofcpsNm",loginVO.getOfcpsNm());
 		
@@ -139,6 +147,10 @@ public class AdjCourtCnctnController {
             
         }
 		
+
+		
+		
+		
 		List<AdjCourtCnctnVO> list = adjCourtCnctnService.adjCourtCnctnList(adjCourtCnctnVO);
 		
 		model.addAttribute("deptNmArr", deptNmArr(list));

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

@@ -36,6 +36,11 @@
               )
               c
 		WHERE	1=1
+				/*조정위원일 경우 해당 법원만 조회*/
+		<isNotEmpty property="crtLinkHouse" prepend="AND">
+			 a.crt_link_house = #crtLinkHouse#
+			
+		</isNotEmpty>
 		<isNotEmpty property="searchCondition">
 			
 			<isEqual property="searchCondition" prepend="AND" compareValue="10">
@@ -619,13 +624,13 @@
 		                     FROM    lettnemplyrinfo t1
 		                     WHERE   t1.esntl_id = a.crt_aprvl_id3
 		                     )
-		              ELSE NULL
+					ELSE '완료'
 		       END AS stepMem
 		FROM   adr_court_aprvl_mgr a
 		       LEFT JOIN adr_court_mgr b
 		       ON     a.crt_seq = b.crt_seq
 		WHERE 1=1
-		
+		ORDER BY a.frst_regist_pnttm desc
 		LIMIT #recordCountPerPage# OFFSET #firstIndex#
 	
 	</select>

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

@@ -274,6 +274,17 @@
 								</td>
 								<td>
 									<p>
+										<c:choose>
+											<c:when test="${empty list.crtAprvlDe3 and empty list.crtAprvlDe2}">
+												<c:out value="${fn:substring(list.crtAprvlDe1, 0, 10)}"/>
+											</c:when>
+											<c:when test="${empty list.crtAprvlDe3 }">
+												<c:out value="${fn:substring(list.crtAprvlDe2, 0, 10)}"/>
+											</c:when>
+											<c:otherwise>
+												<c:out value="${fn:substring(list.crtAprvlDe1, 0, 10)}"/>
+											</c:otherwise>
+										</c:choose>
 									</p>
 								</td>
 							</tr>

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

@@ -68,6 +68,10 @@ function aprvlPop(pram){
 	
 	var url = "";
 	if(pram == '101010'){
+		if(!$('#crtDeptOrdiValChk').val()){
+			alert('사건배당 진행 후 다시 시도해주세요.');
+			return false;
+		}
 		url = "/kccadr/adjCourtAprvl/popup/aprvlReqPop.do";
 	}else{
 		url = "/kccadr/adjCourtAprvl/popup/aprvlReqEndPop.do";
@@ -299,6 +303,7 @@ function fn_updateCrtStatCd(val){
 								<th>조정위원</th>
 								<td>
 									<c:out value="${courtVO.crtDeptOrdi}"/>
+									<input type="hidden" id="crtDeptOrdiValChk" value="<c:out value="${courtVO.crtDeptOrdi}"/>"/>
 									<c:if test="${loginVO.ofcpsNm ne '80'}">
 										<c:if test="${courtVO.crtStatCd*1 < 101050}">
 											<button type="button" class="btnType06" onclick="DeptPop();">

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

@@ -299,9 +299,10 @@ function setSearchMonthDate(month) {
 								
 								<col style="width: 10%">
 								<col style="width: 10%">
+								<col style="width: 20%">
 								<col style="width: 10%">
 								
-								<col style="width: 80px">
+								<col style="width: 150px">
 							</colgroup>
 							<thead>
 								<tr>