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')); + + }); + +}) + + +