From ac7a59601caba9e81dfad88e4732c410007a3ebe Mon Sep 17 00:00:00 2001 From: hylee Date: Thu, 6 Oct 2022 18:14:17 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=EA=B3=BC=EA=B1=B0=EC=82=AC=EA=B1=B4?= =?UTF-8?q?=EB=93=B1=EB=A1=9D=20=EB=AA=A9=EB=A1=9D=20=EC=A2=85=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/AdjReqMgrOffLineVO.java | 10 + .../service/AdjReqMgrPastService.java | 6 +- .../service/AdjReqMgrPastVO.java | 93 ++- .../service/HstryStatEnumVO.java | 46 ++ .../service/impl/AdjReqMgrPastDAO.java | 24 + .../impl/AdjReqMgrPastServiceImpl.java | 210 +++++-- .../web/AdjReqMgrPastController.java | 57 +- .../adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml | 219 +++++++- .../adjReqMgrPastBasicRegist.jsp | 102 +--- .../adjReqMgrPast/adjReqMgrPastFileRegist.jsp | 12 + .../adjReqMgrPast/adjReqMgrPastList.jsp | 277 +++++++++ .../adjReqMgrPast/adjReqMgrPastProgRegist.jsp | 15 + .../adjReqMgrPastRecordRegist.jsp | 21 +- .../webapp/js/kccadr/adjReqMgrPast/value.js | 530 +++++++++--------- 14 files changed, 1211 insertions(+), 411 deletions(-) create mode 100644 src/main/java/kcc/kccadr/adjReqMgrPast/service/HstryStatEnumVO.java create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastList.jsp diff --git a/src/main/java/kcc/kccadr/adjReqMgrOff/service/AdjReqMgrOffLineVO.java b/src/main/java/kcc/kccadr/adjReqMgrOff/service/AdjReqMgrOffLineVO.java index 4bcab201..212339e3 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrOff/service/AdjReqMgrOffLineVO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrOff/service/AdjReqMgrOffLineVO.java @@ -100,6 +100,7 @@ public class AdjReqMgrOffLineVO extends ComDefaultVO implements Serializable { // 조정기일대리인 // private String adrSeq = ""; // 조정일련번호 private String adrSn = ""; // 조정회차 + private String adrSnChgYn = ""; // 조정회차 private String agntSeq = ""; // 대리인일련번호 // private String rpplSeq = ""; // 대리신청_관련인일련번호 private String agntSbmtYn = ""; // 조정대리신청제출여부 @@ -165,6 +166,9 @@ public class AdjReqMgrOffLineVO extends ComDefaultVO implements Serializable { private String adrHstrySeq; private String pstCn; + + + public AdjReqMgrVO getAdrVO() { return adrVO; } @@ -824,6 +828,12 @@ public class AdjReqMgrOffLineVO extends ComDefaultVO implements Serializable { public void setPstCn(String pstCn) { this.pstCn = pstCn; } + public String getAdrSnChgYn() { + return adrSnChgYn; + } + public void setAdrSnChgYn(String adrSnChgYn) { + this.adrSnChgYn = adrSnChgYn; + } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java index 81bdf59d..c3b2681c 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java @@ -40,6 +40,10 @@ public interface AdjReqMgrPastService { AdjReqMgrPastVO findByAdrHstryWhereStatCd(AdjReqMgrPastVO adjReqMgrPastVO); - void updateAdjReqMgrEtc(AdjReqMgrPastVO adjReqMgrPastVO) throws FdlException; + void updateAdjReqMgrEtc(AdjReqMgrOffLineVO adjReqMgrOffLineVO) throws FdlException; + + List selectAdjReqMgrPastList(AdjReqMgrPastVO adjReqMgrPastVO); + + int selectAdjReqMgrPastListCount(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 c7302728..62a69da5 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java @@ -52,6 +52,7 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { private String adrSeq = ""; // 조정일련번호 private String adrNo = ""; // 조정사건번호 private String statCd = ""; // 조정사건상태 + private String statTx = ""; // 조정사건상태 private String reqOlCd = ""; // 온_오프라인_신청구분 private String reqCn1 = ""; // 신청취지 private String reqCn2 = ""; // 신청원인 @@ -85,6 +86,8 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { private String adrOlYn = ""; // 전자조정진행여부 private String rpplId = ""; // 조정사건관리인ID private String rpplNm = ""; // 이름_대표자 + private String PrpplNm = ""; // 이름_대표자 + private long pRpplCnt = 0; // private String rpplBizId = ""; // 법인등록번호 private String rpplBizNo = ""; // 개인사업자번호 private String rpplBizNm = ""; // 법인_사업체명 @@ -121,6 +124,7 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { // 조정기일대리인 private String addUsrNmList[]; /* ass.agntSeq | ass.assUsrTy | add_yn " */ private String adrSn = ""; // 조정회차 + private String adrSnChgYn = ""; // 조정회차 private String agntSeq = ""; // 대리인일련번호 private String agntSbmtYn = ""; // 조정대리신청제출여부 private String agntApprYn = ""; // 조정대리승인여부 @@ -148,6 +152,7 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { private String reqPerTotCnt = ""; //피신청인 총 갯수 private String rpplAtchFileId = ""; //대리인 첨부파일 아이디 private String rpplMgrAtchFileId = ""; //조정신청 첨부파일 아이디 + private String adrEndDe = ""; // 조장 기간 private String resPonDentNm; @@ -209,8 +214,19 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { private String refSeq1; // 참고용 일련번호 1 private String refSeq2; // 참고용 일련번호 2 - private String adrHstryList[]; + + private String searchStatCdAll; + + private String searchCondition2; + + private String diffYear; + + + + + private List searchStatCdList = new ArrayList(); + public AdjReqMgrVO getAdrVO() { return adrVO; @@ -404,6 +420,14 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { this.statCd = statCd; } + public String getStatTx() { + return statTx; + } + + public void setStatTx(String statTx) { + this.statTx = statTx; + } + public String getReqOlCd() { return reqOlCd; } @@ -644,6 +668,22 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { this.rpplNm = rpplNm; } + public String getPrpplNm() { + return PrpplNm; + } + + public void setPrpplNm(String prpplNm) { + PrpplNm = prpplNm; + } + + public long getpRpplCnt() { + return pRpplCnt; + } + + public void setpRpplCnt(long pRpplCnt) { + this.pRpplCnt = pRpplCnt; + } + public String getRpplBizId() { return rpplBizId; } @@ -1354,7 +1394,56 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { public void setMemPstSeq(String memPstSeq) { this.memPstSeq = memPstSeq; - } + } + + public String getAdrEndDe() { + return adrEndDe; + } + + public void setAdrEndDe(String adrEndDe) { + this.adrEndDe = adrEndDe; + } + + public String getAdrSnChgYn() { + return adrSnChgYn; + } + + public void setAdrSnChgYn(String adrSnChgYn) { + this.adrSnChgYn = adrSnChgYn; + } + + public String getSearchStatCdAll() { + return searchStatCdAll; + } + + public void setSearchStatCdAll(String searchStatCdAll) { + this.searchStatCdAll = searchStatCdAll; + } + + public List getSearchStatCdList() { + return searchStatCdList; + } + + public void setSearchStatCdList(List searchStatCdList) { + this.searchStatCdList = searchStatCdList; + } + + public String getSearchCondition2() { + return searchCondition2; + } + + public void setSearchCondition2(String searchCondition2) { + this.searchCondition2 = searchCondition2; + } + + public String getDiffYear() { + return diffYear; + } + + public void setDiffYear(String diffYear) { + this.diffYear = diffYear; + } + // ============================================= diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/HstryStatEnumVO.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/HstryStatEnumVO.java new file mode 100644 index 00000000..8454654d --- /dev/null +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/HstryStatEnumVO.java @@ -0,0 +1,46 @@ +package kcc.kccadr.adjReqMgrPast.service; + +public enum HstryStatEnumVO { + CODE305050("조정취하") + , CODE304050("조정조서종결(성립)") + , CODE307050("불성립종결") + , CODE306050("직권조정성립") + ; + + + + + private final String label; + + HstryStatEnumVO(String label) { + this.label = label; + } + + public String label() { + return label; + } + + /** + * @methodName : getStatCdSwitching + * @author : 이호영 + * @date : 2022.10.05 + * @description : Enum type인 HstryStatEnumVO에서 코드별로 텍스트 추출 + * @param statCd + * @return + */ + public static String getStatCdSwitching(String statCd) { + String statTx = ""; + if("305050".equals(statCd)) { + statTx = HstryStatEnumVO.CODE305050.label(); + }else if("304050".equals(statCd)) { + statTx = HstryStatEnumVO.CODE304050.label(); + }else if("307050".equals(statCd)) { + statTx = HstryStatEnumVO.CODE307050.label(); + }else if("306050".equals(statCd)) { + statTx = HstryStatEnumVO.CODE306050.label(); + } + return statTx; + + } + +} 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 1ce3f0cc..e42a6457 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java @@ -147,5 +147,29 @@ public class AdjReqMgrPastDAO extends EgovAbstractDAO { delete("adjReqMgrPastDAO.deleteAdrPrtclMgrRow", adjReqMgrPastVO ); } + public void updateBasicInfo(AdjReqMgrPastVO adjReqMgrPastVO) { + update("adjReqMgrPastDAO.updateBasicInfo", adjReqMgrPastVO ); + } + + public List selectAdjReqMgrPastList(AdjReqMgrPastVO adjReqMgrPastVO) { + return (List) list("adjReqMgrPastDAO.selectAdjReqMgrPastList", adjReqMgrPastVO); + } + + public List selectRpplList(AdjReqMgrPastVO adjReqMgrPastVO) { + return (List) list("adjReqMgrPastDAO.selectRpplList", adjReqMgrPastVO); + } + + public String findByIdAdrHstry(AdjReqMgrPastVO adjPastVO) { + return (String) select("adjReqMgrPastDAO.findByIdAdrHstry", adjPastVO); + } + + public int selectAdjReqMgrPastListCount(AdjReqMgrPastVO adjReqMgrPastVO) { + return (int) select("adjReqMgrPastDAO.selectAdjReqMgrPastListCount", adjReqMgrPastVO); + } + + public void updateAdrEndDe(AdjReqMgrPastVO adjPastVO) { + update("adjReqMgrPastDAO.updateAdrEndDe", adjPastVO); + } + } 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 b84017a1..49242047 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -1,7 +1,11 @@ package kcc.kccadr.adjReqMgrPast.service.impl; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; import java.util.List; import javax.annotation.Resource; @@ -16,11 +20,14 @@ import org.springframework.stereotype.Service; import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; import egovframework.rte.fdl.cmmn.exception.FdlException; import egovframework.rte.fdl.idgnr.EgovIdGnrService; +import kcc.com.cmm.util.StringUtil; import kcc.com.utl.user.service.CheckAdrProcessUtil; +import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO; 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.service.HstryStatEnumVO; import kcc.kccadr.adjReqMgrPast.web.AdjReqMgrPastController; import kcc.kccadr.adjreqmgr.service.impl.AdjReqMgrDAO; import kcc.kccadr.adjst.service.impl.AdjstReqDAO; @@ -81,7 +88,6 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements //이력정보 관리 @Resource(name = "adrHstryMgrDAO") private AdrHstryMgrDAO adrHstryMgrDAO; - //오프라인 조정신청 정보 상세내역 불러오기 public AdjReqMgrPastVO selectAdjReqMgrOffLineInfo(AdjReqMgrPastVO adjReqMgrPastVO) throws Exception{ @@ -433,10 +439,8 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements int adrSn = Integer.parseInt(adjReqMgrPastVO.getAdrSn()); int cnt = 1; - System.out.println("adrSn :: " + adrSn); while(cnt <= adrSn) { - System.out.println("cnt : "+cnt); adjReqMgrPastVO.setPrtclSeq(idgenPrtclSeqService.getNextStringId()); // idgenPrtclSeqService adjReqMgrPastVO.setAdrSn(Integer.toString(cnt)); adjReqMgrPastDAO.insertAdrSnInit(adjReqMgrPastVO); @@ -704,8 +708,17 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements @Override public List findByAdrHstryId(AdjReqMgrPastVO adjPastVO) { + List list = adjReqMgrPastDAO.findByAdrHstryId(adjPastVO); - list.forEach(t -> t.setHstryDe(t.getHstryDe().split(" ")[0])); + + for(AdjReqMgrPastVO adjReqVO :list) + { + if(StringUtils.isNotEmpty(adjReqVO.getHstryDe())) + { + adjReqVO.setHstryDe(adjReqVO.getHstryDe().split(" ")[0]); + } + } + return list; } @@ -734,7 +747,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements if("".equals(adjReqMgrPastVO.getAdrHstrySeq())) { adjReqMgrPastVO.setAdrHstrySeq(adrHstrySeqGnrService.getNextStringId()); - adjReqMgrPastVO.setAdrSn("0"); + adjReqMgrPastVO.setAdrSn("1"); adjReqMgrPastDAO.insertAdjReqRecordAjax(adjReqMgrPastVO); }else{ adjReqMgrPastVO.setLastUpdusrId(adjPastVO.getLastUpdusrId()); @@ -743,6 +756,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements } + adjReqMgrPastDAO.updateAdrEndDe(adjPastVO); return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "사건진행정보 등록이 완료되었습니다.", LocalDateTime.now())); @@ -799,18 +813,48 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements @Override - public void updateAdjReqMgrEtc(AdjReqMgrPastVO adjReqMgrPastVO) throws FdlException { + public void updateAdjReqMgrEtc(AdjReqMgrOffLineVO adjReqMgrOffLineVO) throws FdlException { + + + AdjReqMgrPastVO adjReqMgrPastVO = new AdjReqMgrPastVO(); + + adjReqMgrPastVO.setAdrSeq(adjReqMgrOffLineVO.getAdrSeq()); + adjReqMgrPastVO.setMemDeptNm(adjReqMgrOffLineVO.getMemDeptNm()); // 조정부 PK + adjReqMgrPastVO.setMemPstSeq(adjReqMgrOffLineVO.getMemPstSeq()); // 조정부 명 + adjReqMgrPastVO.setAssPstSeq(adjReqMgrOffLineVO.getAssPstSeq()); // 조사관 PK + adjReqMgrPastVO.setAssPstUsrNm(adjReqMgrOffLineVO.getAssPstUsrNm()); // 조사관 명 + adjReqMgrPastVO.setStatCd(adjReqMgrOffLineVO.getStatCd()); // 최종 결과 코드 + adjReqMgrPastVO.setAdrHstrySeq(adjReqMgrOffLineVO.getAdrHstrySeq()); // 히스토리 PK + adjReqMgrPastVO.setAdrSn(adjReqMgrOffLineVO.getAdrSn()); // 차수 + adjReqMgrPastVO.setPstCn(adjReqMgrOffLineVO.getPstCn()); // 조정결과 + + adjReqMgrPastVO.setAdrNo(adjReqMgrOffLineVO.getAdrNo()); + adjReqMgrPastVO.setFrstRegistPnttm(adjReqMgrOffLineVO.getFrstRegistPnttm()); + adjReqMgrPastVO.setLastUpdtPnttm(adjReqMgrOffLineVO.getLastUpdtPnttm()); + adjReqMgrPastVO.setAdrSnChgYn(adjReqMgrOffLineVO.getAdrSnChgYn()); + logger.info(" ++ updateAdjReqMgrEtc ++ "); + + adjReqMgrPastDAO.updateBasicInfo(adjReqMgrPastVO); + // 조정부 수정 adjReqMgrPastDAO.updateMemDeptNm(adjReqMgrPastVO); // 조사관 수정 adjReqMgrPastDAO.updateAssPstUsrNm(adjReqMgrPastVO); - // 최종결과 CODE 수정 - adjReqMgrPastDAO.updateAdrHstry(adjReqMgrPastVO); - + if(StringUtil.isNotEmpty(adjReqMgrPastVO.getAdrHstrySeq())) + { + // 최종결과 CODE 수정 + adjReqMgrPastDAO.updateAdrHstry(adjReqMgrPastVO); + } + else + { + adjReqMgrPastVO.setAdrHstrySeq(adrHstrySeqGnrService.getNextStringId()); + adjReqMgrPastVO.setAdrSn("0"); + adjReqMgrPastDAO.insertAdjReqRecordAjax(adjReqMgrPastVO); + } // 조정결과 수정 adjReqMgrPastDAO.updateAdrMgrDetailPstCn(adjReqMgrPastVO); @@ -821,44 +865,126 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements * 기존 차수와 현재 차수 갯수가 다르면 삭제 및 추가 해야함 * */ List prtclRowList = adjReqMgrPastDAO.selectAdrPrtclMgrRow(adjReqMgrPastVO); -// System.out.println("prtclRowList.get(0).getPrtclSeq() : "+ prtclRowList.get(0).getPrtclSeq()); - prtclRowList.forEach(t->{ - logger.info(" + t.getAdrSeq() [{}], [{}], [{}]", t.getAdrSeq(), t.getAdrSn(), t.getPrtclSeq()); - }); - logger.info(" exist row size :: [{}]", prtclRowList.size()); - logger.info(" modify row size :: [{}]", adjReqMgrPastVO.getAdrSn()); - int existAdrSnSize = prtclRowList.size(); - int changeAdrSnSize = Integer.parseInt(adjReqMgrPastVO.getAdrSn()); - - // 기존에 있는 row보다 수정된 차수가 더 낮은 경우 - // 기존row > 수정row - int gap = 0; - if(existAdrSnSize > changeAdrSnSize) + + + /* + * adjReqMgrPastVO.getAdrSnChgYn() + * 차수 수정 + * */ + if("Y".equals(adjReqMgrPastVO.getAdrSnChgYn())) { - gap = existAdrSnSize - changeAdrSnSize; - for(int i=existAdrSnSize; i > gap; i--) + if(prtclRowList.size() > 0) + adjReqMgrPastDAO.deleteAdrPrtclMgrRow(prtclRowList.get(0)); + int adrSn = Integer.parseInt(adjReqMgrPastVO.getAdrSn()); + int cnt = 1; + while(cnt <= adrSn) { - adjReqMgrPastDAO.deleteAdrPrtclMgrRow(prtclRowList.get(i-1)); - } - } - // 기존에 있는 row보다 수정된 차수가 더 높은 경우 - // 기존row < 수정row - else if(existAdrSnSize < changeAdrSnSize) - { - gap = changeAdrSnSize - existAdrSnSize; - - -// int adrSn = Integer.parseInt(adjReqMgrPastVO.getAdrSn()); - int cnt = existAdrSnSize; // 기존 row size - while(cnt <= changeAdrSnSize) // 수정할 row size - { - System.out.println("cnt : "+cnt); -// adjReqMgrPastVO.setPrtclSeq(idgenPrtclSeqService.getNextStringId()); // idgenPrtclSeqService -// adjReqMgrPastVO.setAdrSn(Integer.toString(cnt)); -// adjReqMgrPastDAO.insertAdrSnInit(adjReqMgrPastVO); + adjReqMgrPastVO.setPrtclSeq(idgenPrtclSeqService.getNextStringId()); // idgenPrtclSeqService + adjReqMgrPastVO.setAdrSn(Integer.toString(cnt)); + adjReqMgrPastDAO.insertAdrSnInit(adjReqMgrPastVO); cnt++; } } + } + + + /* + * ADR_RPPL - rppl_ty 값 + * + * 01 : 신청인 + * 02 : 피신청인 + * 03 : 신청대리인 + * 04 : 피신청인대리인 + * + */ + @Override + public List selectAdjReqMgrPastList(AdjReqMgrPastVO adjReqMgrPastVO) { + + // + if(StringUtils.isNotEmpty(adjReqMgrPastVO.getSearchYear()) + && adjReqMgrPastVO.getSearchYear() != "99") + adjReqMgrPastVO.setDiffYear(this.setDiffYear(adjReqMgrPastVO.getSearchYear())); + + + List adjReqMgrPastList = adjReqMgrPastDAO.selectAdjReqMgrPastList(adjReqMgrPastVO); + + // 신청인 피신청인 select + adjReqMgrPastList.stream() + .forEach(t-> t.setAdjReqMgrVoList(adjReqMgrPastDAO.selectRpplList(t))); + /* + * 조정결과 상태값 select + * code -> text 변환 + * */ + adjReqMgrPastList.stream() + .forEach(t-> { + if(StringUtils.isNotEmpty(t.getStatCd())) + t.setStatTx(HstryStatEnumVO.getStatCdSwitching(t.getStatCd())); + }); + + // 리스트에서 피신청인 갯수 count + adjReqMgrPastList.stream().forEach(t-> { + t.setpRpplCnt(t.getAdjReqMgrVoList().stream() + .filter(c -> "20".equals(c.getRpplTy())) + .count()); + }); + + for(AdjReqMgrPastVO adjRpplVO : adjReqMgrPastList){ + // 피신청 이름 + String PrpplNm = ""; + // 외 n명 + String etcStr = ""; + // 피신청인 1명 이름 추출 + for(AdjReqMgrPastVO adjRppl : adjRpplVO.getAdjReqMgrVoList()) + { + if("20".equals(adjRppl.getRpplTy())) + { + PrpplNm = adjRppl.getRpplNm(); + break; + } + } + // 신청인 이름 추출 + for(AdjReqMgrPastVO adjRppl : adjRpplVO.getAdjReqMgrVoList()) + { + if("10".equals(adjRppl.getRpplTy())) + { + adjRpplVO.setRpplNm(egovCryptoUtil.decrypt(adjRppl.getRpplNm())); + break; + } + } + // 피신청인이 1명보다 많으면 "외 n명" 구하기 + if(adjRpplVO.getpRpplCnt() > 1) + { + int cnt = (int) (adjRpplVO.getpRpplCnt()-1); + etcStr = " 외 "+cnt+"명"; + } + adjRpplVO.setPrpplNm(egovCryptoUtil.decrypt(PrpplNm) + etcStr); + } + + + return adjReqMgrPastList; + } + + + @Override + public int selectAdjReqMgrPastListCount(AdjReqMgrPastVO adjReqMgrPastVO) { + if(StringUtils.isNotEmpty(adjReqMgrPastVO.getSearchYear()) + && adjReqMgrPastVO.getSearchYear() != "99") + adjReqMgrPastVO.setDiffYear(this.setDiffYear(adjReqMgrPastVO.getSearchYear())); + return adjReqMgrPastDAO.selectAdjReqMgrPastListCount(adjReqMgrPastVO); + } + + public String setDiffYear(String searchYear) { + + int yearChar = Integer.parseInt(searchYear); + Calendar cal = Calendar.getInstance(); + cal.setTime(new Date()); + DateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + + cal.add(Calendar.YEAR, -yearChar); + + return df.format(cal.getTime()); + } + } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index 8d2a1deb..d6c26a67 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping; 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; @@ -149,6 +150,44 @@ public class AdjReqMgrPastController { return "kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist"; } + @RequestMapping("/kccadr/adjReqMgOff/adjReqMgrPastList.do") + public String adjReqMgrPastList(@ModelAttribute("adjReqMgrPastVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { + + if(adjReqMgrPastVO.getPageUnit() != 10) { + adjReqMgrPastVO.setPageUnit(adjReqMgrPastVO.getPageUnit()); + } + + if("".equals(adjReqMgrPastVO.getSearchSortOrd())){ + adjReqMgrPastVO.setSearchSortOrd("desc"); + } + if(("3".equals(adjReqMgrPastVO.getSearchCondition()) || "4".equals(adjReqMgrPastVO.getSearchCondition())) && StringUtils.isNotBlank(adjReqMgrPastVO.getSearchKeyword())){ + adjReqMgrPastVO.setSearchKeyword(egovCryptoUtil.encrypt(adjReqMgrPastVO.getSearchKeyword())); + } + + /** paging */ + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(adjReqMgrPastVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(adjReqMgrPastVO.getPageUnit()); + paginationInfo.setPageSize(adjReqMgrPastVO.getPageSize()); + + adjReqMgrPastVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); + adjReqMgrPastVO.setLastIndex(paginationInfo.getLastRecordIndex()); + adjReqMgrPastVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); + + adjReqMgrPastVO.setReqOlCd("2"); + paginationInfo.setTotalRecordCount(adjReqMgrPastService.selectAdjReqMgrPastListCount(adjReqMgrPastVO)); + model.addAttribute("paginationInfo", paginationInfo); + + // 과거사건 구분 코드 + List list = adjReqMgrPastService.selectAdjReqMgrPastList(adjReqMgrPastVO); + // 복호화 + model.addAttribute("list", list); + + + + return "kccadr/adjReqMgrPast/adjReqMgrPastList"; + } + /** * @methodName : adjReqMgrPastProgRegist * @author : 이호영 @@ -309,8 +348,6 @@ public class AdjReqMgrPastController { @RequestMapping("/kccadr/adjReqMgOff/adjReqMgrPastRecordRegist.do") public String adjReqMgrPastRecordRegist(@ModelAttribute("adjReqMgrPastVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { - //TODO 테스트로 인한 seq 코딩 - adjReqMgrPastVO.setAdrSeq("ADR_0000000000002920"); List adrHstryList = adjReqMgrPastService.findByAdrHstryId(adjReqMgrPastVO); @@ -351,7 +388,6 @@ public class AdjReqMgrPastController { return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now())); } - System.out.println("adjReqMgrPastVO :: "+ adjReqMgrPastVO.getAdrSeq()); //사용자 유니크 아이디 받아오기 adjReqMgrPastVO.setFrstRegisterId(userId); adjReqMgrPastVO.setLastUpdusrId(userId); @@ -548,30 +584,19 @@ public class AdjReqMgrPastController { //사용자 유니크 아이디 받아오기 adjReqMgrOffLineVO.setLastUpdusrId(userId); - /* * 오프라인 수정 로직 * 수정 X * */ String resultSts = adjReqMgrOffLineService.updateAdjReqMgrRpplReq(adjReqMgrOffLineVO); - AdjReqMgrPastVO adjReqMgrPastVO = new AdjReqMgrPastVO(); - - adjReqMgrPastVO.setAdrSeq(adjReqMgrOffLineVO.getAdrSeq()); - adjReqMgrPastVO.setMemDeptNm(adjReqMgrOffLineVO.getMemDeptNm()); // 조정부 PK - adjReqMgrPastVO.setMemPstSeq(adjReqMgrOffLineVO.getMemPstSeq()); // 조정부 명 - adjReqMgrPastVO.setAssPstSeq(adjReqMgrOffLineVO.getAssPstSeq()); // 조사관 PK - adjReqMgrPastVO.setAssPstUsrNm(adjReqMgrOffLineVO.getAssPstUsrNm()); // 조사관 명 - adjReqMgrPastVO.setStatCd(adjReqMgrOffLineVO.getStatCd()); // 최종 결과 코드 - adjReqMgrPastVO.setAdrHstrySeq(adjReqMgrOffLineVO.getAdrHstrySeq()); // 히스토리 PK - adjReqMgrPastVO.setAdrSn(adjReqMgrOffLineVO.getAdrSn()); // 차수 - adjReqMgrPastVO.setPstCn(adjReqMgrOffLineVO.getPstCn()); // 조정결과 /* * 기존 수정로직 후 기타사항 수정 * 조정부, 조정조사관, 진행된 차수, 최종결과, 조정결과 * */ - adjReqMgrPastService.updateAdjReqMgrEtc(adjReqMgrPastVO); + adjReqMgrPastService.updateAdjReqMgrEtc(adjReqMgrOffLineVO); + if(resultSts.equals("updateSucc")) { return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "정상적으로 수정하였습니다.", adjReqMgrOffLineVO.getAdrSeq(), LocalDateTime.now())); 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 bb6a8790..ca51d02e 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 @@ -587,6 +587,7 @@ ADR_HSTRY WHERE ADR_SEQ = #adrSeq# + AND ADR_SN = 1 @@ -748,7 +749,15 @@ ADR_SEQ = #adrSeq# - SELECT ADR_SEQ as adrSeq @@ -763,7 +772,213 @@ DELETE FROM ADR_PRTCL_MGR WHERE ADR_SEQ = #adrSeq# - AND PRTCL_SEQ = #prtclSeq# + + + + UPDATE ADR_MGR_MASTER SET + ADR_NO = #adrNo# + , FRST_REGIST_PNTTM = TO_CHAR(#frstRegistPnttm#,'YYYY-MM-DD') + , LAST_UPDT_PNTTM = #lastUpdtPnttm# + WHERE + ADR_SEQ = #adrSeq# + + + + + + + + + + + + + + + + \ 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 0a2db936..8eb306d9 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp @@ -70,17 +70,32 @@ $(document).on('change', '#adrSnTemp', function(){ { $('#adrSnTemp').val($('#prtclSize').val()).prop("selected", true); + }else{ + $('#adrSnChgYn').val('Y'); } } }); +function fn_goListPage(){ + + var pageForm = document.pageForm ; + pageForm.action = ""; + pageForm.submit(); + +} + + +
+ +
+
@@ -101,7 +116,8 @@ $(document).on('change', '#adrSnTemp', function(){ - > + +
@@ -131,15 +147,15 @@ $(document).on('change', '#adrSnTemp', function(){ 조정번호 - + 조정신청일
-<%-- --%> - + +
@@ -1462,9 +1410,7 @@ $(document).on('change', '#adrSnTemp', function(){
-<%-- " /> --%> - - + " /> 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 8e569899..9194c7dc 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp @@ -50,6 +50,13 @@ function fn_testPageAlert(){ alert("사건관련 문서 추가 시 작동하는 버튼입니다. \n 첨부파일 솔루션 도입 후 적용 예정"); } +function fn_goListPage(){ + var pageForm = document.pageForm ; + pageForm.action = ""; + pageForm.submit(); +} + +