2022-08-16 사건 이력관리 내용 수정

src/main/java/kcc/kccadr/accdnt/chg/web/ChgController.java

@@ -174,7 +174,7 @@ public class ChgController {
         	//이력관리를 위한 adr_hstry_mgr 데이터 관리 추가	-	2022-08-09
         	chgService.updateRpplId(rpplVO
         			, "사용자>>나의사건관리>온라인조정전환>전자조정전환"	//String p_code_desc	-	CC199
-        			, "005"	//String p_stat_cd        		        			
+        			, "C050"	//String p_stat_cd        		        			
         			);
         	
         	modelAndView.addObject("result", "success");
@@ -184,7 +184,7 @@ public class ChgController {
         	//이력관리를 위한 adr_hstry_mgr 데이터 관리 추가	-	2022-08-09
         	chgService.updateRpplId(rpplVO
         			, "사용자>>나의사건관리>온라인조정전환>전자조정전환"	//String p_code_desc	-	CC199
-        			, "005"	//String p_stat_cd        		        			
+        			, "C050"	//String p_stat_cd        		        			
         			);
         	
         	modelAndView.addObject("result", "success");
@@ -251,7 +251,7 @@ public class ChgController {
         //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가	-	2022-08-09
         int rs = apmService.addRpplPopAjax(rpplVO
     			, "사용자>>나의사건관리>온라인조정전환>대리인등록"	//String p_code_desc	-	CC199
-    			, "004"	//String p_stat_cd        		
+    			, "C040"	//String p_stat_cd        		
         		);
         
         

src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java

@@ -559,11 +559,13 @@ public class ApmController {
     	//가장 마지막 조정회차로 지정
     	//이력관리를 위한 adr_hstry_mgr 데이터 관리 추가	-	2022-08-09
     	String adrSn = cmmService.selectLastAdrSn(apmVO
-    			, "조정진행관리>>조정진행목록>조정진행상세>P>사건정보"	//String p_code_desc	-	CC199
+    			, "관리자>>P>사건정보"	//String p_code_desc	-	CC199
-    			, "002"	//String p_stat_cd
+    			, "V020"	//String p_stat_cd
     			);
     	apmVO.setAdrSn(adrSn);
     	
+    	this._adrDetailPop(apmVO, model);
+    	/*
         //조정 사건 정보 불러오기
     	model.addAttribute("info", cmmService.selectPgrCmm(apmVO));
         
@@ -575,12 +577,11 @@ public class ApmController {
         
         //신청인, 피신청인, 대리인 첨부파일 정보 불러오기
         model.addAttribute("reqfileList", apmService.selectAdrReqFileList(apmVO));
+        */
         
         return "/kccadr/adjPgrMgr/apm/popup/adrDetailPop";
     }
     
-    
-    
     /**
      * 접속번호확인 팝업 상세
      *
@@ -1081,7 +1082,7 @@ public class ApmController {
         //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가	-	2022-08-09
         int rs = apmService.addRpplPopAjax(rpplVO
     			, "조정진행관리>>조정진행목록>조정진행상세>P>대리인등록"	//String p_code_desc	-	CC199
-    			, "003"	//String p_stat_cd        		
+    			, "A030"	//String p_stat_cd        		
         		);
         
          modelAndView.addObject("result", "success");
@@ -1242,7 +1243,7 @@ public class ApmController {
         //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가	-	2022-08-09
         int rs = apmService.updateAdrEndDe(apmVO
         		, "조정진행관리>>조정진행목록>조정진행상세>P>처리일자1개월연장"	//String p_code_desc	-	CC199
-    			, "006"	//String p_stat_cd              		
+    			, "A060"	//String p_stat_cd              		
         		);
         
         /*  처리기간연장은 아무때나 가능.
@@ -1550,8 +1551,8 @@ public class ApmController {
     	//가장 마지막 조정회차로 지정
     	//이력관리를 위한 adr_hstry_mgr 데이터 관리 추가	-	2022-08-09
     	String adrSn = cmmService.selectLastAdrSn(apmVO
-    			, "조정진행관리>>조정진행목록>조정진행상세"	//String p_code_desc	-	CC199
+    			, "관리자>>조정진행상세"	//String p_code_desc	-	CC199
-    			, "001"	//String p_stat_cd
+    			, "V010"	//String p_stat_cd
     			);
     	apmVO.setAdrSn(adrSn);
     	
@@ -2097,5 +2098,24 @@ public class ApmController {
 			info.setAppliCantNm(egovCryptoUtil.decrypt(info.getAppliCantNm()));
 		}
 	}
+	
+	////////////////////////////////////////////////////////////////////////////////////////
+	//
+	//	private function
+	//
+	////////////////////////////////////////////////////////////////////////////////////////
+    private void _adrDetailPop(ApmVO apmVO, ModelMap model) throws Exception{
+        //조정 사건 정보 불러오기
+    	model.addAttribute("info", cmmService.selectPgrCmm(apmVO));
+        
+    	//신청인, 피신청인, 대리인 정보 불러오기
+    	model.addAttribute("rppList", apmService.selectAdrRpplList(apmVO));
+        
+    	//조정사건의 첨부파일 정보 불러오기
+        model.addAttribute("fileList", apmService.selectAdrFileList(apmVO));
+        
+        //신청인, 피신청인, 대리인 첨부파일 정보 불러오기
+        model.addAttribute("reqfileList", apmService.selectAdrReqFileList(apmVO));
+    }
     
 }

src/main/java/kcc/kccadr/adjPgrMgr/iam/service/InternalApprovManageService.java

@@ -7,7 +7,10 @@ public interface InternalApprovManageService {
 
     Integer selectInternalApprovManageCount(InternalApprovManageVO internalApprovManageVO) throws Exception;
 
-    Integer updateinternalApprovManageSave(InternalApprovManageVO internalApprovManageVO) throws Exception;
+    Integer updateinternalApprovManageSave(InternalApprovManageVO internalApprovManageVO
+			, String p_code_desc
+			, String p_stat_cd     		
+    		) throws Exception;
 
     List<InternalApprovManageVO> selectInternalApprovManageList(InternalApprovManageVO internalApprovManageVO) throws Exception;
 

src/main/java/kcc/kccadr/adjPgrMgr/iam/service/impl/InternalAppovManageServiceImpl.java

@@ -1,16 +1,19 @@
 package kcc.kccadr.adjPgrMgr.iam.service.impl;
 
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
 import kcc.kccadr.adjPgrMgr.iam.service.InternalApprovManageService;
 import kcc.kccadr.adjPgrMgr.iam.service.InternalApprovManageVO;
 import kcc.kccadr.adjcclt.service.AdjstConciliatorService;
 import kcc.kccadr.adjcclt.service.AdjstConciliatorVO;
+import kcc.kccadr.advc.service.impl.AdrHstryMgrDAO;
 import kcc.kccadr.cmm.KccadrConstants;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
 
 @Service("internalApprovManageService")
 public class InternalAppovManageServiceImpl implements InternalApprovManageService {
@@ -21,6 +24,10 @@ public class InternalAppovManageServiceImpl implements InternalApprovManageServi
     @Resource(name="adjstConciliatorService")
     private AdjstConciliatorService adjstConciliatorService;
 
+	// 조정사건이력관리 DAO
+    @Resource(name = "adrHstryMgrDAO")
+    private AdrHstryMgrDAO adrHstryMgrDAO;
+    
     @Override
     public Integer selectInternalApprovManageCount(InternalApprovManageVO internalApprovManageVO) throws Exception {
         return internalApprovManageDAO.selectInternalApprovManageCount(internalApprovManageVO);
@@ -42,7 +49,10 @@ public class InternalAppovManageServiceImpl implements InternalApprovManageServi
     }
 
     @Override
-    public Integer updateinternalApprovManageSave(InternalApprovManageVO internalApprovManageVO) throws Exception {
+    public Integer updateinternalApprovManageSave(InternalApprovManageVO internalApprovManageVO
+			, String p_code_desc
+			, String p_stat_cd     		
+    		) throws Exception {
         int rs = 0;
 
         AdjstConciliatorVO statSearch = new AdjstConciliatorVO();
@@ -68,9 +78,21 @@ public class InternalAppovManageServiceImpl implements InternalApprovManageServi
                 }
             }else{
                 rs += internalApprovManageDAO.updateUserSbmtMgr(internalApprovManageVO);
-            }
+            } 
             
             
+        	//이력관리를 위한 adr_hstry_mgr 데이터 관리 추가	-	2022-08-09
+    		//adr_hstry_mgr에 값 넣기	-	시작    	
+    		adrHstryMgrDAO.insert4Func(internalApprovManageVO.getAdrSeq()
+    				//, "상태코드수정"
+    				, p_code_desc
+    				//, adjReqMgrVO.getStatCd()
+    				, p_stat_cd
+    				
+    				, internalApprovManageVO.getFrstRegisterId() 
+    				, internalApprovManageVO.getLastUpdusrId());
+    		//adr_hstry_mgr에 값 넣기	-	끝            
+            
             
         }
         return rs;

src/main/java/kcc/kccadr/adjPgrMgr/iam/web/InternalApprovManageController.java

@@ -343,7 +343,12 @@ public class InternalApprovManageController {
 			modelAndView.addObject("message", s_process_check_result);
 			return modelAndView;
 		}
-		int rs = internalApprovManageService.updateinternalApprovManageSave(internalApprovManageVO);
+		
+		//이력관리를 위한 adr_hstry_mgr 데이터 관리 추가	-	2022-08-09
+		int rs = internalApprovManageService.updateinternalApprovManageSave(internalApprovManageVO
+    			, "조정진행관리>>내부결재목록>조정결재상세>결재처리"	//String p_code_desc	-	CC199
+    			, "A090"	//String p_stat_cd						
+				);
 		if(rs > 0 ){
             AdjstConciliatorVO statSearch = new AdjstConciliatorVO();
             BeanUtils.copyProperties(internalApprovManageVO, statSearch);

src/main/java/kcc/kccadr/aprvl/service/AprvlMgrService.java

@@ -21,10 +21,16 @@ public interface AprvlMgrService {
 	void insert(AprvlMgrVO aprvlMgrVO) throws Exception;
 	
 	//조정사건결재저장
-	int insertAdrSbmtMgr(AprvlMgrVO aprvlMgrVO) throws Exception;
+	int insertAdrSbmtMgr(AprvlMgrVO aprvlMgrVO
+			, String p_code_desc
+			, String p_stat_cd    				
+			) throws Exception;
 	
 	//조정사건결재 조정부 저장
-	int insertAdrSbmtDetailMgr(AprvlMgrVO aprvlMgrVO) throws Exception;
+	int insertAdrSbmtDetailMgr(AprvlMgrVO aprvlMgrVO
+			, String p_code_desc
+			, String p_stat_cd    				
+			) throws Exception;
 	
 	
 	AprvlMgrVO selectDetail(AprvlMgrVO aprvlMgrVO) throws Exception;

src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java

@@ -7,6 +7,7 @@ import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
+import kcc.kccadr.advc.service.impl.AdrHstryMgrDAO;
 import kcc.kccadr.aprvl.service.AprvlMgrService;
 import kcc.kccadr.aprvl.service.AprvlMgrVO;
 
@@ -30,23 +31,60 @@ public class AprvlMgrServiceImpl  extends EgovAbstractServiceImpl implements Apr
 	@Resource(name = "aprvlMgrDAO")
 	private AprvlMgrDAO aprvlMgrDAO;
 	
+	// 조정사건이력관리 DAO
+    @Resource(name = "adrHstryMgrDAO")
+    private AdrHstryMgrDAO adrHstryMgrDAO;
 	
 	public void insert(AprvlMgrVO aprvlMgrVO) throws Exception {
 		aprvlMgrDAO.insert(aprvlMgrVO);
 	}
 	//조종사건결재
-	public int insertAdrSbmtMgr(AprvlMgrVO aprvlMgrVO) throws Exception {
+	public int insertAdrSbmtMgr(AprvlMgrVO aprvlMgrVO
-		return aprvlMgrDAO.insertAdrSbmtMgr(aprvlMgrVO);
+			, String p_code_desc
+			, String p_stat_cd    				
+			) throws Exception {
+    	int rs	=	aprvlMgrDAO.insertAdrSbmtMgr(aprvlMgrVO);
+    	
+    	//이력관리를 위한 adr_hstry_mgr 데이터 관리 추가	-	2022-08-09
+		//adr_hstry_mgr에 값 넣기	-	시작    	
+		adrHstryMgrDAO.insert4Func(aprvlMgrVO.getAdrSeq()
+				//, "상태코드수정"
+				, p_code_desc
+				//, adjReqMgrVO.getStatCd()
+				, p_stat_cd
+				
+				, aprvlMgrVO.getFrstRegisterId() 
+				, aprvlMgrVO.getLastUpdusrId());
+		//adr_hstry_mgr에 값 넣기	-	끝
+    	
+    	return rs;
 	}
 
 	//조정사건조정부 결재
-	public int insertAdrSbmtDetailMgr(AprvlMgrVO aprvlMgrVO) throws Exception {
+	public int insertAdrSbmtDetailMgr(AprvlMgrVO aprvlMgrVO
+			, String p_code_desc
+			, String p_stat_cd    				
+			) throws Exception {
 		
 		//step1. 해당 조정사건결재에 조정부가 있는지 확인
 		//있으면 저장
 		//없으면 1 리턴
+    	int rs	=	aprvlMgrDAO.insertAdrSbmtDetailMgr(aprvlMgrVO);
+    	
+    	//이력관리를 위한 adr_hstry_mgr 데이터 관리 추가	-	2022-08-09
+		//adr_hstry_mgr에 값 넣기	-	시작    	
+		adrHstryMgrDAO.insert4Func(aprvlMgrVO.getAdrSeq()
+				//, "상태코드수정"
+				, p_code_desc
+				//, adjReqMgrVO.getStatCd()
+				, p_stat_cd
+				
+				, aprvlMgrVO.getFrstRegisterId() 
+				, aprvlMgrVO.getLastUpdusrId());
+		//adr_hstry_mgr에 값 넣기	-	끝
 		
-		return aprvlMgrDAO.insertAdrSbmtDetailMgr(aprvlMgrVO);
+    	
+    	return rs;
 	}
 	
 

src/main/java/kcc/kccadr/aprvl/web/AprvlMgrController.java

@@ -170,8 +170,11 @@ public class AprvlMgrController {
 			}
 			
 			//조정사건결재 내용 추가해주기
-			i = aprvlMgrService.insertAdrSbmtMgr(aprvlMgrVO);
+			//이력관리를 위한 adr_hstry_mgr 데이터 관리 추가	-	2022-08-09
-						
+			i = aprvlMgrService.insertAdrSbmtMgr(aprvlMgrVO
+        			, "조정진행관리>>조정진행목록>조정진행상세>접수결재요청"	//String p_code_desc	-	CC199
+        			, "A070"	//String p_stat_cd 					
+					);						
 			
 			//조정부가 있는지 확인 하자.
 			aprvlMgrVO = aprvlMgrService.selectDetail(aprvlMgrVO);
@@ -187,7 +190,12 @@ public class AprvlMgrController {
 					|| "60".equals(aprvlMgrVO.getSbmtId6().trim())
 					) {
 				aprvlMgrService.deleteDetail(aprvlMgrVO);
-				i = aprvlMgrService.insertAdrSbmtDetailMgr(aprvlMgrVO);
+				
+				//이력관리를 위한 adr_hstry_mgr 데이터 관리 추가	-	2022-08-09
+				i = aprvlMgrService.insertAdrSbmtDetailMgr(aprvlMgrVO
+	        			, "조정진행관리>>조정진행목록>조정진행상세>접수결재요청-조정부"	//String p_code_desc	-	CC199
+	        			, "A080"	//String p_stat_cd						
+						);
 			}