2022-08-23 10:33 이력정보 기일통지서 까지 처리

src/main/java/kcc/kccadr/accdnt/ans/service/AnsService.java

@@ -4,6 +4,9 @@ public interface AnsService {
 
     AnsVO selectAnsSubmit(AnsVO ansVO) throws Exception;
 
-    void ansSubmitAjax(AnsVO ansVO) throws Exception;
+    void ansSubmitAjax(AnsVO ansVO
+			, String p_code_desc
+			, String p_stat_cd    		
+    		) throws Exception;
 
 }

src/main/java/kcc/kccadr/accdnt/ans/service/impl/AnsServiceImpl.java

@@ -10,6 +10,7 @@ import kcc.com.cmm.util.StringUtil;
 import kcc.kccadr.accdnt.ans.service.AnsService;
 import kcc.kccadr.accdnt.ans.service.AnsVO;
 import kcc.kccadr.adjPgrMgr.cmm.service.impl.PgrCmmServiceImpl;
+import kcc.kccadr.advc.service.impl.AdrHstryMgrDAO;
 import kcc.let.utl.fcc.service.EgovCryptoUtil;
 
 @Service("ansService")
@@ -26,6 +27,10 @@ public class AnsServiceImpl implements AnsService {
         return result;
     }
 
+	// 조정사건이력관리 DAO
+    @Resource(name = "adrHstryMgrDAO")
+    private AdrHstryMgrDAO adrHstryMgrDAO;
+    
     @Resource(name = "egovCryptoUtil")
     EgovCryptoUtil egovCryptoUtil;
 
@@ -56,7 +61,10 @@ public class AnsServiceImpl implements AnsService {
     }
 
     @Override
-    public void ansSubmitAjax(AnsVO ansVO) throws Exception {
+    public void ansSubmitAjax(AnsVO ansVO
+			, String p_code_desc
+			, String p_stat_cd    		
+    		) throws Exception {
         /*
          * String resPonDentSeq = ansVO.getResPonDentSeq();
          * 
@@ -70,5 +78,20 @@ public class AnsServiceImpl implements AnsService {
     	
         ansDAO.ansSubmitAjax_setp1(ansVO);
         ansDAO.ansSubmitAjax_setp2(ansVO);
+        
+        
+    	//이력관리를 위한 adr_hstry_mgr 데이터 관리 추가	-	2022-08-09
+		//adr_hstry_mgr에 값 넣기	-	시작    	
+		adrHstryMgrDAO.insert4Func(ansVO.getAdrSeq()
+				//, "상태코드수정"
+				, p_code_desc
+				//, adjReqMgrVO.getStatCd()
+				, p_stat_cd
+				
+				, ansVO.getFrstRegisterId() 
+				, ansVO.getLastUpdusrId());
+		//adr_hstry_mgr에 값 넣기	-	끝        
+        
+        
     }
 }

src/main/java/kcc/kccadr/accdnt/ans/web/AnsController.java

@@ -1,11 +1,8 @@
 package kcc.kccadr.accdnt.ans.web;
 
-import java.util.List;
-
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
@@ -19,12 +16,10 @@ import egovframework.rte.fdl.idgnr.EgovIdGnrService;
 import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
 import kcc.com.cmm.LoginVO;
 import kcc.com.utl.fcc.service.EgovStringUtil;
-import kcc.com.utl.user.service.CheckAdrProcessUtil;
 import kcc.com.utl.user.service.CheckFileUtil;
 import kcc.kccadr.accdnt.ai.service.AdjstIncidentService;
 import kcc.kccadr.accdnt.ans.service.AnsService;
 import kcc.kccadr.accdnt.ans.service.AnsVO;
-import kcc.kccadr.adjPgrMgr.apm.service.RpplVO;
 import kcc.let.utl.fcc.service.EgovCryptoUtil;
 
 /**
@@ -115,7 +110,10 @@ public class AnsController {
         ansVO.setFrstRegisterId(userId);
         ansVO.setLastUpdusrId(userId);
 
-        ansService.ansSubmitAjax(ansVO);
+        ansService.ansSubmitAjax(ansVO
+    			, "사용자>>나의사건관리>조정진행 상황>답변서제출"	//String p_code_desc	-	CC199
+    			, "C150"	//String p_stat_cd 			        		
+        		);
 
         modelAndView.addObject("result", "success");
 

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

@@ -1493,7 +1493,10 @@ public class ApmController {
         ansVO.setFrstRegisterId(userId);
         ansVO.setLastUpdusrId(userId);
 
-        ansService.ansSubmitAjax(ansVO);
+        ansService.ansSubmitAjax(ansVO
+    			, "사용자>>나의사건관리>조정진행 상황>답변서제출"	//String p_code_desc	-	CC199
+    			, "C160"	//String p_stat_cd 	        		
+        		);
         result = "success";
         
         } catch (Exception e) {

src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/DntService.java

@@ -14,11 +14,17 @@ public interface DntService {
 
     int udateDateNotice(DntVO dntVO) throws Exception;
 
-    int insertDateNotice(DntVO dntVO) throws Exception;
+    int insertDateNotice(DntVO dntVO
+			, String p_code_desc
+			, String p_stat_cd    		    		
+    		) throws Exception;
 
     int deleteDateNotice(DntVO dntVO);
 
-    void updateDistribution(DntVO dntVO) throws Exception;
+    void updateDistribution(DntVO dntVO
+			, String p_code_desc
+			, String p_stat_cd    		    		
+    		) throws Exception;
     
     DntVO selectDateNoticeDate(DntVO dntVO) throws Exception;
     

src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/impl/DntDAO.java

@@ -39,6 +39,10 @@ public class DntDAO extends EgovAbstractDAO {
     }
 
     public void updateDistribution(DntVO dntVO) {
+    	//ADR_ASS_HSTRY	-	insert
+    	insert("Dnt.insertAdrAssHstry", dntVO);
+    	
+    	//ADR_ASS_MGR - update
         update("Dnt.updateDistribution", dntVO);
     }
     

src/main/java/kcc/kccadr/adjPgrMgr/dnt/service/impl/DntServiceImpl.java

@@ -10,6 +10,7 @@ import kcc.com.cmm.util.StringUtil;
 import kcc.kccadr.adjPgrMgr.dnt.service.DntService;
 import kcc.kccadr.adjPgrMgr.dnt.service.DntVO;
 import kcc.kccadr.adjPgrMgr.drt.service.DrtVO;
+import kcc.kccadr.advc.service.impl.AdrHstryMgrDAO;
 import kcc.let.utl.fcc.service.EgovCryptoUtil;
 
 @Repository("dntService")
@@ -25,6 +26,9 @@ public class DntServiceImpl implements DntService {
     @Resource(name = "egovCryptoUtil")
     EgovCryptoUtil egovCryptoUtil;
     
+	// 조정사건이력관리 DAO
+    @Resource(name = "adrHstryMgrDAO")
+    private AdrHstryMgrDAO adrHstryMgrDAO;
     
     @Override
     public List<DntVO> selectDateNoticeList(DntVO dntVO) throws Exception {
@@ -100,10 +104,28 @@ public class DntServiceImpl implements DntService {
     
     
     @Override
-    public int insertDateNotice(DntVO dntVO) throws Exception {
+    public int insertDateNotice(DntVO dntVO
-        
+			, String p_code_desc
+			, String p_stat_cd    		    		
+    		) throws Exception {
+
         setDayNoticeInfo(dntVO);
         dntDAO.insertDateNotice(dntVO);
+        
+        
+    	//이력관리를 위한 adr_hstry_mgr 데이터 관리 추가	-	2022-08-09
+		//adr_hstry_mgr에 값 넣기	-	시작    	
+		adrHstryMgrDAO.insert4Func(dntVO.getAdrSeq()
+				//, "상태코드수정"
+				, p_code_desc
+				//, adjReqMgrVO.getStatCd()
+				, p_stat_cd
+				
+				, dntVO.getFrstRegisterId() 
+				, dntVO.getLastUpdusrId());
+		//adr_hstry_mgr에 값 넣기	-	끝   
+		
+        
         return 1;
     }
     
@@ -124,7 +146,10 @@ public class DntServiceImpl implements DntService {
 
 
     @Override
-    public void updateDistribution(DntVO dntVO) throws Exception {
+    public void updateDistribution(DntVO dntVO
+			, String p_code_desc
+			, String p_stat_cd    		    		
+    		) throws Exception {
         
         
         if (!StringUtil.isEmpty(dntVO.getAddUsrId0())) {
@@ -134,7 +159,21 @@ public class DntServiceImpl implements DntService {
             dntVO.setAddChgYn(dntVO.getAddChgYn0());
             dntVO.setAssSeq(dntVO.getAssSeq0());
             
-            dntDAO.updateDistribution(dntVO);            
+            dntDAO.updateDistribution(dntVO);   
+            
+            
+        	//이력관리를 위한 adr_hstry_mgr 데이터 관리 추가	-	2022-08-09
+    		//adr_hstry_mgr에 값 넣기	-	시작    	
+    		adrHstryMgrDAO.insert4Func(dntVO.getAdrSeq()
+    				//, "상태코드수정"
+    				, p_code_desc
+    				//, adjReqMgrVO.getStatCd()
+    				, p_stat_cd
+    				
+    				, dntVO.getFrstRegisterId() 
+    				, dntVO.getLastUpdusrId());
+    		//adr_hstry_mgr에 값 넣기	-	끝   
+    		
         }
         
         
@@ -145,7 +184,21 @@ public class DntServiceImpl implements DntService {
             dntVO.setAddChgYn(dntVO.getAddChgYn1());
             dntVO.setAssSeq(dntVO.getAssSeq1());
             
-            dntDAO.updateDistribution(dntVO);            
+            dntDAO.updateDistribution(dntVO);          
+            
+            
+        	//이력관리를 위한 adr_hstry_mgr 데이터 관리 추가	-	2022-08-09
+    		//adr_hstry_mgr에 값 넣기	-	시작    	
+    		adrHstryMgrDAO.insert4Func(dntVO.getAdrSeq()
+    				//, "상태코드수정"
+    				, p_code_desc
+    				//, adjReqMgrVO.getStatCd()
+    				, p_stat_cd
+    				
+    				, dntVO.getFrstRegisterId() 
+    				, dntVO.getLastUpdusrId());
+    		//adr_hstry_mgr에 값 넣기	-	끝   
+    		
         }
         
         if (!StringUtil.isEmpty(dntVO.getAddUsrId2())) {
@@ -155,7 +208,21 @@ public class DntServiceImpl implements DntService {
             dntVO.setAddChgYn(dntVO.getAddChgYn2());
             dntVO.setAssSeq(dntVO.getAssSeq2());
             
-            dntDAO.updateDistribution(dntVO);            
+            dntDAO.updateDistribution(dntVO);     
+            
+            
+        	//이력관리를 위한 adr_hstry_mgr 데이터 관리 추가	-	2022-08-09
+    		//adr_hstry_mgr에 값 넣기	-	시작    	
+    		adrHstryMgrDAO.insert4Func(dntVO.getAdrSeq()
+    				//, "상태코드수정"
+    				, p_code_desc
+    				//, adjReqMgrVO.getStatCd()
+    				, p_stat_cd
+    				
+    				, dntVO.getFrstRegisterId() 
+    				, dntVO.getLastUpdusrId());
+    		//adr_hstry_mgr에 값 넣기	-	끝   
+    		
         }
         
         

src/main/java/kcc/kccadr/adjPgrMgr/dnt/web/DntController.java

@@ -37,6 +37,7 @@ import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoVO;
 import kcc.kccadr.adjPgrMgr.dnt.service.DntService;
 import kcc.kccadr.adjPgrMgr.dnt.service.DntVO;
 import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO;
+import kcc.kccadr.advc.service.AdrHstryMgrService;
 import kcc.kccadr.cmm.KccadrConstants;
 import kcc.kccadr.kccadrCom.service.KccadrCommonService;
 import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService;
@@ -93,6 +94,10 @@ public class DntController {
     @Resource(name = "dlvinfoService")
     private DlvinfoService dlvinfoService;
     
+	// 이력관리
+	@Resource(name = "adrHstryMgrService")
+	private AdrHstryMgrService adrHstryMgrService;
+    
 	// 실서버 개발서버 구분
 	private static String islocal;	//	/pdf/out/
     @Value("#{globalSettings['Globals.prod.islocal']}")
@@ -169,7 +174,10 @@ public class DntController {
         
         
         //대석 등록
-        dntService.updateDistribution(dntVO);
+        dntService.updateDistribution(dntVO
+        		, "조정진행관리>>조정진행목록>조정진행상세>기일등록>대석등록-수정"	//String p_code_desc	-	CC199
+        		, "A130"	//String p_stat_cd			대석등록-수정        		
+        		);
 /*
         AdjReqMgrVO arv = new AdjReqMgrVO();
         arv.setAdrSeq(dntVO.getAdrSeq()); // 조정일련번호
@@ -300,10 +308,19 @@ public class DntController {
         }
         */
     
-        dntService.insertDateNotice(dntVO);
+        //조정기일지정
+        //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가	-	2022-08-09
+        dntService.insertDateNotice(dntVO
+        		, "조정진행관리>>조정진행목록>조정진행상세>기일등록>조정기일지정"	//String p_code_desc	-	CC199
+        		, "A120"	//String p_stat_cd			     		
+        		);
 
         //대석 등록
-        dntService.updateDistribution(dntVO);
+        //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가	-	2022-08-09
+        dntService.updateDistribution(dntVO
+        		, "조정진행관리>>조정진행목록>조정진행상세>기일등록>대석등록-수정"	//String p_code_desc	-	CC199
+        		, "A130"	//String p_stat_cd			대석등록-수정	        		
+        		);
                 
         /*
         AdjReqMgrVO arv = new AdjReqMgrVO();
@@ -375,7 +392,10 @@ public class DntController {
         dntService.updateAdrMgrDetailSn(dntVO);
         
         //대석 등록
-        dntService.updateDistribution(dntVO);
+        dntService.updateDistribution(dntVO
+        		, "조정진행관리>>조정진행목록>조정진행상세>기일등록>대석등록-수정"	//String p_code_desc	-	CC199
+        		, "A130"	//String p_stat_cd			대석등록-수정        		
+        		);
         
         //사건 상태정보 업데이트 해주기
         AdjReqMgrVO arv = new AdjReqMgrVO();
@@ -479,6 +499,17 @@ public class DntController {
     	jsonData = jsonData.replace("\\\\r\\\\n", "\\r\\n");	//리포트 내용에 줄바꿈 문자 변환 - pdf에서는 \\r\\n으로 넘겨야 줄바꿈이 정상 처리됨 
     	ozSchd.ozschdFileExport(ozrFilePath, jsonData, savePath, req);*/
     	
+    	
+    	//이력관리를 위한 adr_hstry_mgr 데이터 관리 추가	-	2022-08-09
+		//adr_hstry_mgr에 값 넣기	-	시작
+		adrHstryMgrService.insert4Func(result.getAdrSeq()
+				, "조정진행관리>>조정진행목록>조정진행상세>기일지정상세>출력"	//String p_code_desc	-	CC199
+    			, "V140"	//String p_stat_cd
+				, result.getFrstRegisterId() 
+				, result.getLastUpdusrId()
+				);
+		//adr_hstry_mgr에 값 넣기	-	끝		
+		
         return "/kccadr/adjPgrMgr/dnt/report/adrAppSlctReport";
     }
     

src/main/java/kcc/kccadr/adjPgrMgr/dtb/service/DtbService.java

@@ -10,9 +10,15 @@ public interface DtbService {
     
     DtbVO selectDistribution(DtbVO dtbVO) throws Exception;
     
-    int updateDistribution(DtbVO dtbVO) throws Exception;
+    int updateDistribution(DtbVO dtbVO
+			, String p_code_desc
+			, String p_stat_cd        		
+    		) throws Exception;
     
-    int insertDistribution(DtbVO dtbVO) throws Exception;
+    int insertDistribution(DtbVO dtbVO
+			, String p_code_desc
+			, String p_stat_cd        		
+    		) throws Exception;
     
     int deleteDistribution(DtbVO dtbVO) throws Exception;
     

src/main/java/kcc/kccadr/adjPgrMgr/dtb/service/impl/DtbServiceImpl.java

@@ -1,10 +1,13 @@
 package kcc.kccadr.adjPgrMgr.dtb.service.impl;
 
 import java.util.List;
+
 import javax.annotation.Resource;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Repository;
+
 import egovframework.rte.fdl.idgnr.EgovIdGnrService;
 import kcc.com.cmm.util.StringUtil;
 import kcc.kccadr.adjPgrMgr.dtb.service.AssVO;
@@ -12,6 +15,7 @@ import kcc.kccadr.adjPgrMgr.dtb.service.DeptUserVO;
 import kcc.kccadr.adjPgrMgr.dtb.service.DeptVO;
 import kcc.kccadr.adjPgrMgr.dtb.service.DtbService;
 import kcc.kccadr.adjPgrMgr.dtb.service.DtbVO;
+import kcc.kccadr.advc.service.impl.AdrHstryMgrDAO;
 import kcc.let.utl.fcc.service.EgovCryptoUtil;
 
 @Repository("dtbService")
@@ -32,6 +36,9 @@ public class DtbServiceImpl implements DtbService {
     @Resource(name = "egovCryptoUtil")
     EgovCryptoUtil egovCryptoUtil;
     
+	// 조정사건이력관리 DAO
+    @Resource(name = "adrHstryMgrDAO")
+    private AdrHstryMgrDAO adrHstryMgrDAO;
     
     @Override
     public List<DtbVO> selectDistributionList(DtbVO dtbVO) throws Exception {
@@ -52,8 +59,14 @@ public class DtbServiceImpl implements DtbService {
     
     
     @Override
-    public int updateDistribution(DtbVO dtbVO) throws Exception {
+    public int updateDistribution(DtbVO dtbVO
-        return insertDistribution(dtbVO);
+			, String p_code_desc
+			, String p_stat_cd        		
+    		) throws Exception {
+        return insertDistribution(dtbVO
+    			, p_code_desc
+    			, p_stat_cd    
+        		);
     }
     
     
@@ -61,7 +74,10 @@ public class DtbServiceImpl implements DtbService {
      * TODO daenge 출석인구분값넣기 (대석의 구분값)
      */
     @Override
-    public int insertDistribution(DtbVO dtbVO) throws Exception {
+    public int insertDistribution(DtbVO dtbVO
+			, String p_code_desc
+			, String p_stat_cd        		
+    		) throws Exception {
         
         
         dtbDAO.deleteDistribution_setp0(dtbVO);
@@ -112,7 +128,21 @@ public class DtbServiceImpl implements DtbService {
         }
         
         
-        return dtbDAO.updateDistribution_setp1(dtbVO);
+    	int rs	=	dtbDAO.updateDistribution_setp1(dtbVO);
+    	
+    	//이력관리를 위한 adr_hstry_mgr 데이터 관리 추가	-	2022-08-09
+		//adr_hstry_mgr에 값 넣기	-	시작    	
+		adrHstryMgrDAO.insert4Func(dtbVO.getAdrSeq()
+				//, "상태코드수정"
+				, p_code_desc
+				//, adjReqMgrVO.getStatCd()
+				, p_stat_cd
+				
+				, dtbVO.getFrstRegisterId() 
+				, dtbVO.getLastUpdusrId());
+		//adr_hstry_mgr에 값 넣기	-	끝
+    	
+    	return rs;
     }
     
     

src/main/java/kcc/kccadr/adjPgrMgr/dtb/web/DtbController.java

@@ -227,7 +227,13 @@ public class DtbController {
             dtbVO.setFrstRegisterId(userId);
             dtbVO.setLastUpdusrId(userId);
             
-            dtbService.insertDistribution(dtbVO);
+			//조정사건결재 내용 추가해주기
+			//이력관리를 위한 adr_hstry_mgr 데이터 관리 추가	-	2022-08-09
+            dtbService.insertDistribution(dtbVO
+        			, "조정진행관리>>조정진행목록>조정결재상세>조정부지정>배당결재요청"	//String p_code_desc	-	CC199
+        			, "A100"	//String p_stat_cd			배당결재요청        			
+            		);
+            
             
             /* 조정부 등록
             AdjReqMgrVO arv = new AdjReqMgrVO();
@@ -266,7 +272,10 @@ public class DtbController {
                     dtbVO.setAdrSn("1"); // 없으면 무조건 1회차
                 }
                 
-                dtbService.insertDistribution(dtbVO);
+                dtbService.insertDistribution(dtbVO
+            			, "조정진행관리>>조정진행목록>조정결재상세>조정부지정>배당결재요청"	//String p_code_desc	-	CC199
+            			, "A100"	//String p_stat_cd			배당결재요청        	                		
+                		);
                 
                 /* 조정부등록
                 AdjReqMgrVO arv = new AdjReqMgrVO();
@@ -307,7 +316,10 @@ public class DtbController {
         dtbVO.setLastUpdusrId(userId);
         
         
-        dtbService.updateDistribution(dtbVO);
+        dtbService.updateDistribution(dtbVO
+    			, "조정진행관리>>조정진행목록>조정결재상세>조정부지정>배당결재요청-수정"	//String p_code_desc	-	CC199
+    			, "A110"	//String p_stat_cd			배당결재요청        	        		
+        		);
         
         
         modelAndView.addObject("result", "success");

src/main/java/kcc/kccadr/advc/service/AdrHstryMgrVO.java

@@ -34,6 +34,10 @@ public class AdrHstryMgrVO extends ComDefaultVO implements Serializable {
 	//추가항목
 	private String codeNm;			//코드명
 	
+	private String aCodeNm;			//코드명(관리자)
+	private String cCodeNm;			//코드명(사용자)
+	private String eCodeNm;			//코드명(추가된)
+	
 	
 	public String getAdrSeq() {
 		return adrSeq;
@@ -119,6 +123,24 @@ public class AdrHstryMgrVO extends ComDefaultVO implements Serializable {
 	public void setCodeNm(String codeNm) {
 		this.codeNm = codeNm;
 	}
+	public String getaCodeNm() {
+		return aCodeNm;
+	}
+	public void setaCodeNm(String aCodeNm) {
+		this.aCodeNm = aCodeNm;
+	}
+	public String getcCodeNm() {
+		return cCodeNm;
+	}
+	public void setcCodeNm(String cCodeNm) {
+		this.cCodeNm = cCodeNm;
+	}
+	public String geteCodeNm() {
+		return eCodeNm;
+	}
+	public void seteCodeNm(String eCodeNm) {
+		this.eCodeNm = eCodeNm;
+	}
 	
 	
 }

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

@@ -172,7 +172,7 @@ public class AprvlMgrController {
 			//조정사건결재 내용 추가해주기
 			//이력관리를 위한 adr_hstry_mgr 데이터 관리 추가	-	2022-08-09
 			i = aprvlMgrService.insertAdrSbmtMgr(aprvlMgrVO
-        			, "조정진행관리>>조정진행목록>조정진행상세>접수결재요청"	//String p_code_desc	-	CC199
+        			, "조정진행관리>>조정진행목록>조정진행상세>결재요청"	//String p_code_desc	-	CC199
         			, "A070"	//String p_stat_cd 					
 					);						
 			
@@ -193,7 +193,7 @@ public class AprvlMgrController {
 				
 				//이력관리를 위한 adr_hstry_mgr 데이터 관리 추가	-	2022-08-09
 				i = aprvlMgrService.insertAdrSbmtDetailMgr(aprvlMgrVO
-	        			, "조정진행관리>>조정진행목록>조정진행상세>접수결재요청-조정부"	//String p_code_desc	-	CC199
+	        			, "조정진행관리>>조정진행목록>조정진행상세>결재요청-조정부"	//String p_code_desc	-	CC199
 	        			, "A080"	//String p_stat_cd						
 						);
 			}

src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/dnt/Dnt_SQL_Mysql.xml

@@ -104,7 +104,42 @@
 		  AND ADR_SN 	= #adrSn#		  
 		  AND APP_SEQ 	= #appSeq#
 	</update>
-	
+
+	<update id="Dnt.insertAdrAssHstry" parameterClass="kcc.kccadr.adjPgrMgr.dnt.service.DntVO">
+		INSERT INTO adr_ass_hstry ( 
+			ass_hstry_seq
+			
+			,adr_seq
+			,adr_sn
+			,ass_seq
+			
+			,add_usr_id
+			
+			,frst_regist_pnttm
+			,frst_register_id
+			 
+			)
+			SELECT a.ass_hstry_seq
+				, b.adr_seq
+				, b.adr_sn
+				, b.ass_seq
+				, b.add_usr_id
+				, b.frst_regist_pnttm
+				, b.frst_register_id
+			FROM (           
+			        SELECT IFNULL(MAX(ass_hstry_seq),0)+1 ass_hstry_seq
+			        FROM adr_ass_hstry   
+			      )a,
+			      (
+			        SELECT adr_seq, adr_sn, ass_seq, add_usr_id, SYS_DATETIME as frst_regist_pnttm, #lastUpdusrId# as frst_register_id
+			        FROM ADR_ASS_MGR
+			        WHERE ADR_SEQ   = #adrSeq#
+			          AND ADR_SN    = #adrSn#
+			          AND ASS_SEQ   = #assSeq#      
+			      )b
+      			
+    </update>
+    	
 	<update id="updateDistribution" parameterClass="kcc.kccadr.adjPgrMgr.dnt.service.DntVO">
 		UPDATE ADR_ASS_MGR SET
               ADD_USR_ID  = #addUsrId#

src/main/resources/egovframework/sqlmap/kccadr/advc/AdrHstryMgr_SQL_Cubrid.xml

@@ -109,15 +109,29 @@
 	<select id="AdrHstryMgrDAO.selectList" parameterClass="AdrHstryMgrVO" resultClass="AdrHstryMgrVO">
 		SELECT			
 			<include refid="AdrHstryMgrDAO.select_column_name"/>
-			, c.code_nm	AS	codeNm
+			, c.code_nm	AS	aCodeNm		/*관리자 코드값*/
+			, d.code_nm	AS	cCodeNm		/*사용자 코드값*/
+			, e.code_nm	AS	eCodeNm		/*추가된 기타 명칭*/
 		FROM 
 			<include refid="AdrHstryMgrDAO.table_name"/> a
         		LEFT OUTER JOIN lettccmmndetailcode c
 						ON (
-						c.code_id='CC022'
+						c.code_id='CC013'
 						and
 						a.menu_id=c.code
-						)			
+						)
+        		LEFT OUTER JOIN lettccmmndetailcode d
+						ON (
+						d.code_id='CC022'
+						and
+						a.menu_id=d.code
+						)		
+        		LEFT OUTER JOIN lettccmmndetailcode e
+						ON (
+						e.code_id='CC199'
+						and
+						a.menu_id=e.code
+						)																	
 		WHERE
 			1=1
 		<isNotEmpty property="adrSeq">

src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab2.jsp

@@ -101,7 +101,8 @@
 					<colgroup>
 						<col style="width: 15%">
 						<col style="width: auto;">
-						<col style="width: 30%;">
+						<col style="width: 15%;">
+						<col style="width: 7%;">
 					</colgroup>
 					<thead>
 						<tr>
@@ -110,13 +111,15 @@
 <!-- 								<button type="button" class="btn_sort">▲</button> -->
 							</th>
 							<th>진행현황</th>
-							<th>비고</th>
+							<th>비고1</th>
+							<th>비고2</th>
 						</tr>
 					</thead>
 					<tbody>
 						<c:forEach var="list" items="${list_mgr}" varStatus="status">
 						
 						
+							<c:if test="${not fn:contains(list.menuId,'V')}">
 							
 					        	<tr>
 					                <td>
@@ -127,15 +130,23 @@
 					                </td>
 					                <td>
 					                	<p>
-					                		<c:out value="${list.codeNm}" />
+					                		<c:out value="${list.aCodeNm}" />
+						                		<c:if test="${empty list.aCodeNm}">
+						                			<c:out value="${list.eCodeNm}" />
+						                		</c:if>
+					                		
+					                	</p>
+									</td>					                
+					                <td>
+					                	<p>
 					                		<c:if test="${not empty list.menuId}">
-					                			(<c:out value="${list.menuId}" />)
+					                			<c:out value="${list.menuId}" />
 					                		</c:if>
 					                		
 					                	</p>
 									</td>
 					            </tr>
-					             
+					        </c:if>     
         						
 						</c:forEach>
 						<c:if test="${empty list_mgr}">

src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ans/ansSubmit.jsp

@@ -104,8 +104,9 @@
 
 	}
 	
-	function listPage(){
+	function listPage(){		
-		location.href="<c:url value='/web/kccadr/accdnt/ars/adjstReqStatusDetail.do'/>";
+		//location.href="<c:url value='/web/kccadr/accdnt/ars/adjstReqStatusDetail.do'/>";
+		fncGoList();
 	}
 </script>
 </head>