diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java index ac88b541..e8b5fe4c 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/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; @@ -200,8 +202,15 @@ public class ApmController { private static String islocal; // /pdf/out/ @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 adrHstryMgrVOList = adrHstryMgrDAO.selectCancelList(adrHstryMgrVO); + + //단계별 상세 처리 가져오기 + List 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; + + } /** * 조정진행정보 상세 diff --git a/src/main/java/kcc/kccadr/adjreqmgr/service/impl/AdjReqMgrServiceImpl.java b/src/main/java/kcc/kccadr/adjreqmgr/service/impl/AdjReqMgrServiceImpl.java index c6fd1de1..7ad91727 100644 --- a/src/main/java/kcc/kccadr/adjreqmgr/service/impl/AdjReqMgrServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjreqmgr/service/impl/AdjReqMgrServiceImpl.java @@ -376,10 +376,15 @@ public class AdjReqMgrServiceImpl extends EgovAbstractServiceImpl implements A , String p_code_desc , String p_stat_cd , String p_adrHstryMgrSeq - ) throws Exception { - // 결제 테이블에 상태 변경 + ) 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에 값 넣기 - 끝 diff --git a/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java b/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java index 860b105d..7597dee4 100644 --- a/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java +++ b/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 diff --git a/src/main/java/kcc/kccadr/advc/service/AdrHstryMgrDetailService.java b/src/main/java/kcc/kccadr/advc/service/AdrHstryMgrDetailService.java index 7c0354b1..a88459a3 100644 --- a/src/main/java/kcc/kccadr/advc/service/AdrHstryMgrDetailService.java +++ b/src/main/java/kcc/kccadr/advc/service/AdrHstryMgrDetailService.java @@ -22,5 +22,6 @@ public interface AdrHstryMgrDetailService { //L page List selectPagingList(AdrHstryMgrVO adrHstryMgrVO) throws Exception; - + //L + List selectCancelList(AdrHstryMgrVO adrHstryMgrVO) throws Exception; } diff --git a/src/main/java/kcc/kccadr/advc/service/AdrHstryMgrService.java b/src/main/java/kcc/kccadr/advc/service/AdrHstryMgrService.java index 0999a6d9..aae23abe 100644 --- a/src/main/java/kcc/kccadr/advc/service/AdrHstryMgrService.java +++ b/src/main/java/kcc/kccadr/advc/service/AdrHstryMgrService.java @@ -36,5 +36,6 @@ public interface AdrHstryMgrService { //L page List selectPagingList(AdrHstryMgrVO adrHstryMgrVO) throws Exception; - + //L + List selectCancelList(AdrHstryMgrVO adrHstryMgrVO) throws Exception; } diff --git a/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrDAO.java b/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrDAO.java index 7fdebf90..a0882efe 100644 --- a/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrDAO.java +++ b/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrDAO.java @@ -66,7 +66,7 @@ public class AdrHstryMgrDAO extends EgovAbstractDAO { insert("AdrHstryMgrDetailDAO.insert", adrHstryMgrVO); - + return s_adrHstryMgrSeq; } @@ -91,25 +91,28 @@ public class AdrHstryMgrDAO extends EgovAbstractDAO { //String s_adrHstryMgrSeq = adrHstryMgrSeqGnrService.getNextStringId(); AdrHstryMgrVO adrHstryMgrVO = new AdrHstryMgrVO(); + + adrHstryMgrVO.setAdrSeq(p_adrSeq); + adrHstryMgrVO.setMenuNm(p_menuNm); + adrHstryMgrVO.setMenuId(p_menuId); + if ("".equals(p_frstRegisterId) || p_frstRegisterId==null) { + adrHstryMgrVO.setFrstRegisterId(p_lastUpdusrId); + }else { + adrHstryMgrVO.setFrstRegisterId(p_frstRegisterId); + } + //개별 액션 단독 저장인 경우 if ("".equals(p_adrHstryMgrSeq)) { p_adrHstryMgrSeq = adrHstryMgrSeqGnrService.getNextStringId(); - - - adrHstryMgrVO.setAdrSeq(p_adrSeq); - adrHstryMgrVO.setMenuNm(p_menuNm); - adrHstryMgrVO.setMenuId(p_menuId); - if ("".equals(p_frstRegisterId) || p_frstRegisterId==null) { - adrHstryMgrVO.setFrstRegisterId(p_lastUpdusrId); - }else { - adrHstryMgrVO.setFrstRegisterId(p_frstRegisterId); - } - + 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 selectCancelList(AdrHstryMgrVO adrHstryMgrVO) throws Exception { + List tlist = (List) list("AdrHstryMgrDAO.selectCancelList", adrHstryMgrVO); + return tlist; + } } diff --git a/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrDetailDAO.java b/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrDetailDAO.java index 3e7f0f4f..a1d34085 100644 --- a/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrDetailDAO.java +++ b/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrDetailDAO.java @@ -78,5 +78,10 @@ public class AdrHstryMgrDetailDAO extends EgovAbstractDAO { return (List) list("AdjstChangeDateDAO.selectPagingList", adjstChangeDateVO); } */ - + + //L + public List selectCancelList(AdrHstryMgrVO adrHstryMgrVO) throws Exception { + List tlist = (List) list("AdrHstryMgrDetailDAO.selectCancelList", adrHstryMgrVO); + return tlist; + } } diff --git a/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrDetailServiceImpl.java b/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrDetailServiceImpl.java index 9148b7aa..8ae35619 100644 --- a/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrDetailServiceImpl.java +++ b/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrDetailServiceImpl.java @@ -58,6 +58,9 @@ public class AdrHstryMgrDetailServiceImpl implements AdrHstryMgrDetailService { } */ - + //List + public List selectCancelList(AdrHstryMgrVO adrHstryMgrVO) throws Exception{ + return adrHstryMgrDetailDAO.selectCancelList(adrHstryMgrVO); + } } diff --git a/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrServiceImpl.java b/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrServiceImpl.java index 2551bb85..3f1a8b9d 100644 --- a/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrServiceImpl.java +++ b/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrServiceImpl.java @@ -93,6 +93,9 @@ public class AdrHstryMgrServiceImpl implements AdrHstryMgrService { } */ - + //List + public List selectCancelList(AdrHstryMgrVO adrHstryMgrVO) throws Exception{ + return adrHstryMgrDAO.selectCancelList(adrHstryMgrVO); + } } diff --git a/src/main/java/kcc/kccadr/aprvl/service/AprvlMgrService.java b/src/main/java/kcc/kccadr/aprvl/service/AprvlMgrService.java index 8d3fe1d5..1be98801 100644 --- a/src/main/java/kcc/kccadr/aprvl/service/AprvlMgrService.java +++ b/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; diff --git a/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrDAO.java b/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrDAO.java index 8a72ad25..d4595cdd 100644 --- a/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrDAO.java +++ b/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 diff --git a/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java b/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java index d44ad263..55957cb1 100644 --- a/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java +++ b/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java @@ -44,8 +44,21 @@ 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에 값 넣기 - 시작 adrHstryMgrDAO.insert4Func(aprvlMgrVO.getAdrSeq() @@ -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,7 +117,13 @@ 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); } diff --git a/src/main/resources/egovframework/sqlmap/kccadr/advc/AdrHstryMgrDetail_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/kccadr/advc/AdrHstryMgrDetail_SQL_Cubrid.xml index b05e1644..243fd16f 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/advc/AdrHstryMgrDetail_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/advc/AdrHstryMgrDetail_SQL_Cubrid.xml @@ -194,4 +194,16 @@ WHERE a.adr_seq = #adrSeq# + + + diff --git a/src/main/resources/egovframework/sqlmap/kccadr/advc/AdrHstryMgr_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/kccadr/advc/AdrHstryMgr_SQL_Cubrid.xml index 5ca81efe..0fc8eab5 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/advc/AdrHstryMgr_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/advc/AdrHstryMgr_SQL_Cubrid.xml @@ -187,4 +187,17 @@ + + diff --git a/src/main/resources/egovframework/sqlmap/kccadr/aprvl/AprvlMgr_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/aprvl/AprvlMgr_SQL_Mysql.xml index 7fd429dd..0f61f660 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/aprvl/AprvlMgr_SQL_Mysql.xml +++ b/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 INTO ( + + + )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 INTO adr_sbmt_detail_mgr ( diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab2.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab2.jsp index e23d2c9c..f1e2b294 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab2.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab2.jsp @@ -18,10 +18,67 @@ - +
@@ -103,6 +160,7 @@ + @@ -113,6 +171,7 @@ 진행현황 비고1 비고2 + 비고3 @@ -145,6 +204,16 @@

+ +

+ + + 취소 + + + +

+ @@ -169,6 +238,10 @@
-
+
+ + +
+ diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp index 4fc34632..4e27057b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp +++ b/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 - + <%-- --%> diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep1.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep1.jsp index c3a32e52..3c3679c1 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep1.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep1.jsp @@ -192,7 +192,7 @@ $( document ).ready(function(){ - @ + @ @@ -452,7 +452,7 @@ $( document ).ready(function(){ - @ diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep2.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep2.jsp index 8a100ce6..a8743cfe 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep2.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep2.jsp @@ -255,7 +255,7 @@ - @ + @ @@ -457,7 +457,7 @@ - @ + @