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

- 감리 응용프로그램 부분 조치사항 수정

src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java

@@ -116,8 +116,8 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
 		List<AdjReqMgrPastVO> resultAdjReqMgrList = new ArrayList<AdjReqMgrPastVO>();
 		resultAdjReqMgrList = adjReqMgrPastDAO.selectAdjReqMgrListInfo(adjReqMgrPastVO);
 		
-		if(resultAdjReqMgrList != null) {
+//		if(resultAdjReqMgrList != null) {
-			
+		if(resultAdjReqMgrList.size() > 0) {
 			
 			String rpplTy = resultAdjReqMgrList.get(0).getRpplTy();
 			int listCnt = resultAdjReqMgrList.size();

src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java

@@ -2,7 +2,6 @@ package kcc.kccadr.adjReqMgrPast.web;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -13,7 +12,6 @@ import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.core.env.SystemEnvironmentPropertySource;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
@@ -24,12 +22,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
-import com.dreamsecurity.magicline.util.Log;
-
 import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
 import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
 import kcc.com.cmm.LoginVO;
-import kcc.com.cmm.service.AdrInnorixFileVO;
 import kcc.com.cmm.service.EgovCmmUseService;
 import kcc.com.cmm.service.EgovFileMngService;
 import kcc.com.cmm.service.EgovFileMngUtil;
@@ -123,9 +118,6 @@ public class AdjReqMgrPastController {
 	public String adjReqMgrPastBasicRegist(@ModelAttribute("searchVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception {
 		
 		
-		System.out.println("git test");
-		System.out.println("git test");
-		
 		//TODO TEST 
 //		adjReqMgrPastVO.setAdrSeq("ADR_0000000000002920");
 		
@@ -171,7 +163,6 @@ public class AdjReqMgrPastController {
 	@RequestMapping("/kccadr/adjReqMgOff/adjReqMgrPastDetail.do")
 	public String adjReqMgrPastDetail(@ModelAttribute("adjReqMgrPastVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception {
 
-		System.out.println("git test!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
 		return "kccadr/adjReqMgrPast/adjReqMgrPastDetail";
 	}
 
@@ -655,7 +646,13 @@ public class AdjReqMgrPastController {
 		
 		//사용자 유니크 아이디 받아오기
 		adjReqMgrPastVO.setFrstRegisterId(userId);
+		if("".equals(adjReqMgrPastVO.getFrstRegistPnttm())) {
+			adjReqMgrPastVO.setFrstRegistPnttm(null);
+		}
 		adjReqMgrPastVO.setLastUpdusrId(userId);
+		if("".equals(adjReqMgrPastVO.getLastUpdtPnttm())) {
+			adjReqMgrPastVO.setLastUpdtPnttm(null);
+		}
 		//조정신청, 대리인, 신청인 등록 처리
 		return adjReqMgrPastService.insertAdjReqMgrRpplReq(adjReqMgrPastVO);
 	}

src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml

@@ -395,7 +395,8 @@
 	left join ADR_MEM_DEPT_MGR_PST AMDMP on
 		AMD.MEM_DEPT_SEQ = AMDMP.MEM_PST_SEQ
 	left join ADR_ASS_MGR_PST AAMP on
-		AMD.ADR_ADM_ID = AAMP.ASS_PST_SEQ
+<!-- 		AMD.ADR_ADM_ID = AAMP.ASS_PST_SEQ -->
+		AMD.ADR_SEQ = AAMP.ADR_SEQ
 	where AMD.ADR_SEQ= #adrSeq#
 	</select>
 	
@@ -917,7 +918,7 @@
 		LEFT JOIN ADR_MGR_DETAIL amd
 			ON amm.ADR_SEQ = amd.ADR_SEQ 
 		LEFT JOIN ADR_ASS_MGR_PST aamp
-			ON amd.ADR_ADM_ID = aamp.ASS_PST_SEQ
+			ON     amd.adr_seq = aamp.adr_seq
 		LEFT JOIN ADR_MEM_DEPT_MGR_PST amdm
 			ON amd.MEM_DEPT_SEQ = amdm.MEM_PST_SEQ
  		LEFT JOIN ADR_HSTRY ah 
@@ -1000,7 +1001,7 @@
 		LEFT JOIN ADR_MGR_DETAIL amd
 			ON amm.ADR_SEQ = amd.ADR_SEQ 
 		LEFT JOIN ADR_ASS_MGR_PST aamp
-			ON amd.ADR_ADM_ID = aamp.ASS_PST_SEQ
+			ON     amd.adr_seq = aamp.adr_seq
 		LEFT JOIN ADR_MEM_DEPT_MGR_PST amdm
 			ON amd.MEM_DEPT_SEQ = amdm.MEM_PST_SEQ
  		LEFT JOIN ADR_HSTRY ah 

src/main/resources/egovframework/sqlmap/let/uss/ion/cnt/CntManage_SQL_Mysql.xml

@@ -138,6 +138,8 @@
 		SELECT 	 
 		  count(A.CNTDT_ID) totCnt
 	 	FROM CNT_MANAGE A
+	       	INNER JOIN LETTNEMPLYRINFO B
+       			ON     A.REGISTER_ID = B.ESNTL_ID
 	 	WHERE 1=1
 	 	AND  CNT_ID = #cntId#
 	 	<isNotEmpty property="useAt">

src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerList.jsp

@@ -101,13 +101,13 @@
 
 			<!-- cont_tit -->
 			<div class="cont_tit">
-				<h2>신청이유예문관리 목록</h2>
+				<h2>신청원인예문관리 목록</h2>
 				<ul class="cont_nav">
 					<li class="home"><a href="/"><i></i></a></li>
 					<li>
 						<p>조정진행관리</p>
 					</li>
-					<li><span class="cur_nav">신청이유예문관리 목록</span></li>
+					<li><span class="cur_nav">신청원인예문관리 목록</span></li>
 				</ul>
 			</div>
 			<!-- //cont_tit -->

src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/popup/adjReqMgrRegMultyPaymentPopup.jsp

@@ -74,8 +74,9 @@
 				alert("수수료근거가 최소 하나이상 되어야합니다.");
 				return false;
 			}else{
+				var obj = $(thisObj).closest("tbody");
 				$(thisObj).closest("tr").remove();
-				setSumTotal($(thisObj).closest("tbody"));
+				setSumTotal(obj);
 			}
 		}
 
@@ -267,7 +268,7 @@
 
 			<div class="btn_wrap btn_layout04">
 				<button type="button" class="btnType06" onclick="fncSave(); return false;">납부요청</button>
-				<button type="button" class="btnType03">취소</button>
+				<button type="button" class="btnType03" onclick="window.close();">취소</button>
 			</div>
 		</div>
 	</div>

src/main/webapp/WEB-INF/jsp/kccadr/stts/sttsAdr.jsp

@@ -85,13 +85,13 @@ $(document).ready(function() {
 	
 			<!-- cont_tit -->
 			<div class="cont_tit">
-				<h2>조정현황</h2>
+				<h2>조정시스템 만족도 대상</h2>
 				<ul class="cont_nav">
 					<li class="home"><a href="/"><i></i></a></li>
 					<li>
 						<p>통계</p>
 					</li>
-					<li><span class="cur_nav">조정 현황</span></li>
+					<li><span class="cur_nav">조정시스템 만족도 대상</span></li>
 				</ul>
 			</div>
 			<!-- //cont_tit -->

src/main/webapp/WEB-INF/jsp/main/inc/EgovIncFooter.jsp

@@ -67,8 +67,8 @@ $(function() { $("body").keydown(function(evt) {
 		}
 	} });
 }) ;
-
+	 --%>
-
+<script type="text/javaScript" language="javascript">
 function showLodingBar(){
 	var width = 0;
     var height = 0;
@@ -97,4 +97,3 @@ function deleteLodingBar(){
     }    
 }
 </script>
-	 --%>

src/main/webapp/WEB-INF/jsp/sec/rgm/EgovAuthorGroupManage.jsp

@@ -128,7 +128,7 @@ function fncSelectAuthorGroupList(){
 
 function fncAddAuthorGroupInsert() {
     if(!fncManageChecked()) return;
-    if(confirm("수정하시겠습니까?")) {
+    if(confirm("등록 하시겠습니까?")) {
         document.listForm.action = "<c:url value='/sec/rgm/EgovAuthorGroupInsert.do'/>";
         document.listForm.submit();
     }
@@ -309,7 +309,7 @@ function press() {
 				<!-- btn_wrap -->
 				<div class="btn_wrap btn_layout01">
 					<div class="area_left">
-						<button type="button" class="btnType03"  onclick="fncAuthorGroupDeleteList(); return false;">삭제</button>
+						<button type="button" class="btnType03"  onclick="fncAuthorGroupDeleteList(); return false;">등록 취소</button>
 					</div>
 					<div class="area_right">
 						<button type="button" class="btnType02"  onclick="fncAddAuthorGroupInsert(); return false;">등록</button>

src/main/webapp/WEB-INF/jsp/uss/ion/cnt/cntManageDetailList.jsp

@@ -159,7 +159,10 @@ function fn_egov_ajaxEditorCopy(cntDtId){
 							<tr>
 								<td><input type="checkbox" id="<c:out value="${result.cntDtId}"/>" name="delYn" class="check2" title="선택"><label for="<c:out value="${result.cntDtId}"/>"></label>
 									<input type="hidden" name="checkId" value="<c:out value="${result.cntDtId}"/>" /></td>
-								<td><c:out value="${(cntManageVO.pageIndex - 1) * cntManageVO.pageSize + status.count}"/></td>
+<%-- 								<td><c:out value="${(cntManageVO.pageIndex - 1) * cntManageVO.pageSize + status.count}"/></td> --%>
+								<td>
+		               				<c:out value="${ ( paginationInfo.totalRecordCount - ((paginationInfo.currentPageNo -1)*paginationInfo.recordCountPerPage) ) - status.index }"/>
+			                	</td>
 								<td><c:out value="${result.cntName}"/></td>
 								<td><c:out value="${result.registerId}"/></td>
 								<td><c:out value="${result.registPnttm}"/></td>

src/main/webapp/js/kccadr/adjReqMgrPast/value.js

@@ -10,6 +10,11 @@
         $('#memDeptNm').val($('#memDeptNmTemp').val());
         $('#assPstUsrNm').val($('#assPstUsrNmTemp').val()); 
 
+		if($('#adrNo').val() == ''){
+			alert('조정번호는 필수 입력값입니다.');
+			return false;
+		}
+        
         console.log(' !! ', $('#adrSn').val());
         console.log(' !! ', $('#frstRegistPnttm').val());
         console.log(' !! ', $('#lastUpdtPnttm').val());