From a70db8677cfa183f349a0a268a219a527baf09ca Mon Sep 17 00:00:00 2001 From: HappyITN Date: Mon, 17 Oct 2022 12:52:24 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EB=A0=88=EB=93=9C=EB=A7=88=EC=9D=B8=20#283?= =?UTF-8?q?5,=20#2839=20=ED=8C=9D=EC=97=85=20=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/AdjstConciliatorController.java | 9 ++ .../adjcclt/opinion/adjstOpinionList.jsp | 2 +- .../popup/adjstOpinionsRegistPopList.jsp | 99 ++++++++++++ .../adjst/popup/adjstReqOpenExamplePop.jsp | 144 +++++++----------- .../kccadr/kccadrCom/kccadrConstantsJsp.jsp | 19 +++ src/main/webapp/kccadrPb/usr/css/content.css | 11 ++ 6 files changed, 195 insertions(+), 89 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopList.jsp diff --git a/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java b/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java index e855f85e..cc040cdf 100644 --- a/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java +++ b/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java @@ -375,6 +375,15 @@ public class AdjstConciliatorController { // model.addAttribute("info", adjstConciliatorService.selectAdjstRecommendationCommentDetail(adjstConciliatorVO)); return "/web/kccadr/adjcclt/popup/adjstOpinionsPopList"; } + + /** + * 의견관리 목록 > 자주쓰는 의견 등록 팝업 + */ + @RequestMapping("/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopList.do") + public String adjstOpinionsRegistPopList(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, ModelMap model) throws Exception { +// model.addAttribute("info", adjstConciliatorService.selectAdjstRecommendationCommentDetail(adjstConciliatorVO)); + return "/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopList"; + } /** * 조정사건 목록 화면 diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/opinion/adjstOpinionList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/opinion/adjstOpinionList.jsp index 014867a5..f0d5cd79 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/opinion/adjstOpinionList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/opinion/adjstOpinionList.jsp @@ -155,7 +155,7 @@
- <%----%> +
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopList.jsp new file mode 100644 index 00000000..7750f1cb --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopList.jsp @@ -0,0 +1,99 @@ +<%@ 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"%> + + + + +조정신청 수정요청 + + + + + + + + + +" /> +" /> + +
+
+

자주쓰는 의견 등록

+
+
+ + + + + + + + + + + + + + + + + + + +
유형 + +
제목 + +
제목 + +
+ +
+ + +
+
+
+ + + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp index 99353c9e..536ff59f 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp @@ -15,106 +15,74 @@ +
-

신청취지 예문

+

청구취지 작성예시

- -
- * -
- - - - - - - - - - - - - - - - -
- - - -
- 내용 - - -
+
+
+

금전청구 일반

+ +
+
+
+
- 기본형
+
피고는 원고에게 △△,△△△,△△△원을 지급하라.
+
+
+
- 부대청구(이자 등)가 있는 경우
+
피고는 원고에게 △△,△△△,△△△원과 이에 대하여 △△△△.△△.△△부터 다 갚믄 날까지 연 △△%의 비율로 계산한 돈을 지급하라.
+
+
+
+
+
+

보증채무금

+ +
+
+
+ 피고는 원고에게 △△,△△△,△△△원과 이에 대하여 △△△△.△△.△△부터 다 갚믄 날까지 연 △△%의 비율로 계산한 돈을 지급하라. +
+
+
+
+
+

임대차보증금반환

+ +
+
+
+ 피고는 원고에게 △△,△△△,△△△원과 이에 대하여 △△△△.△△.△△부터 다 갚믄 날까지 연 △△%의 비율로 계산한 돈을 지급하라. +
+
+
- - +
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp index 6aa91599..f90f8fdb 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp @@ -1242,6 +1242,25 @@ var AdjstReq = { , "adjstOpinionsPop" ); }, + opinionsRegistAdjstPopList : function(paramObj){ + if(paramObj == undefined || paramObj == ''){ + paramObj = { + pageIndex : 1, + searchKeyword : "", + searchCondition : "", + pageUnit : 5 + }; + } + // 이전신청데이터 팝업 호출.. + commonPopLayeropen( + "/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopList.do" + , 1000 + , 700 + , paramObj + , "N" + , "adjstOpinionsRegistPop" + ); + }, openExamplePop : function(exmpCd){ /* - 01 : 신청취지 diff --git a/src/main/webapp/kccadrPb/usr/css/content.css b/src/main/webapp/kccadrPb/usr/css/content.css index a64c3e61..118d6fc9 100644 --- a/src/main/webapp/kccadrPb/usr/css/content.css +++ b/src/main/webapp/kccadrPb/usr/css/content.css @@ -732,6 +732,17 @@ table .label{position: absolute;width: 1px; height: 1px; margin: 0; border: none .work_cont p.status01{border: 1px solid #ea5404; color: #ea5404;} .work_cont .status02 p{border: 2px solid #1b6fcd; color: #1b6fcd; font-weight: 500;width:208px;height:43px;} .work_cont p.status02{border: 2px solid #1b6fcd; color: #1b6fcd; font-weight: 500;width:208px;height:43px;} + +.popup_wrap .work_flow_wrap {padding:0 10px;margin:0 0 15px;} +.popup_wrap .work_flow_wrap .work_tit {padding:10px 0 10px 5px;font-size:16px;} +.popup_wrap .work_flow_wrap .work_cont {height:auto;padding:10px 15px;transition:none;} +.popup_wrap .work_flow_wrap .work_cont dl dt {margin:10px 0 0;line-height:30px;} +.popup_wrap .work_flow_wrap .work_cont dl dd {margin:5px 0 0;padding:10px;line-height:24px;background:#f1f2f4;border-radius:5px;} +.popup_wrap .work_flow_wrap .work_cont dl dd span {color:#d43403;} +.popup_wrap .work_flow_wrap .work_cont dl:first-child dt {margin:0;} +.popup_wrap .work_flow_wrap .work_cont .text {line-height:24px;} +.popup_wrap .work_flow_wrap .work_cont .text span {color:#d43403;} +.popup_wrap .work_flow_wrap.off .work_cont {height:0;padding:0 15px;} /* //워크플로우 */ /* 익스플로어 */ From 64b0502af1866c002b66cedff5bc56bc79ebe06f Mon Sep 17 00:00:00 2001 From: LJH Date: Mon, 17 Oct 2022 18:17:06 +0900 Subject: [PATCH 2/3] =?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=EA=B3=A0?= =?UTF-8?q?=EB=8F=84=ED=99=94=20=EC=BB=A4=EB=B0=8B=20=20-=20(=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90)=20=EA=B0=81=20=ED=86=B5=EC=A7=80=EC=84=9C?= =?UTF-8?q?=EB=93=A4=20=EC=86=A1=EB=8B=AC=20=EC=9E=85=EB=A0=A5=20=EC=8B=9C?= =?UTF-8?q?=20=EC=86=A1=EB=8B=AC=EB=B2=88=ED=98=B8=20=EC=9E=85=EB=A0=A5=20?= =?UTF-8?q?=ED=8C=9D=EC=97=85=20=EC=97=86=EC=9D=B4=20=EB=B0=94=EB=A1=9C=20?= =?UTF-8?q?=EC=86=A1=EB=8B=AC=20=EB=93=B1=EB=A1=9D=20=ED=99=94=EB=A9=B4?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp | 2 +- .../WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetailNotice.jsp | 2 +- .../webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cfrm/cfrmDetail.jsp | 2 +- src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdDetail.jsp | 2 +- src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdReg.jsp | 2 +- src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp | 2 +- .../WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetailNotice.jsp | 2 +- src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp | 3 ++- src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp | 2 +- .../WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrDetail.jsp | 2 +- .../WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrDetailNotice.jsp | 2 +- .../webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrReg.jsp | 2 +- src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entDetail.jsp | 2 +- .../WEB-INF/jsp/kccadr/adjPgrMgr/ent/entDetailNotice.jsp | 2 +- src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entReg.jsp | 2 +- src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp | 2 +- 16 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp index b7fbf93f..bf83da35 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp @@ -563,7 +563,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetailNotice.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetailNotice.jsp index cdb4337f..31ca7f6d 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetailNotice.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetailNotice.jsp @@ -385,7 +385,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cfrm/cfrmDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cfrm/cfrmDetail.jsp index 161619ca..63af5ba5 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cfrm/cfrmDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cfrm/cfrmDetail.jsp @@ -466,7 +466,7 @@ $(document).ready(function() { - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdDetail.jsp index 03ec10d9..620d3963 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdDetail.jsp @@ -592,7 +592,7 @@ - + --%> diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdReg.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdReg.jsp index dcec66cf..7b448977 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdReg.jsp @@ -442,7 +442,7 @@ <%-- 기일변경 통지서 등록화면이라서 송달정보 입력은 주석처리했음 20220126 --%> - <%-- --%> + <%-- --%> diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp index a0f9f769..fac56eb3 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp @@ -478,7 +478,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetailNotice.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetailNotice.jsp index 1e7ab44a..cc2dfbfe 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetailNotice.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetailNotice.jsp @@ -311,7 +311,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp index 5d5718fb..9d99bae0 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp @@ -620,7 +620,8 @@ - + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp index 19f83d03..1a4996c5 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp @@ -787,7 +787,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrDetail.jsp index 374cb8ae..34241de7 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrDetail.jsp @@ -646,7 +646,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrDetailNotice.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrDetailNotice.jsp index 74f5bcde..3752c975 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrDetailNotice.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrDetailNotice.jsp @@ -536,7 +536,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrReg.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrReg.jsp index 8419f73b..311a355e 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrReg.jsp @@ -441,7 +441,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entDetail.jsp index 0910d38d..dac47ea1 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entDetail.jsp @@ -486,7 +486,7 @@ - + <%-- --%> diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entDetailNotice.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entDetailNotice.jsp index c3c8b3cb..a91762e4 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entDetailNotice.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entDetailNotice.jsp @@ -276,7 +276,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entReg.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entReg.jsp index f65c8907..f959d81d 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entReg.jsp @@ -267,7 +267,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp index 6fc482a9..f06e0db9 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp @@ -557,7 +557,7 @@ - + From 1ed7a7990a6b065cdc23dd12a31d7854ebf6f442 Mon Sep 17 00:00:00 2001 From: hylee Date: Tue, 18 Oct 2022 09:46:50 +0900 Subject: [PATCH 3/3] =?UTF-8?q?feat:=EA=B8=B0=EC=9D=BC=EC=A1=B0=EC=84=9C?= =?UTF-8?q?=20=EC=9D=98=EA=B2=AC=EB=93=B1=EB=A1=9D=20/=20=EC=9E=90?= =?UTF-8?q?=EC=A3=BC=EC=93=B0=EB=8A=94=20=EC=9D=98=EA=B2=AC=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/service/ExmpAppManageService.java | 4 ++ .../app/service/impl/ExmpAppManageDAO.java | 8 +++ .../impl/ExmpAppManageServiceImpl.java | 10 +++ .../adjPgrMgr/exmp/cmm/ExmpManageVO.java | 31 ++++++++ .../adjcclt/service/AdjstConciliatorVO.java | 19 ++++- .../impl/AdjstConciliatorServiceImpl.java | 40 +++++++++-- .../web/AdjstConciliatorController.java | 37 +++++++++- .../adjPgrMgr/exmp/ExmpManage_SQL_Mysql.xml | 66 ++++++++++++++++- .../jsp/web/kccadr/adjcclt/adjstDrtDetail.jsp | 70 +++++-------------- .../adjstRecommendationCommentList.jsp | 61 ++++++++++------ .../adjcclt/popup/adjstOpinionsPopList.jsp | 70 ++++++++++++------- .../kccadr/kccadrCom/kccadrConstantsJsp.jsp | 2 +- 12 files changed, 306 insertions(+), 112 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/ExmpAppManageService.java b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/ExmpAppManageService.java index 6356a306..c4d34057 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/ExmpAppManageService.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/ExmpAppManageService.java @@ -9,8 +9,12 @@ import kcc.kccadr.cmm.RestResponse; public interface ExmpAppManageService { Integer selectExmpAppManagerCount(ExmpManageVO exmpManageVO) throws Exception; + + Integer selectExmpOpinionsManagerCount(ExmpManageVO exmpManageVO) throws Exception; List selectExmpAppManagerList(ExmpManageVO exmpManageVO) throws Exception; + + List selectExmpOpinionsManagerList(ExmpManageVO exmpManageVO) throws Exception; Map selectExmpAppManagerInfo(ExmpManageVO exmpManageVO) throws Exception; diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/impl/ExmpAppManageDAO.java b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/impl/ExmpAppManageDAO.java index 375e091e..3d7d2983 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/impl/ExmpAppManageDAO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/impl/ExmpAppManageDAO.java @@ -14,10 +14,18 @@ public class ExmpAppManageDAO extends EgovAbstractDAO { public Integer selectExmpAppManagerCount(ExmpManageVO exmpManageVO) throws Exception { return (Integer) select("ExmpAppManageDAO.selectExmpManagerCount", exmpManageVO); } + + public Integer selectExmpOpinionsManagerCount(ExmpManageVO exmpManageVO) throws Exception { + return (Integer) select("ExmpAppManageDAO.selectExmpOpinionsManagerCount", exmpManageVO); + } public List selectExmpManagerList(ExmpManageVO exmpManageVO) throws Exception { return (List) list("ExmpAppManageDAO.selectExmpManagerList", exmpManageVO); } + + public List selectExmpOpinionsManagerList(ExmpManageVO exmpManageVO) throws Exception { + return (List) list("ExmpAppManageDAO.selectExmpOpinionsManagerList", exmpManageVO); + } public Integer deleteExmpCdList(ExmpManageVO exmpManageVO) throws Exception { return delete("ExmpAppManageDAO.deleteExmpCdList", exmpManageVO); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/impl/ExmpAppManageServiceImpl.java b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/impl/ExmpAppManageServiceImpl.java index 79a72a26..4bb85cc0 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/impl/ExmpAppManageServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/impl/ExmpAppManageServiceImpl.java @@ -39,11 +39,21 @@ public class ExmpAppManageServiceImpl implements ExmpAppManageService { public Integer selectExmpAppManagerCount(ExmpManageVO exmpManageVO) throws Exception { return exmpAppManageDAO.selectExmpAppManagerCount(exmpManageVO); } + + @Override + public Integer selectExmpOpinionsManagerCount(ExmpManageVO exmpManageVO) throws Exception { + return exmpAppManageDAO.selectExmpOpinionsManagerCount(exmpManageVO); + } @Override public List selectExmpAppManagerList(ExmpManageVO exmpManageVO) throws Exception { return exmpAppManageDAO.selectExmpManagerList(exmpManageVO); } + + @Override + public List selectExmpOpinionsManagerList(ExmpManageVO exmpManageVO) throws Exception { + return exmpAppManageDAO.selectExmpOpinionsManagerList(exmpManageVO); + } @Override public Map selectExmpAppManagerInfo(ExmpManageVO exmpManageVO) throws Exception { diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/cmm/ExmpManageVO.java b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/cmm/ExmpManageVO.java index b19477c9..b17dedb5 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/cmm/ExmpManageVO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/cmm/ExmpManageVO.java @@ -5,6 +5,37 @@ import kcc.kccadr.adjPgrMgr.cclt.service.ConciliatorManageVO; import java.util.List; +/** + * + * @author : 이호영 + * @fileName : ExmpManageVO.java + * @date : 2022.10.17 + * @description : + * @exmp_cd + * - 01 : 신청취지 + * - 02 : 신청원인 + * - 03 : 의견 + * - 04 : 답변서 + * - 05 : 사건진행도움말 + * @exmpCcTy + * - 의견일 경우 (exmp_cd == 03) + * exmpCcTy == CC045 + * - 기일통지서 "10"; + * - 기일조서 "20"; + * - 조정권고안 "30"; + * - 조정조서 "40"; + * - 취하종결통보서 "50"; + * - 직권조정결정서 "60"; + * - 불성립종결통보서 "70"; + * - 확정증명원 "80"; + * =========================================================== + * DATE AUTHOR NOTE + * ----------------------------------------------------------- * + * 2022.10.17 이호영 최초 생성 + * + * + * + */ public class ExmpManageVO extends ConciliatorManageVO { diff --git a/src/main/java/kcc/kccadr/adjcclt/service/AdjstConciliatorVO.java b/src/main/java/kcc/kccadr/adjcclt/service/AdjstConciliatorVO.java index 90f000ba..a27c6c27 100644 --- a/src/main/java/kcc/kccadr/adjcclt/service/AdjstConciliatorVO.java +++ b/src/main/java/kcc/kccadr/adjcclt/service/AdjstConciliatorVO.java @@ -8,7 +8,12 @@ import kcc.com.cmm.service.FileVO; public class AdjstConciliatorVO extends ComDefaultVO implements Serializable { - List fileList; + /** + * + */ + private static final long serialVersionUID = -1672039196841819050L; + + List fileList; private String adrSeq; @@ -213,6 +218,8 @@ public class AdjstConciliatorVO extends ComDefaultVO implements Serializable { private String cmntCn; private String cmntNm; + + private Boolean cmntOftenFlag; private String adrCnclSeq; @@ -1857,6 +1864,16 @@ public class AdjstConciliatorVO extends ComDefaultVO implements Serializable { public void setPrtclCn(String prtclCn) { this.prtclCn = prtclCn; } + + public Boolean getCmntOftenFlag() { + return cmntOftenFlag; + } + + public void setCmntOftenFlag(Boolean cmntOftenFlag) { + this.cmntOftenFlag = cmntOftenFlag; + } + + } diff --git a/src/main/java/kcc/kccadr/adjcclt/service/impl/AdjstConciliatorServiceImpl.java b/src/main/java/kcc/kccadr/adjcclt/service/impl/AdjstConciliatorServiceImpl.java index 34e91bb1..a7e48913 100644 --- a/src/main/java/kcc/kccadr/adjcclt/service/impl/AdjstConciliatorServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjcclt/service/impl/AdjstConciliatorServiceImpl.java @@ -8,8 +8,11 @@ import javax.annotation.Resource; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import egovframework.rte.fdl.cmmn.exception.FdlException; import egovframework.rte.fdl.idgnr.EgovIdGnrService; import egovframework.rte.psl.dataaccess.util.EgovMap; +import kcc.kccadr.adjPgrMgr.exmp.app.service.impl.ExmpAppManageDAO; +import kcc.kccadr.adjPgrMgr.exmp.cmm.ExmpManageVO; import kcc.kccadr.adjcclt.service.AdjstConciliatorService; import kcc.kccadr.adjcclt.service.AdjstConciliatorVO; import kcc.kccadr.cmm.KccadrConstants; @@ -22,7 +25,13 @@ public class AdjstConciliatorServiceImpl implements AdjstConciliatorService { @Resource(name="egovCommentManageGnrService") private EgovIdGnrService commentIdgen; + + @Resource(name="ExmpAppManageDAO") + private ExmpAppManageDAO exmpAppManageDAO; + @Resource(name="egovExmpMrgManageGnrService") + private EgovIdGnrService idgenExmpMrgService; + @Override public Integer selectAdjstConciliatorCount(AdjstConciliatorVO adjstConciliatorVO) throws Exception { return adjstConciliatorDAO.selectAdjstConciliatorCount(adjstConciliatorVO); @@ -123,10 +132,15 @@ public class AdjstConciliatorServiceImpl implements AdjstConciliatorService { @Override public Integer insertAdjstRecommendationCommentSave(AdjstConciliatorVO adjstConciliatorVO) throws Exception { adjstConciliatorVO.setCmntSeq(commentIdgen.getNextStringId()); - return adjstConciliatorDAO.insertAdjstRecommendationCommentSave(adjstConciliatorVO); + + int rs = adjstConciliatorDAO.insertAdjstRecommendationCommentSave(adjstConciliatorVO); + // 자주쓰는 의견 등록 + this.insertCmntOften(rs, adjstConciliatorVO); + + return rs; } - - @Override + + @Override public AdjstConciliatorVO selectAdjstRecommendationCommentDetail(AdjstConciliatorVO adjstConciliatorVO) throws Exception { return adjstConciliatorDAO.selectAdjstRecommendationCommentDetail(adjstConciliatorVO); } @@ -196,6 +210,24 @@ public class AdjstConciliatorServiceImpl implements AdjstConciliatorService { adjstConciliatorDAO.insertEndAdrPdfConversionReq(adjstConciliatorVO); } - + + + private void insertCmntOften(int rs, AdjstConciliatorVO adjstConciliatorVO) throws FdlException { + + if(rs > 0 && adjstConciliatorVO.getCmntOftenFlag()) + { + ExmpManageVO exmpManageVO = new ExmpManageVO(); + + exmpManageVO.setExmpMgrId(idgenExmpMrgService.getNextStringId()); + exmpManageVO.setExmpCd("03"); + exmpManageVO.setExmpCcTy(adjstConciliatorVO.getCmntTy()); + exmpManageVO.setExmpCn(adjstConciliatorVO.getCmntCn()); + exmpManageVO.setFrstRegisterId(adjstConciliatorVO.getFrstRegisterId()); + + exmpAppManageDAO.insertExmpAppManager(exmpManageVO); + + } + } + } diff --git a/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java b/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java index e855f85e..17efbd14 100644 --- a/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java +++ b/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java @@ -42,6 +42,8 @@ import kcc.kccadr.adjPgrMgr.dnt.service.DntVO; import kcc.kccadr.adjPgrMgr.drt.service.AssVO; import kcc.kccadr.adjPgrMgr.drt.service.DrtService; import kcc.kccadr.adjPgrMgr.drt.service.DrtVO; +import kcc.kccadr.adjPgrMgr.exmp.app.service.ExmpAppManageService; +import kcc.kccadr.adjPgrMgr.exmp.cmm.ExmpManageVO; import kcc.kccadr.adjcclt.service.AdjstConciliatorService; import kcc.kccadr.adjcclt.service.AdjstConciliatorVO; import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; @@ -110,7 +112,9 @@ public class AdjstConciliatorController { //조정사건 이력관리 일련번호 @Resource(name="adrHstryMgrSeqGnrService") private EgovIdGnrService adrHstryMgrSeqGnrService; - + + @Resource(name = "ExmpAppManageService") + private ExmpAppManageService exmpAppManageService; /** * 조정위원 대시보드 화면 */ @@ -371,8 +375,34 @@ public class AdjstConciliatorController { * 기일조서 상세 > 자주쓰는 의견 목록 팝업 */ @RequestMapping("/web/kccadr/adjcclt/popup/adjstOpinionsPopList.do") - public String adjstOpinionsPopList(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, ModelMap model) throws Exception { -// model.addAttribute("info", adjstConciliatorService.selectAdjstRecommendationCommentDetail(adjstConciliatorVO)); + public String adjstOpinionsPopList(@ModelAttribute("exmpManageVO") ExmpManageVO exmpManageVO, ModelMap model) throws Exception { + if(exmpManageVO.getPageUnit() != 10) { + exmpManageVO.setPageUnit(exmpManageVO.getPageUnit()); + } + + if("".equals(exmpManageVO.getSearchSortCnd())){ //최초조회시 최신것 조회List +// exmpManageVO.setSearchSortCnd("T1.Exmp_CC_TY"); +// exmpManageVO.setSearchSortOrd("asc"); + } + System.out.println("exmpManageVO.getSearchCondition() :: "+exmpManageVO.getSearchCondition()); + + /** paging */ + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(exmpManageVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(exmpManageVO.getPageUnit()); + paginationInfo.setPageSize(exmpManageVO.getPageSize()); + + exmpManageVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); + exmpManageVO.setLastIndex(paginationInfo.getLastRecordIndex()); + exmpManageVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); + + // 의견 코드 + exmpManageVO.setExmpCd("03"); + + paginationInfo.setTotalRecordCount(exmpAppManageService.selectExmpOpinionsManagerCount(exmpManageVO)); + model.addAttribute("paginationInfo", paginationInfo); + model.addAttribute("list", exmpAppManageService.selectExmpOpinionsManagerList(exmpManageVO)); + return "/web/kccadr/adjcclt/popup/adjstOpinionsPopList"; } @@ -532,6 +562,7 @@ public class AdjstConciliatorController { int rs = adjstConciliatorService.insertAdjstRecommendationCommentSave(adjstConciliatorVO); modelAndView.addObject("rs", (rs>0)); + modelAndView.addObject("rs", 0); return modelAndView; } diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/exmp/ExmpManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/exmp/ExmpManage_SQL_Mysql.xml index 8dffd474..6850ea32 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/exmp/ExmpManage_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/exmp/ExmpManage_SQL_Mysql.xml @@ -23,6 +23,35 @@ + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/adjstDrtDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/adjstDrtDetail.jsp index 7a01e8c8..57e1ea2b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/adjstDrtDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/adjstDrtDetail.jsp @@ -16,8 +16,6 @@ +
+

의견

+
-
+
의견 목록 : 일자, 내용, 조정위원등 정보제공 @@ -106,9 +110,9 @@

- + + +

@@ -125,22 +129,37 @@
-
    -
  • -

    의견

    -
    • -
  • - - -
    • -
    • -
- -
+ + +
+ + + + + + + + + + + +
+

의견

+ 		+

+
+ + +
+
+
+ + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/popup/adjstOpinionsPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/popup/adjstOpinionsPopList.jsp index 86a1916c..4005b6de 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/popup/adjstOpinionsPopList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/popup/adjstOpinionsPopList.jsp @@ -26,7 +26,10 @@ searchCondition : $("#searchCondition").val(), pageUnit : 5, } - AdjstReq.historyAdjstPopList(data); + AdjstReq.opinionsAdjstPopList(data); + } + + function fn_selected(){ } $(document).ready(function(){ @@ -38,7 +41,16 @@ $(document).ready(function(){ $('[data-tooltip="opinion_popup"]').focus(); }); - }) + $(".selectedVal").click(function(){ + console.log($(this).data('info')); + $('#commentInput').val($(this).data('info')); + + }); + +}) + + +