diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java index f722a137..665639c5 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -206,11 +206,11 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements adjReqMgrPastVO.setStatCd(KccadrConstants.ADR_NOSUCC); - //신규 조정사건 생성해 주기 int adrCnt = 0 ; adrCnt = adjReqMgrPastDAO.insertAdrMgrMaster(adjReqMgrPastVO); - + + if(adrCnt == 0) { //조정사건 생성이 실패했다면 return ResponseEntity.ok(new RestResponse(HttpStatus.BAD_REQUEST, "저장에 실패하였습니다.", LocalDateTime.now())); @@ -401,7 +401,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements - return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "조정신청 정보 저장이 완료되었습니다.", LocalDateTime.now())); + return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "조정신청 정보 저장이 완료되었습니다.", adrSeq, LocalDateTime.now())); } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index 65fe69ff..dd8aef06 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -127,6 +127,47 @@ public class AdjReqMgrPastController { return "kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist"; } + + /** + * @methodName : adjReqMgrPastProgRegist + * @author : 이호영 + * @date : 2022.09.15 + * @description : 사건진행정보 목록 + * @param adjReqMgrPastVO + * @param model + * @return + * @throws Exception + */ + @RequestMapping("/kccadr/adjReqMgOff/adjReqMgrPastProgRegist.do") + public String adjReqMgrPastProgRegist(@ModelAttribute("searchVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { + + //로그인 권한정보 불러오기 +// LoginVO user = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; +// model.addAttribute("user", user); +// +// // 공통코드 조회 +// List codeResult = cmmUseService.selectCmmCodeDetail("CC001"); +// model.addAttribute("CC001", codeResult); +// +// int reqPerTotCnt = 0; +// +// if(StringUtils.isNotBlank(adjReqMgrPastVO.getAdrSeq())) { +// +// //오프라인 조정 신청 정보 불러오기. +// AdjReqMgrPastVO resultAdjReqMgrOffLine = adjReqMgrPastService.selectAdjReqMgrOffLineInfo(adjReqMgrPastVO); +// model.addAttribute("adrVO", resultAdjReqMgrOffLine); +// }else { +// //기본 값 셋팅 - 대리인 여부, 신청자 분류 +// adjReqMgrPastVO.setRpplTy("10"); +// adjReqMgrPastVO.setReqTy("01"); +// model.addAttribute("adrVO", adjReqMgrPastVO); +// } +// +// +// model.addAttribute("reqPerTotCnt", reqPerTotCnt); + + return "kccadr/adjReqMgrPast/adjReqMgrPastProgRegist"; + } /** * @methodName : insertAdjReqMgrOffAjax diff --git a/src/main/java/kcc/kccadr/cmm/RestResponse.java b/src/main/java/kcc/kccadr/cmm/RestResponse.java index 1a1055af..67535342 100644 --- a/src/main/java/kcc/kccadr/cmm/RestResponse.java +++ b/src/main/java/kcc/kccadr/cmm/RestResponse.java @@ -37,9 +37,11 @@ import org.springframework.http.HttpStatus; public class RestResponse { - private HttpStatus status; + private HttpStatus status; - private String data; + private String data; + + private String dataSub; private LocalDateTime timestamp; @@ -51,6 +53,13 @@ public class RestResponse { this.timestamp = timestamp; } + public RestResponse(HttpStatus status, String data, String dataSub, LocalDateTime timestamp) { + this.status = status; + this.data = data; + this.dataSub = dataSub; + this.timestamp = timestamp; + } + public RestResponse(HttpStatus status, List dataList, String data, LocalDateTime timestamp) { this.status = status; this.dataList = dataList; @@ -89,6 +98,15 @@ public class RestResponse { public void setDataList(List dataList) { this.dataList = dataList; } + + public String getDataSub() { + return dataSub; + } + + public void setDataSub(String dataSub) { + this.dataSub = dataSub; + } + diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml index fe3839da..36ba07cb 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml @@ -123,7 +123,7 @@ ,LAST_UPDUSR_ID ) VALUES ( #adrSeq# - ,"400000" + ,'400000' ,#adrNo# ,#reqOlCd# ,#reqCn1# diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp index 446365a0..c391b3ad 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp @@ -40,9 +40,9 @@ -
- -
+<%--
--%> + +<%--
--%>
@@ -1392,6 +1392,10 @@ + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastProgRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastProgRegist.jsp new file mode 100644 index 00000000..27c9a5f0 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastProgRegist.jsp @@ -0,0 +1,166 @@ + +<%@ page language="java" contentType="text/html; charset=utf-8" + pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt_rt" %> +<% + /** + * @Class Name : AdjustDeptManagerList.jsp + * @Description : 조정부관리 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.09 김봉호 최초 생성 + * @author 김봉호 + * @since 2021.08.21 + * @version 1.0 + * @see + * + */ +%> + + + + +사건진행정보 + + + +<%-- --%> +<%-- " /> --%> +<%-- " /> --%> +<%-- " /> --%> + + + +
+
+ + +
+

사건진행정보

+
    +
    • +
  • +

    오프라인 조정관리

    +
    • +
  • +

    과거사건등록

    +
    • +
  • 사건진행정보
    • +
+
+ + +
+ +
+

총 진행 회차 : ??건

+
+ +
+
+ + +
+ + + + + + + + + + + + + + + + + + + + +
회차결과등록/삭제
+ 1 + + 1 + + +
+
+ + +
+ +
+ + + +<%-- --%> + + +
+
+
+ + + + + + + diff --git a/src/main/webapp/js/kccadr/adjReqMgrPast/value.js b/src/main/webapp/js/kccadr/adjReqMgrPast/value.js index 0573fd24..7fc08f52 100644 --- a/src/main/webapp/js/kccadr/adjReqMgrPast/value.js +++ b/src/main/webapp/js/kccadr/adjReqMgrPast/value.js @@ -1080,7 +1080,8 @@ success: function (data) { console.log('data : ', data); if(data.status == 'OK'){ - alert(data.message); + alert(data.data); + dataSub } else if(data.status == 'Unauthorized') {