From 257e73472edec591c6c893ca0521fe40f90bd54f Mon Sep 17 00:00:00 2001 From: JooYoung Date: Thu, 22 Sep 2022 18:34:08 +0900 Subject: [PATCH 01/15] =?UTF-8?q?=EB=84=A4=EC=9D=B4=EB=B2=84=20sns?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=97=B0=EB=8F=99=20(=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kccadr/certDoc/web/CertDocController.java | 23 +++ .../jsp/web/kccadr/certDoc/certDocList.jsp | 1 + .../jsp/web/kccadr/certDoc/cfrmDetail.jsp | 131 ------------------ .../jsp/web/kccadr/login/SsoLoginUsrSns.jsp | 88 ++++++++++-- 4 files changed, 103 insertions(+), 140 deletions(-) diff --git a/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java b/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java index 132abf8d..ad3e9478 100644 --- a/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java +++ b/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java @@ -1,5 +1,6 @@ package kcc.kccadr.certDoc.web; +import java.util.HashMap; import java.util.List; import javax.annotation.Resource; @@ -8,6 +9,7 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.EgovMessageSource; @@ -83,6 +85,27 @@ public class CertDocController { @Resource(name="adjstConciliatorService") private AdjstConciliatorService adjstConciliatorService; + /** + * 송달문서조회용 SNS 로그인 페이지 + */ + @RequestMapping("/web/kccadr/certDoc/snsLoginPage.do") + public String snsLoginPage(@RequestParam HashMap test) throws Exception { + + return "/web/kccadr/login/SsoLoginUsrSns"; + + } + + + /** + * 송달문서 목록 + */ + @RequestMapping("/web/kccadr/certDoc/certDocList.do") + public String certDocList(@ModelAttribute("cmmVO") PgrCmmVO cmmVO, ModelMap model) throws Exception { + + return "/web/kccadr/certDoc/certDocList"; + + } + /** * 확정증명원 상세 */ diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/certDoc/certDocList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/certDoc/certDocList.jsp index eebb25ab..7e358eab 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/certDoc/certDocList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/certDoc/certDocList.jsp @@ -5,6 +5,7 @@ <%@ 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"%> + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/certDoc/cfrmDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/certDoc/cfrmDetail.jsp index a191f03a..e7ce3055 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/certDoc/cfrmDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/certDoc/cfrmDetail.jsp @@ -12,8 +12,6 @@ - - @@ -118,135 +116,6 @@ - - - - - - -





- - - - - - diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp index f202b2c4..7d692bb7 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp @@ -4,11 +4,13 @@ <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> - +
+ + +
+ - @@ -26,8 +28,8 @@ @@ -38,7 +40,75 @@ -<%--
- - -
--%> + + + + From 3bf751d99c4e686481b8d72f89a7af5c2a73efe9 Mon Sep 17 00:00:00 2001 From: JooYoung Date: Thu, 22 Sep 2022 18:40:33 +0900 Subject: [PATCH 02/15] =?UTF-8?q?=EB=84=A4=EC=9D=B4=EB=B2=84=20sns=20?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20ip?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp index 7d692bb7..249e29e4 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp @@ -76,7 +76,7 @@ var naverLogin = new naver.LoginWithNaverId( { clientId: "iMGwQvTUeD4tVwv41haJ", - callbackUrl: "http://127.0.0.1:8089/web/kccadr/certDoc/snsLoginPage.do", + callbackUrl: "http://dev1.iten.co.kr:9999/web/kccadr/certDoc/snsLoginPage.do", loginButton: {color: "green", type: 2, height: 40}, isPopup: false /* 팝업을 통한 연동처리 여부 */ } From 2a0e0b5d01b9ce773cbc3c2958673b7e007b0381 Mon Sep 17 00:00:00 2001 From: hylee Date: Thu, 22 Sep 2022 20:43:36 +0900 Subject: [PATCH 03/15] =?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()); From b6c222135a12b88426c5b27f3d0e22c08f1356fa Mon Sep 17 00:00:00 2001 From: hylee Date: Thu, 22 Sep 2022 21:53:37 +0900 Subject: [PATCH 04/15] =?UTF-8?q?refactor:=20AdjReqMgrPastVO=20=EB=B3=80?= =?UTF-8?q?=EC=88=98=20=EC=B6=94=EA=B0=80=20/=20=EA=B3=BC=EA=B1=B0?= =?UTF-8?q?=EC=82=AC=EA=B1=B4=EB=93=B1=EB=A1=9D=20=EA=B8=B0=EC=9D=BC?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20update=20=EC=B6=94=EC=B9=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/AdjReqMgrPastVO.java | 404 ++++++++++++++---- .../service/impl/AdjReqMgrPastDAO.java | 4 + .../impl/AdjReqMgrPastServiceImpl.java | 13 +- .../adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml | 24 +- 4 files changed, 366 insertions(+), 79 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java index 66e4f5a8..3e667a71 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java @@ -39,7 +39,7 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { private String addUsrNm0; /* 조정부장 */ private String addUsrNm1; /* 조정위원1 */ private String addUsrNm2; /* 조정위원2 */ - private String addDe; /* 공개여부 */ + private String addDe; /* 기일조정일자 */ // 조정사건 @@ -178,531 +178,818 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { private String assPstUsrNm; + private String assPstSeq; + private String assPstUsrTy; + private String addYn; + private String addChgYn; + + + + public AdjReqMgrVO getAdrVO() { return adrVO; } + public void setAdrVO(AdjReqMgrVO adrVO) { this.adrVO = adrVO; } + public List getAdjReqMgrVoList() { return adjReqMgrVoList; } + public void setAdjReqMgrVoList(List adjReqMgrVoList) { this.adjReqMgrVoList = adjReqMgrVoList; } + public String getSrchYear() { return srchYear; } + public void setSrchYear(String srchYear) { this.srchYear = srchYear; } + public String getEsntlId() { return esntlId; } + public void setEsntlId(String esntlId) { this.esntlId = esntlId; } + public String getBbsId() { return bbsId; } + public void setBbsId(String bbsId) { this.bbsId = bbsId; } + public String getNttId() { return nttId; } + public void setNttId(String nttId) { this.nttId = nttId; } + public String getLastUpdusrNm() { return lastUpdusrNm; } + public void setLastUpdusrNm(String lastUpdusrNm) { this.lastUpdusrNm = lastUpdusrNm; } + public String getSearchCnd() { return searchCnd; } + public void setSearchCnd(String searchCnd) { this.searchCnd = searchCnd; } + public String getSearchWrd() { return searchWrd; } + public void setSearchWrd(String searchWrd) { this.searchWrd = searchWrd; } + public String getFrstRegisterNm() { return frstRegisterNm; } + public void setFrstRegisterNm(String frstRegisterNm) { this.frstRegisterNm = frstRegisterNm; } + + 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; + } + public String getAdrSeq() { return adrSeq; } + public void setAdrSeq(String adrSeq) { this.adrSeq = adrSeq; } + public String getAdrNo() { return adrNo; } + public void setAdrNo(String adrNo) { this.adrNo = adrNo; } + public String getStatCd() { return statCd; } + public void setStatCd(String statCd) { this.statCd = statCd; } + public String getReqOlCd() { return reqOlCd; } + public void setReqOlCd(String reqOlCd) { this.reqOlCd = reqOlCd; } + public String getReqCn1() { return reqCn1; } + public void setReqCn1(String reqCn1) { this.reqCn1 = reqCn1; } + public String getReqCn2() { return reqCn2; } + public void setReqCn2(String reqCn2) { this.reqCn2 = reqCn2; } + public String getReqTy() { return reqTy; } + public void setReqTy(String reqTy) { this.reqTy = reqTy; } + public String getCcTy() { return ccTy; } + public void setCcTy(String ccTy) { this.ccTy = ccTy; } + public String getSbmtYn() { return sbmtYn; } + public void setSbmtYn(String sbmtYn) { this.sbmtYn = sbmtYn; } + public String getSbmtDe() { return sbmtDe; } + public void setSbmtDe(String sbmtDe) { this.sbmtDe = sbmtDe; } + public String getAdrCost() { return adrCost; } + public void setAdrCost(String adrCost) { this.adrCost = adrCost; } + public String getAdrPayYn() { return adrPayYn; } + public void setAdrPayYn(String adrPayYn) { this.adrPayYn = adrPayYn; } + public String getApprSeq() { return apprSeq; } + public void setApprSeq(String apprSeq) { this.apprSeq = apprSeq; } + public String getApprDe() { return apprDe; } + public void setApprDe(String apprDe) { this.apprDe = apprDe; } + public String getAtchFileId() { return atchFileId; } + public void setAtchFileId(String atchFileId) { this.atchFileId = atchFileId; } + public String getRjctReqCn() { return rjctReqCn; } + public void setRjctReqCn(String rjctReqCn) { this.rjctReqCn = rjctReqCn; } + public String getRjctResCn() { return rjctResCn; } + public void setRjctResCn(String rjctResCn) { this.rjctResCn = rjctResCn; } + 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; } + public String getPrtclSeq() { return prtclSeq; } + public void setPrtclSeq(String prtclSeq) { this.prtclSeq = prtclSeq; } + public String getOpenYn() { return openYn; } + public void setOpenYn(String openYn) { this.openYn = openYn; } + public String getNextAppDe() { return nextAppDe; } + public void setNextAppDe(String nextAppDe) { this.nextAppDe = nextAppDe; } + public String getPrtclCn() { return prtclCn; } + public void setPrtclCn(String prtclCn) { this.prtclCn = prtclCn; } + + public String getAppDe() { + return appDe; + } + + public void setAppDe(String appDe) { + this.appDe = appDe; + } + public String getRpplSeq() { return rpplSeq; } + public void setRpplSeq(String rpplSeq) { this.rpplSeq = rpplSeq; } + public String getRpplTy() { return rpplTy; } + public void setRpplTy(String rpplTy) { this.rpplTy = rpplTy; } + public String getAgntYn() { return agntYn; } + public void setAgntYn(String agntYn) { this.agntYn = agntYn; } + public String getRpplUsrTy() { return rpplUsrTy; } + public void setRpplUsrTy(String rpplUsrTy) { this.rpplUsrTy = rpplUsrTy; } + public String getAdrOlYn() { return adrOlYn; } + public void setAdrOlYn(String adrOlYn) { this.adrOlYn = adrOlYn; } + public String getRpplId() { return rpplId; } + public void setRpplId(String rpplId) { this.rpplId = rpplId; } + public String getRpplNm() { return rpplNm; } + public void setRpplNm(String rpplNm) { this.rpplNm = rpplNm; } + public String getRpplBizId() { return rpplBizId; } + public void setRpplBizId(String rpplBizId) { this.rpplBizId = rpplBizId; } + public String getRpplBizNo() { return rpplBizNo; } + public void setRpplBizNo(String rpplBizNo) { this.rpplBizNo = rpplBizNo; } + public String getRpplBizNm() { return rpplBizNm; } + public void setRpplBizNm(String rpplBizNm) { this.rpplBizNm = rpplBizNm; } + public String getRpplPost() { return rpplPost; } + public void setRpplPost(String rpplPost) { this.rpplPost = rpplPost; } + public String getRpplAddr() { return rpplAddr; } + public void setRpplAddr(String rpplAddr) { this.rpplAddr = rpplAddr; } + public String getRpplAddrDtl() { return rpplAddrDtl; } + public void setRpplAddrDtl(String rpplAddrDtl) { this.rpplAddrDtl = rpplAddrDtl; } + public String getRpplAddrCpYn() { return rpplAddrCpYn; } + public void setRpplAddrCpYn(String rpplAddrCpYn) { this.rpplAddrCpYn = rpplAddrCpYn; } + public String getRpplRealPost() { return rpplRealPost; } + public void setRpplRealPost(String rpplRealPost) { this.rpplRealPost = rpplRealPost; } + public String getRpplRealAddr() { return rpplRealAddr; } + public void setRpplRealAddr(String rpplRealAddr) { this.rpplRealAddr = rpplRealAddr; } + public String getRpplRealAddrDtl() { return rpplRealAddrDtl; } + public void setRpplRealAddrDtl(String rpplRealAddrDtl) { this.rpplRealAddrDtl = rpplRealAddrDtl; } + public String getRpplPhone() { return rpplPhone; } + public void setRpplPhone(String rpplPhone) { this.rpplPhone = rpplPhone; } + public String getRpplEmail1() { return rpplEmail1; } + public void setRpplEmail1(String rpplEmail1) { this.rpplEmail1 = rpplEmail1; } + public String getRpplEmail2() { return rpplEmail2; } + public void setRpplEmail2(String rpplEmail2) { this.rpplEmail2 = rpplEmail2; } + public String getRpplEmail() { return rpplEmail; } + public void setRpplEmail(String rpplEmail) { this.rpplEmail = rpplEmail; } + public String getRpplEmailYn() { return rpplEmailYn; } + public void setRpplEmailYn(String rpplEmailYn) { this.rpplEmailYn = rpplEmailYn; } + public String getRpplSmsYn() { return rpplSmsYn; } + public void setRpplSmsYn(String rpplSmsYn) { this.rpplSmsYn = rpplSmsYn; } + public String getRpplClass() { return rpplClass; } + public void setRpplClass(String rpplClass) { this.rpplClass = rpplClass; } + public String getRpplGrade() { return rpplGrade; } + public void setRpplGrade(String rpplGrade) { this.rpplGrade = rpplGrade; } + public String getUsrCi() { return usrCi; } + public void setUsrCi(String usrCi) { this.usrCi = usrCi; } + public String getApprYn() { return apprYn; } + public void setApprYn(String apprYn) { this.apprYn = apprYn; } + public String getRpplPhone1() { return rpplPhone1; } + public void setRpplPhone1(String rpplPhone1) { this.rpplPhone1 = rpplPhone1; } + public String getRpplPhone2() { return rpplPhone2; } + public void setRpplPhone2(String rpplPhone2) { this.rpplPhone2 = rpplPhone2; } + public String getRpplPhone3() { return rpplPhone3; } + public void setRpplPhone3(String rpplPhone3) { this.rpplPhone3 = rpplPhone3; } + public String getRpplRelation() { return rpplRelation; } + public void setRpplRelation(String rpplRelation) { this.rpplRelation = rpplRelation; } + public String getRpplRelationEtc() { return rpplRelationEtc; } + public void setRpplRelationEtc(String rpplRelationEtc) { this.rpplRelationEtc = rpplRelationEtc; } + + 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 getAdrSn() { return adrSn; } + public void setAdrSn(String adrSn) { this.adrSn = adrSn; } + public String getAgntSeq() { return agntSeq; } + public void setAgntSeq(String agntSeq) { this.agntSeq = agntSeq; } + public String getAgntSbmtYn() { return agntSbmtYn; } + public void setAgntSbmtYn(String agntSbmtYn) { this.agntSbmtYn = agntSbmtYn; } + public String getAgntApprYn() { return agntApprYn; } + public void setAgntApprYn(String agntApprYn) { this.agntApprYn = agntApprYn; } + public String getAgntId() { return agntId; } + public void setAgntId(String agntId) { this.agntId = agntId; } + public String getRpplRltnTy() { return rpplRltnTy; } + public void setRpplRltnTy(String rpplRltnTy) { this.rpplRltnTy = rpplRltnTy; } + public String getRpplRltnCn() { return rpplRltnCn; } + public void setRpplRltnCn(String rpplRltnCn) { this.rpplRltnCn = rpplRltnCn; } + public String getAgntNm() { return agntNm; } + public void setAgntNm(String agntNm) { this.agntNm = agntNm; } + public String getAgntBrthDt() { return agntBrthDt; } + public void setAgntBrthDt(String agntBrthDt) { this.agntBrthDt = agntBrthDt; } + public String getAgntPost() { return agntPost; } + public void setAgntPost(String agntPost) { this.agntPost = agntPost; } + public String getAgntAddr() { return agntAddr; } + public void setAgntAddr(String agntAddr) { this.agntAddr = agntAddr; } + public String getAgntAddrDtl() { return agntAddrDtl; } + public void setAgntAddrDtl(String agntAddrDtl) { this.agntAddrDtl = agntAddrDtl; } + public String getAgntPhone() { return agntPhone; } + public void setAgntPhone(String agntPhone) { this.agntPhone = agntPhone; } + public String getAgntCelnum() { return agntCelnum; } + public void setAgntCelnum(String agntCelnum) { this.agntCelnum = agntCelnum; } + public String getAgntEmail() { return agntEmail; } + public void setAgntEmail(String agntEmail) { this.agntEmail = agntEmail; } + public String getAgntEmailYn() { return agntEmailYn; } + public void setAgntEmailYn(String agntEmailYn) { this.agntEmailYn = agntEmailYn; } + public String getAgntSmsYn() { return agntSmsYn; } + public void setAgntSmsYn(String agntSmsYn) { this.agntSmsYn = agntSmsYn; } + public String getReqAddSeq() { return reqAddSeq; } + public void setReqAddSeq(String reqAddSeq) { this.reqAddSeq = reqAddSeq; } + public String getReqPerTotCnt() { return reqPerTotCnt; } + public void setReqPerTotCnt(String reqPerTotCnt) { this.reqPerTotCnt = reqPerTotCnt; } + public String getRpplAtchFileId() { return rpplAtchFileId; } + public void setRpplAtchFileId(String rpplAtchFileId) { this.rpplAtchFileId = rpplAtchFileId; } + public String getRpplMgrAtchFileId() { return rpplMgrAtchFileId; } + public void setRpplMgrAtchFileId(String rpplMgrAtchFileId) { this.rpplMgrAtchFileId = rpplMgrAtchFileId; } @@ -794,141 +1081,110 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { public void setRpplConnNo(String rpplConnNo) { this.rpplConnNo = rpplConnNo; } - + public String getResPonDentNms() { return resPonDentNms; } + public void setResPonDentNms(String resPonDentNms) { this.resPonDentNms = resPonDentNms; } - public String getAppDe() { - return appDe; - } - public void setAppDe(String appDe) { - this.appDe = appDe; - } + public String getAppPlaceTy() { return appPlaceTy; } + public void setAppPlaceTy(String appPlaceTy) { this.appPlaceTy = appPlaceTy; } + public String getAppPlace() { return appPlace; } + public void setAppPlace(String appPlace) { this.appPlace = appPlace; } + public String getNextAppDeYn() { return nextAppDeYn; } + public void setNextAppDeYn(String nextAppDeYn) { this.nextAppDeYn = nextAppDeYn; } + public String getAppResultTy() { return appResultTy; } + 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 String getAssPstSeq() { + return assPstSeq; } - public void setAddUsrIdList(String[] addUsrIdList) { - this.addUsrIdList = addUsrIdList; + + public void setAssPstSeq(String assPstSeq) { + this.assPstSeq = assPstSeq; } - public String getAddUsrId() { - return addUsrId; + + public String getAssPstUsrTy() { + return assPstUsrTy; } - public void setAddUsrId(String addUsrId) { - this.addUsrId = addUsrId; + + public void setAssPstUsrTy(String assPstUsrTy) { + this.assPstUsrTy = assPstUsrTy; } - public String[] getAddAgntList() { - return addAgntList; + + public String getAddYn() { + return addYn; } - public void setAddAgntList(String[] addAgntList) { - this.addAgntList = addAgntList; + + public void setAddYn(String addYn) { + this.addYn = addYn; } - public String getAppDeDay() { - return appDeDay; + + public String getAddChgYn() { + return addChgYn; } - public void setAppDeDay(String appDeDay) { - this.appDeDay = appDeDay; + + public void setAddChgYn(String addChgYn) { + this.addChgYn = addChgYn; } - 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/impl/AdjReqMgrPastDAO.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java index 98d1b082..9868c469 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java @@ -61,5 +61,9 @@ public class AdjReqMgrPastDAO extends EgovAbstractDAO { insert("adjReqMgrPastDAO.insertAdjAssList", adjAssMgrPastList ); } + public void updateAdrPrtclMgr(AdjReqMgrPastVO adjPastVO) { + update("adjReqMgrPastDAO.updateAdrPrtclMgr", 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 7f25e2c2..82672e76 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -549,9 +549,13 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements private void insertAdrPrtclMgrAndDataCleansing(AdjReqMgrPastVO adjPastVO) { - adjPastVO.setAddDe(adjPastVO.getAppDeDay()+" "+adjPastVO.getAppDeTime()); - adjPastVO.setAppPlace(adjPastVO.getAppPlaceTx()); - System.out.println(" 조정기일장소 :: "+adjPastVO.getAppPlaceTx()); + + String addDe = adjPastVO.getAppDeDay()+" "+adjPastVO.getAppDeTime(); + + adjPastVO.setAddDe(addDe); + adjPastVO.setAppPlace(adjPastVO.getAppPlaceTx()); // 기일 장소 + adjPastVO.setNextAppDe(adjPastVO.getNextAppDeDay()+" "+adjPastVO.getNextAppDeTime()); + // 10 성립 // 20 불성립 @@ -560,10 +564,11 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements // 50 다음기일 // 60 조정권고안 // - if("05".equals(adjPastVO.getAppResultTy())) + if("50".equals(adjPastVO.getAppResultTy())) { } + adjReqMgrPastDAO.updateAdrPrtclMgr(adjPastVO); } 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 0ad89938..5c0a39e4 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 @@ -360,7 +360,7 @@ WHERE AMD.ADR_SEQ= #adrSeq# - + INSERT INTO ADR_ASS_MGR_PST ( @@ -393,6 +393,28 @@ + + + + UPDATE ADR_PRTCL_MGR SET + open_yn = #openYn# + , app_de = TO_DATETIME(TO_CHAR(#addDe#,'YYYY-MM-DD HH24:MI')) + , app_place_ty = #appPlaceTy# + , app_place = #appPlace# + , next_app_de_yn = #nextAppDeYn# + , next_app_de = TO_DATETIME(TO_CHAR(#nextAppDe#,'YYYY-MM-DD HH24:MI')) + , prtcl_cn = #prtclCn# + , sbmt_yn = #sbmtYn# + , appr_yn = #apprYn# + , frst_regist_pnttm = NOW() + , frst_register_id = #frstRegisterId# + , last_updt_pnttm = NOW() + , last_updusr_id = #lastUpdusrId# + , app_result_ty = #appResultTy# + WHERE ADR_SEQ = #adrSeq# + AND ADR_SN = #adrSn# + + From 34573e2eea534b75300f4efd98fba136852842e6 Mon Sep 17 00:00:00 2001 From: LJH Date: Thu, 22 Sep 2022 21:55:40 +0900 Subject: [PATCH 05/15] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?= =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?= =?UTF-8?q?=EA=B3=A0=EB=8F=84=ED=99=94=20=EC=BB=A4=EB=B0=8B=20=20-=20?= =?UTF-8?q?=EA=B3=BC=EA=B1=B0=EC=82=AC=EA=B1=B4=20=EB=93=B1=EB=A1=9D(?= =?UTF-8?q?=EC=82=AC=EA=B1=B4=EB=AC=B8=EC=84=9C=EB=93=B1=EB=A1=9D=20?= =?UTF-8?q?=EA=B0=9C=EB=B0=9C=EC=A4=91)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/AdjReqMgrPastService.java | 2 +- .../service/impl/AdjReqMgrPastDAO.java | 5 + .../impl/AdjReqMgrPastServiceImpl.java | 9 + .../web/AdjReqMgrPastController.java | 18 +- .../adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml | 14 + .../adjReqMgrPast/adjReqMgrPastFileRegist.jsp | 432 +++++++++++++++++- 6 files changed, 446 insertions(+), 34 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java index b8513fc4..f31d1082 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java @@ -21,5 +21,5 @@ public interface AdjReqMgrPastService { AdjReqMgrPastVO selectMemAss(AdjReqMgrPastVO adjReqMgrPastVO); - + List selectAdrRpplPastList(AdjReqMgrPastVO adjReqMgrPastVO); } 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 98d1b082..651d8807 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java @@ -60,6 +60,11 @@ public class AdjReqMgrPastDAO extends EgovAbstractDAO { public void insertAdjAssList(List adjAssMgrPastList) { insert("adjReqMgrPastDAO.insertAdjAssList", adjAssMgrPastList ); } + + public List selectAdrRpplPastList(AdjReqMgrPastVO adjReqMgrPastVO) { + + return (List) list("adjReqMgrPastDAO.selectAdrRpplPastList", 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 7f25e2c2..f055f7ee 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -647,5 +647,14 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements } + + @Override + public List selectAdrRpplPastList(AdjReqMgrPastVO adjReqMgrPastVO) { + + return adjReqMgrPastDAO.selectAdrRpplPastList(adjReqMgrPastVO); + } + + + } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index d0b2d57b..42afcb0f 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -2,37 +2,26 @@ 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.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.util.StringUtil; import kcc.com.utl.fcc.service.EgovStringUtil; import kcc.kccadr.adjPgrMgr.apm.service.ApmService; @@ -41,8 +30,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; @@ -200,6 +187,11 @@ public class AdjReqMgrPastController { // PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); // model.addAttribute("info", info); // model.addAttribute("adjReqMgrPastListVO", adjReqMgrPastService.selectAdrPrtclMgrPastList(adjReqMgrPastVO)); + List rpplList = new ArrayList(); + + rpplList = adjReqMgrPastService.selectAdrRpplPastList(adjReqMgrPastVO); + + model.addAttribute("rpplList", rpplList); return "kccadr/adjReqMgrPast/adjReqMgrPastFileRegist"; } 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 0ad89938..7548531d 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 @@ -393,6 +393,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 7b897473..e87e4237 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp @@ -33,23 +33,204 @@ $(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(){ -// }); - }); +//단일 첨부파일 버튼 +$(function() { + $('#filebutton').click(function(e) { + e.preventDefault(); + $('#file_temp').click(); + }); +}); + +//등록 버튼 +function fncReg() { + var f = document.getElementById("listForm"); + var data = new FormData(f); + _fileForm2.forEach(function(obj, idx) { + if (obj) + data.append("file" + idx, obj.fileObj); + }); + + if (validation()) { + if(confirm("사건문서를 등록 하시겠습니까?")){ + + $.ajax({ + type : "POST", + enctype : 'multipart/form-data', + url : "/kccadr/adjPgrMgr/apm/docRegPopAjax.do", + data : data, + dataType : 'json', + async : false, + processData : false, + contentType : false, + cache : false, + success : function(returnData, status) { + if (returnData.result == 'success') { + alert("사건문서 제출이 완료되었습니다."); + opener.location.reload(true); + self.close(); + } else { + alert(returnData.message); + } + + }, + error : function(e) { + alert("사건문서 제출에 실패하였습니다."); + console.log("ERROR : ", e); + } + }); + } + + } + +} + +function validation() { + + if (isEmpty($('#adrDocCn1').val())) { + alert('답변내용을 입력해 주세요.'); + return false; + } + + if ($('#tbody_fiielist tr').length * 1 <= 0) { + alert("첨부서류를 등록해 주세요"); + return false; + + } + return true; +} + +//문서구분에 따른 신청인 피신청인 선택값 show/hide +function docTypeDiv(divVal){ + //답변서 + if(divVal == '10'){ + //신청인 + $('#rpplSeq').find('option[name=10]').prop('disabled', true); + $('#rpplSeq').find('option[name=10]').prop('selected', false); + //피신청인 + $('#rpplSeq').find('option[name=20]').each(function(){ + $(this).prop('disabled', false); + $(this).eq(0).prop('selected', true); + }); + //조정조사관 + $('#rpplSeq').find('option[name=30]').prop('disabled', true); + $('#rpplSeq').find('option[name=30]').prop('selected', false); + } + //준비서면 + else if(divVal == '20'){ + //신청인 + $('#rpplSeq').find('option[name=10]').prop('disabled', false); + $('#rpplSeq').find('option[name=10]').prop('selected', true); + //피신청인 + $('#rpplSeq').find('option[name=20]').each(function(){ + $(this).prop('disabled', true); + $(this).prop('selected', false); + }); + //조정조사관 + $('#rpplSeq').find('option[name=30]').prop('disabled', true); + $('#rpplSeq').find('option[name=30]').prop('selected', false); + } + //취하신청서 + else if(divVal == '30'){ + $('#rpplSeq').find('option[name=10]').prop('disabled', false); + $('#rpplSeq').find('option[name=10]').prop('selected', true); + //피신청인 + $('#rpplSeq').find('option[name=20]').each(function(){ + $(this).prop('disabled', true); + $(this).prop('selected', false); + }); + //조정조사관 + $('#rpplSeq').find('option[name=30]').prop('disabled', true); + $('#rpplSeq').find('option[name=30]').prop('selected', false); + } + //피신청인 경정신청서 + else if(divVal == '40'){ + $('#rpplSeq').find('option[name=10]').prop('disabled', false); + $('#rpplSeq').find('option[name=10]').prop('selected', true); + //피신청인 + $('#rpplSeq').find('option[name=20]').each(function(){ + $(this).prop('disabled', true); + $(this).prop('selected', false); + }); + //조정조사관 + $('#rpplSeq').find('option[name=30]').prop('disabled', true); + $('#rpplSeq').find('option[name=30]').prop('selected', false); + } + //조정기일 연장동의서 + else if(divVal == '50'){ + $('#rpplSeq').find('option[name=10]').prop('disabled', false); + $('#rpplSeq').find('option[name=10]').prop('selected', true); + //피신청인 + $('#rpplSeq').find('option[name=20]').each(function(){ + $(this).prop('disabled', false); + $(this).prop('selected', false); + }); + //조정조사관 + $('#rpplSeq').find('option[name=30]').prop('disabled', true); + $('#rpplSeq').find('option[name=30]').prop('selected', false); + } + //우편발송 배달증명서 + else if(divVal == '60'){ + $('#rpplSeq').find('option[name=10]').prop('disabled', false); + $('#rpplSeq').find('option[name=10]').prop('selected', true); + //피신청인 + $('#rpplSeq').find('option[name=20]').each(function(){ + $(this).prop('disabled', false); + $(this).prop('selected', false); + }); + //조정조사관 + $('#rpplSeq').find('option[name=30]').prop('disabled', true); + $('#rpplSeq').find('option[name=30]').prop('selected', false); + } + //관련 문서 전체 + else if(divVal == '70'){ + //신청인 + $('#rpplSeq').find('option[name=10]').prop('disabled', true); + $('#rpplSeq').find('option[name=10]').prop('selected', false); + //피신청인 + $('#rpplSeq').find('option[name=20]').each(function(){ + $(this).prop('disabled', true); + $(this).prop('selected', false); + }); + //조정조사관 + $('#rpplSeq').find('option[name=30]').prop('disabled', false); + $('#rpplSeq').find('option[name=30]').prop('selected', true); + } + //조정기일변경신청서 + else if(divVal == '80'){ + //신청인 + $('#rpplSeq').find('option[name=10]').prop('disabled', false); + $('#rpplSeq').find('option[name=10]').prop('selected', true); + //피신청인 + $('#rpplSeq').find('option[name=20]').each(function(){ + $(this).prop('disabled', false); + $(this).prop('selected', false); + }); + //조정조사관 + $('#rpplSeq').find('option[name=30]').prop('disabled', true); + $('#rpplSeq').find('option[name=30]').prop('selected', false); + } + //직권조정 이의신청서 + else if(divVal == '90'){ + //신청인 + $('#rpplSeq').find('option[name=10]').prop('disabled', false); + $('#rpplSeq').find('option[name=10]').prop('selected', true); + //피신청인 + $('#rpplSeq').find('option[name=20]').each(function(){ + $(this).prop('disabled', false); + $(this).prop('selected', false); + }); + //조정조사관 + $('#rpplSeq').find('option[name=30]').prop('disabled', true); + $('#rpplSeq').find('option[name=30]').prop('selected', false); + } +} + +//더하기 버튼 alert +function fn_testPageAlert(){ + alert("사건관련 문서 추가 시 작동하는 버튼입니다. \n 첨부파일 솔루션 도입 후 적용 예정"); +} 사건관련문서 등록 @@ -72,6 +253,221 @@ $(document).ready(function(){
+
+ + +
+

사건관련문서 등록

+
    +
    • +
  • +

    오프라인 조정관리

    +
    • +
  • +

    과거사건등록

    +
    • +
  • 사건관련문서 등록
    • +
+
+ + +
+ +
+ <%--

총 진행 회차 : 건

--%> + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
사건문서 등록 : 신청인, 피신청인, 관리자가 사건에 관련된 첨부파일을 등록한다.
+

문서 구분

+ 		+

+ +

+
+

사건문서 등록인 구분

+ 		+

+ +

+
+

내용

+ 		+ + +
+

첨부서류

+ 		+ + + +

* 첨부파일을 등록해 주세요. (최대3개)

+
+ + + + + + + + + + + + + + + + + + + +
첨부파일 추가 리스트 : 파일명, 종류, 크기, 삭제
파일 명종류크기삭제
+

+ 첨부하실 파일을 + 마우스로 끌어서 + 넣어주세요. +

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
첨부파일 추가 리스트 : 파일명, 종류, 크기, 삭제
파일 명종류크기삭제
+ + + "> + + + + "> + + + + +
+
+
+

상대방공개여부

+ 		+
+ + + + + + + + +
+
+ +
+ + +
+ +
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--
@@ -131,8 +527,4 @@ $(document).ready(function(){
- - - - - + --%> \ No newline at end of file From 8f9f3907a600d419ca43715fb448de17d8df4f06 Mon Sep 17 00:00:00 2001 From: hylee Date: Fri, 23 Sep 2022 09:30:16 +0900 Subject: [PATCH 06/15] =?UTF-8?q?refactor:=EA=B3=BC=EA=B1=B0=EC=82=AC?= =?UTF-8?q?=EA=B1=B4=EB=93=B1=EB=A1=9D=20=EC=A7=84=ED=96=89=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/AdjReqMgrPastService.java | 2 + .../service/impl/AdjReqMgrPastDAO.java | 4 ++ .../impl/AdjReqMgrPastServiceImpl.java | 12 +++-- .../web/AdjReqMgrPastController.java | 52 +++++++++++++++--- .../adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml | 53 ++++++++++++++++++- .../adjReqMgrPast/adjReqMgrPastProgRegist.jsp | 6 ++- 6 files changed, 115 insertions(+), 14 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java index b8513fc4..13b36d81 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java @@ -21,5 +21,7 @@ public interface AdjReqMgrPastService { AdjReqMgrPastVO selectMemAss(AdjReqMgrPastVO adjReqMgrPastVO); + AdjReqMgrPastVO findByIdPrtclMgr(AdjReqMgrPastVO adjReqMgrPastVO); + } 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 9868c469..dbb4839c 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java @@ -65,5 +65,9 @@ public class AdjReqMgrPastDAO extends EgovAbstractDAO { update("adjReqMgrPastDAO.updateAdrPrtclMgr", adjPastVO ); } + public AdjReqMgrPastVO findByIdPrtclMgr(AdjReqMgrPastVO adjReqMgrPastVO) { + return (AdjReqMgrPastVO) select("adjReqMgrPastDAO.findByIdPrtclMgr", 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 82672e76..a4b023c7 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -563,11 +563,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements // 40 조정취하 // 50 다음기일 // 60 조정권고안 -// - if("50".equals(adjPastVO.getAppResultTy())) - { - - } + adjReqMgrPastDAO.updateAdrPrtclMgr(adjPastVO); } @@ -652,5 +648,11 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements } + + @Override + public AdjReqMgrPastVO findByIdPrtclMgr(AdjReqMgrPastVO adjReqMgrPastVO) { + return adjReqMgrPastDAO.findByIdPrtclMgr(adjReqMgrPastVO); + } + } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index d0b2d57b..57880189 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -217,7 +217,7 @@ public class AdjReqMgrPastController { * @issue 기존에 기일조서등록 sql이 너무 길어 기존 로직 그대로 구현 */ @RequestMapping("/kccadr/adjReqMgOff/popup/drtRegPop.do") - public String adjReqMgrPastProgPop(PgrCmmVO cmmVO, DrtVO drtVO, ModelMap model) throws Exception { + public String drtRegPop(PgrCmmVO cmmVO, DrtVO drtVO, ModelMap model) throws Exception { List assList = drtService.selectAssRegList(drtVO); @@ -250,13 +250,51 @@ public class AdjReqMgrPastController { return "/kccadr/adjReqMgrPast/drtRegPop"; } - - - - - - + /** + * @methodName : drtUpdtPop + * @author : 이호영 + * @date : 2022.09.22 + * @description : + * @param cmmVO + * @param drtVO + * @param model + * @return + * @throws Exception + */ + @RequestMapping("/kccadr/adjReqMgOff/popup/drtUpdtPop.do") + public String drtUpdtPop(AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { + + AdjReqMgrPastVO adjPastVO = adjReqMgrPastService.findByIdPrtclMgr(adjReqMgrPastVO); + + + +// DrtVO drtVO = new DrtVO(); +// drtVO.setAdrSeq(adjReqMgrPastVO.); +// drtVO.setAdrSn(adrSeq); + +// model.addAttribute("assList", drtService.selectAssRegList(drtVO)); + + //사건 정보 불러오기 +// PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); + + /* 조정부 / 조정조사관 select */ +// AdjReqMgrPastVO adjReqVO = new AdjReqMgrPastVO(); +// adjReqVO.setAdrSeq(cmmVO.getAdrSeq()); +// model.addAttribute("memAss", adjReqMgrPastService.selectMemAss(adjReqVO)); + + + // 등록된 값이 있으면 select +// if(StringUtils.isNotEmpty(cmmVO.getPrtclCn())) +// { + +// } +// model.addAttribute("newAdrSn", cmmVO.getNowAdrSn()); + + + return "/kccadr/adjReqMgrPast/drtRegPop"; + + } 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 5c0a39e4..d49b70ef 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 @@ -39,6 +39,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + SELECT + ADR_SEQ + , ADR_SN + , PRTCL_SEQ + , OPEN_YN + , APP_DE + , APP_PLACE_TY + , APP_PLACE + , NEXT_APP_DE_YN + , NEXT_APP_DE + , PRTCL_CN + , SBMT_YN + , SBMT_DE + , APPR_YN + , APPR_DE + , FRST_REGIST_PNTTM + , FRST_REGISTER_ID + , LAST_UPDT_PNTTM + , LAST_UPDUSR_ID + , APP_RESULT_TY + FROM ADR_PRTCL_MGR + WHERE PRTCL_SEQ = #prtclSeq# + + - + \ No newline at end of file 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 745f8262..873ce1c9 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastProgRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastProgRegist.jsp @@ -80,14 +80,18 @@ $(document).ready(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(){ + + $('#prtclSeq').val($(this).data('info')); + + commonPopWindowopenForm("/kccadr/adjReqMgOff/popup/drtUpdtPop.do", '820', '600', "adjReqMgrPastProgPop", $('#popPageForm')); }); }); From 59d302c72a354d1eb9329eed6a45ad4326565651 Mon Sep 17 00:00:00 2001 From: hylee Date: Fri, 23 Sep 2022 09:57:44 +0900 Subject: [PATCH 07/15] =?UTF-8?q?refactor=20:=20xml=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) 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 842fd02b..d779fee9 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 @@ -39,27 +39,27 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -455,7 +455,7 @@ - SELECT ADR_SEQ From 00891be54d0ed05b3f002176cedf5d71b6eaf218 Mon Sep 17 00:00:00 2001 From: LJH Date: Fri, 23 Sep 2022 10:13:23 +0900 Subject: [PATCH 08/15] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?= =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?= =?UTF-8?q?=EA=B3=A0=EB=8F=84=ED=99=94=20=EC=BB=A4=EB=B0=8B=20=20-=20?= =?UTF-8?q?=EC=9B=90=EB=B3=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java | 1 + .../kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java | 1 + .../adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java | 1 + .../kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java | 1 + .../sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml | 1 + .../jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp | 2 +- 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java index f31d1082..b8cdab5a 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java @@ -22,4 +22,5 @@ public interface AdjReqMgrPastService { AdjReqMgrPastVO selectMemAss(AdjReqMgrPastVO adjReqMgrPastVO); List selectAdrRpplPastList(AdjReqMgrPastVO adjReqMgrPastVO); + } 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 651d8807..561b738e 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java @@ -67,4 +67,5 @@ public class AdjReqMgrPastDAO extends EgovAbstractDAO { } + } 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 f055f7ee..17eadee9 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -656,5 +656,6 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements + } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index 42afcb0f..5a58efc6 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -191,6 +191,7 @@ public class AdjReqMgrPastController { rpplList = adjReqMgrPastService.selectAdrRpplPastList(adjReqMgrPastVO); + model.addAttribute("rpplList", rpplList); return "kccadr/adjReqMgrPast/adjReqMgrPastFileRegist"; 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 7548531d..2b28fc42 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 @@ -407,6 +407,7 @@ + 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 e87e4237..bdb7cb67 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp @@ -527,4 +527,4 @@ function fn_testPageAlert(){
- --%> \ No newline at end of file + --%> From 5f7ba7e17eab5c5c1a381cb072bda8bd9ca054f4 Mon Sep 17 00:00:00 2001 From: LJH Date: Fri, 23 Sep 2022 10:19:03 +0900 Subject: [PATCH 09/15] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?= =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?= =?UTF-8?q?=EA=B3=A0=EB=8F=84=ED=99=94=20=EC=BB=A4=EB=B0=8B=20=20-=20?= =?UTF-8?q?=EB=8B=A4=EC=98=A4=20=EC=9E=84=ED=94=8C=20=EC=9B=90=EB=B3=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java | 5 ++++- .../service/impl/AdjReqMgrPastServiceImpl.java | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) 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 7212d072..799e1d57 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java @@ -69,6 +69,9 @@ public class AdjReqMgrPastDAO extends EgovAbstractDAO { return (AdjReqMgrPastVO) select("adjReqMgrPastDAO.findByIdPrtclMgr", adjReqMgrPastVO); } - + public List selectAdrRpplPastList(AdjReqMgrPastVO adjReqMgrPastVO) { + + return (List) list("adjReqMgrPastDAO.selectAdrRpplPastList", 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 3a2d728d..1609f451 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -654,6 +654,13 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements return adjReqMgrPastDAO.findByIdPrtclMgr(adjReqMgrPastVO); } + + @Override + public List selectAdrRpplPastList(AdjReqMgrPastVO adjReqMgrPastVO) { + + return adjReqMgrPastDAO.selectAdrRpplPastList(adjReqMgrPastVO); + } + } From bee1cbaf528ae50163a94280475c06ecb39970ab Mon Sep 17 00:00:00 2001 From: LJH Date: Fri, 23 Sep 2022 10:22:06 +0900 Subject: [PATCH 10/15] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?= =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?= =?UTF-8?q?=EA=B3=A0=EB=8F=84=ED=99=94=20=EC=BB=A4=EB=B0=8B=20=20-=20jsp?= =?UTF-8?q?=EC=9B=90=EB=B3=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjReqMgrPast/adjReqMgrPastFileRegist.jsp | 433 +++++++++++++++++- 1 file changed, 412 insertions(+), 21 deletions(-) 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 ae371a70..e87e4237 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp @@ -33,23 +33,204 @@ $(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(){ -// }); - }); +//단일 첨부파일 버튼 +$(function() { + $('#filebutton').click(function(e) { + e.preventDefault(); + $('#file_temp').click(); + }); +}); + +//등록 버튼 +function fncReg() { + var f = document.getElementById("listForm"); + var data = new FormData(f); + _fileForm2.forEach(function(obj, idx) { + if (obj) + data.append("file" + idx, obj.fileObj); + }); + + if (validation()) { + if(confirm("사건문서를 등록 하시겠습니까?")){ + + $.ajax({ + type : "POST", + enctype : 'multipart/form-data', + url : "/kccadr/adjPgrMgr/apm/docRegPopAjax.do", + data : data, + dataType : 'json', + async : false, + processData : false, + contentType : false, + cache : false, + success : function(returnData, status) { + if (returnData.result == 'success') { + alert("사건문서 제출이 완료되었습니다."); + opener.location.reload(true); + self.close(); + } else { + alert(returnData.message); + } + + }, + error : function(e) { + alert("사건문서 제출에 실패하였습니다."); + console.log("ERROR : ", e); + } + }); + } + + } + +} + +function validation() { + + if (isEmpty($('#adrDocCn1').val())) { + alert('답변내용을 입력해 주세요.'); + return false; + } + + if ($('#tbody_fiielist tr').length * 1 <= 0) { + alert("첨부서류를 등록해 주세요"); + return false; + + } + return true; +} + +//문서구분에 따른 신청인 피신청인 선택값 show/hide +function docTypeDiv(divVal){ + //답변서 + if(divVal == '10'){ + //신청인 + $('#rpplSeq').find('option[name=10]').prop('disabled', true); + $('#rpplSeq').find('option[name=10]').prop('selected', false); + //피신청인 + $('#rpplSeq').find('option[name=20]').each(function(){ + $(this).prop('disabled', false); + $(this).eq(0).prop('selected', true); + }); + //조정조사관 + $('#rpplSeq').find('option[name=30]').prop('disabled', true); + $('#rpplSeq').find('option[name=30]').prop('selected', false); + } + //준비서면 + else if(divVal == '20'){ + //신청인 + $('#rpplSeq').find('option[name=10]').prop('disabled', false); + $('#rpplSeq').find('option[name=10]').prop('selected', true); + //피신청인 + $('#rpplSeq').find('option[name=20]').each(function(){ + $(this).prop('disabled', true); + $(this).prop('selected', false); + }); + //조정조사관 + $('#rpplSeq').find('option[name=30]').prop('disabled', true); + $('#rpplSeq').find('option[name=30]').prop('selected', false); + } + //취하신청서 + else if(divVal == '30'){ + $('#rpplSeq').find('option[name=10]').prop('disabled', false); + $('#rpplSeq').find('option[name=10]').prop('selected', true); + //피신청인 + $('#rpplSeq').find('option[name=20]').each(function(){ + $(this).prop('disabled', true); + $(this).prop('selected', false); + }); + //조정조사관 + $('#rpplSeq').find('option[name=30]').prop('disabled', true); + $('#rpplSeq').find('option[name=30]').prop('selected', false); + } + //피신청인 경정신청서 + else if(divVal == '40'){ + $('#rpplSeq').find('option[name=10]').prop('disabled', false); + $('#rpplSeq').find('option[name=10]').prop('selected', true); + //피신청인 + $('#rpplSeq').find('option[name=20]').each(function(){ + $(this).prop('disabled', true); + $(this).prop('selected', false); + }); + //조정조사관 + $('#rpplSeq').find('option[name=30]').prop('disabled', true); + $('#rpplSeq').find('option[name=30]').prop('selected', false); + } + //조정기일 연장동의서 + else if(divVal == '50'){ + $('#rpplSeq').find('option[name=10]').prop('disabled', false); + $('#rpplSeq').find('option[name=10]').prop('selected', true); + //피신청인 + $('#rpplSeq').find('option[name=20]').each(function(){ + $(this).prop('disabled', false); + $(this).prop('selected', false); + }); + //조정조사관 + $('#rpplSeq').find('option[name=30]').prop('disabled', true); + $('#rpplSeq').find('option[name=30]').prop('selected', false); + } + //우편발송 배달증명서 + else if(divVal == '60'){ + $('#rpplSeq').find('option[name=10]').prop('disabled', false); + $('#rpplSeq').find('option[name=10]').prop('selected', true); + //피신청인 + $('#rpplSeq').find('option[name=20]').each(function(){ + $(this).prop('disabled', false); + $(this).prop('selected', false); + }); + //조정조사관 + $('#rpplSeq').find('option[name=30]').prop('disabled', true); + $('#rpplSeq').find('option[name=30]').prop('selected', false); + } + //관련 문서 전체 + else if(divVal == '70'){ + //신청인 + $('#rpplSeq').find('option[name=10]').prop('disabled', true); + $('#rpplSeq').find('option[name=10]').prop('selected', false); + //피신청인 + $('#rpplSeq').find('option[name=20]').each(function(){ + $(this).prop('disabled', true); + $(this).prop('selected', false); + }); + //조정조사관 + $('#rpplSeq').find('option[name=30]').prop('disabled', false); + $('#rpplSeq').find('option[name=30]').prop('selected', true); + } + //조정기일변경신청서 + else if(divVal == '80'){ + //신청인 + $('#rpplSeq').find('option[name=10]').prop('disabled', false); + $('#rpplSeq').find('option[name=10]').prop('selected', true); + //피신청인 + $('#rpplSeq').find('option[name=20]').each(function(){ + $(this).prop('disabled', false); + $(this).prop('selected', false); + }); + //조정조사관 + $('#rpplSeq').find('option[name=30]').prop('disabled', true); + $('#rpplSeq').find('option[name=30]').prop('selected', false); + } + //직권조정 이의신청서 + else if(divVal == '90'){ + //신청인 + $('#rpplSeq').find('option[name=10]').prop('disabled', false); + $('#rpplSeq').find('option[name=10]').prop('selected', true); + //피신청인 + $('#rpplSeq').find('option[name=20]').each(function(){ + $(this).prop('disabled', false); + $(this).prop('selected', false); + }); + //조정조사관 + $('#rpplSeq').find('option[name=30]').prop('disabled', true); + $('#rpplSeq').find('option[name=30]').prop('selected', false); + } +} + +//더하기 버튼 alert +function fn_testPageAlert(){ + alert("사건관련 문서 추가 시 작동하는 버튼입니다. \n 첨부파일 솔루션 도입 후 적용 예정"); +} 사건관련문서 등록 @@ -72,6 +253,221 @@ $(document).ready(function(){
+
+ + +
+

사건관련문서 등록

+
    +
    • +
  • +

    오프라인 조정관리

    +
    • +
  • +

    과거사건등록

    +
    • +
  • 사건관련문서 등록
    • +
+
+ + +
+ +
+ <%--

총 진행 회차 : 건

--%> + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
사건문서 등록 : 신청인, 피신청인, 관리자가 사건에 관련된 첨부파일을 등록한다.
+

문서 구분

+ 		+

+ +

+
+

사건문서 등록인 구분

+ 		+

+ +

+
+

내용

+ 		+ + +
+

첨부서류

+ 		+ + + +

* 첨부파일을 등록해 주세요. (최대3개)

+
+ + + + + + + + + + + + + + + + + + + +
첨부파일 추가 리스트 : 파일명, 종류, 크기, 삭제
파일 명종류크기삭제
+

+ 첨부하실 파일을 + 마우스로 끌어서 + 넣어주세요. +

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
첨부파일 추가 리스트 : 파일명, 종류, 크기, 삭제
파일 명종류크기삭제
+ + + "> + + + + "> + + + + +
+
+
+

상대방공개여부

+ 		+
+ + + + + + + + +
+
+ +
+ + +
+ +
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--
@@ -131,9 +527,4 @@ $(document).ready(function(){
- - - - - - + --%> \ No newline at end of file From 93962226a03ffa68e4cbe00bf8bbc907d5fa612d Mon Sep 17 00:00:00 2001 From: JooYoung Date: Fri, 23 Sep 2022 12:54:32 +0900 Subject: [PATCH 11/15] =?UTF-8?q?=EB=84=A4=EC=9D=B4=EB=B2=84=20sns=20?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kccadr/certDoc/web/CertDocController.java | 10 ++++ .../jsp/web/kccadr/login/SsoLoginUsrSns.jsp | 43 ++++---------- .../jsp/web/kccadr/login/snsCallBack.jsp | 58 +++++++++++++++++++ 3 files changed, 80 insertions(+), 31 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/web/kccadr/login/snsCallBack.jsp diff --git a/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java b/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java index ad3e9478..5c8e24d9 100644 --- a/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java +++ b/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java @@ -95,6 +95,16 @@ public class CertDocController { } + /** + * 송달문서조회용 SNS 로그인 callback 페이지 + */ + @RequestMapping("/web/kccadr/certDoc/snsCallBack.do") + public String snsCallBack(@RequestParam HashMap test) throws Exception { + + return "/web/kccadr/login/snsCallBack"; + + } + /** * 송달문서 목록 diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp index 249e29e4..11587caa 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp @@ -29,7 +29,8 @@ @@ -42,8 +43,14 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/login/snsCallBack.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/snsCallBack.jsp new file mode 100644 index 00000000..b851a056 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/snsCallBack.jsp @@ -0,0 +1,58 @@ +<%@ 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="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> + + +
+ + +
+ + + + + + From 5729c4db438521f6a100b7a93febab5c6a649427 Mon Sep 17 00:00:00 2001 From: JooYoung Date: Fri, 23 Sep 2022 14:07:01 +0900 Subject: [PATCH 12/15] =?UTF-8?q?=EB=84=A4=EC=9D=B4=EB=B2=84=20sns=20?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp | 2 +- src/main/webapp/WEB-INF/jsp/web/kccadr/login/snsCallBack.jsp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp index 11587caa..3a3f39f8 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp @@ -83,7 +83,7 @@ $(document).on("click", "#naverLogin", function(){ var naverLogin = new naver.LoginWithNaverId( { clientId: "iMGwQvTUeD4tVwv41haJ", - callbackUrl: "http://127.0.0.1:8089/web/kccadr/certDoc/snsCallBack.do", + callbackUrl: "http://dev1.iten.co.kr:9999/web/kccadr/certDoc/snsCallBack.do", loginButton: {color: "green", type: 4, height: 40}, isPopup: false /* 팝업을 통한 연동처리 여부 */ } diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/login/snsCallBack.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/snsCallBack.jsp index b851a056..434bbcb3 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/login/snsCallBack.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/snsCallBack.jsp @@ -19,12 +19,12 @@ var naverLogin = new naver.LoginWithNaverId( { clientId: "iMGwQvTUeD4tVwv41haJ", - callbackUrl: "http://127.0.0.1:8089/web/kccadr/certDoc/snsCallBack.do", + callbackUrl: "http://dev1.iten.co.kr:9999//web/kccadr/certDoc/snsCallBack.do", isPopup: false, callbackHandle: true } ); - + /* 설정정보를 초기화하고 연동을 준비 */ naverLogin.init(); From d042a3608637c383eea1f20e822820440f1612d2 Mon Sep 17 00:00:00 2001 From: HappyITN Date: Fri, 23 Sep 2022 14:15:34 +0900 Subject: [PATCH 13/15] =?UTF-8?q?220923=20=EB=A0=88=EB=93=9C=EB=A7=88?= =?UTF-8?q?=EC=9D=B8=20#2732=20=EA=B4=80=EB=A6=AC=EC=9E=90=20-=20=EB=A9=94?= =?UTF-8?q?=EB=89=B4=EB=B3=84=20=EA=B6=8C=ED=95=9C=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80,=20=EA=B2=B0=EC=9E=AC=EC=84=A0=20?= =?UTF-8?q?=ED=8C=9D=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/AdjReqMgrOffLineController.java | 10 + .../web/EgovMenuCreateManageController.java | 25 + .../kccadr/adjReqMgrOff/adjReqMgrOffList.jsp | 9 + .../popup/adjReqMgrOffAppReqPop.jsp | 135 ++ .../mnu/mpm/EgovMenuAuthoritySelectJtree.jsp | 1217 +++++++++++++++++ .../css/jstree/themes/default/style.min.css | 2 +- src/main/webapp/kccadrPb/adm/css/content.css | 17 + src/main/webapp/kccadrPb/adm/css/popup.css | 20 +- .../kccadrPb/adm/image/icon_btnType08.png | Bin 0 -> 1182 bytes 9 files changed, 1433 insertions(+), 2 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/popup/adjReqMgrOffAppReqPop.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuAuthoritySelectJtree.jsp create mode 100644 src/main/webapp/kccadrPb/adm/image/icon_btnType08.png diff --git a/src/main/java/kcc/kccadr/adjReqMgrOff/web/AdjReqMgrOffLineController.java b/src/main/java/kcc/kccadr/adjReqMgrOff/web/AdjReqMgrOffLineController.java index 9f76070c..04e5b68b 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrOff/web/AdjReqMgrOffLineController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrOff/web/AdjReqMgrOffLineController.java @@ -583,6 +583,16 @@ public class AdjReqMgrOffLineController { model.addAttribute("list", list); return "kccadr/adjReqMgrOff/popup/adjReqMgrOffHistoryPopList"; } + + /** + * auth : bhkim + * 전자조정신청 목록 화면 + * date : 2021.09.111 + */ + @RequestMapping("/kccadr/adjReqMgOff/popup/adjReqMgrOffAppReqPop.do") + public String adjReqMgrOffAppReqPop(@ModelAttribute("adjReqMgrOffLineVO") AdjReqMgrOffLineVO adjReqMgrOffLineVO, ModelMap model) throws Exception { + return "kccadr/adjReqMgrOff/popup/adjReqMgrOffAppReqPop"; + } public void decryptInfomation(List list, AdjReqMgrOffLineVO info){ diff --git a/src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java b/src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java index 3cb3d010..df957c71 100644 --- a/src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java +++ b/src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java @@ -249,6 +249,31 @@ public class EgovMenuCreateManageController { return "sym/mnu/mpm/EgovMenuCreatSelectJtree"; } + /* 메뉴생성 세부조회 */ + /** + * 메뉴별 권한관리 페이지입니다. + * + * @param menuCreatVO + * MenuCreatVO + * @return 출력페이지정보 "sym/mnu/mcm/EgovMenuCreat" + * @exception Exception + */ + @RequestMapping(value = "/sym/mnu/mcm/EgovMenuAuthoritySelectJtree.do") + public String selectEgovMenuAuthoritySelectJtree(@ModelAttribute("menuCreatVO") MenuCreatVO menuCreatVO, @ModelAttribute("searchVO") ComDefaultVO searchVO, + ModelMap model, MenuManageVO menuManageVO , HttpSession session ) throws Exception { + // 0. Spring Security 사용자권한 처리 + + if(menuCreatVO.getMenuUserType() == null){ + menuCreatVO.setMenuUserType("A"); //사용자 디폴트 + } + + if(null == menuManageVO.getAuthorCode()) { + menuManageVO.setAuthorCode("ROLE_ANONYMOUS"); + } + model.addAttribute("menuCreatVO", menuCreatVO); + return "sym/mnu/mpm/EgovMenuAuthoritySelectJtree"; + } + @RequestMapping(value = {"/sym/mnu/mcm/EgovMenuCreatSelectJtreeAjax.do", "/sym/mnu/mcm/EgovMenuQuickSelectJtreeAjax.do" } ) public void EgovMenuCreatSelectJtreeAjax(@ModelAttribute("menuManageVO") MenuManageJTreeVO menuManageVO, ModelMap model, diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffList.jsp index 75407f8b..c6d6270a 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffList.jsp @@ -54,6 +54,14 @@ listForm.action = ""; listForm.submit(); } + + function AppReq(){ + var form = $('
'); + form.append($('', {type: 'hidden', name: 'mltApprSeq', value: 'test'})); + form.appendTo('body'); + commonPopWindowopenForm("/kccadr/adjReqMgOff/popup/adjReqMgrOffAppReqPop.do" , "850", "700", "AppReqPopup", form); + form.remove(); + } 조정신청목록 @@ -181,6 +189,7 @@
+
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/popup/adjReqMgrOffAppReqPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/popup/adjReqMgrOffAppReqPop.jsp new file mode 100644 index 00000000..c94c069a --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/popup/adjReqMgrOffAppReqPop.jsp @@ -0,0 +1,135 @@ + +<%@ 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 uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ 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="validator" uri="http://www.springmodules.org/tags/commons-validator" %> + + + + +○○○ 결재 요청 + + +
+
+
+ +
+ +
+
+
+ + +
+ +
+
+
    +
  • +
    팀장
    +
    +
    + +
    +
    +
    +
    결재자
    +
    + 홍길동 +
    + + +
    +
    +
    +
    +
    +
    • +
  • +
    부서장
    +
    +
    + +
    +
    +
    +
    결재자
    +
    + 홍길동 +
    + + +
    +
    +
    +
    +
    +
    • +
  • +
    위원장
    +
    +
    + +
    +
    +
    +
    결재자
    +
    + 홍길동 +
    + + +
    +
    +
    +
    +
    +
    • +
+
+
+
+ +
+
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuAuthoritySelectJtree.jsp b/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuAuthoritySelectJtree.jsp new file mode 100644 index 00000000..e5eccd0e --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuAuthoritySelectJtree.jsp @@ -0,0 +1,1217 @@ +<%-- + Class Name : EgovOrgChartManage.jsp + Description : 조직도 관리 화면 + Modification Information + + 수정일 수정자 수정내용 + ------- -------- --------------------------- + 2018.06.11 ITN 최초 생성 + + author : ITN + since : 2018.06.11 +--%> +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ page import="kcc.com.cmm.service.EgovProperties"%> +<%@ 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="spring" uri="http://www.springframework.org/tags"%> + + + + + + + + + + +메뉴관리 + + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/css/jstree/themes/default/style.min.css b/src/main/webapp/css/jstree/themes/default/style.min.css index f9822c74..efa5c6cc 100644 --- a/src/main/webapp/css/jstree/themes/default/style.min.css +++ b/src/main/webapp/css/jstree/themes/default/style.min.css @@ -1 +1 @@ -.jstree-node,.jstree-children,.jstree-container-ul{display:block;margin:0;padding:0;list-style-type:none;list-style-image:none}.jstree-node{white-space:nowrap}.jstree-anchor{display:inline-block;color:#000;white-space:nowrap;padding:0 4px 0 1px;margin:0;vertical-align:top}.jstree-anchor:focus{outline:0}.jstree-anchor,.jstree-anchor:link,.jstree-anchor:visited,.jstree-anchor:hover,.jstree-anchor:active{text-decoration:none;color:inherit}.jstree-icon{display:inline-block;text-decoration:none;margin:0;padding:0;vertical-align:top;text-align:center}.jstree-icon:empty{display:inline-block;text-decoration:none;margin:0;padding:0;vertical-align:top;text-align:center}.jstree-ocl{cursor:pointer}.jstree-leaf>.jstree-ocl{cursor:default}.jstree .jstree-open>.jstree-children{display:block}.jstree .jstree-closed>.jstree-children,.jstree .jstree-leaf>.jstree-children{display:none}.jstree-anchor>.jstree-themeicon{margin-right:2px}.jstree-no-icons .jstree-themeicon,.jstree-anchor>.jstree-themeicon-hidden{display:none}.jstree-hidden,.jstree-node.jstree-hidden{display:none}.jstree-rtl .jstree-anchor{padding:0 1px 0 4px}.jstree-rtl .jstree-anchor>.jstree-themeicon{margin-left:2px;margin-right:0}.jstree-rtl .jstree-node{margin-left:0}.jstree-rtl .jstree-container-ul>.jstree-node{margin-right:0}.jstree-wholerow-ul{position:relative;display:inline-block;min-width:100%}.jstree-wholerow-ul .jstree-leaf>.jstree-ocl{cursor:pointer}.jstree-wholerow-ul .jstree-anchor,.jstree-wholerow-ul .jstree-icon{position:relative}.jstree-wholerow-ul .jstree-wholerow{width:100%;cursor:pointer;position:absolute;left:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.jstree-contextmenu .jstree-anchor{-webkit-user-select:none;-webkit-touch-callout:none}.vakata-context{display:none}.vakata-context,.vakata-context ul{margin:0;padding:2px;position:absolute;background:#f5f5f5;border:1px solid #979797;box-shadow:2px 2px 2px #999}.vakata-context ul{list-style:none;left:100%;margin-top:-2.7em;margin-left:-4px}.vakata-context .vakata-context-right ul{left:auto;right:100%;margin-left:auto;margin-right:-4px}.vakata-context li{list-style:none}.vakata-context li>a{display:block;padding:0 2em;text-decoration:none;width:auto;color:#000;white-space:nowrap;line-height:2.4em;text-shadow:1px 1px 0 #fff;border-radius:1px}.vakata-context li>a:hover{position:relative;background-color:#e8eff7;box-shadow:0 0 2px #0a6aa1}.vakata-context li>a.vakata-context-parent{background-image:url(data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAIORI4JlrqN1oMSnmmZDQUAOw==);background-position:right center;background-repeat:no-repeat}.vakata-context li>a:focus{outline:0}.vakata-context .vakata-context-hover>a{position:relative;background-color:#e8eff7;box-shadow:0 0 2px #0a6aa1}.vakata-context .vakata-context-separator>a,.vakata-context .vakata-context-separator>a:hover{background:#fff;border:0;border-top:1px solid #e2e3e3;height:1px;min-height:1px;max-height:1px;padding:0;margin:0 0 0 2.4em;border-left:1px solid #e0e0e0;text-shadow:0 0 0 transparent;box-shadow:0 0 0 transparent;border-radius:0}.vakata-context .vakata-contextmenu-disabled a,.vakata-context .vakata-contextmenu-disabled a:hover{color:silver;background-color:transparent;border:0;box-shadow:0 0 0}.vakata-context li>a>i{text-decoration:none;display:inline-block;width:2.4em;height:2.4em;background:0 0;margin:0 0 0 -2em;vertical-align:top;text-align:center;line-height:2.4em}.vakata-context li>a>i:empty{width:2.4em;line-height:2.4em}.vakata-context li>a .vakata-contextmenu-sep{display:inline-block;width:1px;height:2.4em;background:#fff;margin:0 .5em 0 0;border-left:1px solid #e2e3e3}.vakata-context .vakata-contextmenu-shortcut{font-size:.8em;color:silver;opacity:.5;display:none}.vakata-context-rtl ul{left:auto;right:100%;margin-left:auto;margin-right:-4px}.vakata-context-rtl li>a.vakata-context-parent{background-image:url(data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAINjI+AC7rWHIsPtmoxLAA7);background-position:left center;background-repeat:no-repeat}.vakata-context-rtl .vakata-context-separator>a{margin:0 2.4em 0 0;border-left:0;border-right:1px solid #e2e3e3}.vakata-context-rtl .vakata-context-left ul{right:auto;left:100%;margin-left:-4px;margin-right:auto}.vakata-context-rtl li>a>i{margin:0 -2em 0 0}.vakata-context-rtl li>a .vakata-contextmenu-sep{margin:0 0 0 .5em;border-left-color:#fff;background:#e2e3e3}#jstree-marker{position:absolute;top:0;left:0;margin:-5px 0 0 0;padding:0;border-right:0;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid;width:0;height:0;font-size:0;line-height:0}#jstree-dnd{line-height:16px;margin:0;padding:4px}#jstree-dnd .jstree-icon,#jstree-dnd .jstree-copy{display:inline-block;text-decoration:none;margin:0 2px 0 0;padding:0;width:16px;height:16px}#jstree-dnd .jstree-ok{background:green}#jstree-dnd .jstree-er{background:red}#jstree-dnd .jstree-copy{margin:0 2px}.jstree-default .jstree-node,.jstree-default .jstree-icon{background-repeat:no-repeat;background-color:transparent}.jstree-default .jstree-anchor,.jstree-default .jstree-animated,.jstree-default .jstree-wholerow{transition:background-color .15s,box-shadow .15s}.jstree-default .jstree-hovered{background:#e7f4f9;border-radius:2px;box-shadow:inset 0 0 1px #ccc}.jstree-default .jstree-context{background:#e7f4f9;border-radius:2px;box-shadow:inset 0 0 1px #ccc}.jstree-default .jstree-clicked{background:#beebff;border-radius:2px;box-shadow:inset 0 0 1px #999}.jstree-default .jstree-no-icons .jstree-anchor>.jstree-themeicon{display:none}.jstree-default .jstree-disabled{background:0 0;color:#666}.jstree-default .jstree-disabled.jstree-hovered{background:0 0;box-shadow:none}.jstree-default .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default .jstree-disabled>.jstree-icon{opacity:.8;filter:url("data:image/svg+xml;utf8,#jstree-grayscale");filter:gray;-webkit-filter:grayscale(100%)}.jstree-default .jstree-search{font-style:italic;color:#8b0000;font-weight:700}.jstree-default .jstree-no-checkboxes .jstree-checkbox{display:none!important}.jstree-default.jstree-checkbox-no-clicked .jstree-clicked{background:0 0;box-shadow:none}.jstree-default.jstree-checkbox-no-clicked .jstree-clicked.jstree-hovered{background:#e7f4f9}.jstree-default.jstree-checkbox-no-clicked>.jstree-wholerow-ul .jstree-wholerow-clicked{background:0 0}.jstree-default.jstree-checkbox-no-clicked>.jstree-wholerow-ul .jstree-wholerow-clicked.jstree-wholerow-hovered{background:#e7f4f9}.jstree-default>.jstree-striped{min-width:100%;display:inline-block;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAMAAAB/qqA+AAAABlBMVEUAAAAAAAClZ7nPAAAAAnRSTlMNAMM9s3UAAAAXSURBVHjajcEBAQAAAIKg/H/aCQZ70AUBjAATb6YPDgAAAABJRU5ErkJggg==) left top repeat}.jstree-default>.jstree-wholerow-ul .jstree-hovered,.jstree-default>.jstree-wholerow-ul .jstree-clicked{background:0 0;box-shadow:none;border-radius:0}.jstree-default .jstree-wholerow{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.jstree-default .jstree-wholerow-hovered{background:#e7f4f9}.jstree-default .jstree-wholerow-clicked{background:#beebff;background:-webkit-linear-gradient(top,#beebff 0,#a8e4ff 100%);background:linear-gradient(to bottom,#beebff 0,#a8e4ff 100%)}.jstree-default .jstree-node{min-height:24px;line-height:24px;margin-left:24px;min-width:24px}.jstree-default .jstree-anchor{line-height:24px;height:24px}.jstree-default .jstree-icon{width:24px;height:24px;line-height:24px}.jstree-default .jstree-icon:empty{width:24px;height:24px;line-height:24px}.jstree-default.jstree-rtl .jstree-node{margin-right:24px}.jstree-default .jstree-wholerow{height:24px}.jstree-default .jstree-node,.jstree-default .jstree-icon{background-image:url(32px.png)}.jstree-default .jstree-node{background-position:-292px -4px;background-repeat:repeat-y}.jstree-default .jstree-last{background:0 0}.jstree-default .jstree-open>.jstree-ocl{background-position:-132px -4px}.jstree-default .jstree-closed>.jstree-ocl{background-position:-100px -4px}.jstree-default .jstree-leaf>.jstree-ocl{background-position:-68px -4px}.jstree-default .jstree-themeicon{background-position:-260px -4px}.jstree-default>.jstree-no-dots .jstree-node,.jstree-default>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-36px -4px}.jstree-default>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-4px -4px}.jstree-default .jstree-disabled{background:0 0}.jstree-default .jstree-disabled.jstree-hovered{background:0 0}.jstree-default .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default .jstree-checkbox{background-position:-164px -4px}.jstree-default .jstree-checkbox:hover{background-position:-164px -36px}.jstree-default.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default .jstree-checked>.jstree-checkbox{background-position:-228px -4px}.jstree-default.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover,.jstree-default .jstree-checked>.jstree-checkbox:hover{background-position:-228px -36px}.jstree-default .jstree-anchor>.jstree-undetermined{background-position:-196px -4px}.jstree-default .jstree-anchor>.jstree-undetermined:hover{background-position:-196px -36px}.jstree-default .jstree-checkbox-disabled{opacity:.8;filter:url("data:image/svg+xml;utf8,#jstree-grayscale");filter:gray;-webkit-filter:grayscale(100%)}.jstree-default>.jstree-striped{background-size:auto 48px}.jstree-default.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==);background-position:100% 1px;background-repeat:repeat-y}.jstree-default.jstree-rtl .jstree-last{background:0 0}.jstree-default.jstree-rtl .jstree-open>.jstree-ocl{background-position:-132px -36px}.jstree-default.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-100px -36px}.jstree-default.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-68px -36px}.jstree-default.jstree-rtl>.jstree-no-dots .jstree-node,.jstree-default.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-36px -36px}.jstree-default.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-4px -36px}.jstree-default .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(throbber.gif) center center no-repeat}.jstree-default .jstree-file{background:url(32px.png) -100px -68px no-repeat}.jstree-default .jstree-folder{background:url(32px.png) -260px -4px no-repeat}.jstree-default>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default{line-height:24px;padding:0 4px}#jstree-dnd.jstree-default .jstree-ok,#jstree-dnd.jstree-default .jstree-er{background-image:url(32px.png);background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default i{background:0 0;width:24px;height:24px;line-height:24px}#jstree-dnd.jstree-default .jstree-ok{background-position:-4px -68px}#jstree-dnd.jstree-default .jstree-er{background-position:-36px -68px}.jstree-default .jstree-ellipsis{overflow:hidden}.jstree-default .jstree-ellipsis .jstree-anchor{width:calc(100% - 29px);text-overflow:ellipsis;overflow:hidden}.jstree-default .jstree-ellipsis.jstree-no-icons .jstree-anchor{width:calc(100% - 5px)}.jstree-default.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==)}.jstree-default.jstree-rtl .jstree-last{background:0 0}.jstree-default-small .jstree-node{min-height:18px;line-height:18px;margin-left:18px;min-width:18px}.jstree-default-small .jstree-anchor{line-height:18px;height:18px}.jstree-default-small .jstree-icon{width:18px;height:18px;line-height:18px}.jstree-default-small .jstree-icon:empty{width:18px;height:18px;line-height:18px}.jstree-default-small.jstree-rtl .jstree-node{margin-right:18px}.jstree-default-small .jstree-wholerow{height:18px}.jstree-default-small .jstree-node,.jstree-default-small .jstree-icon{background-image:url(32px.png)}.jstree-default-small .jstree-node{background-position:-295px -7px;background-repeat:repeat-y}.jstree-default-small .jstree-last{background:0 0}.jstree-default-small .jstree-open>.jstree-ocl{background-position:-135px -7px}.jstree-default-small .jstree-closed>.jstree-ocl{background-position:-103px -7px}.jstree-default-small .jstree-leaf>.jstree-ocl{background-position:-71px -7px}.jstree-default-small .jstree-themeicon{background-position:-263px -7px}.jstree-default-small>.jstree-no-dots .jstree-node,.jstree-default-small>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-small>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-39px -7px}.jstree-default-small>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-7px -7px}.jstree-default-small .jstree-disabled{background:0 0}.jstree-default-small .jstree-disabled.jstree-hovered{background:0 0}.jstree-default-small .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default-small .jstree-checkbox{background-position:-167px -7px}.jstree-default-small .jstree-checkbox:hover{background-position:-167px -39px}.jstree-default-small.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default-small .jstree-checked>.jstree-checkbox{background-position:-231px -7px}.jstree-default-small.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover,.jstree-default-small .jstree-checked>.jstree-checkbox:hover{background-position:-231px -39px}.jstree-default-small .jstree-anchor>.jstree-undetermined{background-position:-199px -7px}.jstree-default-small .jstree-anchor>.jstree-undetermined:hover{background-position:-199px -39px}.jstree-default-small .jstree-checkbox-disabled{opacity:.8;filter:url("data:image/svg+xml;utf8,#jstree-grayscale");filter:gray;-webkit-filter:grayscale(100%)}.jstree-default-small>.jstree-striped{background-size:auto 36px}.jstree-default-small.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==);background-position:100% 1px;background-repeat:repeat-y}.jstree-default-small.jstree-rtl .jstree-last{background:0 0}.jstree-default-small.jstree-rtl .jstree-open>.jstree-ocl{background-position:-135px -39px}.jstree-default-small.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-103px -39px}.jstree-default-small.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-71px -39px}.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-node,.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-39px -39px}.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-7px -39px}.jstree-default-small .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-small>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(throbber.gif) center center no-repeat}.jstree-default-small .jstree-file{background:url(32px.png) -103px -71px no-repeat}.jstree-default-small .jstree-folder{background:url(32px.png) -263px -7px no-repeat}.jstree-default-small>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default-small{line-height:18px;padding:0 4px}#jstree-dnd.jstree-default-small .jstree-ok,#jstree-dnd.jstree-default-small .jstree-er{background-image:url(32px.png);background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default-small i{background:0 0;width:18px;height:18px;line-height:18px}#jstree-dnd.jstree-default-small .jstree-ok{background-position:-7px -71px}#jstree-dnd.jstree-default-small .jstree-er{background-position:-39px -71px}.jstree-default-small .jstree-ellipsis{overflow:hidden}.jstree-default-small .jstree-ellipsis .jstree-anchor{width:calc(100% - 23px);text-overflow:ellipsis;overflow:hidden}.jstree-default-small .jstree-ellipsis.jstree-no-icons .jstree-anchor{width:calc(100% - 5px)}.jstree-default-small.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAACAQMAAABv1h6PAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMHBgAAiABBI4gz9AAAAABJRU5ErkJggg==)}.jstree-default-small.jstree-rtl .jstree-last{background:0 0}.jstree-default-large .jstree-node{min-height:32px;line-height:32px;margin-left:32px;min-width:32px}.jstree-default-large .jstree-anchor{line-height:32px;height:32px}.jstree-default-large .jstree-icon{width:32px;height:32px;line-height:32px}.jstree-default-large .jstree-icon:empty{width:32px;height:32px;line-height:32px}.jstree-default-large.jstree-rtl .jstree-node{margin-right:32px}.jstree-default-large .jstree-wholerow{height:32px}.jstree-default-large .jstree-node,.jstree-default-large .jstree-icon{background-image:url(32px.png)}.jstree-default-large .jstree-node{background-position:-288px 0;background-repeat:repeat-y}.jstree-default-large .jstree-last{background:0 0}.jstree-default-large .jstree-open>.jstree-ocl{background-position:-128px 0}.jstree-default-large .jstree-closed>.jstree-ocl{background-position:-96px 0}.jstree-default-large .jstree-leaf>.jstree-ocl{background-position:-64px 0}.jstree-default-large .jstree-themeicon{background-position:-256px 0}.jstree-default-large>.jstree-no-dots .jstree-node,.jstree-default-large>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-large>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-32px 0}.jstree-default-large>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:0 0}.jstree-default-large .jstree-disabled{background:0 0}.jstree-default-large .jstree-disabled.jstree-hovered{background:0 0}.jstree-default-large .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default-large .jstree-checkbox{background-position:-160px 0}.jstree-default-large .jstree-checkbox:hover{background-position:-160px -32px}.jstree-default-large.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default-large .jstree-checked>.jstree-checkbox{background-position:-224px 0}.jstree-default-large.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover,.jstree-default-large .jstree-checked>.jstree-checkbox:hover{background-position:-224px -32px}.jstree-default-large .jstree-anchor>.jstree-undetermined{background-position:-192px 0}.jstree-default-large .jstree-anchor>.jstree-undetermined:hover{background-position:-192px -32px}.jstree-default-large .jstree-checkbox-disabled{opacity:.8;filter:url("data:image/svg+xml;utf8,#jstree-grayscale");filter:gray;-webkit-filter:grayscale(100%)}.jstree-default-large>.jstree-striped{background-size:auto 64px}.jstree-default-large.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==);background-position:100% 1px;background-repeat:repeat-y}.jstree-default-large.jstree-rtl .jstree-last{background:0 0}.jstree-default-large.jstree-rtl .jstree-open>.jstree-ocl{background-position:-128px -32px}.jstree-default-large.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-96px -32px}.jstree-default-large.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-64px -32px}.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-node,.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-32px -32px}.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:0 -32px}.jstree-default-large .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-large>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(throbber.gif) center center no-repeat}.jstree-default-large .jstree-file{background:url(32px.png) -96px -64px no-repeat}.jstree-default-large .jstree-folder{background:url(32px.png) -256px 0 no-repeat}.jstree-default-large>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default-large{line-height:32px;padding:0 4px}#jstree-dnd.jstree-default-large .jstree-ok,#jstree-dnd.jstree-default-large .jstree-er{background-image:url(32px.png);background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default-large i{background:0 0;width:32px;height:32px;line-height:32px}#jstree-dnd.jstree-default-large .jstree-ok{background-position:0 -64px}#jstree-dnd.jstree-default-large .jstree-er{background-position:-32px -64px}.jstree-default-large .jstree-ellipsis{overflow:hidden}.jstree-default-large .jstree-ellipsis .jstree-anchor{width:calc(100% - 37px);text-overflow:ellipsis;overflow:hidden}.jstree-default-large .jstree-ellipsis.jstree-no-icons .jstree-anchor{width:calc(100% - 5px)}.jstree-default-large.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAACAQMAAAAD0EyKAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjgIIGBgABCgCBvVLXcAAAAABJRU5ErkJggg==)}.jstree-default-large.jstree-rtl .jstree-last{background:0 0}@media (max-width:768px){#jstree-dnd.jstree-dnd-responsive{line-height:40px;font-weight:700;font-size:1.1em;text-shadow:1px 1px #fff}#jstree-dnd.jstree-dnd-responsive>i{background:0 0;width:40px;height:40px}#jstree-dnd.jstree-dnd-responsive>.jstree-ok{background-image:url(40px.png);background-position:0 -200px;background-size:120px 240px}#jstree-dnd.jstree-dnd-responsive>.jstree-er{background-image:url(40px.png);background-position:-40px -200px;background-size:120px 240px}#jstree-marker.jstree-dnd-responsive{border-left-width:10px;border-top-width:10px;border-bottom-width:10px;margin-top:-10px}}@media (max-width:768px){.jstree-default-responsive .jstree-icon{background-image:url(40px.png)}.jstree-default-responsive .jstree-node,.jstree-default-responsive .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-responsive .jstree-node{min-height:40px;line-height:40px;margin-left:40px;min-width:40px;white-space:nowrap}.jstree-default-responsive .jstree-anchor{line-height:40px;height:40px}.jstree-default-responsive .jstree-icon,.jstree-default-responsive .jstree-icon:empty{width:40px;height:40px;line-height:40px}.jstree-default-responsive>.jstree-container-ul>.jstree-node{margin-left:0}.jstree-default-responsive.jstree-rtl .jstree-node{margin-left:0;margin-right:40px;background:0 0}.jstree-default-responsive.jstree-rtl .jstree-container-ul>.jstree-node{margin-right:0}.jstree-default-responsive .jstree-ocl,.jstree-default-responsive .jstree-themeicon,.jstree-default-responsive .jstree-checkbox{background-size:120px 240px}.jstree-default-responsive .jstree-leaf>.jstree-ocl,.jstree-default-responsive.jstree-rtl .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-responsive .jstree-open>.jstree-ocl{background-position:0 0!important}.jstree-default-responsive .jstree-closed>.jstree-ocl{background-position:0 -40px!important}.jstree-default-responsive.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-40px 0!important}.jstree-default-responsive .jstree-themeicon{background-position:-40px -40px}.jstree-default-responsive .jstree-checkbox,.jstree-default-responsive .jstree-checkbox:hover{background-position:-40px -80px}.jstree-default-responsive.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default-responsive.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover,.jstree-default-responsive .jstree-checked>.jstree-checkbox,.jstree-default-responsive .jstree-checked>.jstree-checkbox:hover{background-position:0 -80px}.jstree-default-responsive .jstree-anchor>.jstree-undetermined,.jstree-default-responsive .jstree-anchor>.jstree-undetermined:hover{background-position:0 -120px}.jstree-default-responsive .jstree-anchor{font-weight:700;font-size:1.1em;text-shadow:1px 1px #fff}.jstree-default-responsive>.jstree-striped{background:0 0}.jstree-default-responsive .jstree-wholerow{border-top:1px solid rgba(255,255,255,.7);border-bottom:1px solid rgba(64,64,64,.2);background:#ebebeb;height:40px}.jstree-default-responsive .jstree-wholerow-hovered{background:#e7f4f9}.jstree-default-responsive .jstree-wholerow-clicked{background:#beebff}.jstree-default-responsive .jstree-children .jstree-last>.jstree-wholerow{box-shadow:inset 0 -6px 3px -5px #666}.jstree-default-responsive .jstree-children .jstree-open>.jstree-wholerow{box-shadow:inset 0 6px 3px -5px #666;border-top:0}.jstree-default-responsive .jstree-children .jstree-open+.jstree-open{box-shadow:none}.jstree-default-responsive .jstree-node,.jstree-default-responsive .jstree-icon,.jstree-default-responsive .jstree-node>.jstree-ocl,.jstree-default-responsive .jstree-themeicon,.jstree-default-responsive .jstree-checkbox{background-image:url(40px.png);background-size:120px 240px}.jstree-default-responsive .jstree-node{background-position:-80px 0;background-repeat:repeat-y}.jstree-default-responsive .jstree-last{background:0 0}.jstree-default-responsive .jstree-leaf>.jstree-ocl{background-position:-40px -120px}.jstree-default-responsive .jstree-last>.jstree-ocl{background-position:-40px -160px}.jstree-default-responsive .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-responsive .jstree-file{background:url(40px.png) 0 -160px no-repeat;background-size:120px 240px}.jstree-default-responsive .jstree-folder{background:url(40px.png) -40px -40px no-repeat;background-size:120px 240px}.jstree-default-responsive>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}} \ No newline at end of file +.jstree-node,.jstree-children,.jstree-container-ul{display:block;margin:0;padding:0;list-style-type:none;list-style-image:none}.jstree-node{white-space:nowrap}.jstree-anchor{display:inline-block;color:#000;white-space:nowrap;padding:0 4px 0 1px;margin:0;vertical-align:top}.jstree-anchor:focus{outline:0}.jstree-anchor,.jstree-anchor:link,.jstree-anchor:visited,.jstree-anchor:hover,.jstree-anchor:active{text-decoration:none;color:inherit}.jstree-icon{display:inline-block;text-decoration:none;margin:0;padding:0;vertical-align:top;text-align:center}.jstree-icon:empty{display:inline-block;text-decoration:none;margin:0;padding:0;vertical-align:top;text-align:center}.jstree-ocl{cursor:pointer}.jstree-leaf>.jstree-ocl{cursor:default}.jstree .jstree-open>.jstree-children{display:block}.jstree .jstree-closed>.jstree-children,.jstree .jstree-leaf>.jstree-children{display:none}.jstree-anchor>.jstree-themeicon{margin-right:2px}.jstree-no-icons .jstree-themeicon,.jstree-anchor>.jstree-themeicon-hidden{display:none}.jstree-hidden,.jstree-node.jstree-hidden{display:none}.jstree-rtl .jstree-anchor{padding:0 1px 0 4px}.jstree-rtl .jstree-anchor>.jstree-themeicon{margin-left:2px;margin-right:0}.jstree-rtl .jstree-node{margin-left:0}.jstree-rtl .jstree-container-ul>.jstree-node{margin-right:0}.jstree-wholerow-ul{position:relative;display:inline-block;min-width:100%}.jstree-wholerow-ul .jstree-leaf>.jstree-ocl{cursor:pointer}.jstree-wholerow-ul .jstree-anchor,.jstree-wholerow-ul .jstree-icon{position:relative}.jstree-wholerow-ul .jstree-wholerow{width:100%;cursor:pointer;position:absolute;left:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.jstree-contextmenu .jstree-anchor{-webkit-user-select:none;-webkit-touch-callout:none}.vakata-context{display:none}.vakata-context,.vakata-context ul{margin:0;padding:2px;position:absolute;background:#f5f5f5;border:1px solid #979797;box-shadow:2px 2px 2px #999}.vakata-context ul{list-style:none;left:100%;margin-top:-2.7em;margin-left:-4px}.vakata-context .vakata-context-right ul{left:auto;right:100%;margin-left:auto;margin-right:-4px}.vakata-context li{list-style:none}.vakata-context li>a{display:block;padding:0 2em;text-decoration:none;width:auto;color:#000;white-space:nowrap;line-height:2.4em;text-shadow:1px 1px 0 #fff;border-radius:1px}.vakata-context li>a:hover{position:relative;background-color:#e8eff7;box-shadow:0 0 2px #0a6aa1}.vakata-context li>a.vakata-context-parent{background-image:url(data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAIORI4JlrqN1oMSnmmZDQUAOw==);background-position:right center;background-repeat:no-repeat}.vakata-context li>a:focus{outline:0}.vakata-context .vakata-context-hover>a{position:relative;background-color:#e8eff7;box-shadow:0 0 2px #0a6aa1}.vakata-context .vakata-context-separator>a,.vakata-context .vakata-context-separator>a:hover{background:#fff;border:0;border-top:1px solid #e2e3e3;height:1px;min-height:1px;max-height:1px;padding:0;margin:0 0 0 2.4em;border-left:1px solid #e0e0e0;text-shadow:0 0 0 transparent;box-shadow:0 0 0 transparent;border-radius:0}.vakata-context .vakata-contextmenu-disabled a,.vakata-context .vakata-contextmenu-disabled a:hover{color:silver;background-color:transparent;border:0;box-shadow:0 0 0}.vakata-context li>a>i{text-decoration:none;display:inline-block;width:2.4em;height:2.4em;background:0 0;margin:0 0 0 -2em;vertical-align:top;text-align:center;line-height:2.4em}.vakata-context li>a>i:empty{width:2.4em;line-height:2.4em}.vakata-context li>a .vakata-contextmenu-sep{display:inline-block;width:1px;height:2.4em;background:#fff;margin:0 .5em 0 0;border-left:1px solid #e2e3e3}.vakata-context .vakata-contextmenu-shortcut{font-size:.8em;color:silver;opacity:.5;display:none}.vakata-context-rtl ul{left:auto;right:100%;margin-left:auto;margin-right:-4px}.vakata-context-rtl li>a.vakata-context-parent{background-image:url(data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAINjI+AC7rWHIsPtmoxLAA7);background-position:left center;background-repeat:no-repeat}.vakata-context-rtl .vakata-context-separator>a{margin:0 2.4em 0 0;border-left:0;border-right:1px solid #e2e3e3}.vakata-context-rtl .vakata-context-left ul{right:auto;left:100%;margin-left:-4px;margin-right:auto}.vakata-context-rtl li>a>i{margin:0 -2em 0 0}.vakata-context-rtl li>a .vakata-contextmenu-sep{margin:0 0 0 .5em;border-left-color:#fff;background:#e2e3e3}#jstree-marker{position:absolute;top:0;left:0;margin:-5px 0 0 0;padding:0;border-right:0;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid;width:0;height:0;font-size:0;line-height:0}#jstree-dnd{line-height:16px;margin:0;padding:4px}#jstree-dnd .jstree-icon,#jstree-dnd .jstree-copy{display:inline-block;text-decoration:none;margin:0 2px 0 0;padding:0;width:16px;height:16px}#jstree-dnd .jstree-ok{background:green}#jstree-dnd .jstree-er{background:red}#jstree-dnd .jstree-copy{margin:0 2px}.jstree-default .jstree-node,.jstree-default .jstree-icon{background-repeat:no-repeat;background-color:transparent}.jstree-default .jstree-anchor,.jstree-default .jstree-animated,.jstree-default .jstree-wholerow{transition:background-color .15s,box-shadow .15s}.jstree-default .jstree-hovered{background:#f99e54;color:#fff;border-radius:2px;box-shadow:inset 0 0 1px #ccc}.jstree-default .jstree-context{background:#e7f4f9;border-radius:2px;box-shadow:inset 0 0 1px #ccc}.jstree-default .jstree-clicked{background:#e96800;color:#fff;border-radius:2px;box-shadow:inset 0 0 1px #999}.jstree-default .jstree-no-icons .jstree-anchor>.jstree-themeicon{display:none}.jstree-default .jstree-disabled{background:0 0;color:#666}.jstree-default .jstree-disabled.jstree-hovered{background:0 0;box-shadow:none}.jstree-default .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default .jstree-disabled>.jstree-icon{opacity:.8;filter:url("data:image/svg+xml;utf8,#jstree-grayscale");filter:gray;-webkit-filter:grayscale(100%)}.jstree-default .jstree-search{font-style:italic;color:#8b0000;font-weight:700}.jstree-default .jstree-no-checkboxes .jstree-checkbox{display:none!important}.jstree-default.jstree-checkbox-no-clicked .jstree-clicked{background:0 0;box-shadow:none}.jstree-default.jstree-checkbox-no-clicked .jstree-clicked.jstree-hovered{background:#e7f4f9}.jstree-default.jstree-checkbox-no-clicked>.jstree-wholerow-ul .jstree-wholerow-clicked{background:0 0}.jstree-default.jstree-checkbox-no-clicked>.jstree-wholerow-ul .jstree-wholerow-clicked.jstree-wholerow-hovered{background:#e7f4f9}.jstree-default>.jstree-striped{min-width:100%;display:inline-block;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAMAAAB/qqA+AAAABlBMVEUAAAAAAAClZ7nPAAAAAnRSTlMNAMM9s3UAAAAXSURBVHjajcEBAQAAAIKg/H/aCQZ70AUBjAATb6YPDgAAAABJRU5ErkJggg==) left top repeat}.jstree-default>.jstree-wholerow-ul .jstree-hovered,.jstree-default>.jstree-wholerow-ul .jstree-clicked{background:0 0;box-shadow:none;border-radius:0}.jstree-default .jstree-wholerow{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.jstree-default .jstree-wholerow-hovered{background:#e7f4f9}.jstree-default .jstree-wholerow-clicked{background:#beebff;background:-webkit-linear-gradient(top,#beebff 0,#a8e4ff 100%);background:linear-gradient(to bottom,#beebff 0,#a8e4ff 100%)}.jstree-default .jstree-node{min-height:24px;line-height:24px;margin-left:24px;min-width:24px}.jstree-default .jstree-anchor{line-height:24px;height:24px}.jstree-default .jstree-icon{width:24px;height:24px;line-height:24px}.jstree-default .jstree-icon:empty{width:24px;height:24px;line-height:24px}.jstree-default.jstree-rtl .jstree-node{margin-right:24px}.jstree-default .jstree-wholerow{height:24px}.jstree-default .jstree-node,.jstree-default .jstree-icon{background-image:url(32px.png)}.jstree-default .jstree-node{background-position:-292px -4px;background-repeat:repeat-y}.jstree-default .jstree-last{background:0 0}.jstree-default .jstree-open>.jstree-ocl{background-position:-132px -4px}.jstree-default .jstree-closed>.jstree-ocl{background-position:-100px -4px}.jstree-default .jstree-leaf>.jstree-ocl{background-position:-68px -4px}.jstree-default .jstree-themeicon{background-position:-260px -4px}.jstree-default>.jstree-no-dots .jstree-node,.jstree-default>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-36px -4px}.jstree-default>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-4px -4px}.jstree-default .jstree-disabled{background:0 0}.jstree-default .jstree-disabled.jstree-hovered{background:0 0}.jstree-default .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default .jstree-checkbox{background-position:-164px -4px}.jstree-default .jstree-checkbox:hover{background-position:-164px -36px}.jstree-default.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default .jstree-checked>.jstree-checkbox{background-position:-228px -4px}.jstree-default.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover,.jstree-default .jstree-checked>.jstree-checkbox:hover{background-position:-228px -36px}.jstree-default .jstree-anchor>.jstree-undetermined{background-position:-196px -4px}.jstree-default .jstree-anchor>.jstree-undetermined:hover{background-position:-196px -36px}.jstree-default .jstree-checkbox-disabled{opacity:.8;filter:url("data:image/svg+xml;utf8,#jstree-grayscale");filter:gray;-webkit-filter:grayscale(100%)}.jstree-default>.jstree-striped{background-size:auto 48px}.jstree-default.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==);background-position:100% 1px;background-repeat:repeat-y}.jstree-default.jstree-rtl .jstree-last{background:0 0}.jstree-default.jstree-rtl .jstree-open>.jstree-ocl{background-position:-132px -36px}.jstree-default.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-100px -36px}.jstree-default.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-68px -36px}.jstree-default.jstree-rtl>.jstree-no-dots .jstree-node,.jstree-default.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-36px -36px}.jstree-default.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-4px -36px}.jstree-default .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(throbber.gif) center center no-repeat}.jstree-default .jstree-file{background:url(32px.png) -100px -68px no-repeat}.jstree-default .jstree-folder{background:url(32px.png) -260px -4px no-repeat}.jstree-default>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default{line-height:24px;padding:0 4px}#jstree-dnd.jstree-default .jstree-ok,#jstree-dnd.jstree-default .jstree-er{background-image:url(32px.png);background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default i{background:0 0;width:24px;height:24px;line-height:24px}#jstree-dnd.jstree-default .jstree-ok{background-position:-4px -68px}#jstree-dnd.jstree-default .jstree-er{background-position:-36px -68px}.jstree-default .jstree-ellipsis{overflow:hidden}.jstree-default .jstree-ellipsis .jstree-anchor{width:calc(100% - 29px);text-overflow:ellipsis;overflow:hidden}.jstree-default .jstree-ellipsis.jstree-no-icons .jstree-anchor{width:calc(100% - 5px)}.jstree-default.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==)}.jstree-default.jstree-rtl .jstree-last{background:0 0}.jstree-default-small .jstree-node{min-height:18px;line-height:18px;margin-left:18px;min-width:18px}.jstree-default-small .jstree-anchor{line-height:18px;height:18px}.jstree-default-small .jstree-icon{width:18px;height:18px;line-height:18px}.jstree-default-small .jstree-icon:empty{width:18px;height:18px;line-height:18px}.jstree-default-small.jstree-rtl .jstree-node{margin-right:18px}.jstree-default-small .jstree-wholerow{height:18px}.jstree-default-small .jstree-node,.jstree-default-small .jstree-icon{background-image:url(32px.png)}.jstree-default-small .jstree-node{background-position:-295px -7px;background-repeat:repeat-y}.jstree-default-small .jstree-last{background:0 0}.jstree-default-small .jstree-open>.jstree-ocl{background-position:-135px -7px}.jstree-default-small .jstree-closed>.jstree-ocl{background-position:-103px -7px}.jstree-default-small .jstree-leaf>.jstree-ocl{background-position:-71px -7px}.jstree-default-small .jstree-themeicon{background-position:-263px -7px}.jstree-default-small>.jstree-no-dots .jstree-node,.jstree-default-small>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-small>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-39px -7px}.jstree-default-small>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-7px -7px}.jstree-default-small .jstree-disabled{background:0 0}.jstree-default-small .jstree-disabled.jstree-hovered{background:0 0}.jstree-default-small .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default-small .jstree-checkbox{background-position:-167px -7px}.jstree-default-small .jstree-checkbox:hover{background-position:-167px -39px}.jstree-default-small.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default-small .jstree-checked>.jstree-checkbox{background-position:-231px -7px}.jstree-default-small.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover,.jstree-default-small .jstree-checked>.jstree-checkbox:hover{background-position:-231px -39px}.jstree-default-small .jstree-anchor>.jstree-undetermined{background-position:-199px -7px}.jstree-default-small .jstree-anchor>.jstree-undetermined:hover{background-position:-199px -39px}.jstree-default-small .jstree-checkbox-disabled{opacity:.8;filter:url("data:image/svg+xml;utf8,#jstree-grayscale");filter:gray;-webkit-filter:grayscale(100%)}.jstree-default-small>.jstree-striped{background-size:auto 36px}.jstree-default-small.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==);background-position:100% 1px;background-repeat:repeat-y}.jstree-default-small.jstree-rtl .jstree-last{background:0 0}.jstree-default-small.jstree-rtl .jstree-open>.jstree-ocl{background-position:-135px -39px}.jstree-default-small.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-103px -39px}.jstree-default-small.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-71px -39px}.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-node,.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-39px -39px}.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-7px -39px}.jstree-default-small .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-small>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(throbber.gif) center center no-repeat}.jstree-default-small .jstree-file{background:url(32px.png) -103px -71px no-repeat}.jstree-default-small .jstree-folder{background:url(32px.png) -263px -7px no-repeat}.jstree-default-small>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default-small{line-height:18px;padding:0 4px}#jstree-dnd.jstree-default-small .jstree-ok,#jstree-dnd.jstree-default-small .jstree-er{background-image:url(32px.png);background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default-small i{background:0 0;width:18px;height:18px;line-height:18px}#jstree-dnd.jstree-default-small .jstree-ok{background-position:-7px -71px}#jstree-dnd.jstree-default-small .jstree-er{background-position:-39px -71px}.jstree-default-small .jstree-ellipsis{overflow:hidden}.jstree-default-small .jstree-ellipsis .jstree-anchor{width:calc(100% - 23px);text-overflow:ellipsis;overflow:hidden}.jstree-default-small .jstree-ellipsis.jstree-no-icons .jstree-anchor{width:calc(100% - 5px)}.jstree-default-small.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAACAQMAAABv1h6PAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMHBgAAiABBI4gz9AAAAABJRU5ErkJggg==)}.jstree-default-small.jstree-rtl .jstree-last{background:0 0}.jstree-default-large .jstree-node{min-height:32px;line-height:32px;margin-left:32px;min-width:32px}.jstree-default-large .jstree-anchor{line-height:32px;height:32px}.jstree-default-large .jstree-icon{width:32px;height:32px;line-height:32px}.jstree-default-large .jstree-icon:empty{width:32px;height:32px;line-height:32px}.jstree-default-large.jstree-rtl .jstree-node{margin-right:32px}.jstree-default-large .jstree-wholerow{height:32px}.jstree-default-large .jstree-node,.jstree-default-large .jstree-icon{background-image:url(32px.png)}.jstree-default-large .jstree-node{background-position:-288px 0;background-repeat:repeat-y}.jstree-default-large .jstree-last{background:0 0}.jstree-default-large .jstree-open>.jstree-ocl{background-position:-128px 0}.jstree-default-large .jstree-closed>.jstree-ocl{background-position:-96px 0}.jstree-default-large .jstree-leaf>.jstree-ocl{background-position:-64px 0}.jstree-default-large .jstree-themeicon{background-position:-256px 0}.jstree-default-large>.jstree-no-dots .jstree-node,.jstree-default-large>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-large>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-32px 0}.jstree-default-large>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:0 0}.jstree-default-large .jstree-disabled{background:0 0}.jstree-default-large .jstree-disabled.jstree-hovered{background:0 0}.jstree-default-large .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default-large .jstree-checkbox{background-position:-160px 0}.jstree-default-large .jstree-checkbox:hover{background-position:-160px -32px}.jstree-default-large.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default-large .jstree-checked>.jstree-checkbox{background-position:-224px 0}.jstree-default-large.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover,.jstree-default-large .jstree-checked>.jstree-checkbox:hover{background-position:-224px -32px}.jstree-default-large .jstree-anchor>.jstree-undetermined{background-position:-192px 0}.jstree-default-large .jstree-anchor>.jstree-undetermined:hover{background-position:-192px -32px}.jstree-default-large .jstree-checkbox-disabled{opacity:.8;filter:url("data:image/svg+xml;utf8,#jstree-grayscale");filter:gray;-webkit-filter:grayscale(100%)}.jstree-default-large>.jstree-striped{background-size:auto 64px}.jstree-default-large.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==);background-position:100% 1px;background-repeat:repeat-y}.jstree-default-large.jstree-rtl .jstree-last{background:0 0}.jstree-default-large.jstree-rtl .jstree-open>.jstree-ocl{background-position:-128px -32px}.jstree-default-large.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-96px -32px}.jstree-default-large.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-64px -32px}.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-node,.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-32px -32px}.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:0 -32px}.jstree-default-large .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-large>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(throbber.gif) center center no-repeat}.jstree-default-large .jstree-file{background:url(32px.png) -96px -64px no-repeat}.jstree-default-large .jstree-folder{background:url(32px.png) -256px 0 no-repeat}.jstree-default-large>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default-large{line-height:32px;padding:0 4px}#jstree-dnd.jstree-default-large .jstree-ok,#jstree-dnd.jstree-default-large .jstree-er{background-image:url(32px.png);background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default-large i{background:0 0;width:32px;height:32px;line-height:32px}#jstree-dnd.jstree-default-large .jstree-ok{background-position:0 -64px}#jstree-dnd.jstree-default-large .jstree-er{background-position:-32px -64px}.jstree-default-large .jstree-ellipsis{overflow:hidden}.jstree-default-large .jstree-ellipsis .jstree-anchor{width:calc(100% - 37px);text-overflow:ellipsis;overflow:hidden}.jstree-default-large .jstree-ellipsis.jstree-no-icons .jstree-anchor{width:calc(100% - 5px)}.jstree-default-large.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAACAQMAAAAD0EyKAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjgIIGBgABCgCBvVLXcAAAAABJRU5ErkJggg==)}.jstree-default-large.jstree-rtl .jstree-last{background:0 0}@media (max-width:768px){#jstree-dnd.jstree-dnd-responsive{line-height:40px;font-weight:700;font-size:1.1em;text-shadow:1px 1px #fff}#jstree-dnd.jstree-dnd-responsive>i{background:0 0;width:40px;height:40px}#jstree-dnd.jstree-dnd-responsive>.jstree-ok{background-image:url(40px.png);background-position:0 -200px;background-size:120px 240px}#jstree-dnd.jstree-dnd-responsive>.jstree-er{background-image:url(40px.png);background-position:-40px -200px;background-size:120px 240px}#jstree-marker.jstree-dnd-responsive{border-left-width:10px;border-top-width:10px;border-bottom-width:10px;margin-top:-10px}}@media (max-width:768px){.jstree-default-responsive .jstree-icon{background-image:url(40px.png)}.jstree-default-responsive .jstree-node,.jstree-default-responsive .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-responsive .jstree-node{min-height:40px;line-height:40px;margin-left:40px;min-width:40px;white-space:nowrap}.jstree-default-responsive .jstree-anchor{line-height:40px;height:40px}.jstree-default-responsive .jstree-icon,.jstree-default-responsive .jstree-icon:empty{width:40px;height:40px;line-height:40px}.jstree-default-responsive>.jstree-container-ul>.jstree-node{margin-left:0}.jstree-default-responsive.jstree-rtl .jstree-node{margin-left:0;margin-right:40px;background:0 0}.jstree-default-responsive.jstree-rtl .jstree-container-ul>.jstree-node{margin-right:0}.jstree-default-responsive .jstree-ocl,.jstree-default-responsive .jstree-themeicon,.jstree-default-responsive .jstree-checkbox{background-size:120px 240px}.jstree-default-responsive .jstree-leaf>.jstree-ocl,.jstree-default-responsive.jstree-rtl .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-responsive .jstree-open>.jstree-ocl{background-position:0 0!important}.jstree-default-responsive .jstree-closed>.jstree-ocl{background-position:0 -40px!important}.jstree-default-responsive.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-40px 0!important}.jstree-default-responsive .jstree-themeicon{background-position:-40px -40px}.jstree-default-responsive .jstree-checkbox,.jstree-default-responsive .jstree-checkbox:hover{background-position:-40px -80px}.jstree-default-responsive.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default-responsive.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover,.jstree-default-responsive .jstree-checked>.jstree-checkbox,.jstree-default-responsive .jstree-checked>.jstree-checkbox:hover{background-position:0 -80px}.jstree-default-responsive .jstree-anchor>.jstree-undetermined,.jstree-default-responsive .jstree-anchor>.jstree-undetermined:hover{background-position:0 -120px}.jstree-default-responsive .jstree-anchor{font-weight:700;font-size:1.1em;text-shadow:1px 1px #fff}.jstree-default-responsive>.jstree-striped{background:0 0}.jstree-default-responsive .jstree-wholerow{border-top:1px solid rgba(255,255,255,.7);border-bottom:1px solid rgba(64,64,64,.2);background:#ebebeb;height:40px}.jstree-default-responsive .jstree-wholerow-hovered{background:#e7f4f9}.jstree-default-responsive .jstree-wholerow-clicked{background:#beebff}.jstree-default-responsive .jstree-children .jstree-last>.jstree-wholerow{box-shadow:inset 0 -6px 3px -5px #666}.jstree-default-responsive .jstree-children .jstree-open>.jstree-wholerow{box-shadow:inset 0 6px 3px -5px #666;border-top:0}.jstree-default-responsive .jstree-children .jstree-open+.jstree-open{box-shadow:none}.jstree-default-responsive .jstree-node,.jstree-default-responsive .jstree-icon,.jstree-default-responsive .jstree-node>.jstree-ocl,.jstree-default-responsive .jstree-themeicon,.jstree-default-responsive .jstree-checkbox{background-image:url(40px.png);background-size:120px 240px}.jstree-default-responsive .jstree-node{background-position:-80px 0;background-repeat:repeat-y}.jstree-default-responsive .jstree-last{background:0 0}.jstree-default-responsive .jstree-leaf>.jstree-ocl{background-position:-40px -120px}.jstree-default-responsive .jstree-last>.jstree-ocl{background-position:-40px -160px}.jstree-default-responsive .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-responsive .jstree-file{background:url(40px.png) 0 -160px no-repeat;background-size:120px 240px}.jstree-default-responsive .jstree-folder{background:url(40px.png) -40px -40px no-repeat;background-size:120px 240px}.jstree-default-responsive>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}} \ No newline at end of file diff --git a/src/main/webapp/kccadrPb/adm/css/content.css b/src/main/webapp/kccadrPb/adm/css/content.css index 402b4889..0bcf1a41 100644 --- a/src/main/webapp/kccadrPb/adm/css/content.css +++ b/src/main/webapp/kccadrPb/adm/css/content.css @@ -147,6 +147,9 @@ p+.list_util{width: auto;} .btnType05:hover{background-color: #f5f5f5; transition: all 0.1s linear;} .btnType06{min-width: 80px; height: 46px; padding: 0 12px; font-size: 18px; font-weight: 400; background-color: #1b6fcd; color: #fff; border-radius: 5px; transition: all 0.1s linear;} .btnType06:hover{background-color: #0d5fba; transition: all 0.1s linear;} +.btnType07 {height:46px;padding:0 15px;font-size:18px;font-weight:400;color:#555;border:1px solid #555;border-radius:5px;transition:all 0.1s linear;} +.btnType07:hover {background:#fafafa;} +.btnType08 {display:inline-block;width:95px;height:33px;padding:0 10px;font-size:15px;line-height:30px;text-align:left;color:#666;border:1px solid #d5d5d5;background:url(/kccadrPb/adm/image/icon_btnType08.png) no-repeat right center;border-radius:5px;box-sizing:border-box;} /* //버튼 타입 */ .btn_wrap .btn_print i{width: 22px; height: 22px; display: inline-block; background-image: url(/kccadrPb/adm/image/btn_print02.png); vertical-align: middle; margin-top: -5px;} @@ -209,6 +212,17 @@ p+.list_util{width: auto;} .tbType01 tbody td p.status_ing{width: auto; font-size: 15px; border: 1px solid #1b6fcd; border-radius: 25px; color: #1b6fcd; padding: 3px 10px; display: inline-block; vertical-align: middle;} .tbType01 tbody td .status_req{width: auto; height: auto; font-size: 15px; border: 1px solid #e40000; border-radius: 25px; color: #e40000; padding: 3px 10px; display: inline-block; vertical-align: middle;} .tbType01 tr td textarea{width: 100%; border: 1px solid #d5d5d5; border-radius: 5px; margin: 15px 0 10px 0; font-size: 18px; color: #222; padding: 15px; box-sizing: border-box; font-family: 'Noto Sans KR', sans-serif;} + +.tbType01.list_table {overflow:auto;max-height:510px;border-top:1px solid #000;} +.tbType01.list_table::-webkit-scrollbar {width:4px;height:4px;border:3px solid #fff;} +.tbType01.list_table::-webkit-scrollbar-thumb {width:20px;height:20px;background:#d5d5d5;border-radius:4px;} +.tbType01.list_table table {width:100%;table-layout:fixed;} +.tbType01.list_table table thead {position:sticky;top:0;z-index:1;} +.tbType01.list_table table thead tr th {height:50px;border-right:0 none;border-bottom-color:#d5d5d5;background:#e5e5e5;} +.tbType01.list_table table tbody tr th, +.tbType01.list_table table tbody tr td {height:50px;font-weight:300;border-right:0 none;border-bottom:1px solid #d5d5d5;background:none;} +.tbType01.list_table table tbody tr.depth th {font-weight:400;background:#f5f5f5;} +.tbType01.list_table table tbody tr.depth td {background:#f5f5f5;} /* //list */ /* 갤러리 리스트 */ @@ -323,6 +337,9 @@ table select+button{vertical-align: middle;} .menu_wrap .menu_detail_tit{font-size: 20px; font-weight: 500; padding-left: 12px; position: relative; margin-bottom: 20px;} .menu_wrap .menu_detail_tit::before{position: absolute; content: " "; width: 4px; height: 15px; background-color: #ea5404; left: 0; top: 3px; border-radius: 10px;} .menu_wrap .menu_detail .tbType02{width: 100%;} +.menu_wrap .menu_detail_tit02 {overflow:hidden;line-height:46px;} +.menu_wrap .menu_detail_tit02:before {top:16px;} +.menu_wrap .menu_detail_tit02 .btnType07 {float:right;} /* //매뉴 트리구조 */ /* 파일 테이블 */ diff --git a/src/main/webapp/kccadrPb/adm/css/popup.css b/src/main/webapp/kccadrPb/adm/css/popup.css index 82fe8d8c..064dc80b 100644 --- a/src/main/webapp/kccadrPb/adm/css/popup.css +++ b/src/main/webapp/kccadrPb/adm/css/popup.css @@ -74,6 +74,7 @@ /* //사건번호 변경 */ .cont_popup .btn_wrap button{height: 40px; min-width: 110px;} +.cont_popup .menu_area .btn_wrap button {min-width:auto;height:30px;} /* 수수료납부금액 */ .fee_popup .tit_text+.tb_tit{margin-top: 30px;} @@ -153,4 +154,21 @@ .popup_tbType01 .req_text::before {top: 16px} .area_popup table button{height: 30px; vertical-align: middle} .area_popup table .number_select{width: 100px} -/* //21/11/24 */ \ No newline at end of file +/* //21/11/24 */ + +/* 결재요청 팝업 */ +.appreq_menu_wrap .menu_list {width:270px;} +.appreq_menu_wrap .menu_detail {width:calc(100% - 290px);} +.appreq_menu_wrap .appreq_list li {margin:35px 0 0;} +.appreq_menu_wrap .appreq_list li:first-child {margin:0;} +.appreq_menu_wrap .appreq_list li .title {margin:0 0 0 116px;padding:0 0 18px;font-size:18px;color:#222;border-bottom:1px solid #000;} +.appreq_menu_wrap .appreq_list li .appreq_box {overflow:hidden;} +.appreq_menu_wrap .appreq_list li .appreq_box .add_box {float:left;margin:6px 0 0;} +.appreq_menu_wrap .appreq_list li .appreq_box .list_box {float:right;width:calc(100% - 116px);} +.appreq_menu_wrap .appreq_list li .appreq_box .list_box dl:after {content:'';display:block;clear:both;} +.appreq_menu_wrap .appreq_list li .appreq_box .list_box dl dt {float:left;width:100px;height:45px;padding:0 0 0 10px;font-size:16px;line-height:45px;border-bottom:1px solid #d5d5d5;background:#f5f5f5;box-sizing:border-box;} +.appreq_menu_wrap .appreq_list li .appreq_box .list_box dl dd {position:relative;float:left;width:calc(100% - 100px);height:45px;padding:0 0 0 10px;font-size:16px;font-weight:300;line-height:45px;border-bottom:1px solid #d5d5d5;box-sizing:border-box;} +.appreq_menu_wrap .appreq_list li .appreq_box .list_box dl dd .button_box {position:absolute;right:0;top:7px;} +.appreq_menu_wrap .appreq_list li .appreq_box .list_box dl dd .button_box button {float:left;height:31px;margin:0 0 0 8px;padding:0 10px;font-size:15px;line-height:29px;text-align:center;color:#ea5404;border:1px solid #ea5404;background:#fff;border-radius:5px;box-sizing:border-box;} +.appreq_menu_wrap .appreq_list li .appreq_box .list_box dl dd .button_box button.btn_reset {color:#666;border-color:#d5d5d5;} + diff --git a/src/main/webapp/kccadrPb/adm/image/icon_btnType08.png b/src/main/webapp/kccadrPb/adm/image/icon_btnType08.png new file mode 100644 index 0000000000000000000000000000000000000000..6960fd0a91e79e7d5775b164224114c24cdb65e5 GIT binary patch literal 1182 zcmaJ>O=uit7@jspC1m45Y0-MfbaH7i^Z&Cm(`+}Bon15FrrXUz<0b7k-+Yryllke) zB)b~~ZIIHUmqgJXgLoafWhE5I<1d+3*%?2Ki;b-*a7x8;=^U1e(crC5WrL&=%wm^&s!wGFfT0U4n z4FsId)nCvAK@42;nsez~?JXUKJ_9lvrtL=h4%i&w0c}bTQT_}*fi^ASw$JHBVwdV`3 ziqvA7Mmo#3S}mp}GGV;H@|vb)9D+b&3p(ipDQMF{GS+7>Q37KxO1&^3Ge%&CD`}C! zO7}zXqgw5NI7oVl!YO0hAYyrjV|_o1YtK4K8|Z%-hgv7iPK4M7O2U;G;`4CF`e2;9 z=R3*_u^Rn+?BPQJ%Vr2yd=#XXS)}k6#_=2-Xq=`(;L@s6fHaULfmT)5re)rNDyJ44 zSL6FUhvC(Vq*aV5Lo}2!&sR)CEL62Zp(<77sj{d@eXJEEDF`6y`}VN!9#(rURxig0 zq+#3)!{vSz)EC1vOcuk46huZQPha!`Cu}8WvNPHb*+j9oikxa3`s7}cb?*=Xt}O_z zs32ODIi40YiKlH5SC6Cc9Mo*7Aj*j9;hkraw_l`q2L}=LwdfFPoB$+9D>8Cv(UBzD z&XTIiP*PPS*oXrZizTvI-8@rA{ViOa+4P_*@ZzAaP=K2$#$D5`jQ))~?yhAT&Gw)6 z)7{DsMaaeH&!xcOu>|JzGl q?()b^<-+R8uj|#^>)Y3lyznaV@GmRBGe65_e+;WKW8Rs%y#629>VCWc literal 0 HcmV?d00001 From c6971b628b2c15fc8c87b285afb7ee096bfb680b Mon Sep 17 00:00:00 2001 From: HappyITN Date: Fri, 23 Sep 2022 14:23:23 +0900 Subject: [PATCH 14/15] =?UTF-8?q?220923=20=EB=A0=88=EB=93=9C=EB=A7=88?= =?UTF-8?q?=EC=9D=B8=20#2732=20=EA=B4=80=EB=A6=AC=EC=9E=90=20-=20=EB=A9=94?= =?UTF-8?q?=EB=89=B4=EB=B3=84=20=EA=B6=8C=ED=95=9C=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80,=20=EA=B2=B0=EC=9E=AC=EC=84=A0=20?= =?UTF-8?q?=ED=8C=9D=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/kccadr/adjReqMgrOff/popup/adjReqMgrOffAppReqPop.jsp | 4 +++- src/main/webapp/kccadrPb/adm/css/popup.css | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/popup/adjReqMgrOffAppReqPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/popup/adjReqMgrOffAppReqPop.jsp index c94c069a..59a6c93e 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/popup/adjReqMgrOffAppReqPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/popup/adjReqMgrOffAppReqPop.jsp @@ -127,7 +127,9 @@ function proxyPay(obj){
- + + +
diff --git a/src/main/webapp/kccadrPb/adm/css/popup.css b/src/main/webapp/kccadrPb/adm/css/popup.css index 064dc80b..ea758565 100644 --- a/src/main/webapp/kccadrPb/adm/css/popup.css +++ b/src/main/webapp/kccadrPb/adm/css/popup.css @@ -171,4 +171,4 @@ .appreq_menu_wrap .appreq_list li .appreq_box .list_box dl dd .button_box {position:absolute;right:0;top:7px;} .appreq_menu_wrap .appreq_list li .appreq_box .list_box dl dd .button_box button {float:left;height:31px;margin:0 0 0 8px;padding:0 10px;font-size:15px;line-height:29px;text-align:center;color:#ea5404;border:1px solid #ea5404;background:#fff;border-radius:5px;box-sizing:border-box;} .appreq_menu_wrap .appreq_list li .appreq_box .list_box dl dd .button_box button.btn_reset {color:#666;border-color:#d5d5d5;} - +.appreq_menu_wrap + .btn_wrap button.btnType01 {font-size:18px;} From bb6cbf5d13bdd4ef0724868dc984b24865b90538 Mon Sep 17 00:00:00 2001 From: LJH Date: Fri, 23 Sep 2022 14:50:53 +0900 Subject: [PATCH 15/15] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?= =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?= =?UTF-8?q?=EA=B3=A0=EB=8F=84=ED=99=94=20=EC=BB=A4=EB=B0=8B=20=20-=20[?= =?UTF-8?q?=ED=8D=BC=EB=B8=94=EB=A6=AC=EC=8B=B1][=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EC=9E=90=20-=20=ED=99=94=EB=A9=B4]=20=EB=82=98=EC=9D=98?= =?UTF-8?q?=EC=82=AC=EA=B1=B4=EA=B4=80=EB=A6=AC>=EC=82=AC=EA=B1=B4?= =?UTF-8?q?=EA=B8=B0=EB=A1=9D=20=EC=97=B4=EB=9E=8C-=EB=B0=9C=EA=B8=89=20>?= =?UTF-8?q?=20=EB=93=B1=EB=A1=9D=20=ED=8D=BC=EB=B8=94=EB=A6=AC=EC=8B=B1=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9=20=20-=20[=ED=8D=BC=EB=B8=94=EB=A6=AC?= =?UTF-8?q?=EC=8B=B1][=EC=82=AC=EC=9A=A9=EC=9E=90=20-=20=ED=99=94=EB=A9=B4?= =?UTF-8?q?]=20=EB=82=98=EC=9D=98=EC=82=AC=EA=B1=B4=EA=B4=80=EB=A6=AC>?= =?UTF-8?q?=EC=A1=B0=EC=A0=95=EC=A7=84=ED=96=89=EC=83=81=ED=99=A9(?= =?UTF-8?q?=EC=A7=84=ED=96=89=EC=A4=91=EC=82=AC=EA=B1=B4)>=EC=83=81?= =?UTF-8?q?=EC=84=B8=EC=A0=95=EB=B3=B4=20-=20=EC=83=81=EB=8B=A8=20?= =?UTF-8?q?=EC=8A=A4=ED=83=AD=20=EB=B6=80=EB=B6=84=20=EC=B2=B4=ED=97=98?= =?UTF-8?q?=ED=95=98=EA=B8=B0=20=EB=A9=94=EB=89=B4=EC=97=90=EB=8F=84=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9=20=20-=20[=ED=8D=BC=EB=B8=94=EB=A6=AC?= =?UTF-8?q?=EC=8B=B1][=EC=82=AC=EC=9A=A9=EC=9E=90=20-=20=ED=99=94=EB=A9=B4?= =?UTF-8?q?]=20=EC=A1=B0=EC=A0=95=EC=8B=A0=EC=B2=AD=20=EB=93=B1=EB=A1=9D?= =?UTF-8?q?=20=EB=AC=B8=EA=B5=AC=20=EA=B0=95=EC=A1=B0=20=EB=B0=8F=20?= =?UTF-8?q?=EC=95=84=EC=9D=B4=EC=BD=98=20=EC=A0=81=EC=9A=A9=20=EC=B2=B4?= =?UTF-8?q?=ED=97=98=ED=95=98=EA=B8=B0=20=EB=A9=94=EB=89=B4=EC=97=90?= =?UTF-8?q?=EB=8F=84=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ai/web/AdjstIncidentController.java | 6 ----- .../ars/web/AdjstReqStatusController.java | 14 +++++++++++ .../kccadr/accdnt/ars/tab/docIssReqList.jsp | 12 ++++++--- .../tab/docIssReqRegist.jsp} | 0 .../tab/docIssReqRegistPop.jsp} | 0 .../adjstExp/adjstReqRegistInformation.jsp | 11 ++++---- .../adjstReqStatusTabDetail.jsp | 25 +++++++++++++++---- src/main/webapp/js/page/adjstReq/adjstReq.js | 2 +- 8 files changed, 49 insertions(+), 21 deletions(-) rename src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/{ai/adjstIncidentRequest.jsp => ars/tab/docIssReqRegist.jsp} (100%) rename src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/{ai/popup/adjstIncRegistPopEndList.jsp => ars/tab/docIssReqRegistPop.jsp} (100%) diff --git a/src/main/java/kcc/kccadr/accdnt/ai/web/AdjstIncidentController.java b/src/main/java/kcc/kccadr/accdnt/ai/web/AdjstIncidentController.java index 499265cc..41b8b7cb 100644 --- a/src/main/java/kcc/kccadr/accdnt/ai/web/AdjstIncidentController.java +++ b/src/main/java/kcc/kccadr/accdnt/ai/web/AdjstIncidentController.java @@ -349,12 +349,6 @@ public class AdjstIncidentController { return "/web/kccadr/accdnt/ai/adjstIncidentRequest"; } - //종결 조정사건 목록 팝업 - @RequestMapping("/web/kccadr/accdnt/ai/popup/adjstIncRegistPopEndList.do") - public String adjstIncRegistPopEndList(@ModelAttribute("adjstReqVO") AdjstReqVO adjstReqVO, ModelMap model) throws Exception { - return "/web/kccadr/accdnt/ai/popup/adjstIncRegistPopEndList"; - } - public void decryptInfomation(List list, AdjstIncidentVO info){ if(CollectionUtils.isNotEmpty(list)){ for(AdjstIncidentVO model : list){ diff --git a/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java b/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java index 4674a4a8..4405bc0e 100644 --- a/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java +++ b/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java @@ -427,6 +427,20 @@ public class AdjstReqStatusController { return "/web/kccadr/accdnt/ars/tab/docIssReqList"; } + // 대국민 서류 발급 요청 등록 + @RequestMapping(value = "/web/kccadr/accdnt/ai/docIssReqRegist.do") + public String docIssReqRegist(@ModelAttribute("adjClsMgrVO") AdjClsMgrVO adjClsMgrVO, ModelMap model) throws Exception { + + return "/web/kccadr/accdnt/ars/tab/docIssReqRegist"; + } + + // 대국민 서류 발급 요청 등록 조정번호 조회팝업 + @RequestMapping(value = "/web/kccadr/accdnt/ai/docIssReqRegistPop.do") + public String docIssReqRegistPop(@ModelAttribute("adjClsMgrVO") AdjClsMgrVO adjClsMgrVO, ModelMap model) throws Exception { + + return "/web/kccadr/accdnt/ars/tab/docIssReqRegistPop"; + } + // 종결VO public void decryptInfomation2(List list, AdjClsMgrVO info){ if(CollectionUtils.isNotEmpty(list)){ diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqList.jsp index 3871888a..d250580c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqList.jsp @@ -87,6 +87,12 @@ $(".select_wrap1").hide(); $(".subSearch").trigger("change"); }); + + function fn_goRegist(){ + location.href = "/web/kccadr/accdnt/ai/docIssReqRegist.do"; + } + + @@ -292,9 +298,9 @@ - +
+ +
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentRequest.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqRegist.jsp similarity index 100% rename from src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentRequest.jsp rename to src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqRegist.jsp diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/popup/adjstIncRegistPopEndList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqRegistPop.jsp similarity index 100% rename from src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/popup/adjstIncRegistPopEndList.jsp rename to src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqRegistPop.jsp diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistInformation.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistInformation.jsp index 7f8f1dc1..4eb0059a 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistInformation.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstReqRegistInformation.jsp @@ -96,8 +96,7 @@ function fnGoCrtfc(){

대리인 신청가능 : 권리자 또는 침해자의 대리인 자격으로 온라인 조정신청을 할 수 있습니다.

-

주의사항 : 분쟁조정신청 작성이 오래 걸릴 경우 신청 중 오류가 발생할 수 있습니다. 신청 취지/원인을 미리 작성한 후 신청하시기 바랍니다.(STEP3 - 신청취지/원인 예문보기)

+

주의사항 : 분쟁조정신청 작성이 오래 걸릴 경우 신청 중 오류가 발생할 수 있습니다. 신청 취지/원인을 미리 작성한 후 신청하시기 바랍니다.
(STEP3 신청취지/원인 예문보기)

@@ -133,12 +132,12 @@ function fnGoCrtfc(){

2. 조정의 당사자 본인이신가요?

  • - + +
  • - + +
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabDetail.jsp index c36e3bd2..32622147 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusTabDetail.jsp @@ -180,44 +180,59 @@ resInfo--%>
-
+
hover_content_wrap" data-info="1" style="cursor:pointer;">

STEP. 01 접수

다음 +
+ 조정 진행과정 중 하나의 절차로써, 사건 당사자들의 합의를 위해 한국저작권위원회가 중재하는 자리로 조정위원, 사건당사자, 그 밖의 사건관계인이 출석 하는 날을 말합니다. +
-
+
hover_content_wrap" data-info="2" style="cursor:pointer;">

STEP. 02 기일지정

다음 +
+ 조정 진행과정 중 하나의 절차로써, 사건 당사자들의 합의를 위해 한국저작권위원회가 중재하는 자리로 조정위원, 사건당사자, 그 밖의 사건관계인이 출석 하는 날을 말합니다. +
-
+
hover_content_wrap" data-info="3" style="cursor:pointer;">

STEP. 03 기일개최

다음 +
+ 조정 진행과정 중 하나의 절차로써, 사건 당사자들의 합의를 위해 한국저작권위원회가 중재하는 자리로 조정위원, 사건당사자, 그 밖의 사건관계인이 출석 하는 날을 말합니다. +
-
+
hover_content_wrap" data-info="4" style="cursor:pointer;">

STEP. 04 조정중

다음 +
+ 조정 진행과정 중 하나의 절차로써, 사건 당사자들의 합의를 위해 한국저작권위원회가 중재하는 자리로 조정위원, 사건당사자, 그 밖의 사건관계인이 출석 하는 날을 말합니다. +
-
+
hover_content_wrap" data-info="5" style="cursor:pointer;">

STEP. 05 종료

+
+ 조정 진행과정 중 하나의 절차로써, 사건 당사자들의 합의를 위해 한국저작권위원회가 중재하는 자리로 조정위원, 사건당사자, 그 밖의 사건관계인이 출석 하는 날을 말합니다. +
diff --git a/src/main/webapp/js/page/adjstReq/adjstReq.js b/src/main/webapp/js/page/adjstReq/adjstReq.js index 1ca87c62..a3feb2ca 100644 --- a/src/main/webapp/js/page/adjstReq/adjstReq.js +++ b/src/main/webapp/js/page/adjstReq/adjstReq.js @@ -1016,7 +1016,7 @@ var AdjstReq = { }*/ // 이전신청데이터 팝업 호출.. commonPopLayeropen( - "/web/kccadr/accdnt/ai/popup/adjstIncRegistPopEndList.do" + "/web/kccadr/accdnt/ai/docIssReqRegistPop.do" , 500 , 600 , paramObj