From 725bd411419bf4893bbba8bb078dbfccea59c6de Mon Sep 17 00:00:00 2001 From: hylee Date: Tue, 18 Oct 2022 10:13:45 +0900 Subject: [PATCH 1/4] =?UTF-8?q?refactor:=20=EC=9D=98=EA=B2=AC=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjcclt/opinion/adjstOpinionList.jsp | 95 +++++++++---------- 1 file changed, 45 insertions(+), 50 deletions(-) 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 f0d5cd79..e8de9f32 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 @@ -11,7 +11,7 @@ -조정사건 목록 +자주쓰는의견 목록 @@ -60,56 +60,55 @@
-

의견관리 목록

+

자주쓰는의견 목록

+
+
+ +
+ + +
+
+ + +
+ ~ +
+ + +
+ +
+
+ + +
+ +
- - - - - -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> - - - -<%-- --%> - - - - - - - - -<%-- --%> - - - - - - - - - - -<%-- --%> - - - -
- @@ -117,9 +116,8 @@ - - + @@ -127,15 +125,12 @@ <%-- --%> -
번호 등록일제목유형 내용 삭제
- 1 - <%--

--%> 2022-09-30 		- 제목 + 유형 내용 From a5f5b01ddb3401fef831a2ec9eb23a044096d0f9 Mon Sep 17 00:00:00 2001 From: LJH Date: Tue, 18 Oct 2022 16:03:32 +0900 Subject: [PATCH 2/4] =?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=20-=20(=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EC=9E=90)=20=EC=86=A1=EB=8B=AC=EC=A0=95=EB=B3=B4=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ars/web/AdjstReqStatusController.java | 43 +++++++++++++++- .../dlvinfo/service/DlvinfoService.java | 3 +- .../dlvinfo/service/impl/DlvinfoDAO.java | 5 ++ .../service/impl/DlvinfoServiceImpl.java | 7 ++- .../adjRppl/service/AdjRpplService.java | 2 + .../adjRppl/service/impl/AdjRpplDAO.java | 4 ++ .../service/impl/AdjRpplServiceImpl.java | 6 +++ .../kccadrCom/web/KccadrCommonController.java | 5 +- .../adjPgrMgr/dlvinfo/Dlvinfo_SQL_Mysql.xml | 21 ++++++++ .../kccadr/adjrppl/AdjRppl_SQL_Mysql.xml | 49 +++++++++++++++++++ .../ars/tab/adjstReqStatusTabDetail.jsp | 21 ++++---- 11 files changed, 150 insertions(+), 16 deletions(-) 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 09a4e5fd..5bae1125 100644 --- a/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java +++ b/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java @@ -2,12 +2,12 @@ package kcc.kccadr.accdnt.ars.web; import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -30,8 +30,12 @@ import kcc.kccadr.accdnt.ai.service.AdjstIncidentService; import kcc.kccadr.accdnt.ai.service.AdjstIncidentVO; import kcc.kccadr.accdnt.ars.service.AdjstReqStatusService; import kcc.kccadr.accdnt.ars.service.AdjstReqStatusVO; +import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoService; +import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoVO; import kcc.kccadr.adjPgrMgr.exmp.app.service.ExmpAppManageService; import kcc.kccadr.adjPgrMgr.exmp.cmm.ExmpManageVO; +import kcc.kccadr.adjRppl.service.AdjRpplService; +import kcc.kccadr.adjRppl.service.AdjRpplVO; import kcc.kccadr.adjclsmgr.service.AdjClsMgrService; import kcc.kccadr.adjclsmgr.service.AdjClsMgrVO; import kcc.kccadr.advc.service.AdrHstryMgrService; @@ -89,6 +93,16 @@ public class AdjstReqStatusController { @Resource(name = "ExmpAppManageService") private ExmpAppManageService exmpAppManageService; + + @Resource(name = "dlvinfoService") + private DlvinfoService dlvinfoService; + + @Resource(name = "adjRpplService") + private AdjRpplService adjRpplService; + + + + /** * 조정진행 상태 및 관리 목록 화면 */ @@ -220,7 +234,9 @@ public class AdjstReqStatusController { public String adjstReqStatusTabDetail( @ModelAttribute("adjstReqStatusVO") AdjstReqStatusVO adjstReqStatusVO , @ModelAttribute("adjstIncidentVO") AdjstIncidentVO adjstIncidentVO - , ModelMap model) throws Exception { + , ModelMap model + , HttpServletRequest request + , HttpServletResponse response) throws Exception { // 조정신청 관련인 조회 List list = adjstReqStatusService.selectAdjstReqRpplInfo(adjstReqStatusVO); @@ -278,6 +294,29 @@ public class AdjstReqStatusController { model.addAttribute("list_mgr" , adrHstryMgrService.selectList(adrHstryMgrVO)); //이력값 - 끝 + /* + * 송달정보조회 + * select + * */ + DlvinfoVO dlvinfoVO = new DlvinfoVO(); + dlvinfoVO.setAdrSeq(adjstReqStatusVO.getAdrSeq()); + + //로그인한 사용자 이름으로 등록된 송달 리스트 조회 + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + String rpplNm = ""; + if(!"".equals(userId)) { + AdjRpplVO adjRpplVO = new AdjRpplVO(); + adjRpplVO.setAdrSeq(adjstReqStatusVO.getAdrSeq()); + adjRpplVO.setRpplId(userId); + adjRpplVO = adjRpplService.selectAdjRpplInfo(adjRpplVO); + rpplNm = egovCryptoUtil.decrypt(adjRpplVO.getRpplNm()); + dlvinfoVO.setRpplNm(rpplNm); + } + + List dlvinfoList = dlvinfoService.selectAdjustDlvryList(dlvinfoVO); + + model.addAttribute("dlvinfoList", dlvinfoList); return "/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail"; } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/DlvinfoService.java b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/DlvinfoService.java index 29dbd949..86f18399 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/DlvinfoService.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/DlvinfoService.java @@ -31,7 +31,8 @@ public interface DlvinfoService { List selectAdjustDeliverySocialList(DlvinfoVO dlvinfoVO) throws Exception; DlvinfoVO selectDlvryInfo(DlvinfoVO dlvinfoVO) throws Exception; - + + List selectAdjustDlvryList(DlvinfoVO dlvinfoVO) throws Exception; /* * List getDlvryDocTyList(AdrInfoVO adrInfoVO); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/impl/DlvinfoDAO.java b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/impl/DlvinfoDAO.java index 7b252367..28c1e978 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/impl/DlvinfoDAO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/impl/DlvinfoDAO.java @@ -63,5 +63,10 @@ public class DlvinfoDAO extends EgovAbstractDAO { public DlvinfoVO selectDlvryInfo(DlvinfoVO dlvinfoVO) throws Exception { return (DlvinfoVO) select("Dlvinfo.selectDlvryInfo", dlvinfoVO); } + + @SuppressWarnings("unchecked") + public List selectAdjustDlvryList(DlvinfoVO dlvinfoVO) throws Exception { + return (List) list("Dlvinfo.selectAdjustDlvryList", dlvinfoVO); + } } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/impl/DlvinfoServiceImpl.java b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/impl/DlvinfoServiceImpl.java index 4406f0be..e990ad92 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/impl/DlvinfoServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/dlvinfo/service/impl/DlvinfoServiceImpl.java @@ -154,8 +154,13 @@ public class DlvinfoServiceImpl implements DlvinfoService { return dlvinfoDAO.selectDlvryInfo(dlvinfoVO); } + @Override + public List selectAdjustDlvryList(DlvinfoVO dlvinfoVO) throws Exception { + return dlvinfoDAO.selectAdjustDlvryList(dlvinfoVO); + } - /** + + /** * 신청인, 피신청인 복호화 * * @param result diff --git a/src/main/java/kcc/kccadr/adjRppl/service/AdjRpplService.java b/src/main/java/kcc/kccadr/adjRppl/service/AdjRpplService.java index 9cdfe43d..bb6238e5 100644 --- a/src/main/java/kcc/kccadr/adjRppl/service/AdjRpplService.java +++ b/src/main/java/kcc/kccadr/adjRppl/service/AdjRpplService.java @@ -39,4 +39,6 @@ public interface AdjRpplService { public void deleteXxx2(AdjRpplVO xxxVO) throws Exception; */ public AdjRpplVO selectAdjRpplDetail(AdjRpplVO adjRpplVO) throws Exception; + + public AdjRpplVO selectAdjRpplInfo(AdjRpplVO adjRpplVO) throws Exception; } diff --git a/src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplDAO.java b/src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplDAO.java index 001e3808..0e29ae62 100644 --- a/src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplDAO.java +++ b/src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplDAO.java @@ -61,4 +61,8 @@ public class AdjRpplDAO extends EgovAbstractDAO { public AdjRpplVO selectAdjRpplDetail(AdjRpplVO adjRpplVO) { return (AdjRpplVO) select("adjRpplDAO.selectAdjRpplDetail", adjRpplVO); } + + public AdjRpplVO selectAdjRpplInfo(AdjRpplVO adjRpplVO) throws Exception { + return (AdjRpplVO) select("adjRpplDAO.selectAdjRpplInfo", adjRpplVO); + } } diff --git a/src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplServiceImpl.java b/src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplServiceImpl.java index bbb06e7f..0f3e2ee6 100644 --- a/src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjRppl/service/impl/AdjRpplServiceImpl.java @@ -84,4 +84,10 @@ public class AdjRpplServiceImpl extends EgovAbstractServiceImpl implements AdjR public AdjRpplVO selectAdjRpplDetail(AdjRpplVO adjRpplVO) throws Exception { return adjRpplDAO.selectAdjRpplDetail(adjRpplVO); } + @Override + public AdjRpplVO selectAdjRpplInfo(AdjRpplVO adjRpplVO) throws Exception { + return adjRpplDAO.selectAdjRpplInfo(adjRpplVO); + } + + } diff --git a/src/main/java/kcc/kccadr/kccadrCom/web/KccadrCommonController.java b/src/main/java/kcc/kccadr/kccadrCom/web/KccadrCommonController.java index 3a2139ae..2f2b96a2 100644 --- a/src/main/java/kcc/kccadr/kccadrCom/web/KccadrCommonController.java +++ b/src/main/java/kcc/kccadr/kccadrCom/web/KccadrCommonController.java @@ -236,9 +236,8 @@ public class KccadrCommonController { } } - /*String resultUrl = "https://service.epost.go.kr/trace.RetrieveDomRigiTraceList.comm?sid1=" + sid;*/ - String resultUrl = "https://service.epost.go.kr/trace.RetrieveDomRigiTraceList.comm?sid1=" + "6401780018896"; -// https://service.epost.go.kr/trace.RetrieveDomRigiTraceList.comm?sid1=6401780018896 + String resultUrl = "https://service.epost.go.kr/trace.RetrieveDomRigiTraceList.comm?sid1=" + sid; + return "redirect:" + resultUrl; } diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/dlvinfo/Dlvinfo_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/dlvinfo/Dlvinfo_SQL_Mysql.xml index 52368e38..d547ee87 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/dlvinfo/Dlvinfo_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/dlvinfo/Dlvinfo_SQL_Mysql.xml @@ -387,5 +387,26 @@ AND D.DLVRY_DOC_TY = #dlvryDocTy# + + \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjrppl/AdjRppl_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjrppl/AdjRppl_SQL_Mysql.xml index ec10642a..18cc0e2e 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjrppl/AdjRppl_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjrppl/AdjRppl_SQL_Mysql.xml @@ -61,4 +61,53 @@ + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail.jsp index ca8cba41..0ecf9bf4 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail.jsp @@ -5,7 +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"%> - +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> @@ -100,8 +100,8 @@ //송달정보 조회 function fnPostChk(){ - commonPopWindowopenForm("/web/kccadr/kccadrCom/postCheckLink.do?sid=123", "1200", "1000", "postChkPop", $('#pop')); -// location.href = "/web/kccadr/kccadrCom/postCheckLink.do?sid=123"; + var regNm = $("#dlvryInfoSelect option:selected").val(); + commonPopWindowopenForm("/web/kccadr/kccadrCom/postCheckLink.do?sid=" + regNm, "1200", "1000", "postChkPop", $('#pop')); } @@ -189,6 +189,7 @@ " /> " /> " /> + <%--reqInfo @@ -318,12 +319,14 @@ resInfo--%>

- - - + + + +
From 59fe2229629482eef334098c4e72d9281779cdaf Mon Sep 17 00:00:00 2001 From: hylee Date: Tue, 18 Oct 2022 16:12:53 +0900 Subject: [PATCH 3/4] =?UTF-8?q?refactor:=EC=9E=90=EC=A3=BC=EC=93=B0?= =?UTF-8?q?=EB=8A=94=EC=9D=98=EA=B2=AC=20=EB=93=B1=EB=A1=9D=20=EC=99=84?= =?UTF-8?q?=EB=A3=8C=20/=20=EC=88=98=EC=A0=95=20=EC=A7=84=ED=96=89?= =?UTF-8?q?=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/web/ExmpAppManagerController.java | 1 + .../opinion/web/AdjstOpinionController.java | 68 ++++---- .../web/AdjstConciliatorController.java | 44 ++++- .../adjPgrMgr/exmp/ExmpManage_SQL_Mysql.xml | 7 +- .../adjcclt/opinion/adjstOpinionList.jsp | 82 +++------- .../adjcclt/popup/adjstOpinionsPopList.jsp | 14 +- .../popup/adjstOpinionsRegistPopDetail.jsp | 129 +++++++++++++++ .../popup/adjstOpinionsRegistPopList.jsp | 152 +++++++++++------- .../kccadr/kccadrCom/kccadrConstantsJsp.jsp | 17 ++ 9 files changed, 352 insertions(+), 162 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopDetail.jsp diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/web/ExmpAppManagerController.java b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/web/ExmpAppManagerController.java index e0dba573..97b8c0d1 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/web/ExmpAppManagerController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/web/ExmpAppManagerController.java @@ -163,6 +163,7 @@ public class ExmpAppManagerController { result = fileUtil.parseFileInf(files, "Exmp_" , 0, atchFileId, "", ""); atchFileId = fileMngService.insertFileInfs(result); } + exmpManageVO.setAtchFileId(atchFileId); exmpManageVO.setFrstRegisterId(loginVO.getUniqId()); return ResponseEntity.ok().body(exmpAppManageService.insertExmpAppManager(exmpManageVO)); diff --git a/src/main/java/kcc/kccadr/adjcclt/opinion/web/AdjstOpinionController.java b/src/main/java/kcc/kccadr/adjcclt/opinion/web/AdjstOpinionController.java index 9dd90cbb..f3dfb420 100644 --- a/src/main/java/kcc/kccadr/adjcclt/opinion/web/AdjstOpinionController.java +++ b/src/main/java/kcc/kccadr/adjcclt/opinion/web/AdjstOpinionController.java @@ -18,6 +18,8 @@ import org.springframework.web.bind.annotation.RequestMethod; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.LoginVO; +import kcc.kccadr.adjPgrMgr.exmp.app.service.ExmpAppManageService; +import kcc.kccadr.adjPgrMgr.exmp.cmm.ExmpManageVO; import kcc.kccadr.adjcclt.opinion.service.AdjstOpinionService; import kcc.kccadr.adjcclt.opinion.service.AdjstOpinionVO; import kcc.kccadr.adjcclt.service.AdjstConciliatorVO; @@ -44,7 +46,9 @@ public class AdjstOpinionController { @Resource(name = "adjstOpinionService") private AdjstOpinionService adjstOpinionService; - + + @Resource(name = "ExmpAppManageService") + private ExmpAppManageService exmpAppManageService; // @RequestMapping(value = {"/web/kccadr/adjcclt/ai/adjstOpinionList.do"}, method = RequestMethod.POST) // public ResponseEntity adjstFindByOpinion(HttpServletRequest request , @RequestBody AdjstOpinionVO adjstOpinionVO) throws Exception { @@ -52,46 +56,38 @@ public class AdjstOpinionController { // } @RequestMapping("/web/kccadr/adjcclt/ai/adjstOpinionList.do") - public String adjstOpinionList(@ModelAttribute("adjstOpinionVO") AdjstOpinionVO adjstOpinionVO, ModelMap model) throws Exception + public String adjstOpinionList(@ModelAttribute("exmpManageVO") ExmpManageVO exmpManageVO, ModelMap model) throws Exception { - String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString(); - LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); - - if (loginVO == null) { + LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); - model.addAttribute("msg", "로그인 해주세요."); - return "redirect:/web/user/login/ssoLogin.do"; - } - logger.info(" + loginVO.getName() :: [{}]", loginVO.getName()); -// adjstOpinionVO.setFrstRegisterId(loginVO.getUniqId()); + exmpManageVO.setFrstRegisterId(loginVO.getUniqId()); + if(exmpManageVO.getPageUnit() != 10) { + exmpManageVO.setPageUnit(exmpManageVO.getPageUnit()); + } -// if(adjstOpinionVO.getPageUnit() != 10) { -// adjstOpinionVO.setPageUnit(adjstOpinionVO.getPageUnit()); -// } -// -// if("".equals(adjstOpinionVO.getSearchSortCnd())){ //최초조회시 최신것 조회List -// adjstOpinionVO.setSearchSortCnd("RS.ADR_SEQ"); -// adjstOpinionVO.setSearchSortOrd("desc"); -// } + 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()); - /** paging */ - PaginationInfo paginationInfo = new PaginationInfo(); - paginationInfo.setCurrentPageNo(adjstOpinionVO.getPageIndex()); - paginationInfo.setRecordCountPerPage(adjstOpinionVO.getPageUnit()); - paginationInfo.setPageSize(adjstOpinionVO.getPageSize()); - - adjstOpinionVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); - adjstOpinionVO.setLastIndex(paginationInfo.getLastRecordIndex()); - adjstOpinionVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - -// paginationInfo.setTotalRecordCount(adjstOpinionService.selectAdjstOpinionListCount(adjstOpinionVO)); - model.addAttribute("paginationInfo", paginationInfo); - - -// List list = adjstOpinionService.selectAdjstOpinionList(adjstOpinionVO); -// decryptInfomation(list, null); -// model.addAttribute("list", list); + 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/opinion/adjstOpinionList"; } diff --git a/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java b/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java index d2f1833e..a15b6696 100644 --- a/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java +++ b/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java @@ -6,6 +6,7 @@ import java.time.format.TextStyle; import java.util.ArrayList; import java.util.List; import java.util.Locale; +import java.util.Map; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -14,12 +15,15 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +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.bind.annotation.RequestParam; +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; @@ -49,6 +53,7 @@ import kcc.kccadr.adjcclt.service.AdjstConciliatorVO; import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; import kcc.kccadr.cmm.CmmUtil; import kcc.kccadr.cmm.KccadrConstants; +import kcc.kccadr.cmm.RestResponse; import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService; import kcc.kccadr.ojct.service.OjctService; import kcc.kccadr.ojct.service.OjctVO; @@ -411,10 +416,47 @@ public class AdjstConciliatorController { */ @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"; } + + /** + * 의견관리 목록 > 자주쓰는 의견 상세 팝업 + */ + @RequestMapping("/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopDetail.do") + public String opinionsRegistAdjstPopDetail(@ModelAttribute("exmpManageVO") ExmpManageVO exmpManageVO, ModelMap model) throws Exception { + System.out.println(" + exmpManageVO :: "+ exmpManageVO.getExmpMgrId()); + model.addAttribute("dataInfo", exmpAppManageService.selectExmpAppManagerInfo(exmpManageVO)); + return "/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopDetail"; + } + + + @RequestMapping(value="/web/kccadr/adjcclt/insertExmpOpinionsAjax.do") + public ResponseEntity insertExmpAppManager(ExmpManageVO exmpManageVO) throws Exception { + + LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); + exmpManageVO.setFrstRegisterId(loginVO.getUniqId()); + return ResponseEntity.ok().body(exmpAppManageService.insertExmpAppManager(exmpManageVO)); + } + /* + + @RequestMapping(value="/web/kccadr/adjcclt/insertExmpOpinionsAjax.do") + public ModelAndView insertExmpAppManager(ExmpManageVO exmpManageVO) throws Exception { + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); + + System.out.println("exmpManageVO.getExmpCd : " + exmpManageVO.getExmpCd()); + System.out.println("exmpManageVO.getCcTy : " + exmpManageVO.getExmpCcTy()); + System.out.println("exmpManageVO.getExmpCn : " + exmpManageVO.getExmpCn()); + + exmpManageVO.setFrstRegisterId(loginVO.getUniqId()); + + exmpAppManageService.insertExmpAppManager(exmpManageVO); + + 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 6850ea32..cc4c230f 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 @@ -112,7 +112,12 @@ AND T1.EXMP_CC_TY = #searchCondition# - ORDER BY 1=1 + + + T1.FRST_REGISTER_ID = #frstRegisterId# + + + ORDER BY T1.FRST_REGIST_PNTTM DESC 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 e8de9f32..89f51945 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 @@ -32,7 +32,7 @@ function linkPage(pageNo){ var listForm = document.listForm ; listForm.pageIndex.value = pageNo ; - listForm.action = ""; + listForm.action = ""; listForm.submit(); } @@ -49,12 +49,13 @@ - -" /> -" /> -" /> - - + + " /> + " /> + " /> + + +
@@ -62,46 +63,15 @@

자주쓰는의견 목록

-
-
- - -
-
- - -
- ~ -
- - -
- -
-
- - -
- -
+
+
+ + + + + +
@@ -123,26 +93,25 @@
-<%-- --%> + -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> + + + +
-<%--

--%> - 2022-09-30 +

- 유형 + - 내용 + - 삭제버튼 +
@@ -160,7 +129,6 @@ - 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 4005b6de..ba9555c9 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 @@ -70,12 +70,14 @@ $(document).ready(function(){

자주쓰는 의견 목록

-
- - - - - +
+
+ + + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopDetail.jsp new file mode 100644 index 00000000..0323c60e --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopDetail.jsp @@ -0,0 +1,129 @@ +<%@ 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/adjcclt/popup/adjstOpinionsRegistPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopList.jsp index 7750f1cb..97546747 100644 --- 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 @@ -15,19 +15,7 @@ +
+ - - -" /> -" /> - -
-
-

자주쓰는 의견 등록

-
-
- - - - - - - - - - - - - - - - - - - -
유형 - -
제목 - -
제목 - -
- -
- - -
-
-
- +
+
+

자주쓰는 의견 등록

+
+
+ + + + + + + + + + + + + + + + + + + + + +
유형 + +
내용 + +
+ +
+ + +
+
+
+
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 addf52f7..0e64dbd1 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 @@ -1261,6 +1261,23 @@ var AdjstReq = { , "adjstOpinionsRegistPop" ); }, + opinionsRegistAdjstPopDetail : function(param){ + + console.log(' param : ', param); + + var paramObj = { + exmpMgrId : param + }; + // 이전신청데이터 팝업 호출.. + commonPopLayeropen( + "/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopDetail.do" + , 1000 + , 700 + , paramObj + , "N" + , "adjstOpinionsRegistPop" + ); + }, openExamplePop : function(exmpCd){ /* - 01 : 신청취지 From b5c689d5e417b8189911581c9ddeb57812942cf0 Mon Sep 17 00:00:00 2001 From: LJH Date: Tue, 18 Oct 2022 17:08:49 +0900 Subject: [PATCH 4/4] =?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=82=AC=EC=9A=A9=EC=9E=90)=20=EC=A1=B0=EC=A0=95=EC=8B=A0?= =?UTF-8?q?=EC=B2=AD=20step3=20=EC=8B=A0=EC=B2=AD=EC=B7=A8=EC=A7=80=20?= =?UTF-8?q?=EC=98=88=EB=AC=B8=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjst/web/AdjstReqWebController.java | 2 + .../adjstExp/web/AdjstExpController.java | 5 ++ .../adjst/popup/adjstReqOpenExamplePop.jsp | 59 +++++++------------ 3 files changed, 27 insertions(+), 39 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java index 260ed2b2..6488a458 100644 --- a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java +++ b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java @@ -215,6 +215,8 @@ public class AdjstReqWebController { // } model.addAttribute("exmpList", exmpList); + + return "/web/kccadr/adjst/popup/adjstReqOpenExamplePop"; } diff --git a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java index dd4d7f57..f803a328 100644 --- a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java +++ b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java @@ -374,9 +374,14 @@ public class AdjstExpController { */ @RequestMapping(value= {"/web/kccadr/adjstExp/popup/adjstReqOpenExamplePop.do"}) public String adjstReqOpenExamplePop(@ModelAttribute("adjstReqVO") AdjstReqVO adjstReqVO, ModelMap model, HttpServletRequest request) throws Exception { + + List exmpList = adjstReqService.selectAdjstReqOpenExamplePop(adjstReqVO); + model.addAttribute("ccTy", adjstReqVO.getCcTy()); model.addAttribute("exmpCd", adjstReqVO.getExmpCd()); + model.addAttribute("exmpList", exmpList); + return "/web/kccadr/adjstExp/popup/adjstReqOpenExamplePop"; } 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 536ff59f..a354a5cf 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 @@ -31,7 +31,13 @@ $(document).ready(function(){ activeTarget.hide(); $('[data-tooltip="fee_info_popup"]').eq(0).focus(); }); -}) +}); + +// 신청취지 텍스트에 추가 +function addText(obj){ + $('#reqCn1').text($('#reqCn1').text()+obj.text); +} +