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
-
-
-
+
+
+
+
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..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
@@ -11,7 +11,7 @@
-조정사건 목록
+자주쓰는의견 목록
@@ -32,7 +32,7 @@
function linkPage(pageNo){
var listForm = document.listForm ;
listForm.pageIndex.value = pageNo ;
- listForm.action = "";
+ listForm.action = "";
listForm.submit();
}
@@ -49,67 +49,36 @@
-
-" />
-" />
-" />
-
-
+
+ " />
+ " />
+ " />
+
+
+
-
의견관리 목록
+ 자주쓰는의견 목록
+
+
+
-
-
-
-
-
-<%--
--%>
-<%--
--%>
-<%--
--%>
-<%--
--%>
-<%--
--%>
-<%--
--%>
-
-
-
-<%--
--%>
-
-
-
-
-
-
-
-
-<%--
--%>
-
-
-
-
-
-
-
-
-
-
-<%--
--%>
-
-
-
-
-
@@ -117,37 +86,32 @@
- | 번호 |
등록일 |
- 제목 |
+ 유형 |
내용 |
삭제 |
-<%-- --%>
+
- |
- 1
- |
-<%-- --%>
- 2022-09-30
+
|
- 제목
+
|
- 내용
+
|
- 삭제버튼
+
|
-<%-- --%>
-<%-- --%>
-<%-- |
--%>
-<%-- --%>
+
+
+ |
+
@@ -165,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(){
자주쓰는 의견 목록