2022-09-16 10:03 되돌리기 기능 개발

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

@@ -73,6 +73,8 @@ import kcc.kccadr.adjst.service.AdjstReqService;
 import kcc.kccadr.adjst.service.AdjstReqVO;
 import kcc.kccadr.advc.service.AdrHstryMgrService;
 import kcc.kccadr.advc.service.AdrHstryMgrVO;
+import kcc.kccadr.advc.service.impl.AdrHstryMgrDAO;
+import kcc.kccadr.advc.service.impl.AdrHstryMgrDetailDAO;
 import kcc.kccadr.cmm.KccadrConstants;
 import kcc.kccadr.kccadrCom.service.KccadrCommonSearchVO;
 import kcc.kccadr.kccadrCom.service.KccadrCommonService;
@@ -201,6 +203,13 @@ public class ApmController {
     @Value("#{globalSettings['Globals.prod.islocal']}")
     public void setIslocal(String path) { islocal = path; }
 
+	//조정 사건 이력 관리
+    @Resource(name = "adrHstryMgrDAO")
+    private AdrHstryMgrDAO adrHstryMgrDAO;
+
+	//조정 사건 이력 상세 관리  
+    @Resource(name = "adrHstryMgrDetailDAO")
+    private AdrHstryMgrDetailDAO adrHstryMgrDetailDAO;
     
     /**
      * 조정진행목록 목록
@@ -1571,7 +1580,49 @@ public class ApmController {
         return "/kccadr/adjPgrMgr/apm/apmTab2";
     }
     
+    /**
+     * 되돌리기 Ajax
+     *
+     * @param 
+     * @param model
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "apmTab2CancelAjax.do")
+    public ModelAndView apmTab2CancelAjax(
+    		AdrHstryMgrVO adrHstryMgrVO
+    		, ModelMap model) throws Exception {
 
+        ModelAndView modelAndView = new ModelAndView();
+        modelAndView.setViewName("jsonView");
+
+        LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null;
+        String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
+        try {
+        	System.out.println(adrHstryMgrVO.toString());
+        	//단계 리스트 가져오기
+        	List<AdrHstryMgrVO> adrHstryMgrVOList	=	adrHstryMgrDAO.selectCancelList(adrHstryMgrVO);
+        	
+        	//단계별 상세 처리 가져오기
+        	List<AdrHstryMgrVO> adrHstryMgrDetailVOList	=	adrHstryMgrDetailDAO.selectCancelList(adrHstryMgrVO);
+        	
+        	/*
+        	//이력관리를 위한 adr_hstry_mgr 데이터 관리 추가	-	2022-08-09
+        	apmService.updateApprYn(corretVO
+        			, "조정진행관리>>조정진행목록>조정진행상세>사건문서>경정신청>P>경정상세-처리"	//String p_code_desc	-	CC199
+        			, "A250"	//String p_stat_cd		-	경정처리     			
+        			);
+        			*/
+
+            modelAndView.addObject("result", "success");
+		} catch (Exception e) {
+			System.out.println("exception!!");
+			modelAndView.addObject("result", "fail");
+		}
+        
+        return modelAndView;
+
+    }
     
     /**
      * 조정진행정보 상세

src/main/java/kcc/kccadr/adjreqmgr/service/impl/AdjReqMgrServiceImpl.java

@@ -378,8 +378,13 @@ public class AdjReqMgrServiceImpl   extends EgovAbstractServiceImpl implements A
 			, String p_adrHstryMgrSeq
 			) throws Exception {    	
 		// 결제 테이블에 상태 변경
+		
+		System.out.println("searchVO.getAdrSeq()============");
+		System.out.println(searchVO.getAdrSeq());
+		
 		int rs = adjReqMgrDAO.updateAdjReqPaymentConfirm(searchVO);
 		
+		System.out.println(searchVO.getAdrSeq());
 		
         //이력관리를 위한 adr_hstry_mgr_detail -	2022-09-07	serviceImpl	#1
     	//이력관리를 위한 adr_hstry_mgr 데이터 관리 추가	-	2022-08-09
@@ -397,7 +402,7 @@ public class AdjReqMgrServiceImpl   extends EgovAbstractServiceImpl implements A
 				, p_adrHstryMgrSeq	//, String p_adrHstryMgrSeq
 				, "U"	//, String p_useCd		I/U/UI/II/RE
 				, "ADR_APPR_MGR"	//, String p_tableName
-				, "	SET	APPR_YN = 'N'	WHERE	1=1	AND	adr_seq='"+searchVO.getAdrSeq()+"'	AND adr_sn='"+searchVO.getAdrSn()+"'	"	//, String p_updateQuery
+				, ""	//, String p_updateQuery
 				
 				);
 		
@@ -425,7 +430,7 @@ public class AdjReqMgrServiceImpl   extends EgovAbstractServiceImpl implements A
 					, p_adrHstryMgrSeq	//, String p_adrHstryMgrSeq
 					, "U"	//, String p_useCd		I/U/UI/II/RE
 					, "ADR_MGR_MASTER"	//, String p_tableName
-					, "	SET	ADR_COST = ''	,ADR_PAY_YN = 'N'	WHERE	1=1	AND	adr_seq='"+searchVO.getAdrSeq()+"'	"	//, String p_updateQuery
+					, ""	//, String p_updateQuery
 					
 					);
 			//adr_hstry_mgr에 값 넣기	-	끝

src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java

@@ -673,6 +673,8 @@ public class AdjReqMgrController {
 		//이력관리를 위한 adr_hstry_mgr_detail -	2022-09-07	controller	#1	
 		String s_adrHstryMgrSeq	=	adrHstryMgrSeqGnrService.getNextStringId();
 		
+		System.out.println("s_adrHstryMgrSeq===================");
+		System.out.println(s_adrHstryMgrSeq);
 		
 		//이력관리를 위한 adr_hstry_mgr 데이터 관리 추가	-	2022-08-09
 		//이력관리를 위한 adr_hstry_mgr_detail -	2022-09-07	controller	#3

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

@@ -22,5 +22,6 @@ public interface AdrHstryMgrDetailService {
 	//L page
 	List<AdrHstryMgrVO> selectPagingList(AdrHstryMgrVO adrHstryMgrVO) throws Exception;
 	
-		
+	//L
+	List<AdrHstryMgrVO> selectCancelList(AdrHstryMgrVO adrHstryMgrVO) throws Exception;		
 }

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

@@ -36,5 +36,6 @@ public interface AdrHstryMgrService {
 	//L page
 	List<AdrHstryMgrVO> selectPagingList(AdrHstryMgrVO adrHstryMgrVO) throws Exception;
 	
-		
+	//L
+	List<AdrHstryMgrVO> selectCancelList(AdrHstryMgrVO adrHstryMgrVO) throws Exception;		
 }

src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrDAO.java

@@ -92,11 +92,6 @@ public class AdrHstryMgrDAO extends EgovAbstractDAO {
 		
 		AdrHstryMgrVO adrHstryMgrVO = new AdrHstryMgrVO();
 
-		//개별 액션 단독 저장인 경우
-		if ("".equals(p_adrHstryMgrSeq)) {
-			p_adrHstryMgrSeq	=	adrHstryMgrSeqGnrService.getNextStringId();
-			
-			
 		adrHstryMgrVO.setAdrSeq(p_adrSeq);
 		adrHstryMgrVO.setMenuNm(p_menuNm);
 		adrHstryMgrVO.setMenuId(p_menuId);
@@ -106,10 +101,18 @@ public class AdrHstryMgrDAO extends EgovAbstractDAO {
 			adrHstryMgrVO.setFrstRegisterId(p_frstRegisterId);	
 		}
 		
+		
+		//개별 액션 단독 저장인 경우
+		if ("".equals(p_adrHstryMgrSeq)) {
+			p_adrHstryMgrSeq	=	adrHstryMgrSeqGnrService.getNextStringId();
+					
 			adrHstryMgrVO.setAdrHstryMgrSeq(p_adrHstryMgrSeq);
 			
 			insert("AdrHstryMgrDAO.insert", adrHstryMgrVO);
 					
+		}else {
+			adrHstryMgrVO.setAdrHstryMgrSeq(p_adrHstryMgrSeq);
+			
 		}
 				
 		//step2.조정사건이력관리상세번호	-	adr_hstry_mgr_detail	insert
@@ -194,4 +197,9 @@ public class AdrHstryMgrDAO extends EgovAbstractDAO {
 	}
 	*/
 	
+	//L
+	public List<AdrHstryMgrVO> selectCancelList(AdrHstryMgrVO adrHstryMgrVO) throws Exception {
+		List<AdrHstryMgrVO> tlist = (List<AdrHstryMgrVO>) list("AdrHstryMgrDAO.selectCancelList", adrHstryMgrVO);
+		return tlist;
+	}
 }

src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrDetailDAO.java

@@ -79,4 +79,9 @@ public class AdrHstryMgrDetailDAO extends EgovAbstractDAO {
 	}
 	*/
 
+	//L
+	public List<AdrHstryMgrVO> selectCancelList(AdrHstryMgrVO adrHstryMgrVO) throws Exception {
+		List<AdrHstryMgrVO> tlist = (List<AdrHstryMgrVO>) list("AdrHstryMgrDetailDAO.selectCancelList", adrHstryMgrVO);
+		return tlist;
+	}
 }

src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrDetailServiceImpl.java

@@ -58,6 +58,9 @@ public class AdrHstryMgrDetailServiceImpl implements AdrHstryMgrDetailService {
 	}
 	*/
 
-
+	//List
+	public List<AdrHstryMgrVO> selectCancelList(AdrHstryMgrVO adrHstryMgrVO) throws Exception{
+		return adrHstryMgrDetailDAO.selectCancelList(adrHstryMgrVO);
+	}
 
 }

src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrServiceImpl.java

@@ -93,6 +93,9 @@ public class AdrHstryMgrServiceImpl implements AdrHstryMgrService {
 	}
 	*/
 
-
+	//List
+	public List<AdrHstryMgrVO> selectCancelList(AdrHstryMgrVO adrHstryMgrVO) throws Exception{
+		return adrHstryMgrDAO.selectCancelList(adrHstryMgrVO);
+	}
 
 }

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

@@ -35,6 +35,12 @@ public interface AprvlMgrService {
 			) throws Exception;
 	
 	
+	/*2022-09-14
+	 * 결재선 이력 남기기용
+	 * */
+	AprvlMgrVO select4InsertAdrSbmtMgr(AprvlMgrVO aprvlMgrVO) throws Exception;
+	
+	
 	AprvlMgrVO selectDetail(AprvlMgrVO aprvlMgrVO) throws Exception;
 
 	int update(AprvlMgrVO aprvlMgrVO) throws Exception;

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

@@ -41,6 +41,18 @@ public class AprvlMgrDAO extends EgovAbstractDAO {
 		return update("AprvlMgrDAO.insertAdrSbmtDetailMgr", aprvlMgrVO);
 	}
 	
+	
+	/*2022-09-14
+	 * 결재선 이력 남기기용
+	 * */
+	public AprvlMgrVO select4InsertAdrSbmtMgr(AprvlMgrVO aprvlMgrVO) throws Exception {
+		return (AprvlMgrVO) select("AprvlMgrDAO.select4InsertAdrSbmtMgr", aprvlMgrVO);
+	}
+	
+	public int insertAdrSbmtMgrWithSelectedData(AprvlMgrVO aprvlMgrVO) throws Exception {
+		return update("AprvlMgrDAO.insertAdrSbmtMgrWithSelectedData", aprvlMgrVO);
+	}
+	
 	/**
 	 * 주소록 상세보기
 	 * @param addrVO

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

@@ -44,7 +44,20 @@ public class AprvlMgrServiceImpl  extends EgovAbstractServiceImpl implements Apr
 			, String p_stat_cd    	
 			, String p_adrHstryMgrSeq
 			) throws Exception {
+		
+		//step0.조정부 대상 값을 가져온다.
+		AprvlMgrVO aprvlMgrVOtmp	=	aprvlMgrDAO.select4InsertAdrSbmtMgr(aprvlMgrVO);
+		
+		
+		//step1.가져온 값으로 저장
+		int rs	=	aprvlMgrDAO.insertAdrSbmtMgrWithSelectedData(aprvlMgrVOtmp);
+		
+		//sbmt seq 데이터 저장
+		aprvlMgrVO.setSbmtSeq(aprvlMgrVOtmp.getSbmtSeq());
+		
+		/*
     	int rs	=	aprvlMgrDAO.insertAdrSbmtMgr(aprvlMgrVO);
+    	*/
 		
     	//이력관리를 위한 adr_hstry_mgr 데이터 관리 추가	-	2022-08-09
 		//adr_hstry_mgr에 값 넣기	-	시작    	
@@ -80,6 +93,7 @@ public class AprvlMgrServiceImpl  extends EgovAbstractServiceImpl implements Apr
 		//없으면 1 리턴
     	int rs	=	aprvlMgrDAO.insertAdrSbmtDetailMgr(aprvlMgrVO);
     	
+    	
     	//이력관리를 위한 adr_hstry_mgr 데이터 관리 추가	-	2022-08-09
 		//adr_hstry_mgr에 값 넣기	-	시작    	
 		adrHstryMgrDAO.insert4Func(aprvlMgrVO.getAdrSeq()
@@ -103,6 +117,12 @@ public class AprvlMgrServiceImpl  extends EgovAbstractServiceImpl implements Apr
     	return rs;
 	}
 	
+	/*2022-09-14
+	 * 결재선 이력 남기기용
+	 * */
+	public AprvlMgrVO select4InsertAdrSbmtMgr(AprvlMgrVO aprvlMgrVO) throws Exception {
+		return aprvlMgrDAO.select4InsertAdrSbmtMgr(aprvlMgrVO);
+	}
 	
 	public AprvlMgrVO selectDetail(AprvlMgrVO aprvlMgrVO) throws Exception {
 		return aprvlMgrDAO.selectDetail(aprvlMgrVO);

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

@@ -194,4 +194,16 @@
 		WHERE
 			a.adr_seq				=	#adrSeq#
 	</select>
+	
+	<!-- 취소 상세 리스트 L -->
+	<select id="AdrHstryMgrDetailDAO.selectCancelList" parameterClass="AdrHstryMgrVO" resultClass="AdrHstryMgrVO">
+		SELECT
+			<include refid="AdrHstryMgrDetailDAO.select_column_name"/>
+		FROM 
+			<include refid="AdrHstryMgrDetailDAO.table_name"/> a
+		WHERE
+			a.adr_seq				=	#adrSeq#
+			AND	a.adr_hstry_mgr_seq	=	#adrHstryMgrSeq#
+		
+	</select>	
 </sqlMap>

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

@@ -187,4 +187,17 @@
 					
 	</select>			 
 
+	<!-- 취소 대상 리스트 L -->
+	<select id="AdrHstryMgrDAO.selectCancelList" parameterClass="AdrHstryMgrVO" resultClass="AdrHstryMgrVO">
+		SELECT
+			<include refid="AdrHstryMgrDAO.select_column_name"/>
+		FROM 
+			<include refid="AdrHstryMgrDAO.table_name"/> a
+		WHERE
+			a.adr_seq				=	#adrSeq#
+			AND	a.adr_hstry_mgr_seq	>=	#adrHstryMgrSeq#
+									
+		ORDER BY a.adr_hstry_mgr_seq
+					
+	</select>
 </sqlMap>

src/main/resources/egovframework/sqlmap/kccadr/aprvl/AprvlMgr_SQL_Mysql.xml

@@ -262,6 +262,204 @@
         	AND (TRIM(aaaa.sbmt_id6)!='50' or aaaa.sbmt_id6 IS null)		
 	</insert>
 	
+	<!-- 조정사건결재등록 C -->
+	<insert id="AprvlMgrDAO.insertAdrSbmtMgrWithSelectedData" parameterClass="aprvlMgrVO">
+		INSERT INTO <include refid="AprvlMgrDAO.table_name"/> (
+			<include refid="AprvlMgrDAO.column_name"/>
+		
+		)VALUES(
+			#adrSeq#
+					,#adrSn#
+					,#sbmtSeq#
+					,#sbmtTy#
+					,#sbmtMemTy#
+					,#sbmtStepCnt#
+					
+					,#sbmtId1#
+					,#sbmtYn1#
+					,#sbmtDe1#
+					
+					,#sbmtId2#
+					,#sbmtYn2#
+					,#sbmtDe2#
+					
+					,#sbmtId3#
+					,#sbmtYn3#
+					,#sbmtDe3#
+					
+					,#sbmtId4#
+					,#sbmtYn4#
+					,#sbmtDe4#
+					
+					,#sbmtId5#
+					,#sbmtYn5#
+					,#sbmtDe5#
+					
+					,#sbmtId6#
+					,#sbmtYn6#
+					,#sbmtDe6#
+					
+					,#frstRegistPnttm#
+					,#frstRegisterId#	
+					,#lastUpdtPnttm#
+					,#lastUpdusrId# 
+		)	
+	</insert>	
+	
+	<!-- 주소록 무료대행 등록 R -->
+	<select id="AprvlMgrDAO.select4InsertAdrSbmtMgr" parameterClass="aprvlMgrVO" resultClass="aprvlMgrVO">
+		SELECT *
+		FROM (
+				SELECT adr_seq										AS	adrSeq
+					, adr_sn										AS	adrSn
+					, MAX(sbmt_seq) 								AS	sbmtSeq
+					, MAX(sbmt_ty_cd) 								AS	sbmtTy
+					, #sbmtMemTy# 	/*	10- 조정종결만 */				AS	sbmtMemTy
+					, MAX(sbmt_line_cnt) 							AS	sbmtStepCnt
+					, MAX(IF(num=1,IFNULL(sbmt_id, IFNULL(mem_seq, sbmt_grade_cd1)),null)) AS	sbmtId1
+					, IF(MAX(sbmt_line_cnt)>=1,'A',null) 			AS	sbmtYn1
+					, null 											AS	sbmtDe1
+					
+					, MAX(IF(num=2,IFNULL(sbmt_id, IFNULL(mem_seq, sbmt_grade_cd2)),null)) AS	sbmtId2
+					, IF(MAX(sbmt_line_cnt)>=2,'A',null) 			AS	sbmtYn2
+					, null 											AS	sbmtDe2
+					
+					, MAX(IF(num=3,IFNULL(sbmt_id, IFNULL(mem_seq, sbmt_grade_cd3)),null)) AS	sbmtId3
+					, IF(MAX(sbmt_line_cnt)>=3,'A',null) 			AS	sbmtYn3
+					, null 											AS	sbmtDe3
+					
+					, MAX(IF(num=4,IFNULL(sbmt_id, IFNULL(mem_seq, sbmt_grade_cd4)),null)) AS	sbmtId4
+					, IF(MAX(sbmt_line_cnt)>=4,'A',null) 			AS	sbmtYn4
+					, null 											AS	sbmtDe4
+					
+					, MAX(IF(num=5,IFNULL(sbmt_id, IFNULL(mem_seq, sbmt_grade_cd5)),null)) AS	sbmtId5
+					, IF(MAX(sbmt_line_cnt)>=5,'A',null) 			AS	sbmtYn5
+					, null 											AS	sbmtDe5
+					
+					, MAX(IF(num=6,IFNULL(sbmt_id, IFNULL(mem_seq, sbmt_grade_cd6)),null)) AS	sbmtId6
+					, IF(MAX(sbmt_line_cnt)>=6,'A',null) 			AS	sbmtYn6
+					, null 											AS	sbmtDe6
+					
+					,NOW()											AS	frstRegistPnttm
+					,#frstRegisterId#								AS	frstRegisterId	
+					,null											AS	lastUpdtPnttm
+					,null											AS	lastUpdusrId 
+						       
+				FROM (
+								SELECT 
+									 #adrSeq# adr_seq
+								    , #adrSn# adr_sn 
+									, cc.*
+									
+        				, CONCAT(
+								IF(num=1, 
+								  		  	IF(sbmt_grade_cd1='10', IFNULL(usr_101050, bb.sbmt_id) , bb.sbmt_id),''
+										)
+								, IF(num=2, 
+								  		  	IF(sbmt_grade_cd2='10', IFNULL(usr_101050, bb.sbmt_id) , bb.sbmt_id),''
+										)
+								, IF(num=3, 
+								  		  	IF(sbmt_grade_cd3='10', IFNULL(usr_101050, bb.sbmt_id) , bb.sbmt_id),''
+										)
+								, IF(num=4, 
+								  		  	IF(sbmt_grade_cd4='10', IFNULL(usr_101050, bb.sbmt_id) , bb.sbmt_id),''
+										)
+								, IF(num=5, 
+								  		  	IF(sbmt_grade_cd5='10', IFNULL(usr_101050, bb.sbmt_id) , bb.sbmt_id),''
+										)
+								, IF(num=6, 
+								  		  	IF(sbmt_grade_cd6='10', IFNULL(usr_101050, bb.sbmt_id) , bb.sbmt_id),''
+										)
+								) sbmt_id 									
+								
+								/*	
+									, bb.sbmt_id
+									*/
+									
+									, aa.*
+									, dd.*
+								FROM (
+											SELECT b.*
+												,a.*
+											FROM adr_sbmt_line_mgr a	/*기준 결재선 */
+												, (
+														SELECT 1 AS NUM  
+													UNION ALL SELECT 2
+													UNION ALL SELECT 3
+													UNION ALL SELECT 4
+													UNION ALL SELECT 5
+													UNION ALL SELECT 6
+												)b
+											WHERE 1=1
+												AND a.sbmt_ty_cd=#sbmtTyCd#
+												AND a.sbmt_line_cnt>=b.NUM
+											)aa
+											
+											LEFT OUTER JOIN adr_sbmt_grade_mgr bb	/*	기본 결재자 연결 */
+											ON(
+												 (aa.sbmt_grade_cd1=bb.sbmt_grade_cd AND aa.num=1)
+											OR (aa.sbmt_grade_cd2=bb.sbmt_grade_cd AND aa.num=2)
+											OR (aa.sbmt_grade_cd3=bb.sbmt_grade_cd AND aa.num=3)
+											OR (aa.sbmt_grade_cd4=bb.sbmt_grade_cd AND aa.num=4)
+											OR (aa.sbmt_grade_cd5=bb.sbmt_grade_cd AND aa.num=5)
+											OR (aa.sbmt_grade_cd6=bb.sbmt_grade_cd AND aa.num=6)
+											)
+											
+											LEFT OUTER JOIN (
+																		SELECT c.mem_grade, d.mem_seq
+																		FROM adr_mgr_detail a
+																			, adr_mem_dept_mgr b
+																			, adr_mem_dept_map c
+																			, adr_mem_mgr d
+																		WHERE a.adr_seq=#adrSeq#
+																			AND a.adr_sn=#adrSn#
+																			AND a.mem_dept_seq=b.mem_dept_seq
+																			AND b.mem_dept_seq=c.mem_dept_seq
+																			AND c.mem_grade='01'
+																			AND c.mem_seq=d.mem_seq
+									
+											) cc
+											ON(
+												 (aa.sbmt_grade_cd1='50' AND cc.mem_grade='01' AND aa.num=1)
+											OR (aa.sbmt_grade_cd2='50' AND cc.mem_grade='01' AND aa.num=2)
+											OR (aa.sbmt_grade_cd3='50' AND cc.mem_grade='01' AND aa.num=3)
+											OR (aa.sbmt_grade_cd4='50' AND cc.mem_grade='01' AND aa.num=4)
+											OR (aa.sbmt_grade_cd5='50' AND cc.mem_grade='01' AND aa.num=5)
+											OR (aa.sbmt_grade_cd6='50' AND cc.mem_grade='01' AND aa.num=6)
+											)
+											
+											/* 조정부장 연결	 */
+											
+											,(
+											SELECT IFNULL(MAX(sbmt_seq),0)+1 sbmt_seq
+											FROM adr_sbmt_mgr
+											WHERE adr_seq=#adrSeq#
+												AND adr_sn=#adrSn#
+											)dd
+											
+	           								LEFT OUTER JOIN (
+	           
+													SELECT MAX(last_updusr_id) usr_101050													
+													FROM adr_hstry a
+													WHERE adr_seq=#adrSeq#
+														AND stat_cd='101050'           
+	           
+	           								)ee ON (1=1)  											
+											
+				
+					)aaa
+				GROUP BY adr_seq, adr_sn				
+		)aaaa
+        WHERE 1=1
+        	AND (TRIM(aaaa.sbmtId1)!='50' or aaaa.sbmtId1 IS null) 
+        	AND (TRIM(aaaa.sbmtId2)!='50' or aaaa.sbmtId2 IS null)
+        	AND (TRIM(aaaa.sbmtId3)!='50' or aaaa.sbmtId3 IS null)
+        	AND (TRIM(aaaa.sbmtId4)!='50' or aaaa.sbmtId4 IS null)
+        	AND (TRIM(aaaa.sbmtId5)!='50' or aaaa.sbmtId5 IS null)
+        	AND (TRIM(aaaa.sbmtId6)!='50' or aaaa.sbmtId6 IS null)	
+						
+	</select>	
+	
 		<!-- 조정사건조정부등록 C -->
 	<insert id="AprvlMgrDAO.insertAdrSbmtDetailMgr" parameterClass="aprvlMgrVO">
 		INSERT INTO adr_sbmt_detail_mgr (

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

@@ -18,10 +18,67 @@
 <script src="/kccadrPb/usr/script/popup.js"></script>
 <script type="text/javaScript" language="javascript">
 
+function fncCancelDo(p_a, p_b){
+		
+	var message = "해당 상태까지 취소 처리합니까?";
+	
+//	alert(p_a);
+	
+	if(confirm(message)){
+		
+		var data = new FormData(document.getElementById("listForm"));
+		data.append("adrSeq", p_a);
+		data.append("adrHstryMgrSeq", p_b);
+		
+		
+		$.ajax({
+			type: "POST",
+			url: "/kccadr/adjPgrMgr/apm/apmTab2CancelAjax.do",
+			
+			data : data,
+			dataType : 'json',
+			async : false,
+			processData : false,
+			contentType : false,
+			cache : false,
+            
+			success: function (returnData, status) {
+				if(status == 'success'){
+					
+					var result = returnData.result
+					
+					if(result == 'loginFail'){
+						
+						alert("로그인을 해주세요.");
+						
+					}
+					
+					if(result == 'fail'){						
+						alert("취소중 오류가 발생하였습니다.");
+						return false;
+						
+					}else{						
+						alert("취소 처리가 완료되었습니다.");							
+						return false;						
+						
+					}
+					
+				} else if(status == 'fail') {
+					alert("처리중 오류가 발생하였습니다.");
+				}
+			},
+			error: function (e) {
+			}
+		});
+		
+	}
+	
+}
+
 </script>
 </head>
 <body>
-	<form:form id="tabForm2" onsubmit="return false;" method="post">
+	
 		<!-- //cont_tit -->
 		<div class="tab_cont on">
 
@@ -103,6 +160,7 @@
 						<col style="width: auto;">
 						<col style="width: 15%;">
 						<col style="width: 7%;">
+						<col style="width: 7%;">
 					</colgroup>
 					<thead>
 						<tr>
@@ -113,6 +171,7 @@
 							<th>진행현황</th>
 							<th>비고1</th>
 							<th>비고2</th>
+							<th>비고3</th>
 						</tr>
 					</thead>
 					<tbody>
@@ -143,6 +202,16 @@
 					                			<c:out value="${list.menuId}" />
 					                		</c:if>
 					                		
+					                	</p>
+									</td>
+					                <td>
+					                	<p>					                		
+					                		<c:if test="${fn:length(list.menuId) eq 6}">
+					                			<c:if test="${list.menuId*1 gt 200000}">
+					                				<a href="javascript:fncCancelDo('${list.adrSeq}','${list.adrHstryMgrSeq}');">취소</a>
+					                			</c:if>					                			
+					                		</c:if>
+					                		
 					                	</p>
 									</td>									
 					            </tr>
@@ -169,6 +238,10 @@
 			
 			
 		</div>
-	</form:form>
+	<form name="tabFormz2" onsubmit="return false;" method="post">
+		<input type="hidden" id="adrSeq" name="adrSeq" />
+		<input type="hidden" id="adrHstryMgrSeq" name="adrHstryMgrSeq" />
+	</form>
+	
 </body>
 </html>

src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp

@@ -48,7 +48,7 @@ content="default-src *; style-src 'self' 'unsafe-inline'; script-src 'self' 'uns
 <script type="text/javascript" src="<c:url value='/js/web_common.js'/>"></script>
 <script src="/kccadrPb/usr/script/postcode.js"></script>
 <!-- 다음 우편번호검색 js -->
-<script type="text/javascript" src="<c:url value='/js/kccadr/kccadrCom.js'/>"></script>
+<script type="text/javascript" src="<c:url value='/js/kccadr/kccadrCom.js?2'/>"></script>
 <%-- <script type="text/javascript" src="<c:url value='/js/kccadr/kccadrConstants.js'/>"></script> --%>
 <!-- 전자조정 공통 -->
 

src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep1.jsp

@@ -192,7 +192,7 @@ $( document ).ready(function(){
 									</c:choose>
 									
 									<label for="rpplEmail1${status.index}" class="label">이메일아이디 입력</label>
-									<form:input path="adjstRpplList[${status.index}].rpplEmail1" id="rpplEmail1${status.index}" value="${not empty emailSplit ? emailSplit[0] : ''}" size="20" cssClass="input_email" placeholder="이메일 입력" onkeyup="onlyAlphabetNumber(this)"/>@
+									<form:input path="adjstRpplList[${status.index}].rpplEmail1" id="rpplEmail1${status.index}" value="${not empty emailSplit ? emailSplit[0] : ''}" size="20" cssClass="input_email" placeholder="이메일 입력" onkeyup="onlyAlphabetNumberEmail(this)"/>@
 									<label for="rpplEmail2${status.index}" class="label">이메일공급자 입력</label>
 									<form:input path="adjstRpplList[${status.index}].rpplEmail2" id="rpplEmail2${status.index}" value="${not empty emailSplit ? emailSplit[1] : ''}" size="20" cssClass="input_email" placeholder="예) naver.com"/>
 									<label for="rpplEmailSelect${status.index}" class="label">이메일공급자 선택</label>
@@ -452,7 +452,7 @@ $( document ).ready(function(){
 									</c:choose>
 									
 									<label for="rpplEmail1${status.index}" class="label">이메일아이디 입력</label>
-									<form:input path="adjstRpplList[${status.index}].rpplEmail1" id="rpplEmail1${status.index}" value="${not empty emailSplit ? emailSplit[0] : ''}" size="20" onkeyup="onlyAlphabetNumber(this)"
+									<form:input path="adjstRpplList[${status.index}].rpplEmail1" id="rpplEmail1${status.index}" value="${not empty emailSplit ? emailSplit[0] : ''}" size="20" onkeyup="onlyAlphabetNumberEmail(this)"
 												cssClass="input_email" placeholder="이메일 입력"/>@
 									<label for="rpplEmail2${status.index}" class="label">이메일공급자 입력</label>
 									<form:input path="adjstRpplList[${status.index}].rpplEmail2" id="rpplEmail2${status.index}" value="${not empty emailSplit ? emailSplit[1] : ''}" size="20" cssClass="input_email" placeholder="예) naver.com"/>

src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep2.jsp

@@ -255,7 +255,7 @@
 							</th>
 							<td>
 								<label for="rpplEmail1" class="label">이메일아이디 입력</label>
-								<form:input path="rpplEmail1" size="20" cssClass="input_email" placeholder="이메일입력" onkeyup="onlyAlphabetNumber(this)"/>@
+								<form:input path="rpplEmail1" size="20" cssClass="input_email" placeholder="이메일입력" onkeyup="onlyAlphabetNumberEmail(this)"/>@
 								<label for="rpplEmail2" class="label">이메일공급자 입력</label>
 								<form:input path="rpplEmail2" size="20" cssClass="input_email" placeholder="ex) naver.com"/>
 
@@ -457,7 +457,7 @@
 								<td>
 									<c:set var="emailSplit" value="${fn:split(list.rpplEmail,'@')}" />
 									<label for="rpplEmail1${chgId}" class="label">이메일아이디 입력</label>
-									<form:input path="rpplEmail1" id="rpplEmail1${chgId}" value="${not empty emailSplit ? emailSplit[0] : ''}" size="20" cssClass="input_email" onkeyup="onlyAlphabetNumber(this)" placeholder="이메일입력"/>@
+									<form:input path="rpplEmail1" id="rpplEmail1${chgId}" value="${not empty emailSplit ? emailSplit[0] : ''}" size="20" cssClass="input_email" onkeyup="onlyAlphabetNumberEmail(this)" placeholder="이메일입력"/>@
 									<label for="rpplEmail2" class="label">이메일공급자 입력</label>
 									<form:input path="rpplEmail2" id="rpplEmail2${chgId}" value="${not empty emailSplit ? emailSplit[1] : ''}" size="20" cssClass="input_email" placeholder="ex) naver.com"/>
 									<label for="rpplEmailSelect${status.index}" class="label">이메일공급자 선택</label>