diff --git a/src/main/java/kcc/kccadr/adjReqMgrOff/service/AdjReqMgrOffLineService.java b/src/main/java/kcc/kccadr/adjReqMgrOff/service/AdjReqMgrOffLineService.java index 4fbd7503..a0446845 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrOff/service/AdjReqMgrOffLineService.java +++ b/src/main/java/kcc/kccadr/adjReqMgrOff/service/AdjReqMgrOffLineService.java @@ -39,4 +39,7 @@ public interface AdjReqMgrOffLineService { String selectAdjstReqMgrOffStatCdYn(AdjReqMgrOffLineVO adjReqMgrOffLineVO) throws Exception; List findByApprDeList(); + + //관리자 보완완료 상태변경 수정 처리 + int updateAdjReqMgrState(AdjReqMgrOffLineVO adjReqMgrOffLineVO) throws Exception; } diff --git a/src/main/java/kcc/kccadr/adjReqMgrOff/service/impl/AdjReqMgrOffLineServiceImpl.java b/src/main/java/kcc/kccadr/adjReqMgrOff/service/impl/AdjReqMgrOffLineServiceImpl.java index 0d6d4aaf..f4d92aec 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrOff/service/impl/AdjReqMgrOffLineServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrOff/service/impl/AdjReqMgrOffLineServiceImpl.java @@ -1117,5 +1117,78 @@ public String insertAdjReqMgrRpplReq(AdjReqMgrOffLineVO adjReqMgrOffLineVO) thro public List findByApprDeList() { return adjReqMgrOffLineDAO.findByApprDeList(); } + + + @Override + public int updateAdjReqMgrState(AdjReqMgrOffLineVO adjReqMgrOffLineVO) throws Exception { + int rs = 0; + + // 조정사건이력업데이트 + { + AdjReqMgrVO adjReqMgrVO = new AdjReqMgrVO(); + adjReqMgrVO.setAdrSeq(adjReqMgrOffLineVO.getAdrSeq()); + adjReqMgrVO.setAdrSn(adjReqMgrOffLineVO.getAdrSn()); + adjReqMgrVO.setLastUpdusrId(adjReqMgrOffLineVO.getLastUpdusrId()); + adjReqMgrVO.setStatCd(KccadrConstants.ADR_REQ_COMP); + + adjReqMgrVO = checkAdrProcessUtil.getAdrHstryCn(adjReqMgrVO); // 이력 내용 확인 + + //하기 내용으로 변경 + CmmnDetailCodeVO cmmnDetailCodeVO = new CmmnDetailCodeVO(); + cmmnDetailCodeVO.setCodeId("CC022"); + cmmnDetailCodeVO.setCode(KccadrConstants.ADR_REQ_COMP); + CmmnDetailCode cmmnDetailCode = new CmmnDetailCode(); + cmmnDetailCode = cmmnDetailCodeManageService.selectCmmnDetailCodeDetail(cmmnDetailCodeVO); + + adjReqMgrVO.setHstryCn(cmmnDetailCode.getCodeNm()); + + System.out.println("cmmnDetailCode.getCodeNm()"); + System.out.println(cmmnDetailCode.getCodeNm()); + + try { + adjReqMgrDAO.insertAdrHstry(adjReqMgrVO); // 이력 등록 + rs++; + }catch(Exception ex) { + ex.printStackTrace(); + } + + } + + //조정 사건 상태(stat_cd) 업데이트 + { + AdjstReqVO adjstReqVO = new AdjstReqVO(); + adjstReqVO.setAdrSeq(adjReqMgrOffLineVO.getAdrSeq()); + adjstReqVO.setLastUpdusrId(adjReqMgrOffLineVO.getLastUpdusrId()); + adjstReqVO.setEdtSn(adjReqMgrOffLineVO.getEdtSn()); + adjstReqVO.setEdtTy(adjReqMgrOffLineVO.getEdtTy()); + + // 조정 마스터 정보 업데이트 + adjstReqVO.setStatCd(KccadrConstants.ADR_REQ_COMP); // 제출완료상태 + if(StringUtils.isNotBlank(adjstReqVO.getEdtSn()) ){ + adjstReqVO.setEdtStatus("02"); // 수정, 보완 완료상태로 변경 + adjstReqDAO.updateAdrMgrEditInfo(adjstReqVO); + //adr_hstry_mgr에 값 넣기 - 시작 + adrHstryMgrDAO.insert4Func(adjReqMgrOffLineVO.getAdrSeq(), "조정신청서 보완완료-관리자" + , adjReqMgrOffLineVO.getStatCd() + , adjReqMgrOffLineVO.getFrstRegisterId() + , adjReqMgrOffLineVO.getLastUpdusrId() + + , "" //, String p_adrHstryMgrSeq + , "U" //, String p_useCd I/U/UI/II/RE + , "ADR_MGR_MASTER" //, String p_tableName + , "" //, String p_updateQuery + + ); + //adr_hstry_mgr에 값 넣기 - 끝 + + // 보완요청을 했을경우 상태를 보완요청완료로 변경 + if("S".equals(adjstReqVO.getEdtTy())){ + adjstReqVO.setStatCd(KccadrConstants.ADR_SUPP_COMP); + } + } + rs += adjstReqDAO.updateAdrMgrMasterComplete(adjstReqVO); + } + return rs; + } } diff --git a/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java b/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java index f45ed2cd..d5dd04cd 100644 --- a/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java +++ b/src/main/java/kcc/kccadr/adjreqmgr/web/AdjReqMgrController.java @@ -1248,7 +1248,43 @@ public class AdjReqMgrController { } return modelAndView; - } + } + + /** + * 조정신청 보완요청 수정 Ajax + * + */ + @RequestMapping(value = {"/kccadr/adjReqMgr/adjReqMgrStateUpdateAjax.do"}) + public ModelAndView adjReqMgrStateUpdateAjax( + @ModelAttribute("adjReqMgrOffLineVO") AdjReqMgrOffLineVO adjReqMgrOffLineVO + , HttpServletRequest request) 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()); + if(userId.equals("")) { + modelAndView.addObject("adjStatus", "loginFail"); + return modelAndView; + } + adjReqMgrOffLineVO.getEdtSn(); + adjReqMgrOffLineVO.getAdrSeq(); + + + adjReqMgrOffLineVO.setFrstRegisterId(userId); + adjReqMgrOffLineVO.setLastUpdusrId(userId); + + int resultCnt = adjReqMgrOffLineService.updateAdjReqMgrState(adjReqMgrOffLineVO); + + if(resultCnt > 0) { + modelAndView.addObject("result", KccadrConstants.SUCCESS); // 성공메세지 + }else { + modelAndView.addObject("result", KccadrConstants.FAIL); // 실패메세지 + } + + return modelAndView; + } @SuppressWarnings("unchecked") public JSONObject parseJsonData(AdjstReqVO adjReqVO) throws Exception{ diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegDetail.jsp index e9d69870..08201cd1 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegDetail.jsp @@ -144,6 +144,36 @@ pop.action = ""; pop.submit(); } + + function fncStateUpdate(edtSn){ + var form = document.updateStateForm; + form.edtSn.value = edtSn; + var data = new FormData(form); + + if (confirm("보완요청 정보를 상태를 변경하시겠습니까?")) { + $.ajax({ + type: "POST" + , url: "/kccadr/adjReqMgr/adjReqMgrStateUpdateAjax.do" + , data: data + , dataType:'json' + , async: false + , processData: false + , contentType: false + , cache: false + , success: function (returnData, status) { + if(returnData.result == 'SUCCESS'){ + alert("조정신청서의 보완요청이 완료 되었습니다."); + location.reload(); + return false; + } + } + , error: function (e) { + alert("저장에 실패하였습니다."); + console.log("ERROR : ", e); + } + }); + } + } //메뉴별 권한 체크 - 시작시 현재 사용자의 해당 페이지 사용권한을 체크한다. /* @@ -209,6 +239,11 @@
" />
+
+ " /> + + " /> +
" /> @@ -618,6 +653,7 @@ + @@ -626,6 +662,7 @@ 진행상태 요청일자 진행상태 + 상태변경 @@ -686,6 +723,24 @@ + + + + + + + + + + + + + - + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp index b74fbcd3..9ac42153 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp @@ -328,7 +328,7 @@ -

+