diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java index 63238907..d153df77 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java @@ -4,6 +4,7 @@ import java.util.List; import org.springframework.http.ResponseEntity; +import egovframework.rte.fdl.cmmn.exception.FdlException; import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO; import kcc.kccadr.cmm.RestResponse; @@ -33,6 +34,10 @@ public interface AdjReqMgrPastService { List findByAdrHstryId(AdjReqMgrPastVO adjReqMgrPastVO); - ResponseEntity insertAdjReqRecordAjax(AdjReqMgrPastVO adjReqMgrPastVO); + ResponseEntity saveAdjReqRecordAjax(AdjReqMgrPastVO adjReqMgrPastVO) throws FdlException; + + ResponseEntity deleteAdjReqRecordAjax(AdjReqMgrPastVO adjReqMgrPastVO); + + String findByAdrHstryWhereStatCd(AdjReqMgrPastVO adjReqMgrPastVO); } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java index f5cfbd44..025afcfa 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java @@ -42,6 +42,9 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { private String addUsrNm2; /* 조정위원2 */ private String addDe; /* 기일조정일자 */ + private String pstCn; /* 조정결과 */ + + // 조정사건 private String adrSeq = ""; // 조정일련번호 @@ -1335,6 +1338,14 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { public void setAdrHstryList(String[] adrHstryList) { this.adrHstryList = adrHstryList; } + + public String getPstCn() { + return pstCn; + } + + public void setPstCn(String pstCn) { + this.pstCn = pstCn; + } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java index b361db7c..6c79e1fd 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java @@ -95,5 +95,20 @@ public class AdjReqMgrPastDAO extends EgovAbstractDAO { public void insertAdjReqRecordAjax(AdjReqMgrPastVO adjPastVO) { insert("adjReqMgrPastDAO.insertAdjReqRecordAjax", adjPastVO ); } + + public void updateAdjReqRecordAjax(AdjReqMgrPastVO adjPastVO) { + update("adjReqMgrPastDAO.updateAdjReqRecordAjax", adjPastVO ); + + } + + public void deleteAdjReqRecordAjax(AdjReqMgrPastVO adjPastVO) { + delete("adjReqMgrPastDAO.deleteAdjReqRecordAjax", adjPastVO ); + // TODO Auto-generated method stub + + } + + public String findByAdrHstryWhereStatCd(AdjReqMgrPastVO adjReqMgrPastVO) { + return (String) select("adjReqMgrPastDAO.findByAdrHstryWhereStatCd", adjReqMgrPastVO); + } } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java index f57f7169..a52721db 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -9,6 +9,8 @@ import java.util.stream.Collectors; import javax.annotation.Resource; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; @@ -23,6 +25,7 @@ import kcc.kccadr.adjReqMgrPast.service.AdjAssMgrPastVO; import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastService; import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO; import kcc.kccadr.adjReqMgrPast.service.AdrMemDeptMgrPstVO; +import kcc.kccadr.adjReqMgrPast.web.AdjReqMgrPastController; import kcc.kccadr.adjreqmgr.service.impl.AdjReqMgrDAO; import kcc.kccadr.adjst.service.impl.AdjstReqDAO; import kcc.kccadr.advc.service.impl.AdrHstryMgrDAO; @@ -34,6 +37,7 @@ import kcc.let.utl.fcc.service.EgovCryptoUtil; @Service("AdjReqMgrPastService") public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements AdjReqMgrPastService { + private static final Logger logger = LoggerFactory.getLogger(AdjReqMgrPastController.class); // 조정신청 DAO @Resource(name = "AdjReqMgrPastDAO") private AdjReqMgrPastDAO adjReqMgrPastDAO; @@ -96,9 +100,10 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements if(resultAdjReqMgrList != null) { + String rpplTy = resultAdjReqMgrList.get(0).getRpplTy(); int listCnt = resultAdjReqMgrList.size(); - + logger.info(" + listCnt :: [{}]", listCnt); //신청 대리인 여부 확인 int rpplTy_30_exist = 0; @@ -138,13 +143,14 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements //신청인 정보 추가해주기 temp = resultAdjReqMgrList.get(i); + logger.info(""); resultAdjReqMgrOffLine.getAdjReqMgrVoList().add(decryptAdjReqMgrReturn(temp)); } } - //피신청인 추가해주기 + //피신청인 추가해주기 int totCnt = 0; for(int i=0; i < listCnt; i++) { @@ -182,7 +188,8 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements String rpplRealPost = egovCryptoUtil.decrypt(adjReqMgrPastVO.getRpplRealPost()); //우편물 수령지 우편번호 String rpplRealAddr = egovCryptoUtil.decrypt(adjReqMgrPastVO.getRpplRealAddr()); //우편물 수령지 주소 String rpplRealAddrDtl = egovCryptoUtil.decrypt(adjReqMgrPastVO.getRpplRealAddrDtl()); //우편물 수령지 상세주소 - + + logger.info("resultAdjReqMgrOffLine.getRp11plTy() :: [{}]", adjReqMgrPastVO.getRpplTy()); adjReqMgrPastVO.setRpplNm(rpplNm); adjReqMgrPastVO.setRpplEmail(rpplEmail); adjReqMgrPastVO.setRpplPhone(rpplPhone); @@ -206,23 +213,20 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements /* - * 공통코드 - * 10 - 성립 - * 20 - 불성립 - * 70 - 직권조정 - 성립 - * 80 - 직권조정 - 불성립 * - * ADR_SUCC = "900011"; // 조정성립 - * ADR_NOSUCC = "900022"; // 조정불성립 - * ADR_CNCL = "901033"; // 조정취하 - * */ - if("40".equals(adjReqMgrPastVO.getStatCd())) - adjReqMgrPastVO.setStatCd(KccadrConstants.ADR_CNCL); - else if("10".equals(adjReqMgrPastVO.getStatCd()) || "70".equals(adjReqMgrPastVO.getStatCd())) - adjReqMgrPastVO.setStatCd(KccadrConstants.ADR_SUCC); - else if("20".equals(adjReqMgrPastVO.getStatCd()) || "80".equals(adjReqMgrPastVO.getStatCd())) - adjReqMgrPastVO.setStatCd(KccadrConstants.ADR_NOSUCC); - + * 304050 + * 조정조서종결 => 성립 + * + * 305050 + * 취하종결 => 취하 + * + * 307050 + * 불성립종결 => 불성립 / 조정권고 불성립 / 직권조정 불성립 + * + * 306050 + * 직권조정 성립 => 직권조정 성립 + * + * */ /* * 조정부 등록 @@ -232,8 +236,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements adrMemDeptMgrPstVO.setMemDeptNm(adjReqMgrPastVO.getMemDeptNm()); adrMemDeptMgrPstVO.setFrstRegisterId(adjReqMgrPastVO.getFrstRegisterId()); adrMemDeptMgrPstVO.setLastUpdusrId(adjReqMgrPastVO.getLastUpdusrId()); - - + adjReqMgrPastDAO.insertMemDeptMgrPst(adrMemDeptMgrPstVO); /* @@ -449,7 +452,10 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements cnt++; } - + + adjReqMgrPastVO.setAdrHstrySeq(adrHstrySeqGnrService.getNextStringId()); + adjReqMgrPastVO.setAdrSn("0"); + adjReqMgrPastDAO.insertAdjReqRecordAjax(adjReqMgrPastVO); return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "조정신청 정보 저장이 완료되었습니다.", adrSeq, LocalDateTime.now())); @@ -707,26 +713,67 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements @Override public List findByAdrHstryId(AdjReqMgrPastVO adjPastVO) { - return adjReqMgrPastDAO.findByAdrHstryId(adjPastVO); + List list = adjReqMgrPastDAO.findByAdrHstryId(adjPastVO); + list.forEach(t -> t.setHstryDe(t.getHstryDe().split(" ")[0])); + return list; } @Override - public ResponseEntity insertAdjReqRecordAjax(AdjReqMgrPastVO adjPastVO) { + public ResponseEntity saveAdjReqRecordAjax(AdjReqMgrPastVO adjPastVO) throws FdlException { + + String adrSeq = adjPastVO.getAdrSeq(); for(String adjHstry : adjPastVO.getAdrHstryList()) { - //TODO 사건진행정보 반복문 + AdjReqMgrPastVO adjReqMgrPastVO = new AdjReqMgrPastVO(); + adjReqMgrPastVO.setAdrSeq(adrSeq); + adjReqMgrPastVO.setAdrHstrySeq(adjHstry.split("\\|")[0]); + adjReqMgrPastVO.setHstryDe(adjHstry.split("\\|")[1]); + adjReqMgrPastVO.setHstryCn(adjHstry.split("\\|")[2]); + + // 비고가 있으면 set + if(adjHstry.split("\\|").length == 4) + { + adjReqMgrPastVO.setAdrSeq(adjPastVO.getAdrSeq()); + adjReqMgrPastVO.setHstryDetailCn(adjHstry.split("\\|")[3]); + } + // seq가 없으면 insert + if("".equals(adjReqMgrPastVO.getAdrHstrySeq())) + { + adjReqMgrPastVO.setAdrHstrySeq(adrHstrySeqGnrService.getNextStringId()); + adjReqMgrPastVO.setAdrSn("0"); + adjReqMgrPastDAO.insertAdjReqRecordAjax(adjReqMgrPastVO); + }else{ + adjReqMgrPastVO.setLastUpdusrId(adjPastVO.getLastUpdusrId()); + adjReqMgrPastDAO.updateAdjReqRecordAjax(adjReqMgrPastVO); + } + } - - adjReqMgrPastDAO.insertAdjReqRecordAjax(adjPastVO); return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "사건진행정보 등록이 완료되었습니다.", LocalDateTime.now())); } - + + @Override + public ResponseEntity deleteAdjReqRecordAjax(AdjReqMgrPastVO adjReqMgrPastVO) { + + try { + adjReqMgrPastDAO.deleteAdjReqRecordAjax(adjReqMgrPastVO); + } catch (Exception e) { + return ResponseEntity.ok(new RestResponse(HttpStatus.BAD_REQUEST, "오류가 발생하였습니다.", LocalDateTime.now())); + } + + return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "정상적으로 삭제하였습니다.", LocalDateTime.now())); + } + + + @Override + public String findByAdrHstryWhereStatCd(AdjReqMgrPastVO adjReqMgrPastVO) { + return adjReqMgrPastDAO.findByAdrHstryWhereStatCd(adjReqMgrPastVO); + } } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index 7675e854..16bd034e 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -2,37 +2,29 @@ package kcc.kccadr.adjReqMgrPast.web; import java.time.LocalDateTime; import java.util.ArrayList; -import java.util.Iterator; -import java.util.LinkedHashMap; import java.util.List; -import java.util.Map; import java.util.Properties; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; 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.MultipartFile; -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 egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.LoginVO; import kcc.com.cmm.service.EgovCmmUseService; import kcc.com.cmm.service.EgovFileMngService; import kcc.com.cmm.service.EgovFileMngUtil; -import kcc.com.cmm.service.FileVO; +import kcc.com.cmm.service.impl.SequenceUtilServiceImpl; import kcc.com.cmm.util.StringUtil; import kcc.com.utl.fcc.service.EgovStringUtil; import kcc.kccadr.adjPgrMgr.apm.service.ApmService; @@ -41,8 +33,6 @@ import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO; import kcc.kccadr.adjPgrMgr.drt.service.AssVO; import kcc.kccadr.adjPgrMgr.drt.service.DrtService; import kcc.kccadr.adjPgrMgr.drt.service.DrtVO; -import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineService; -import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO; import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastService; import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO; import kcc.kccadr.cmm.RestResponse; @@ -64,6 +54,8 @@ import kcc.let.utl.fcc.service.EgovCryptoUtil; */ @Controller public class AdjReqMgrPastController { + + private static final Logger logger = LoggerFactory.getLogger(AdjReqMgrPastController.class); // 조정신청 서비스단 @Resource(name = "AdjReqMgrPastService") @@ -114,7 +106,11 @@ public class AdjReqMgrPastController { */ @RequestMapping("/kccadr/adjReqMgOff/adjReqMgrPastBasicRegist.do") public String adjReqMgrPastBasicRegist(@ModelAttribute("searchVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { + + //TODO TEST +// adjReqMgrPastVO.setAdrSeq("ADR_0000000000002920"); + //로그인 권한정보 불러오기 LoginVO user = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; model.addAttribute("user", user); @@ -125,17 +121,14 @@ public class AdjReqMgrPastController { int reqPerTotCnt = 0; - System.out.println("adjReqMgrPastVO.getAdrSeq() : "+ adjReqMgrPastVO.getAdrSeq()); - - //TODO TEST -// adjReqMgrPastVO.setAdrSeq("ADR_0000000000002920"); -// adjReqMgrPastVO.setAdrSeq("") - if(StringUtils.isNotBlank(adjReqMgrPastVO.getAdrSeq())) { //오프라인 조정 신청 정보 불러오기. - AdjReqMgrPastVO resultAdjReqMgrOffLine = adjReqMgrPastService.selectAdjReqMgrOffLineInfo(adjReqMgrPastVO); - model.addAttribute("adrVO", resultAdjReqMgrOffLine); + AdjReqMgrPastVO resultAdjReqMgrPast = adjReqMgrPastService.selectAdjReqMgrOffLineInfo(adjReqMgrPastVO); + String statCd = adjReqMgrPastService.findByAdrHstryWhereStatCd(adjReqMgrPastVO); + resultAdjReqMgrPast.setStatCd(statCd); + + model.addAttribute("adrVO", resultAdjReqMgrPast); }else { //기본 값 셋팅 - 대리인 여부, 신청자 분류 adjReqMgrPastVO.setRpplTy("10"); @@ -143,7 +136,10 @@ public class AdjReqMgrPastController { model.addAttribute("adrVO", adjReqMgrPastVO); } - + + model.addAttribute("prtclSize", adjReqMgrPastService.selectAdrPrtclMgrPastList(adjReqMgrPastVO).size()); + // 조정부 / 조사관 정보 + model.addAttribute("memAss", adjReqMgrPastService.selectMemAss(adjReqMgrPastVO)); model.addAttribute("reqPerTotCnt", reqPerTotCnt); return "kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist"; @@ -163,15 +159,21 @@ public class AdjReqMgrPastController { public String adjReqMgrPastProgRegist(@ModelAttribute("adjReqMgrPastVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { //TODO 테스트로 인한 seq 코딩 - adjReqMgrPastVO.setAdrSeq("ADR_0000000000002920"); - System.out.println("adjReqMgrPastVO.getAdrSeq() !!! : "+ adjReqMgrPastVO.getAdrSeq()); +// adjReqMgrPastVO.setAdrSeq("ADR_0000000000002920"); + logger.info(" ++ [{}]", adjReqMgrPastVO.getAdrSeq()); PgrCmmVO cmmVO = new PgrCmmVO(); cmmVO.setAdrSeq(adjReqMgrPastVO.getAdrSeq()); // 조정사건일반 - PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); - model.addAttribute("info", info); - model.addAttribute("adjReqMgrPastListVO", adjReqMgrPastService.selectAdrPrtclMgrPastList(adjReqMgrPastVO)); + try { + PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); + model.addAttribute("info", info); + model.addAttribute("adjReqMgrPastListVO", adjReqMgrPastService.selectAdrPrtclMgrPastList(adjReqMgrPastVO)); + + } catch (Exception e) { + e.printStackTrace(); + // TODO: handle exception + } return "kccadr/adjReqMgrPast/adjReqMgrPastProgRegist"; } @@ -188,10 +190,10 @@ public class AdjReqMgrPastController { */ @RequestMapping("/kccadr/adjReqMgOff/adjReqMgrPastFileRegist.do") public String adjReqMgrPastFileRegist(@ModelAttribute("adjReqMgrPastVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { - + + logger.info(" ++ [{}]", adjReqMgrPastVO.getAdrSeq()); //TODO 테스트로 인한 seq 코딩 // adjReqMgrPastVO.setAdrSeq("ADR_0000000000002920"); -// System.out.println("adjReqMgrPastVO.getAdrSeq() !!! : "+ adjReqMgrPastVO.getAdrSeq()); model.addAttribute("adjReqMgrPastVO", adjReqMgrPastVO); // PgrCmmVO cmmVO = new PgrCmmVO(); @@ -308,6 +310,8 @@ public class AdjReqMgrPastController { List adrHstryList = adjReqMgrPastService.findByAdrHstryId(adjReqMgrPastVO); + + model.addAttribute("adrHstryList", adrHstryList); model.addAttribute("adjReqMgrPastVO", adjReqMgrPastVO); @@ -329,9 +333,8 @@ public class AdjReqMgrPastController { * @return * @throws Exception */ - @RequestMapping(value = {"/kccadr/adjReqMgOff/insertAdjReqRecordAjax.do"}) -// public ResponseEntity insertAdjReqRecordAjax(@ModelAttribute("adrVO") AdjReqMgrPastVO adjReqMgrPastVO - public ResponseEntity insertAdjReqRecordAjax(AdjReqMgrPastVO adjReqMgrPastVO + @RequestMapping(value = {"/kccadr/adjReqMgOff/saveAdjReqRecordAjax.do"}) + public ResponseEntity saveAdjReqRecordAjax(AdjReqMgrPastVO adjReqMgrPastVO , RedirectAttributes redirectAttributes , HttpServletRequest request) throws Exception { @@ -344,18 +347,41 @@ public class AdjReqMgrPastController { return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now())); } + System.out.println("adjReqMgrPastVO :: "+ adjReqMgrPastVO.getAdrSeq()); //사용자 유니크 아이디 받아오기 adjReqMgrPastVO.setFrstRegisterId(userId); + adjReqMgrPastVO.setLastUpdusrId(userId); - //조정신청, 대리인, 신청인 등록 처리 - return adjReqMgrPastService.insertAdjReqRecordAjax(adjReqMgrPastVO); + return adjReqMgrPastService.saveAdjReqRecordAjax(adjReqMgrPastVO); } - /* - * + + /** + * @methodName : deleteAdjReqRecordAjax + * @author : 이호영 + * @date : 2022.09.27 + * @description : 과거사건등록 사건진행정보 row 삭제 + * @param adjReqMgrPastVO + * @param redirectAttributes + * @param request + * @return + * @throws Exception */ + @RequestMapping(value = {"/kccadr/adjReqMgOff/deleteAdjReqRecordAjax.do"}) + public ResponseEntity deleteAdjReqRecordAjax(AdjReqMgrPastVO adjReqMgrPastVO + , RedirectAttributes redirectAttributes + , HttpServletRequest request) throws Exception { + + //로그인 권한정보 불러오기 + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + + if(userId.equals("")) { + // Unauthorized : 401, 권한 없음, 예를 들면, 로그인 페이지가 필요한 페이지를 로그인 없이 접속하려는 경우 반환되는 코드 (인증 실패) (Unauthorized) + return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now())); + } + + return adjReqMgrPastService.deleteAdjReqRecordAjax(adjReqMgrPastVO); + } /** * @methodName : insertAdjReqMgrOffAjax @@ -391,7 +417,6 @@ public class AdjReqMgrPastController { return adjReqMgrPastService.insertAdjReqMgrRpplReq(adjReqMgrPastVO); } - /** * @methodName : checkNInsertAprvlPastAjax * @author : 이호영 @@ -459,6 +484,41 @@ public class AdjReqMgrPastController { + //TODO 구현예정 + /** + * @methodName : deletePrtclProc + * @author : 이호영 + * @date : 2022.09.27 + * @description : 기존 차수별 데이터는 삭제 + * @param adjReqMgrPastVO + * @param redirectAttributes + * @param request + * @return + * @throws Exception + */ + @RequestMapping(value = {"/kccadr/adjReqMgOff/deletePrtclProc.do"}) + public ResponseEntity deletePrtclProc(@ModelAttribute("adrVO") AdjReqMgrPastVO adjReqMgrPastVO + , RedirectAttributes redirectAttributes + , HttpServletRequest request) throws Exception { + + //로그인 권한정보 불러오기 + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + + if(userId.equals("")) { + // Unauthorized : 401, 권한 없음, 예를 들면, 로그인 페이지가 필요한 페이지를 로그인 없이 접속하려는 경우 반환되는 코드 (인증 실패) (Unauthorized) + return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now())); + } + + //사용자 유니크 아이디 받아오기 +// adjReqMgrPastVO.setLastUpdusrId(userId); + + return null; +// return adjReqMgrPastService.checkNUpdateAprvlPastAjax(adjReqMgrPastVO); + } + + + diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml index e5dd8258..a4cfe669 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml @@ -68,27 +68,30 @@ @@ -143,6 +146,7 @@ ADR_SEQ, ADR_SN, ADR_ADM_ID, + PST_CN, MEM_DEPT_SEQ, FRST_REGIST_PNTTM, FRST_REGISTER_ID, @@ -154,6 +158,7 @@ #adrSeq#, #adrSn#, #adrAdmId#, + #pstCn#, #memDeptSeq#, NOW() , #frstRegisterId# , @@ -380,16 +385,16 @@ @@ -584,36 +589,71 @@ - + - INSERT INTO ADR_ASS_MGR_PST ( - ADR_SEQ + INSERT INTO ADR_HSTRY ( + ADR_SEQ , ADR_SN - , ASS_PST_SEQ - , ASS_PST_USR_TY - , ASS_PST_USR_NM - , ADD_YN - , ADD_CHG_YN + , ADR_HSTRY_SEQ + , HSTRY_DE + , HSTRY_CN + + , STAT_CD + + + , HSTRY_DETAIL_CN + , FRST_REGIST_PNTTM , FRST_REGISTER_ID - , LAST_UPDT_PNTTM - , LAST_UPDUSR_ID ) VALUES - ( - #[].adrSeq# - , #[].adrSn# - , #[].assPstSeq# - , #[].assPstUsrTy# - , #[].assPstUsrNm# - , #[].addYn# - , 'N' + #adrSeq# + , #adrSn# + , #adrHstrySeq# + , TO_DATETIME(TO_CHAR(#hstryDe#,'YYYY-MM-DD HH24:MI')) + , #hstryCn# + + , #statCd# + + + , #hstryDetailCn# + , NOW() - , #[].frstRegisterId# - , NOW() - , #[].lastUpdusrId# + , #frstRegisterId# ) - + + + + UPDATE ADR_HSTRY SET + HSTRY_DE = TO_DATETIME(TO_CHAR(#hstryDe#,'YYYY-MM-DD HH24:MI')) + , HSTRY_CN = #hstryCn# + + , HSTRY_DETAIL_CN = null + + + , HSTRY_DETAIL_CN = #hstryDetailCn# + + , LAST_UPDUSR_ID = #lastUpdusrId# + , LAST_UPDT_PNTTM = NOW() + WHERE + ADR_HSTRY_SEQ = #adrHstrySeq# + + + + + + DELETE FROM ADR_HSTRY + WHERE ADR_HSTRY_SEQ = #adrHstrySeq# + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp index 72ea1192..366b848f 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp @@ -37,6 +37,47 @@ @@ -49,9 +90,11 @@ + " /> + " /> @@ -138,11 +181,11 @@
- checked > - + checked > + - checked > + checked >
@@ -1349,13 +1392,13 @@

조정부

- + " size="30"/>

조정조사관

- + " size="30"/> @@ -1364,11 +1407,11 @@ @@ -1380,9 +1423,20 @@ - + + + + + 조정결과 + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp index f1efe9cd..8e569899 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp @@ -31,202 +31,20 @@ 사건진행정보 -
- - -<%-- " /> --%> -<%-- " /> --%> -<%-- " /> --%> - -<%-- " /> --%> -<%-- " /> --%> - -<%-- " /> --%> -<%-- " /> --%> - <%-- " /> --%> - + + +
+ +
+ +
+ +
+
@@ -202,9 +305,9 @@ function fn_addRow(len){
-

총 진행 회차 : 건

+

<%-- 총 진행 회차 : 건 --%>

- +
@@ -226,56 +329,59 @@ function fn_addRow(len){ -<%-- --%> - - -<%-- --%> - - -<%-- --%> -<%-- --%> - -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> - - -<%-- --%> -<%-- --%> - -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> - - -<%-- --%> - - - -
- " data-datecontrol="true" onkeyup="setFormat('day',this)" maxlength="10" readonly> -
- - -
- - - - - - - - - - - + + + + + + + + + + + + +
@@ -283,17 +389,15 @@ function fn_addRow(len){
+
- +
-
- -
diff --git a/src/main/webapp/js/kccadr/adjReqMgrPast/event.js b/src/main/webapp/js/kccadr/adjReqMgrPast/event.js index 3e295ef8..6d1dcbc7 100644 --- a/src/main/webapp/js/kccadr/adjReqMgrPast/event.js +++ b/src/main/webapp/js/kccadr/adjReqMgrPast/event.js @@ -1,17 +1,16 @@ // 예문 팝업 function - function openExampleAdminPop(exmpCd) { - console.log('exmpCd : ', exmpCd); var pop = document.pop; pop.ccTy.value = $('#ccTy').val(); pop.exmpCd.value = exmpCd; - commonPopWindowopenForm("/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.do", '500', '400', "openExampleAdminPop", $('#pop')); + commonPopWindowopenForm("/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.do", '600', '400', "openExampleAdminPop", $('#pop')); } + /* 최종결과 선택에 따른 액션 00 -> 종결 @@ -33,16 +32,14 @@ function openExampleAdminPop(exmpCd) { /* 최종결과 선택에 따른 액션 - 00 -> 종결 - 40 -> 조정취하 */ $(document).on('change', '#detailResult', function(){ var thisVal = $(this).val(); $('#statCd').val(thisVal); }); - + //피신청인 삭제버튼 클릭 $(document).on('click', '.reqPerDel', function(){ diff --git a/src/main/webapp/js/kccadr/adjReqMgrPast/value.js b/src/main/webapp/js/kccadr/adjReqMgrPast/value.js index fa715bbe..f62d1fc8 100644 --- a/src/main/webapp/js/kccadr/adjReqMgrPast/value.js +++ b/src/main/webapp/js/kccadr/adjReqMgrPast/value.js @@ -8,7 +8,7 @@ $('#lastUpdtPnttm').val($('#endDate').val()); $('#adrSn').val($('#adrSnTemp').val()); $('#memDeptNm').val($('#memDeptNmTemp').val()); - $('#assPstUsrNm').val($('#assPstUsrNmTemp').val()); + $('#assPstUsrNm').val($('#assPstUsrNmTemp').val()); @@ -1062,15 +1062,50 @@ } - if(confirm("조정신청 정보 등록을 진행하시겠습니까?")){ + if($('#pstCn') == ""){ + alert("조정결과를 입력해 주세요"); + return false; + } + + if($('#statCd') == ""){ + alert("최종결과를 선택해 주세요"); + return false; + } + + if($('#assPstUsrNm') == ""){ + alert("조정조사관을 입력해 주세요"); + return false; + } + + if($('#assPstUsrNm') == ""){ + alert("조정부를 입력해 주세요"); + return false; + } + + var msg = ""; + var url = ""; + + + if($('#adrSeq').val() != null) + { + msg= "조정신청 정보 수정을 진행하시겠습니까?"; + url= "/kccadr/adjReqMgOff/updateAdjReqMgrOffAjax.do"; + } + else{ + msg= "조정신청 정보 등록을 진행하시겠습니까?"; + url= "/kccadr/adjReqMgOff/insertAdjReqMgrPastAjax.do"; + + } + + + if(confirm(msg)){ //신청인 정보 입력 var data = new FormData(form); - - + $.ajax({ type: "POST", - url: "/kccadr/adjReqMgOff/insertAdjReqMgrPastAjax.do", + url: url, data: data, dataType:'json', async: false, @@ -1081,8 +1116,8 @@ console.log('data : ', data); if(data.status == 'OK'){ alert(data.data); - $('#adrSeq').val(dataSub); - $('#nextGoPageForm').submit(); + $('#adrSeq').val(data.dataSub); +// $('#nextGoPageForm').submit(); } else if(data.status == 'Unauthorized') {