From 2a0e0b5d01b9ce773cbc3c2958673b7e007b0381 Mon Sep 17 00:00:00 2001 From: hylee Date: Thu, 22 Sep 2022 20:43:36 +0900 Subject: [PATCH] =?UTF-8?q?feat:=EA=B3=BC=EA=B1=B0=EC=82=AC=EA=B1=B4?= =?UTF-8?q?=EB=93=B1=EB=A1=9D=20-=20=ED=9A=8C=EC=B0=A8=EB=B3=84=20?= =?UTF-8?q?=EA=B8=B0=EC=9D=BC=EC=A1=B0=EC=84=9C=20=EB=93=B1=EB=A1=9D=20?= =?UTF-8?q?=EC=A7=84=ED=96=89=EC=A4=91=20/=20=EC=82=AC=EA=B1=B4=EA=B4=80?= =?UTF-8?q?=EB=A0=A4=EB=AC=B8=EC=84=9C=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjPgrMgr/cmm/service/PgrCmmVO.java | 11 +- .../cmm/service/impl/PgrCmmServiceImpl.java | 2 + .../service/AdjAssMgrPastVO.java | 140 +++++ .../service/AdjReqMgrPastService.java | 5 + .../service/AdjReqMgrPastVO.java | 117 +++- .../service/AdrMemDeptMgrPstVO.java | 98 ++++ .../service/impl/AdjReqMgrPastDAO.java | 21 +- .../impl/AdjReqMgrPastServiceImpl.java | 212 ++++++- .../web/AdjReqMgrPastController.java | 207 +++++-- .../spring/com/context-idgen.xml | 29 + .../adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml | 116 +++- .../adjReqMgrPastBasicRegist.jsp | 14 + .../adjReqMgrPast/adjReqMgrPastFileRegist.jsp | 138 +++++ .../adjReqMgrPast/adjReqMgrPastProgRegist.jsp | 77 ++- .../jsp/kccadr/adjReqMgrPast/drtRegPop.jsp | 549 ++++++++++++++++++ .../webapp/js/kccadr/adjReqMgrPast/value.js | 4 +- 16 files changed, 1672 insertions(+), 68 deletions(-) create mode 100644 src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjAssMgrPastVO.java create mode 100644 src/main/java/kcc/kccadr/adjReqMgrPast/service/AdrMemDeptMgrPstVO.java create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/drtRegPop.jsp diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java index b58d61ae..ba48f848 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java @@ -13,6 +13,7 @@ public class PgrCmmVO extends ComDefaultVO implements Serializable { private String adrNo; // 사건 ( 사건번호) private String adrSeq; // 조정일련번호 Key private String adrSn; // 조정회차 + private String nowAdrSn; // 조정회차 private String adrMaxSn; //기일 최종 차수 정보 private String appDe; // 조정기일시 @@ -207,7 +208,15 @@ public class PgrCmmVO extends ComDefaultVO implements Serializable { this.adrSn = adrSn; } - public String getAdrMaxSn() { + public String getNowAdrSn() { + return nowAdrSn; + } + + public void setNowAdrSn(String nowAdrSn) { + this.nowAdrSn = nowAdrSn; + } + + public String getAdrMaxSn() { return adrMaxSn; } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmServiceImpl.java b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmServiceImpl.java index 34f4fdff..0ef249ad 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/impl/PgrCmmServiceImpl.java @@ -65,6 +65,8 @@ public class PgrCmmServiceImpl implements PgrCmmService { decpyptVo(result); + System.out.println("result.getAppPlace() : "+ result.getAppPlace()); + if (!StringUtil.isEmpty(result.getAppPlace())) { String app[] = (result.getAppPlace()).split("\\|"); if (app.length > 0) { diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjAssMgrPastVO.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjAssMgrPastVO.java new file mode 100644 index 00000000..cd24480c --- /dev/null +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjAssMgrPastVO.java @@ -0,0 +1,140 @@ +package kcc.kccadr.adjReqMgrPast.service; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +import kcc.com.cmm.ComDefaultVO; +import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; + +/** + * + * @author : 이호영 + * @fileName : AdjAssMgrPastVO.java + * @date : 2022.09.20 + * @description : 과거사건등록 - 조정기일배석관리 + * =========================================================== + * DATE AUTHOR NOTE + * ----------------------------------------------------------- * + * 2022.09.20 이호영 최초 생성 + * + * @출석인구분assPstUsrTy CC018 code + * @01 조정부장 + * @02 조정위원 + * @10 신청인 + * @20 피신청인 + * @30 신청대리인 + * @35 신청조정대리인 // 신청 참관대리인 + * @40 피신청대리인 + * @45 피신청조정대리인 // 피신청 참관대리인 + * + * 과거등록만 + * @50 조정조사관 + * + */ +public class AdjAssMgrPastVO extends ComDefaultVO implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 4469124675385114723L; + + + private String adrSeq; + private int adrSn; + private String assPstSeq; + private String assPstUsrTy; + private String assPstUsrNm; + private String addYn; + private String addChgYn; + private String frstRegistPnttm; //등록일시 + private String frstRegisterId; //등록자 + private String lastUpdtPnttm; //수정일시 + private String lastUpdusrId; //수정자 + + public AdjAssMgrPastVO() { + + } + + public AdjAssMgrPastVO(AdjReqMgrPastVO adjPastVO) { + + this.setAdrSeq(adjPastVO.getAdrSeq()); + this.setAdrSn(Integer.parseInt(adjPastVO.getAdrSn())); + this.setFrstRegisterId(adjPastVO.getFrstRegisterId()); + this.setLastUpdusrId(adjPastVO.getLastUpdusrId()); + + } + + + public String getAdrSeq() { + return adrSeq; + } + public void setAdrSeq(String adrSeq) { + this.adrSeq = adrSeq; + } + public int getAdrSn() { + return adrSn; + } + public void setAdrSn(int adrSn) { + this.adrSn = adrSn; + } + public String getAssPstSeq() { + return assPstSeq; + } + public void setAssPstSeq(String assPstSeq) { + this.assPstSeq = assPstSeq; + } + public String getAssPstUsrTy() { + return assPstUsrTy; + } + public void setAssPstUsrTy(String assPstUsrTy) { + this.assPstUsrTy = assPstUsrTy; + } + public String getAssPstUsrNm() { + return assPstUsrNm; + } + public void setAssPstUsrNm(String assPstUsrNm) { + this.assPstUsrNm = assPstUsrNm; + } + public String getAddYn() { + return addYn; + } + public void setAddYn(String addYn) { + this.addYn = addYn; + } + public String getAddChgYn() { + return addChgYn; + } + public void setAddChgYn(String addChgYn) { + this.addChgYn = addChgYn; + } + public String getFrstRegistPnttm() { + return frstRegistPnttm; + } + public void setFrstRegistPnttm(String frstRegistPnttm) { + this.frstRegistPnttm = frstRegistPnttm; + } + public String getFrstRegisterId() { + return frstRegisterId; + } + public void setFrstRegisterId(String frstRegisterId) { + this.frstRegisterId = frstRegisterId; + } + public String getLastUpdtPnttm() { + return lastUpdtPnttm; + } + public void setLastUpdtPnttm(String lastUpdtPnttm) { + this.lastUpdtPnttm = lastUpdtPnttm; + } + public String getLastUpdusrId() { + return lastUpdusrId; + } + public void setLastUpdusrId(String lastUpdusrId) { + this.lastUpdusrId = lastUpdusrId; + } + + + + + +} diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java index 0c2ad641..b8513fc4 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java @@ -14,7 +14,12 @@ public interface AdjReqMgrPastService { //오프라인 조정신청 정보 입력 ResponseEntity insertAdjReqMgrRpplReq(AdjReqMgrPastVO adjReqMgrPastVO) throws Exception; + + ResponseEntity checkNInsertAprvlPastAjax(AdjReqMgrPastVO adjReqMgrPastVO) throws Exception; List selectAdrPrtclMgrPastList(AdjReqMgrPastVO adjReqMgrPastVO); + + AdjReqMgrPastVO selectMemAss(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 99ecf4b3..66e4f5a8 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java @@ -29,6 +29,18 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { private String searchCnd = ""; // 검색 항목 private String searchWrd = ""; // 검색명 private String frstRegisterNm = ""; // 최조작성자 이름 + + private String appDeDay; /* 조정기일일시 */ + private String appDeTime; /* 조정기일일시 */ + private String nextAppDeTime; /* 다음조정기일일시 */ + private String nextAppDeDay; /* 다음조정기일일시 */ + + private String appPlaceTx; /* 조정기일장소 */ + private String addUsrNm0; /* 조정부장 */ + private String addUsrNm1; /* 조정위원1 */ + private String addUsrNm2; /* 조정위원2 */ + private String addDe; /* 공개여부 */ + // 조정사건 private String adrSeq = ""; // 조정일련번호 @@ -94,7 +106,9 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { private String rpplRelation = ""; //신청인과의 관계() private String rpplRelationEtc = ""; //신청인과의 관계 기타 입력 - + private String addUsrIdList[]; /* ass.addUsrId | ass.assUsrTy | add_yn " */ + private String addUsrId; /* ass.addUsrId | ass.assUsrTy | add_yn " */ + private String addAgntList[]; /* ass.agntSeq | ass.assUsrTy | add_yn " */ // 조정기일대리인 private String adrSn = ""; // 조정회차 private String agntSeq = ""; // 대리인일련번호 @@ -157,8 +171,11 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { private String appResultTy; //기일결과 구분 + private String memDeptNm; //조정부명 + private String adrAdmId; //조정조사관ID + private String memDeptSeq; //조정부일련번호 - + private String assPstUsrNm; public AdjReqMgrVO getAdrVO() { @@ -814,6 +831,102 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { public void setAppResultTy(String appResultTy) { this.appResultTy = appResultTy; } + public String getMemDeptNm() { + return memDeptNm; + } + public void setMemDeptNm(String memDeptNm) { + this.memDeptNm = memDeptNm; + } + public String getAdrAdmId() { + return adrAdmId; + } + public void setAdrAdmId(String adrAdmId) { + this.adrAdmId = adrAdmId; + } + public String getMemDeptSeq() { + return memDeptSeq; + } + public void setMemDeptSeq(String memDeptSeq) { + this.memDeptSeq = memDeptSeq; + } + public String getAssPstUsrNm() { + return assPstUsrNm; + } + public void setAssPstUsrNm(String assPstUsrNm) { + this.assPstUsrNm = assPstUsrNm; + } + public String[] getAddUsrIdList() { + return addUsrIdList; + } + public void setAddUsrIdList(String[] addUsrIdList) { + this.addUsrIdList = addUsrIdList; + } + public String getAddUsrId() { + return addUsrId; + } + public void setAddUsrId(String addUsrId) { + this.addUsrId = addUsrId; + } + public String[] getAddAgntList() { + return addAgntList; + } + public void setAddAgntList(String[] addAgntList) { + this.addAgntList = addAgntList; + } + public String getAppDeDay() { + return appDeDay; + } + public void setAppDeDay(String appDeDay) { + this.appDeDay = appDeDay; + } + public String getAppDeTime() { + return appDeTime; + } + public void setAppDeTime(String appDeTime) { + this.appDeTime = appDeTime; + } + public String getNextAppDeTime() { + return nextAppDeTime; + } + public void setNextAppDeTime(String nextAppDeTime) { + this.nextAppDeTime = nextAppDeTime; + } + public String getNextAppDeDay() { + return nextAppDeDay; + } + public void setNextAppDeDay(String nextAppDeDay) { + this.nextAppDeDay = nextAppDeDay; + } + public String getAppPlaceTx() { + return appPlaceTx; + } + public void setAppPlaceTx(String appPlaceTx) { + this.appPlaceTx = appPlaceTx; + } + public String getAddUsrNm0() { + return addUsrNm0; + } + public void setAddUsrNm0(String addUsrNm0) { + this.addUsrNm0 = addUsrNm0; + } + public String getAddUsrNm1() { + return addUsrNm1; + } + public void setAddUsrNm1(String addUsrNm1) { + this.addUsrNm1 = addUsrNm1; + } + public String getAddUsrNm2() { + return addUsrNm2; + } + public void setAddUsrNm2(String addUsrNm2) { + this.addUsrNm2 = addUsrNm2; + } + public String getAddDe() { + return addDe; + } + public void setAddDe(String addDe) { + this.addDe = addDe; + } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdrMemDeptMgrPstVO.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdrMemDeptMgrPstVO.java new file mode 100644 index 00000000..eee87d78 --- /dev/null +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdrMemDeptMgrPstVO.java @@ -0,0 +1,98 @@ +package kcc.kccadr.adjReqMgrPast.service; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +import kcc.com.cmm.ComDefaultVO; +import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; + +/** + * + * @author : 이호영 + * @fileName : AdjAssMgrPastVO.java + * @date : 2022.09.20 + * @description : 과거사건등록 - 조정부관리 + * =========================================================== + * DATE AUTHOR NOTE + * ----------------------------------------------------------- * + * 2022.09.20 이호영 최초 생성 + * + * + * + */ +public class AdrMemDeptMgrPstVO extends ComDefaultVO implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 4469124675385114723L; + + + + private String memPstSeq; //조정부일련번호 + private String memDeptNm; //조정부명 + private String useYn; //사용여부 + + private String frstRegistPnttm; //등록일시 + private String frstRegisterId; //등록자 + private String lastUpdtPnttm; //수정일시 + private String lastUpdusrId; //수정자 + + + + + + + + + + + public String getMemPstSeq() { + return memPstSeq; + } + public void setMemPstSeq(String memPstSeq) { + this.memPstSeq = memPstSeq; + } + public String getMemDeptNm() { + return memDeptNm; + } + public void setMemDeptNm(String memDeptNm) { + this.memDeptNm = memDeptNm; + } + public String getUseYn() { + return useYn; + } + public void setUseYn(String useYn) { + this.useYn = useYn; + } + public String getFrstRegistPnttm() { + return frstRegistPnttm; + } + public void setFrstRegistPnttm(String frstRegistPnttm) { + this.frstRegistPnttm = frstRegistPnttm; + } + public String getFrstRegisterId() { + return frstRegisterId; + } + public void setFrstRegisterId(String frstRegisterId) { + this.frstRegisterId = frstRegisterId; + } + public String getLastUpdtPnttm() { + return lastUpdtPnttm; + } + public void setLastUpdtPnttm(String lastUpdtPnttm) { + this.lastUpdtPnttm = lastUpdtPnttm; + } + public String getLastUpdusrId() { + return lastUpdusrId; + } + public void setLastUpdusrId(String lastUpdusrId) { + this.lastUpdusrId = lastUpdusrId; + } + + + + + +} 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 3318c033..98d1b082 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java @@ -5,7 +5,10 @@ import java.util.List; import org.springframework.stereotype.Repository; import egovframework.rte.psl.dataaccess.EgovAbstractDAO; +import kcc.kccadr.adjPgrMgr.drt.service.AssVO; +import kcc.kccadr.adjReqMgrPast.service.AdjAssMgrPastVO; import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO; +import kcc.kccadr.adjReqMgrPast.service.AdrMemDeptMgrPstVO; @Repository("AdjReqMgrPastDAO") public class AdjReqMgrPastDAO extends EgovAbstractDAO { @@ -41,6 +44,22 @@ public class AdjReqMgrPastDAO extends EgovAbstractDAO { public List selectAdrPrtclMgrPastList(AdjReqMgrPastVO adjReqMgrPastVO) { return (List) list("adjReqMgrPastDAO.selectAdrPrtclMgrPastList", adjReqMgrPastVO); } - + + public void insertMemDeptMgrPst(AdrMemDeptMgrPstVO adrMemDeptMgrPstVO) { + insert("adjReqMgrPastDAO.insertMemDeptMgrPst", adrMemDeptMgrPstVO ); + } + + public void insertAdjAssMgrPst(AdjAssMgrPastVO adjAssMgrPastVO) { + insert("adjReqMgrPastDAO.insertAdjAssMgrPst", adjAssMgrPastVO ); + } + + public AdjReqMgrPastVO selectMemAss(AdjReqMgrPastVO adjReqMgrPastVO) { + return (AdjReqMgrPastVO) select("adjReqMgrPastDAO.selectMemAss", adjReqMgrPastVO); + } + + public void insertAdjAssList(List adjAssMgrPastList) { + insert("adjReqMgrPastDAO.insertAdjAssList", adjAssMgrPastList ); + } + } 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 84c6caf5..7f25e2c2 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -2,19 +2,24 @@ package kcc.kccadr.adjReqMgrPast.service.impl; import java.time.LocalDateTime; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import javax.annotation.Resource; +import org.apache.commons.lang3.StringUtils; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; 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.utl.user.service.CheckAdrProcessUtil; +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.adjreqmgr.service.impl.AdjReqMgrDAO; import kcc.kccadr.adjst.service.impl.AdjstReqDAO; import kcc.kccadr.advc.service.impl.AdrHstryMgrDAO; @@ -35,6 +40,12 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements @Resource(name="rpplGnrService") private EgovIdGnrService rpplIdgenService; + + @Resource(name="adrAssMgrPstGnrService") + private EgovIdGnrService adrAssMgrPstGnrService; // 과거사건등록 - 조정기일배석관리 + + @Resource(name="adrMemDeptMgrPstGnrService") + private EgovIdGnrService adrMemDeptMgrPstGnrService; // 과거사건등록 - 조정부관리 // ADR_PRTCL_MGR 기일조서관리 pk @Resource(name = "egovPrtclManageGnrService") @@ -205,7 +216,33 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements else if("20".equals(adjReqMgrPastVO.getStatCd()) || "80".equals(adjReqMgrPastVO.getStatCd())) adjReqMgrPastVO.setStatCd(KccadrConstants.ADR_NOSUCC); - + + /* + * 조정부 등록 + * */ + AdrMemDeptMgrPstVO adrMemDeptMgrPstVO = new AdrMemDeptMgrPstVO(); + adrMemDeptMgrPstVO.setMemPstSeq(adrMemDeptMgrPstGnrService.getNextStringId()); + adrMemDeptMgrPstVO.setMemDeptNm(adjReqMgrPastVO.getMemDeptNm()); + adrMemDeptMgrPstVO.setFrstRegisterId(adjReqMgrPastVO.getFrstRegisterId()); + adrMemDeptMgrPstVO.setLastUpdusrId(adjReqMgrPastVO.getLastUpdusrId()); + + + adjReqMgrPastDAO.insertMemDeptMgrPst(adrMemDeptMgrPstVO); + + /* + * 조사관 등록 + * */ + AdjAssMgrPastVO adjAssMgrPastVO = new AdjAssMgrPastVO(); + adjAssMgrPastVO.setAdrSeq(adrSeq); + adjAssMgrPastVO.setAdrSn(0); + adjAssMgrPastVO.setAssPstSeq(adrAssMgrPstGnrService.getNextStringId()); + adjAssMgrPastVO.setAssPstUsrTy("50"); + adjAssMgrPastVO.setAssPstUsrNm(adjReqMgrPastVO.getAssPstUsrNm()); + adjAssMgrPastVO.setFrstRegisterId(adjReqMgrPastVO.getFrstRegisterId()); + adjAssMgrPastVO.setLastUpdusrId(adjReqMgrPastVO.getLastUpdusrId()); + + adjReqMgrPastDAO.insertAdjAssMgrPst(adjAssMgrPastVO); + //신규 조정사건 생성해 주기 int adrCnt = 0 ; adrCnt = adjReqMgrPastDAO.insertAdrMgrMaster(adjReqMgrPastVO); @@ -218,8 +255,13 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements //신규 조정사건 상세보기 생성해 주기 // adjReqMgrPastVO.setAdrSn("1"); + + adjReqMgrPastVO.setAdrAdmId(adjAssMgrPastVO.getAssPstSeq()); + adjReqMgrPastVO.setMemDeptSeq(adrMemDeptMgrPstVO.getMemPstSeq()); adjReqMgrPastDAO.insertAdrMgrMasterDetail(adjReqMgrPastVO); + + //조정신청 대리인 및 신청인 정보 추가해 주기 String rpplSeq = ""; String rpplTy = adjReqMgrPastVO.getRpplTy(); @@ -384,6 +426,8 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements } + + } int adrSn = Integer.parseInt(adjReqMgrPastVO.getAdrSn()); @@ -432,18 +476,176 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements //디비에 추가해 주기 int resultCnt = adjReqMgrPastDAO.insertAdrRppl(adjReqMgrPastVO); + + + + return resultCnt; } @Override public List selectAdrPrtclMgrPastList(AdjReqMgrPastVO adjReqMgrPastVO) { - adjReqMgrPastVO.setAdrSeq("ADR_0000000000002920"); - System.out.println("adjReqMgrPastVO.getAdrSeq() : "+ adjReqMgrPastVO.getAdrSeq()); - // TODO Auto-generated method stub -// return null; return adjReqMgrPastDAO.selectAdrPrtclMgrPastList(adjReqMgrPastVO); } + + @Override + public AdjReqMgrPastVO selectMemAss(AdjReqMgrPastVO adjReqMgrPastVO) { + return adjReqMgrPastDAO.selectMemAss(adjReqMgrPastVO); + } + + + @Override + public ResponseEntity checkNInsertAprvlPastAjax(AdjReqMgrPastVO adjPastVO) throws Exception { + + // 공통 +// System.out.println(" 조정번호 :: "+adjPastVO.getAdrSeq()); +// System.out.println(" 조정차수 :: "+adjPastVO.getAdrSn()); +// +// // 기일정보 +// System.out.println(" 조정기일일 :: "+adjPastVO.getAppDeDay()); +// System.out.println(" 조정기일시 :: "+adjPastVO.getAppDeTime()); +// System.out.println(" 다음조정기일일 :: "+adjPastVO.getNextAppDeDay()); +// System.out.println(" 다음조정기일시 :: "+adjPastVO.getNextAppDeTime()); +// System.out.println(" 조정기일장소 :: "+adjPastVO.getAppPlaceTx()); +// System.out.println(" 기일조서내용 :: "+adjPastVO.getPrtclCn()); +// System.out.println(" 장소 Type :: "+adjPastVO.getAppPlaceTy()); +// System.out.println(" 장소 :: "+adjPastVO.getAppPlaceTx()); +// System.out.println(" 공개여부 :: "+adjPastVO.getOpenYn()); + /* + * TO_DATETIME('2015-08-10 16:04:56','YYYY-MM-DD HH24:MI:SS') + * 조정번호 :: ADR_0000000000002920 + * 조정차수 :: 1 + * 신청인 피신청인 정보 :: [신청|10|Y, 피신청|20|Y] + * 참관 대리인 정보 :: [35|참관대, 45|피찬관대] + * 조정기일일 :: 2022-09-01 + * 조정기일시 :: 14:00 + * 다음조정기일일 :: 2022-09-08 + * 다음조정기일시 :: 03:00 + * 조정기일장소 :: + * 조정부장 :: 222 + * 조정위원1 :: + * 조정위원2 :: + * 조서내용 :: 123123 + * */ + // add 정보 + + System.out.println(" 조정기일일 :: "+adjPastVO.getAppDeDay()); + System.out.println(" 조정기일시 :: "+adjPastVO.getAppDeTime()); + System.out.println(" 다음조정기일일 :: "+adjPastVO.getNextAppDeDay()); + System.out.println(" 다음조정기일시 :: "+adjPastVO.getNextAppDeTime()); + System.out.println(" 조정기일장소 :: "+adjPastVO.getAppPlaceTx()); + System.out.println(" 기일조서내용 :: "+adjPastVO.getPrtclCn()); + System.out.println(" 장소 Type :: "+adjPastVO.getAppPlaceTy()); + System.out.println(" 장소 :: "+adjPastVO.getAppPlaceTx()); + System.out.println(" 공개여부 :: "+adjPastVO.getOpenYn()); + + +// this.insertAdjAssAndDataCleansing(adjPastVO); + this.insertAdrPrtclMgrAndDataCleansing(adjPastVO); + return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "기일조서 등록이 완료되었습니다.", LocalDateTime.now())); + } + + + private void insertAdrPrtclMgrAndDataCleansing(AdjReqMgrPastVO adjPastVO) { + adjPastVO.setAddDe(adjPastVO.getAppDeDay()+" "+adjPastVO.getAppDeTime()); + adjPastVO.setAppPlace(adjPastVO.getAppPlaceTx()); + System.out.println(" 조정기일장소 :: "+adjPastVO.getAppPlaceTx()); + +// 10 성립 +// 20 불성립 +// 30 직권조정 +// 40 조정취하 +// 50 다음기일 +// 60 조정권고안 +// + if("05".equals(adjPastVO.getAppResultTy())) + { + + } + } + + + public void insertAdjAssAndDataCleansing(AdjReqMgrPastVO adjPastVO) throws FdlException { + + List adjAssMgrPastList = new ArrayList(); + + /* 신청인 */ + AdjAssMgrPastVO adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO); + String addUsrIdS = adjPastVO.getAddUsrIdList()[0]; + adjAssMgrPastVO.setAssPstSeq(adrAssMgrPstGnrService.getNextStringId()); + adjAssMgrPastVO.setAssPstUsrNm(addUsrIdS.split("\\|")[0]); + adjAssMgrPastVO.setAssPstUsrTy(addUsrIdS.split("\\|")[1]); + adjAssMgrPastVO.setAddYn(addUsrIdS.split("\\|")[2]); + adjAssMgrPastList.add(adjAssMgrPastVO); + + /* 피신청인 */ + adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO); + String addUsrIdP = adjPastVO.getAddUsrIdList()[1]; + adjAssMgrPastVO.setAssPstSeq(adrAssMgrPstGnrService.getNextStringId()); + adjAssMgrPastVO.setAssPstUsrNm(addUsrIdP.split("\\|")[0]); + adjAssMgrPastVO.setAssPstUsrTy(addUsrIdP.split("\\|")[1]); + adjAssMgrPastVO.setAddYn(addUsrIdP.split("\\|")[2]); + adjAssMgrPastList.add(adjAssMgrPastVO); + + String assPstUsrNmS = adjPastVO.getAddAgntList()[0]; + String assPstUsrNmP = adjPastVO.getAddAgntList()[1]; + + /* 신청 참관 대리인 */ + if(StringUtils.isNotEmpty(assPstUsrNmS)) + { + adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO); + adjAssMgrPastVO.setAssPstSeq(adrAssMgrPstGnrService.getNextStringId()); + adjAssMgrPastVO.setAssPstUsrTy(assPstUsrNmS.split("\\|")[0]); + adjAssMgrPastVO.setAssPstUsrNm(assPstUsrNmS.split("\\|")[1]); + adjAssMgrPastVO.setAddYn("Y"); + adjAssMgrPastList.add(adjAssMgrPastVO); + } + /* 피신청 참관 대리인 */ + if(StringUtils.isNotEmpty(assPstUsrNmP)) + { + adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO); + adjAssMgrPastVO.setAssPstSeq(adrAssMgrPstGnrService.getNextStringId()); + adjAssMgrPastVO.setAssPstUsrTy(assPstUsrNmP.split("\\|")[0]); + adjAssMgrPastVO.setAssPstUsrNm(assPstUsrNmP.split("\\|")[1]); + adjAssMgrPastVO.setAddYn("Y"); + adjAssMgrPastList.add(adjAssMgrPastVO); + } + /* 조정부장 필수 값*/ + adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO); + adjAssMgrPastVO.setAssPstSeq(adrAssMgrPstGnrService.getNextStringId()); + adjAssMgrPastVO.setAssPstUsrTy("01"); + adjAssMgrPastVO.setAssPstUsrNm(adjPastVO.getAddUsrNm0()); + adjAssMgrPastVO.setAddYn("Y"); + adjAssMgrPastList.add(adjAssMgrPastVO); + + /* 조정위원 1*/ + if(StringUtils.isNotEmpty(adjPastVO.getAddUsrNm1())) + { + adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO); + adjAssMgrPastVO.setAssPstSeq(adrAssMgrPstGnrService.getNextStringId()); + adjAssMgrPastVO.setAssPstUsrTy("02"); + adjAssMgrPastVO.setAssPstUsrNm(adjPastVO.getAddUsrNm1()); + adjAssMgrPastVO.setAddYn("Y"); + adjAssMgrPastList.add(adjAssMgrPastVO); + } + + + /* 조정위원 2*/ + if(StringUtils.isNotEmpty(adjPastVO.getAddUsrNm2())) + { + adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO); + adjAssMgrPastVO.setAssPstSeq(adrAssMgrPstGnrService.getNextStringId()); + adjAssMgrPastVO.setAssPstUsrTy("02"); + adjAssMgrPastVO.setAssPstUsrNm(adjPastVO.getAddUsrNm2()); + adjAssMgrPastVO.setAddYn("Y"); + adjAssMgrPastList.add(adjAssMgrPastVO); + } + + adjReqMgrPastDAO.insertAdjAssList(adjAssMgrPastList); + + } + } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index d07cbac5..d0b2d57b 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -35,6 +35,12 @@ import kcc.com.cmm.service.EgovFileMngUtil; import kcc.com.cmm.service.FileVO; import kcc.com.cmm.util.StringUtil; import kcc.com.utl.fcc.service.EgovStringUtil; +import kcc.kccadr.adjPgrMgr.apm.service.ApmService; +import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmService; +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; @@ -69,7 +75,16 @@ public class AdjReqMgrPastController { @Resource(name = "EgovFileMngService") private EgovFileMngService fileService; + + @Resource(name = "pgrCmmService") + private PgrCmmService cmmService; + @Resource(name = "drtService") + private DrtService drtService; + + @Resource(name = "apmService") + private ApmService apmService; + // global 프로퍼티 @Resource(name="globalSettings") protected Properties propertiesService; @@ -110,6 +125,12 @@ 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())) { //오프라인 조정 신청 정보 불러오기. @@ -119,7 +140,7 @@ public class AdjReqMgrPastController { //기본 값 셋팅 - 대리인 여부, 신청자 분류 adjReqMgrPastVO.setRpplTy("10"); adjReqMgrPastVO.setReqTy("01"); - model.addAttribute("adrVO", adjReqMgrPastVO); + model.addAttribute("adrVO", adjReqMgrPastVO); } @@ -140,47 +161,106 @@ public class AdjReqMgrPastController { */ @RequestMapping("/kccadr/adjReqMgOff/adjReqMgrPastProgRegist.do") public String adjReqMgrPastProgRegist(@ModelAttribute("adjReqMgrPastVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { - - + //TODO 테스트로 인한 seq 코딩 + adjReqMgrPastVO.setAdrSeq("ADR_0000000000002920"); + System.out.println("adjReqMgrPastVO.getAdrSeq() !!! : "+ adjReqMgrPastVO.getAdrSeq()); - - List adjReqMgrPastListVO = adjReqMgrPastService.selectAdrPrtclMgrPastList(adjReqMgrPastVO); - - System.out.println("adjReqMgrPastListVO size : "+adjReqMgrPastListVO.size()); - for(AdjReqMgrPastVO aa : adjReqMgrPastListVO) - { - System.out.println(aa.getAdrSn()); - } - - //로그인 권한정보 불러오기 -// LoginVO user = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; -// model.addAttribute("user", user); -// -// // 공통코드 조회 -// List codeResult = cmmUseService.selectCmmCodeDetail("CC001"); -// model.addAttribute("CC001", codeResult); -// -// int reqPerTotCnt = 0; -// -// if(StringUtils.isNotBlank(adjReqMgrPastVO.getAdrSeq())) { -// -// //오프라인 조정 신청 정보 불러오기. -// AdjReqMgrPastVO resultAdjReqMgrOffLine = adjReqMgrPastService.selectAdjReqMgrOffLineInfo(adjReqMgrPastVO); -// model.addAttribute("adrVO", resultAdjReqMgrOffLine); -// }else { -// //기본 값 셋팅 - 대리인 여부, 신청자 분류 -// adjReqMgrPastVO.setRpplTy("10"); -// adjReqMgrPastVO.setReqTy("01"); -// model.addAttribute("adrVO", adjReqMgrPastVO); -// } -// -// - model.addAttribute("adjReqMgrPastListVO", adjReqMgrPastListVO); + PgrCmmVO cmmVO = new PgrCmmVO(); + cmmVO.setAdrSeq(adjReqMgrPastVO.getAdrSeq()); + // 조정사건일반 + PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); + model.addAttribute("info", info); + model.addAttribute("adjReqMgrPastListVO", adjReqMgrPastService.selectAdrPrtclMgrPastList(adjReqMgrPastVO)); return "kccadr/adjReqMgrPast/adjReqMgrPastProgRegist"; } + + /** + * @methodName : adjReqMgrPastProgRegist + * @author : 이호영 + * @date : 2022.09.15 + * @description : 사건진행정보 목록 + * @param adjReqMgrPastVO + * @param model + * @return + * @throws Exception + */ + @RequestMapping("/kccadr/adjReqMgOff/adjReqMgrPastFileRegist.do") + public String adjReqMgrPastFileRegist(@ModelAttribute("adjReqMgrPastVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { + + //TODO 테스트로 인한 seq 코딩 + adjReqMgrPastVO.setAdrSeq("ADR_0000000000002920"); + System.out.println("adjReqMgrPastVO.getAdrSeq() !!! : "+ adjReqMgrPastVO.getAdrSeq()); + model.addAttribute("adjReqMgrPastVO", adjReqMgrPastVO); +// PgrCmmVO cmmVO = new PgrCmmVO(); +// cmmVO.setAdrSeq(adjReqMgrPastVO.getAdrSeq()); + // 조정사건일반 +// PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); +// model.addAttribute("info", info); +// model.addAttribute("adjReqMgrPastListVO", adjReqMgrPastService.selectAdrPrtclMgrPastList(adjReqMgrPastVO)); + + return "kccadr/adjReqMgrPast/adjReqMgrPastFileRegist"; + } + + + /** + * @methodName : adjReqMgrPastProgPop + * @author : 이호영 + * @date : 2022.09.19 + * @description : 과거사건 - 사건진행정보 등록 팝업 + * @param adjReqMgrPastVO + * @param model + * @return + * @throws Exception + * @issue 기존에 기일조서등록 sql이 너무 길어 기존 로직 그대로 구현 + */ + @RequestMapping("/kccadr/adjReqMgOff/popup/drtRegPop.do") + public String adjReqMgrPastProgPop(PgrCmmVO cmmVO, DrtVO drtVO, ModelMap model) throws Exception { + + + List assList = drtService.selectAssRegList(drtVO); + model.addAttribute("assList", assList); + + //사건 정보 불러오기 +// PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); + PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); + model.addAttribute("info", info); + + /* 조정부 / 조정조사관 select */ + AdjReqMgrPastVO adjReqVO = new AdjReqMgrPastVO(); + adjReqVO.setAdrSeq(cmmVO.getAdrSeq()); + model.addAttribute("memAss", adjReqMgrPastService.selectMemAss(adjReqVO)); + + + // 등록된 값이 있으면 select + if(StringUtils.isNotEmpty(cmmVO.getPrtclCn())) + { + List apmChgInfo = apmService.selectApmChgDateInfo(cmmVO); + model.addAttribute("apmChgInfo", apmChgInfo.get(0)); + //조정위원 정보 불러오기 + PgrCmmVO dntVO = this.getDntInfo(cmmVO); + model.addAttribute("uiwonInfo", dntVO); + + } + model.addAttribute("newAdrSn", cmmVO.getNowAdrSn()); + + + return "/kccadr/adjReqMgrPast/drtRegPop"; + + } + + + + + + + + + + + /** * @methodName : insertAdjReqMgrOffAjax * @author : 이호영 @@ -207,11 +287,64 @@ public class AdjReqMgrPastController { return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now())); } - //사용자 유니크 아이디 받아오기 adjReqMgrPastVO.setFrstRegisterId(userId); + adjReqMgrPastVO.setLastUpdusrId(userId); //조정신청, 대리인, 신청인 등록 처리 return adjReqMgrPastService.insertAdjReqMgrRpplReq(adjReqMgrPastVO); } + + + @RequestMapping(value = {"/kccadr/adjReqMgOff/checkNInsertAprvlPastAjax.do"}) + public ResponseEntity checkNInsertAprvlPastAjax(@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.setFrstRegisterId(userId); + adjReqMgrPastVO.setLastUpdusrId(userId); + + //조정신청, 대리인, 신청인 등록 처리 + return adjReqMgrPastService.checkNInsertAprvlPastAjax(adjReqMgrPastVO); + } + + + + + + + + + private PgrCmmVO getDntInfo(PgrCmmVO cmmVO) throws Exception { + PgrCmmVO dntVO = cmmService.selectPgrCmm(cmmVO); + if (!StringUtil.isEmpty(dntVO.getMemNames())) { + String[] memNames = dntVO.getMemNames().split(", "); + String[] assSeqes = dntVO.getAssSeqes().split(", "); + + if(memNames.length==1) { + dntVO.setAddUsrNm0(memNames[0]); + dntVO.setAssSeq0(assSeqes[0]); + }else if(memNames.length>1) { + dntVO.setAddUsrNm0(memNames[0]); + dntVO.setAssSeq0(assSeqes[0]); + dntVO.setAddUsrNm1(memNames[1]); + dntVO.setAssSeq1(assSeqes[1]); + } + + } + return dntVO; + } + + + } diff --git a/src/main/resources/egovframework/spring/com/context-idgen.xml b/src/main/resources/egovframework/spring/com/context-idgen.xml index 56826d8f..279c518f 100644 --- a/src/main/resources/egovframework/spring/com/context-idgen.xml +++ b/src/main/resources/egovframework/spring/com/context-idgen.xml @@ -2726,5 +2726,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 7da3f08a..0ad89938 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 @@ -4,6 +4,8 @@ + + @@ -27,6 +29,16 @@ + + + + + + + + + + SELECT @@ -280,5 +316,83 @@ + + + INSERT INTO ADR_ASS_MGR_PST ( + ADR_SEQ + , ADR_SN + , ASS_PST_SEQ + , ASS_PST_USR_TY + , ASS_PST_USR_NM + , ADD_YN + , ADD_CHG_YN + , FRST_REGIST_PNTTM + , FRST_REGISTER_ID + , LAST_UPDT_PNTTM + , LAST_UPDUSR_ID + ) VALUES ( + #adrSeq# + , #adrSn# + , #assPstSeq# + , #assPstUsrTy# + , #assPstUsrNm# + , #addYn# + , #addChgYn# + , NOW() + , #frstRegisterId# + , NOW() + , #lastUpdusrId# + ) + + + + + + + + + INSERT INTO ADR_ASS_MGR_PST ( + ADR_SEQ + , ADR_SN + , ASS_PST_SEQ + , ASS_PST_USR_TY + , ASS_PST_USR_NM + , ADD_YN + , ADD_CHG_YN + , FRST_REGIST_PNTTM + , FRST_REGISTER_ID + , LAST_UPDT_PNTTM + , LAST_UPDUSR_ID + ) VALUES + + ( + #[].adrSeq# + , #[].adrSn# + , #[].assPstSeq# + , #[].assPstUsrTy# + , #[].assPstUsrNm# + , #[].addYn# + , 'N' + , NOW() + , #[].frstRegisterId# + , NOW() + , #[].lastUpdusrId# + ) + + + + 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 682f2c4c..4c3e3672 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp @@ -49,6 +49,8 @@ + + @@ -1343,6 +1345,18 @@ + + +

조정부

+ + + + + +

조정조사관

+ + +

진행된 차수

diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp new file mode 100644 index 00000000..7b897473 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp @@ -0,0 +1,138 @@ + +<%@ page language="java" contentType="text/html; charset=utf-8" + pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt_rt" %> +<% + /** + * @Class Name : AdjustDeptManagerList.jsp + * @Description : 조정부관리 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.09 김봉호 최초 생성 + * @author 김봉호 + * @since 2021.08.21 + * @version 1.0 + * @see + * + */ +%> + + + + +사건관련문서 등록 + + + +
+ + " /> +<%-- " /> --%> +<%-- " /> --%> + +<%-- " /> --%> +<%-- " /> --%> + +<%-- " /> --%> +<%-- " /> --%> + <%-- " /> --%> + +
+ +
+
+ + +
+

사건관련문서 등록

+
    +
  • +
  • +

    오프라인 조정관리

    +
  • +
  • +

    과거사건등록

    +
  • +
  • 사건관련문서 등록
  • +
+
+ + +
+ +
+

총 진행 회차 :

+
+ + +
+ + + + + + + + + + + + + + + + + + + + +
회차결과등록/수정
+ 1 + + 해당 차수의 정보를 등록해 주세요 + + +
+
+ +
+
+
+ + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastProgRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastProgRegist.jsp index 43a9f42c..745f8262 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastProgRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastProgRegist.jsp @@ -3,7 +3,7 @@ pageEncoding="utf-8"%> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> @@ -73,17 +73,46 @@ // listForm.submit(); // } +$(document).ready(function(){ + + // 등록버튼 클릭 이벤트 + $('.regBtn').on('click', function(){ + + // click한 row의 차수 + var nowAdrSn = $.trim($(this).parents().parents().children("td:first").text()); + + $('#nowAdrSn').val(nowAdrSn); + $('#prtclSeq').val($(this).data('info')); + commonPopWindowopenForm("/kccadr/adjReqMgOff/popup/drtRegPop.do", '820', '600', "adjReqMgrPastProgPop", $('#popPageForm')); + + }); + + $('.updBtn').on('click', function(){ + }); + +}); + + 사건진행정보 - -<%-- --%> -<%-- " /> --%> -<%-- " /> --%> -<%-- " /> --%> - - + +
+ + + " /> + " /> + " /> + + " /> + " /> + + " /> + " /> + <%-- " /> --%> + +
@@ -107,10 +136,7 @@
-

총 진행 회차 : ??

-
- -
+

총 진행 회차 :

@@ -125,7 +151,7 @@ 회차 결과 - 등록/삭제 + 등록/수정 @@ -135,10 +161,24 @@ - 1 + + + 해당 차수의 정보를 등록해 주세요 + + + + + - + + + + + + + + @@ -147,9 +187,9 @@
-
- -
+ + + @@ -162,7 +202,6 @@ - diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/drtRegPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/drtRegPop.jsp new file mode 100644 index 00000000..4e735cb3 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/drtRegPop.jsp @@ -0,0 +1,549 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> + + + + +기일조서 등록 + + + + + + + + + + + + " /> + " /> + + +
+
+ +
+

기일조서 등록

+
    +
  • + +
  • +
  • + 과거사건등록 +
  • +
  • + 기일조서 등록 +
  • +
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
조 정 부 + +
차 수 + +
사 건 + + 사건내용 + +
신청인 + + +

+ +

+ +
+
+
대리인 + + +

+ +

+ +
+
+
참관대리인 +<%-- --%> +<%-- --%> +<%-- --%> + +<%-- --%> + + +<%-- --%> +<%-- --%> + +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> + +
피신청인 + + +

+ +

+ +
+
+
대리인 + + +

+ +

+ +
+
+
참관대리인 +<%-- --%> +<%-- --%> +<%-- --%> + +<%-- --%> + + +<%-- --%> +<%-- --%> + +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> + + +
조정기일 +
+ " data-datecontrol="true" onkeyup="setFormat('day',this)" maxlength="10" readonly> +
+ + +
+
+ " onkeyup="setFormat('time',this)" maxlength="8"> +
공개여부 + +
장소 + + +
기일결과 + +
다음 기일 지정 여부 +
+ + + + + + + + +
+
고지된 다음기일 +
+ +
+ + +
+
+ +
조서내용 + +
조정부장 + +
조정위원1 +   +
조정위원2 +   +
조정조사관 + +
+
+ +
+
+
+ + + +
+
+
+
+
+
+ + diff --git a/src/main/webapp/js/kccadr/adjReqMgrPast/value.js b/src/main/webapp/js/kccadr/adjReqMgrPast/value.js index 400fb19a..fa715bbe 100644 --- a/src/main/webapp/js/kccadr/adjReqMgrPast/value.js +++ b/src/main/webapp/js/kccadr/adjReqMgrPast/value.js @@ -7,9 +7,9 @@ $('#frstRegistPnttm').val($('#startDate01').val()); $('#lastUpdtPnttm').val($('#endDate').val()); $('#adrSn').val($('#adrSnTemp').val()); + $('#memDeptNm').val($('#memDeptNmTemp').val()); + $('#assPstUsrNm').val($('#assPstUsrNmTemp').val()); - console.log("$('#startDate01').val() : ", $('#startDate01').val()); - console.log("$('#endDate').val() : ",$('#endDate').val());