diff --git a/src/main/java/kcc/kccadr/adjstExp/service/AdjstExpService.java b/src/main/java/kcc/kccadr/adjstExp/service/AdjstExpService.java index 6fb52ea8..e8a19d46 100644 --- a/src/main/java/kcc/kccadr/adjstExp/service/AdjstExpService.java +++ b/src/main/java/kcc/kccadr/adjstExp/service/AdjstExpService.java @@ -42,5 +42,7 @@ public interface AdjstExpService { //2단계 저장 public int insertAdjsReqStep2Save(AdjstReqVO adjstReqVO) throws Exception; - + + //3단계 저장 + public int updateMasterInfo(AdjstReqVO adjstReqVO, MultipartHttpServletRequest multipartHttpServletRequest) throws Exception; } diff --git a/src/main/java/kcc/kccadr/adjstExp/service/impl/AdjstExpDAO.java b/src/main/java/kcc/kccadr/adjstExp/service/impl/AdjstExpDAO.java index 4c29d84b..4f11f33c 100644 --- a/src/main/java/kcc/kccadr/adjstExp/service/impl/AdjstExpDAO.java +++ b/src/main/java/kcc/kccadr/adjstExp/service/impl/AdjstExpDAO.java @@ -68,8 +68,32 @@ public class AdjstExpDAO extends EgovAbstractDAO { return update("AdjstExpDAO.updateAdrRppl", adjstReqVO); } - public int deleteAdjstReqPersonNotIn(AdjstReqVO adjstReqVO) throws Exception { - return delete("AdjstExpDAO.deleteAdjstReqPersonNotIn", adjstReqVO); - } - + public int deleteAdjstReqPersonNotIn(AdjstReqVO adjstReqVO) throws Exception { + return delete("AdjstExpDAO.deleteAdjstReqPersonNotIn", adjstReqVO); + } + + //조정신청 신청인 취지/원인 정보 등록 + public int updateAdrMgrMaster(AdjstReqVO adjstReqVO) throws Exception{ + return update("AdjstExpDAO.updateAdrMgrMaster", adjstReqVO); + } + + public int updateAdrMgrEditInfo(AdjstReqVO adjstReqVO) throws Exception { + return (Integer) update("AdjstExpDAO.updateAdrMgrEditInfo", adjstReqVO); + } + //조정신청 최종제출 처리 + public int updateAdrMgrMasterComplete(AdjstReqVO adjstReqVO) throws Exception{ + return update("AdjstExpDAO.updateAdrMgrMasterComplete", adjstReqVO); + } + + + + + + + + + + + + } diff --git a/src/main/java/kcc/kccadr/adjstExp/service/impl/AdjstExpServiceImpl.java b/src/main/java/kcc/kccadr/adjstExp/service/impl/AdjstExpServiceImpl.java index 1708589b..cc4cda16 100644 --- a/src/main/java/kcc/kccadr/adjstExp/service/impl/AdjstExpServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjstExp/service/impl/AdjstExpServiceImpl.java @@ -277,8 +277,96 @@ public class AdjstExpServiceImpl extends EgovAbstractServiceImpl implements Adj } return rs; } + @Override + public int updateMasterInfo(AdjstReqVO adjstReqVO, MultipartHttpServletRequest mltReq) throws Exception { + int rs = 0; + + rs = _updateMasterInfo(adjstReqVO, mltReq); + + return rs; + } + + private int _updateMasterInfo(AdjstReqVO adjstReqVO, MultipartHttpServletRequest mltReq) throws Exception { + int rs = 0; + String atchFileId = adjstReqVO.getAtchFileId(); + + final Map files = mltReq.getFileMap(); + if (!files.isEmpty()) { + if ("".equals(atchFileId)) { + List result = fileUtil.parseFileInf(files, "조정 신청_", 0, atchFileId, "", ""); + + atchFileId = fileMngService.insertFileInfs(result); + adjstReqVO.setAtchFileId(atchFileId); + } else { + FileVO fvo = new FileVO(); + fvo.setAtchFileId(atchFileId); + int cnt = fileMngService.getMaxFileSN(fvo); + List result = fileUtil.parseFileInf(files, "조정 신청_", cnt, atchFileId, "", ""); + + fileMngService.updateFileInfs(result); + } + } + + + // 조정사건이력업데이트 + { + AdjReqMgrVO adjReqMgrVO = new AdjReqMgrVO(); + adjReqMgrVO.setAdrSeq(adjstReqVO.getAdrSeq()); + adjReqMgrVO.setAdrSn(adjstReqVO.getAdrSn()); + 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); // 이력 등록 + }catch(Exception ex) { + ex.printStackTrace(); + } + + } + + + + + // 조정 마스터 정보 업데이트 + rs += adjstExpDAO.updateAdrMgrMaster(adjstReqVO); + if(KccadrConstants.ADR_MODE_SMT.equals(adjstReqVO.getMode())){ + adjstReqVO.setStatCd(KccadrConstants.ADR_REQ_COMP); // 제출완료상태 + // 수정,보완요청 상태 업데이트.. + if(StringUtils.isNotBlank(adjstReqVO.getEdtSn()) ){ + adjstReqVO.setEdtStatus("02"); // 수정, 보완 완료상태로 변경 + adjstExpDAO.updateAdrMgrEditInfo(adjstReqVO); + // 보완요청을 했을경우 상태를 보완요청완료로 변경 + if("S".equals(adjstReqVO.getEdtTy())){ + adjstReqVO.setStatCd(KccadrConstants.ADR_SUPP_COMP); + } + } + rs += adjstExpDAO.updateAdrMgrMasterComplete(adjstReqVO); + + //이력관리를 위한 adr_hstry_mgr 데이터 관리 추가 - 2022-08-09 + //adr_hstry_mgr에 값 넣기 - 시작 + adrHstryMgrDAO.insert4Func(adjstReqVO.getAdrSeq(), "조정신청서 제출", adjstReqVO.getStatCd() + , adjstReqVO.getFrstRegisterId() + , adjstReqVO.getLastUpdusrId() + ); + //adr_hstry_mgr에 값 넣기 - 끝 + + } + return rs; + } diff --git a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java index a2029045..b2733aef 100644 --- a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java +++ b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java @@ -17,11 +17,14 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import kcc.com.cmm.LoginVO; +import kcc.com.cmm.service.EgovFileMngService; +import kcc.com.cmm.service.FileVO; import kcc.com.cmm.util.StringUtil; import kcc.com.utl.fcc.service.EgovStringUtil; import kcc.kccadr.accdnt.crtfc.service.CrtfcService; @@ -68,6 +71,9 @@ public class AdjstExpController { //암복호화 유틸 @Resource(name = "egovCryptoUtil") EgovCryptoUtil egovCryptoUtil; + + @Resource(name = "EgovFileMngService") + private EgovFileMngService fileService; private static final Logger LOGGER = LoggerFactory.getLogger(AdjstExpController.class); @@ -269,6 +275,71 @@ public class AdjstExpController { //modelAndView.addObject("rs", rs); // 삽입 개수 return modelAndView; } + + + /* + * 조정신청 정보 작성화면 STEP3 + * */ + @RequestMapping("/web/kccadr/adjstExp/adjstReqRegistStep3.do") + public String adjstReqRegistStep3(@ModelAttribute("adjstReqVO") AdjstReqVO adjstReqVO, ModelMap model, RedirectAttributes redirectAttributes) throws Exception { + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + + // 작성단계 셋팅 + adjstReqVO.setStep(KccadrConstants.STEP9); + adjstReqVO.setFrstRegisterId(userId); // 최초등록자 + adjstReqVO.setLastUpdusrId(userId); // 마지막 수정자 + adjstReqVO.setEsntlId(userId); // 사용자 키 + AdjstReqVO adjMsrMaster = adjstExpService.selectAdjsMgrMasterByUniqId(adjstReqVO); + if(StringUtils.isNotBlank(adjMsrMaster.getAtchFileId())){ + FileVO fileVO = new FileVO(); + fileVO.setAtchFileId(adjMsrMaster.getAtchFileId()); + List fileList = fileService.selectFileInfs(fileVO); + model.addAttribute("fileList", fileList); + } + model.addAttribute("editInfo", adjstExpService.checkAdjsReqEditStatus(adjstReqVO)); + model.addAttribute("master", adjMsrMaster); + return "/web/kccadr/adjstExp/adjstReqRegistStep3"; + } + + @RequestMapping("/web/kccadr/adjstExp/adjstReqRegistStep3Save.do") + public ModelAndView adjstReqRegistStep3Save( + @ModelAttribute("adjstReqVO") AdjstReqVO adjstReqVO + , final MultipartHttpServletRequest multiRequest + ) 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()); + adjstReqVO.setFrstRegisterId(userId); + adjstReqVO.setLastUpdusrId(userId); + int rs = adjstExpService.updateMasterInfo(adjstReqVO, multiRequest); + modelAndView.addObject("result", KccadrConstants.SUCCESS); // 성공메세지 + modelAndView.addObject("rsVO", adjstReqVO); // 성공메세지 + return modelAndView; + } + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/egovframework/egovProps/globals_local.properties b/src/main/resources/egovframework/egovProps/globals_local.properties index bbf6e930..44070cae 100644 --- a/src/main/resources/egovframework/egovProps/globals_local.properties +++ b/src/main/resources/egovframework/egovProps/globals_local.properties @@ -33,7 +33,8 @@ Globals.DriverClassName=cubrid.jdbc.driver.CUBRIDDriver #\ud074\ub77c\uc6b0\ub4dc \uc11c\ubc84 #Globals.Url=jdbc:cubrid:158.247.225.133:30000:kcc_adrs4:::?charset=utf8 #\uac1c\ubc1c\uc11c\ubc84 -Globals.Url=jdbc:cubrid:192.168.0.176:30000:cubdb:::?charset=utf8 +Globals.Url=jdbc:CUBRID:119.193.215.98:30000:kcc_adr_advc:::?charset=utf8 + #\uc2e4\uc11c\ubc84 #Globals.Url=jdbc:cubrid:192.168.39.14:30000:kcc_adrs4:::?charset=utf8 diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjstExp/AdjstExp_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjstExp/AdjstExp_SQL_Mysql.xml index 2c0a6958..55c1c8a2 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjstExp/AdjstExp_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjstExp/AdjstExp_SQL_Mysql.xml @@ -419,7 +419,49 @@ + + + UPDATE ADR_MGR_EXP_MASTER SET + + REQ_CN1 = #reqCn1#, + + + REQ_CN2 = #reqCn2#, + + + CC_TY = #ccTy#, + + + ATCH_FILE_ID = #atchFileId#, + + LAST_UPDT_PNTTM = NOW(), + LAST_UPDUSR_ID = #lastUpdusrId# + WHERE 1=1 + AND ADR_SEQ = #adrSeq# + + + UPDATE ADR_EXP_EDT_REQ SET + EDT_STATUS = #edtStatus#, + CPMTE_DT = NOW(), + LAST_UPDT_PNTTM = NOW(), + LAST_UPDUSR_ID = #lastUpdusrId# + WHERE ADR_SEQ = #adrSeq# + AND EDT_SN = #edtSn# + AND EDT_TY = #edtTy# + + + + + UPDATE ADR_MGR_EXP_MASTER SET + STAT_CD = #statCd# + ,SBMT_DE = NOW() + ,APPR_DE = NOW() + ,LAST_UPDT_PNTTM = NOW() + ,LAST_UPDUSR_ID = #lastUpdusrId# + WHERE 1=1 + AND ADR_SEQ = #adrSeq# + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep2.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep2.jsp index 9ea5ad25..55edbfe1 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep2.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep2.jsp @@ -127,7 +127,7 @@
-

조정신청

+

조정신청 체험하기

diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp index dedc60ab..b0aea508 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistStep3.jsp @@ -94,7 +94,7 @@ function fn_adjstReq_preview() { - + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp index 1f3cb740..b14b2251 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp @@ -382,11 +382,14 @@ var AdjstReq = { return false; } + var depth = this.expDivision(this.STEP); + var url = "/web/kccadr/"+depth+"/adjstReqRegistStep3Save.do"; + $.ajax({ type: "POST", enctype: 'multipart/form-data', - url: "/web/kccadr/adjst/adjstReqRegistStep3Save.do", - data: data, + url: url, + data: data, dataType:'json', async: false, processData: false,