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 c66a0627..e3ae00da 100644 --- a/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java +++ b/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java @@ -360,6 +360,33 @@ public class AdjstReqStatusController { return "/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail"; } + /** + * 조정진행 상세 Tab 조정상세 화면 + */ + @RequestMapping("/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail_in_workflow.do") + public String adjstReqStatusTabDetail_in_workflow( + @ModelAttribute("adjstReqStatusVO") AdjstReqStatusVO adjstReqStatusVO + , @ModelAttribute("adjstIncidentVO") AdjstIncidentVO adjstIncidentVO + , ModelMap model) throws Exception { + + + System.out.println("========start"); + //model.addAttribute("master" , adjstIncidentService.selectAdjstIncidentMaster(adjstIncidentVO)); + model.addAttribute("info" , adjstIncidentService.selectAdjstIncidentMaster(adjstIncidentVO)); + + + //이력값 - 시작 + AdrHstryMgrVO adrHstryMgrVO = new AdrHstryMgrVO(); + adrHstryMgrVO.setAdrSeq(adjstReqStatusVO.getAdrSeq()); + + model.addAttribute("list_mgr" , adrHstryMgrService.selectList(adrHstryMgrVO)); + //이력값 - 끝 + + System.out.println("========start=end"); + + return "/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail_in_workflow"; + } + /** * 조정종결 상세 Tab 조정일반 화면 */ diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java index 0dd54e4d..647ef32b 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -532,6 +532,41 @@ public class ApmController { return "/kccadr/adjPgrMgr/apm/apmTab0"; } + /** + * 조정진행정보 상세-조정사건일반 + * + * @param dlvinfoVO + * @param model + * @return + * @throws Exception + */ + @RequestMapping(value = "apmTab0_in_workflow.do") + public String apmTab0_in_workflow( + @ModelAttribute("info") PgrCmmVO cmmVO + , ModelMap model) throws Exception { + + try { + System.out.println("apmTab0_in_workflow1"); + + // 조정사건일반 + PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); + model.addAttribute("info", info); + System.out.println("apmTab0_in_workflow2"); + //이력값 - 시작 + AdrHstryMgrVO adrHstryMgrVO = new AdrHstryMgrVO(); + adrHstryMgrVO.setAdrSeq(cmmVO.getAdrSeq()); + + model.addAttribute("list_mgr" , adrHstryMgrService.selectList(adrHstryMgrVO)); + //이력값 - 끝 + + }catch(Exception ex) { + ex.printStackTrace(); + } + + + return "/kccadr/adjPgrMgr/apm/apmTab0_in_workflow"; + } + /** * 취하신청 승인/반려 상태 변경 * diff --git a/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java b/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java index 24231188..87b944c4 100644 --- a/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java +++ b/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java @@ -11,7 +11,6 @@ import java.util.Map; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.Response.Status; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -25,8 +24,6 @@ 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; @@ -54,6 +51,8 @@ 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; +import kcc.kccadr.advc.service.AdrHstryMgrService; +import kcc.kccadr.advc.service.AdrHstryMgrVO; import kcc.kccadr.cmm.CmmUtil; import kcc.kccadr.cmm.KccadrConstants; import kcc.kccadr.cmm.RestResponse; @@ -124,6 +123,9 @@ public class AdjstConciliatorController { @Resource(name = "ExmpAppManageService") private ExmpAppManageService exmpAppManageService; + @Resource(name="adrHstryMgrService") + private AdrHstryMgrService adrHstryMgrService; + /** * 조정위원 대시보드 화면 */ @@ -840,6 +842,15 @@ public class AdjstConciliatorController { decryptInfomation(fixedDateList, null); model.addAttribute("fixedDateList", fixedDateList); + + //이력값 - 시작 + AdrHstryMgrVO adrHstryMgrVO = new AdrHstryMgrVO(); + adrHstryMgrVO.setAdrSeq(adjstConciliatorVO.getAdrSeq()); + + model.addAttribute("list_mgr" , adrHstryMgrService.selectList(adrHstryMgrVO)); + //이력값 - 끝 + + return "/web/kccadr/adjcclt/adjstConciliatorApmDetail"; } diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp index 699898b3..d78a341f 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp @@ -620,24 +620,7 @@ $(document).ready(function(){ - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - +/${passMenuId }/
" /> " /> diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0_in_workflow.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0_in_workflow.jsp new file mode 100644 index 00000000..f7b6b7e0 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0_in_workflow.jsp @@ -0,0 +1,248 @@ +<%@ 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" %> + + + + +조정진행 상세 + + + + + + + + + ${list.menuId} + + + + + + + + + + ${list.menuId} + + + + 400000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail_in_workflow.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail_in_workflow.jsp new file mode 100644 index 00000000..54dbeb74 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail_in_workflow.jsp @@ -0,0 +1,245 @@ +<%@ 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"%> + + + +조정진행 + + + + + + + + + ${list.menuId} + + + + + + + + + + ${list.menuId} + + + + 400000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/adjstConciliatorApmDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/adjstConciliatorApmDetail.jsp index 4bfba50d..4085186d 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/adjstConciliatorApmDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/adjstConciliatorApmDetail.jsp @@ -17,6 +17,8 @@ - +//////////////////////////////////////// " /> @@ -358,7 +399,11 @@ function getPageUrl(idx){ - + +
+ +
+