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 e8b5fe4c..a7fbe1f3 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -628,13 +628,11 @@ public class ApmController { */ @RequestMapping(value = "popup/adjstReqOpenExamplePop.do") public String adjstReqOpenExamplePop(@ModelAttribute("adjstReqVO") AdjstReqVO adjstReqVO, ModelMap model) throws Exception { - - AdjstReqVO expm = adjstReqService.selectAdjstReqOpenExamplePop(adjstReqVO); - -// apmVO.setSrchRpplTy(apmVO.getRpplTy()); -// model.addAttribute("rppList", apmService.selectAdrRpplList(apmVO)); - - model.addAttribute("expm", expm); + + model.addAttribute("ccTy", adjstReqVO.getCcTy()); + model.addAttribute("exmpCd", adjstReqVO.getExmpCd()); + System.out.println("adjstReqVO.getExmpCd() : "+ adjstReqVO.getExmpCd()); + return "/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop"; } 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/adjst/service/AdjstReqService.java b/src/main/java/kcc/kccadr/adjst/service/AdjstReqService.java index e545ae3c..12b81fea 100644 --- a/src/main/java/kcc/kccadr/adjst/service/AdjstReqService.java +++ b/src/main/java/kcc/kccadr/adjst/service/AdjstReqService.java @@ -51,7 +51,7 @@ public interface AdjstReqService { // 조정사건 정보 불러오기 public AdjstReqVO selectAdjsMgrMaster(AdjstReqVO adjstReqVO) throws Exception; - public AdjstReqVO selectAdjstReqOpenExamplePop(AdjstReqVO adjstReqVO) throws Exception; + public AdjstReqVO selectAdjstReqOpenExamplePopCn(AdjstReqVO adjstReqVO) throws Exception; // 조정사건 대리인/신청인/피신청인 정보 불러오기 public List selectAdjsReqUserListByadjSeq(AdjstReqVO adjstReqVO) throws Exception; diff --git a/src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java b/src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java index 1df4c032..93afadfe 100644 --- a/src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java +++ b/src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java @@ -826,35 +826,35 @@ public class AdjstReqVO extends ComDefaultVO implements Serializable { this.edtStatus = edtStatus; } - public String getExpmCd() { + public String getExmpCd() { return exmpCd; } - public void setExpmCd(String exmpCd) { + public void setExmpCd(String exmpCd) { this.exmpCd = exmpCd; } - public String getExpmCn() { + public String getExmpCn() { return exmpCn; } - public void setExpmCn(String exmpCn) { + public void setExmpCn(String exmpCn) { this.exmpCn = exmpCn; } - public String getExpmTit() { + public String getExmpTit() { return exmpTit; } - public void setExpmTit(String exmpTit) { + public void setExmpTit(String exmpTit) { this.exmpTit = exmpTit; } - public String getExpmCcTy() { + public String getExmpCcTy() { return exmpCcTy; } - public void setExpmCcTy(String exmpCcTy) { + public void setExmpCcTy(String exmpCcTy) { this.exmpCcTy = exmpCcTy; } diff --git a/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqDAO.java b/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqDAO.java index fd25c459..9750fb91 100644 --- a/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqDAO.java +++ b/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqDAO.java @@ -166,9 +166,9 @@ public class AdjstReqDAO extends EgovAbstractDAO { public int updateAdrMgrEditInfo(AdjstReqVO adjstReqVO) throws Exception { return (Integer) update("AdjstReqDAO.updateAdrMgrEditInfo", adjstReqVO); } - - public AdjstReqVO selectAdjstReqOpenExamplePop(AdjstReqVO adjstReqVO) throws Exception { - return (AdjstReqVO) select("AdjstReqDAO.selectAdjstReqOpenExamplePop",adjstReqVO); + + public AdjstReqVO selectAdjstReqOpenExamplePopCn(AdjstReqVO adjstReqVO) throws Exception { + return (AdjstReqVO) select("AdjstReqDAO.selectAdjstReqOpenExamplePopCn",adjstReqVO); } diff --git a/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqServiceImpl.java b/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqServiceImpl.java index 835fe5b8..10d7f0a7 100644 --- a/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqServiceImpl.java @@ -882,10 +882,10 @@ public class AdjstReqServiceImpl extends EgovAbstractServiceImpl implements Adj } return result; } - + @Override - public AdjstReqVO selectAdjstReqOpenExamplePop(AdjstReqVO adjstReqVO) throws Exception { - return adjstReqDAO.selectAdjstReqOpenExamplePop(adjstReqVO); + public AdjstReqVO selectAdjstReqOpenExamplePopCn(AdjstReqVO adjstReqVO) throws Exception { + return adjstReqDAO.selectAdjstReqOpenExamplePopCn(adjstReqVO); } /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java index 77486a2b..a981efa8 100644 --- a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java +++ b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java @@ -1,6 +1,7 @@ package kcc.kccadr.adjst.web; import java.text.SimpleDateFormat; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -17,6 +18,8 @@ import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.core.env.SystemEnvironmentPropertySource; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; @@ -46,6 +49,7 @@ import kcc.com.cmm.util.StringUtil; import kcc.com.utl.fcc.service.EgovStringUtil; import kcc.com.utl.user.service.CheckAdrProcessUtil; import kcc.kccadr.accdnt.crtfc.service.CrtfcService; +import kcc.kccadr.adjPgrMgr.exmp.cmm.ExmpManageVO; import kcc.kccadr.adjst.service.AdjstReqService; import kcc.kccadr.adjst.service.AdjstReqVO; import kcc.kccadr.cmm.KccadrConstants; @@ -199,17 +203,26 @@ public class AdjstReqWebController { */ @RequestMapping("/web/kccadr/adjst/popup/adjstReqOpenExamplePop.do") public String adjstReqOpenExamplePop(@ModelAttribute("adjstReqVO") AdjstReqVO adjstReqVO, ModelMap model) throws Exception { - AdjstReqVO expm = adjstReqService.selectAdjstReqOpenExamplePop(adjstReqVO); - if (expm != null && StringUtils.isNotBlank(expm.getAtchFileId())) { - FileVO fileVO = new FileVO(); - fileVO.setAtchFileId(expm.getAtchFileId()); - List fileList = fileService.selectFileInfs(fileVO); - model.addAttribute("fileList", fileList); - } - model.addAttribute("expm", expm); + model.addAttribute("ccTy", adjstReqVO.getCcTy()); + model.addAttribute("exmpCd", adjstReqVO.getExmpCd()); return "/web/kccadr/adjst/popup/adjstReqOpenExamplePop"; } + @RequestMapping("/web/kccadr/adjst/popup/adjstReqOpenExamplePopCn.do") + public ResponseEntity adjstReqOpenExamplePopCn(@RequestBody AdjstReqVO adjstReqVO) throws Exception { + System.out.println("adjstReqVO.getExmpCd() :: "+ adjstReqVO.getExmpCd()); + System.out.println("adjstReqVO.getExmpCcTy() :: "+ adjstReqVO.getExmpCcTy()); + AdjstReqVO expm = adjstReqService.selectAdjstReqOpenExamplePopCn(adjstReqVO); + +// if (expm != null && StringUtils.isNotBlank(expm.getAtchFileId())) { +// FileVO fileVO = new FileVO(); +// fileVO.setAtchFileId(expm.getAtchFileId()); +// List fileList = fileService.selectFileInfs(fileVO); +// model.addAttribute("fileList", fileList); +// } + return ResponseEntity.ok().body(new RestResponse(HttpStatus.OK, expm.getExmpCn(), LocalDateTime.now())); + } + /** * 조정신청 구분선택 - 안내화면 */ diff --git a/src/main/java/kcc/kccadr/cmm/RestResponse.java b/src/main/java/kcc/kccadr/cmm/RestResponse.java index f84945bc..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; @@ -66,12 +75,12 @@ public class RestResponse { this.status = status; } - public String getMessage() { + public String getData() { return data; } - public void setMessage(String message) { - this.data = message; + public void setData(String data) { + this.data = data; } public LocalDateTime getTimestamp() { @@ -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/resources/egovframework/sqlmap/kccadr/adjst/AdjstReq_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjst/AdjstReq_SQL_Mysql.xml index 3ca076bf..ce0f0b4d 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjst/AdjstReq_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjst/AdjstReq_SQL_Mysql.xml @@ -859,7 +859,8 @@ AND EDT_SN = #edtSn# AND EDT_TY = #edtTy# - SELECT T1.EXMP_TIT AS exmpTit ,T1.ATCH_FILE_ID AS atchFileId @@ -871,8 +872,8 @@ INNER JOIN ADR_EXMP_DTL T2 ON T1.EXMP_CC_TY = T2.EXMP_CC_TY WHERE 1=1 - AND T1.EXMP_CC_TY = #ccTy# - AND T2.EXMP_CD = #exmpCd# + AND T1.EXMP_CC_TY = #exmpCcTy# + AND T2.EXMP_CD = #exmpCd# diff --git a/src/main/resources/rebel.xml b/src/main/resources/rebel.xml index 20c9d7e6..0e85c739 100644 --- a/src/main/resources/rebel.xml +++ b/src/main/resources/rebel.xml @@ -7,7 +7,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.jsp index 76a4f5f3..8a2653c6 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.jsp @@ -34,45 +34,93 @@ //$('#oldDe').text(moment('').format('YYYY-MM-DD')); //$('#newDe').text(moment('').add(1, 'months').format('YYYY-MM-DD')); + function fncClose() { + window.close(); + } + + /* + * 저작물 변경 event + */ + $('#exmpCcTy').on('change', function(){ + fn_selectCn(); + }); + + /* + * 등록버튼 click event + */ + $('#redBtn').on('click', function(){ + var exmpCd = $("#exmpCd").val(); + console.log(exmpCd.replace(/(^0+)/, "")); + var perId = '#reqCn'+exmpCd.replace(/(^0+)/, ""); + $(opener.document).find(perId).text($('#exmpCn').text()); + window.close(); + + }); + + /* + * 상세내용 select + */ + function fn_selectCn(){ + + $.ajax({ + type: "POST", + url: "/web/kccadr/adjst/popup/adjstReqOpenExamplePopCn.do", + data: JSON.stringify({exmpCd : $("#exmpCd").val() + ,exmpCcTy : $("#exmpCcTy").val() }), + dataType:'json', + async: false, + processData: false, + contentType: "application/json", + cache: false, + success: function (data) { + if(data.status == "OK"){ + console.log('data : ', data); + $('#exmpCn').text(data.data); + }else{ + return false; + } + }, + error: function (e) { alert("조회에 실패하였습니다."); console.log("ERROR : ", e); } + }); + } + + fn_selectCn(); }); - - function fncClose() { - window.close(); - } - +
-

- - - - - - - - - - -
-

- - - - - - 등록된 내용이 없습니다. - - -

-
+

+ + + + + + + + + + + + + + + +
+ + + +
+ 내용 + +
- +
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffRegist.jsp index 7a20dfef..4d9bb2c6 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffRegist.jsp @@ -38,13 +38,13 @@ -
- -
+<%--
--%> + +<%--
--%>
@@ -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/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp index f447b529..47c0bf72 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 @@ -1,75 +1,127 @@ -<%@ 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"%> -<%pageContext.setAttribute("crlf", "\r\n"); %> - - - -조정신청 예문보기 - - - - - -
-
-

조정신청 예문

-
-
- -
- * -
- - - - - - - - - - - -
- - - - - - 등록된 내용이 없습니다. - - -
-
- -
-
-
- - +<%@ 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"%> +<%pageContext.setAttribute("crlf", "\r\n"); %> + + + +조정신청 예문보기 + + + + + +
+ +
+

조정신청 예문

+
+
+ +
+ * +
+ + + + + + + + + + + + + + + + +
+ + + +
+ 내용 + +
+
+ + +
+
+
+ + 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 47d228f2..720a838d 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 @@ -1059,12 +1059,12 @@ var AdjstReq = { , "adjstHostoryPop" ); }, - openExamplePop : function(expmCd){ + openExamplePop : function(exmpCd){ commonPopLayeropen( "/web/kccadr/adjst/popup/adjstReqOpenExamplePop.do" , 1100 , 600 - , {ccTy : $("#ccTy").val(), expmCd : expmCd} + , {ccTy : $("#ccTy").val(), exmpCd : exmpCd} , "N" , "openExamplePop" ); 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') { diff --git a/src/main/webapp/kccadrPb/usr/css/content.css b/src/main/webapp/kccadrPb/usr/css/content.css index 2a3c180c..3ea15ed2 100644 --- a/src/main/webapp/kccadrPb/usr/css/content.css +++ b/src/main/webapp/kccadrPb/usr/css/content.css @@ -54,6 +54,8 @@ .c_ea5404{color: #ea5404;} .read-only,.disabled{background-color: #eee !important; color: #aaa !important; font-size: 16px;} + +.cf_text02{font-size: 16px; font-weight: 300; color: #e40000; text-align: right; margin: 10px 0 0 0;} /* //서브 공통 */ /* 로그인 */ diff --git a/src/main/webapp/kccadrPb/usr/css/main.css b/src/main/webapp/kccadrPb/usr/css/main.css index f7615dcb..a6c7ed8e 100644 --- a/src/main/webapp/kccadrPb/usr/css/main.css +++ b/src/main/webapp/kccadrPb/usr/css/main.css @@ -25,26 +25,51 @@ main{width: 100%; height: 100%; margin-top: 135px; padding-bottom: 90px; backgro /* //메인비주얼 */ /* 바로가기 */ -.baro_cont{padding: 0 20px; box-sizing: border-box;} -.baro_cont .inner{max-width: 1200px; width: 100%; height: 180px; position: relative; display: flex; margin: -90px auto 0 auto; background-color: #fff; border-radius: 10px; margin-top: -90px; box-sizing: border-box; box-shadow: 0 0 10px rgba(0,0,0,0.15); z-index: 12;} -.baro_cont a{width: calc(100% / 5); text-align: center; height: 100%; font-size: 21px; font-weight: 500; letter-spacing: -0.8px; position: relative; padding: 20px 0; box-sizing: border-box; transition: color 0.3s ease-in-out;} -.baro_cont a:hover{font-size: 22px; color: #ea5404; transition: color 0.1s linear;} -.baro_cont a::before{position: absolute; content: " "; width: calc(100% + 10px); height: calc(100% + 10px); border: 5px solid #ea5404; border-radius: 10px; left: 50%; top: 50%; transform: translate(-50%,-50%); background-color: #fff; z-index: 1; opacity: 0; transition: border 0.1s linear, opacity 0.1s linear; box-shadow: 0 0 10px rgba(0,0,0,0.5);} -.baro_cont a:hover::before{opacity: 1; transition: border 0.1s linear, opacity 0.1s linear;} +.baro_cont{padding: 0 20px; box-sizing: border-box; z-index: 21; position: relative;} +.baro_cont .inner{max-width: 1200px; width: 100%; height: 180px; position: relative; display: flex; margin: -90px auto 0 auto; background-color: #fff; border-radius: 10px; margin-top: -90px; box-sizing: border-box; box-shadow: 0 0 10px rgba(0,0,0,0.15); z-index: 24;} +.baro_cont a{width: calc(100% / 5); text-align: center; height: 100%; font-size: 21px; font-weight: 500; letter-spacing: -0.8px; position: relative; padding: 20px 0; box-sizing: border-box; transition: color 0.3s ease-in-out; z-index: 0;} +.baro_cont a.on i,.baro_cont a.on p{position: relative; z-index: 29;} +.baro_cont a.on{font-size: 22px; color: #ea5404; transition: color 0.1s linear; z-index: 25;} +.baro_cont a::before{position: absolute; content: " "; width: calc(100% + 10px); height: calc(100% + 10px); border: 5px solid #ea5404; border-radius: 10px; left: 50%; top: 50%; transform: translate(-50%,-50%); background-color: #fff; z-index: 1; opacity: 0; transition: border 0.1s linear, opacity 0.1s linear; box-shadow: 0 0 10px rgba(0,0,0,0.5);z-index: 28;} +.baro_cont a.on::before{opacity: 1; transition: border 0.1s linear, opacity 0.1s linear;} .baro_cont a::after{position: absolute; content: " "; width: 1px; height: calc(100% - 40px); background-color: #dadada; right: 0; top: 50%; transform: translateY(-50%);} .baro_cont a:last-child:after{display: none;} -.baro_cont i{width: 60px; height: 60px; display: block; background-repeat: no-repeat; background-position: center; background-size: contain; margin: 18px auto 20px auto; position: relative; z-index: 1; transition: background-image 0.3s ease-in-out;} -.baro_cont p{position: relative; z-index: 1;} + +.baro_cont i{position: relative; width: 60px; height: 60px; display: block; background-repeat: no-repeat; background-position: center; background-size: contain; margin: 18px auto 20px auto; position: relative; transition: background-image 0.3s ease-in-out;} +.baro_cont p{position: relative;} .baro_cont a:nth-child(1) i{background-image: url(/kccadrPb/usr/image/main/icon_baro01.png);} -.baro_cont a:nth-child(1):hover i{background-image: url(/kccadrPb/usr/image/main/icon_baro01_hover.png);} +.baro_cont a:nth-child(1).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro01_hover.png);} .baro_cont a:nth-child(2) i{background-image: url(/kccadrPb/usr/image/main/icon_baro02.png);} -.baro_cont a:nth-child(2):hover i{background-image: url(/kccadrPb/usr/image/main/icon_baro02_hover.png);} +.baro_cont a:nth-child(2).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro02_hover.png);} .baro_cont a:nth-child(3) i{background-image: url(/kccadrPb/usr/image/main/icon_baro03.png);} -.baro_cont a:nth-child(3):hover i{background-image: url(/kccadrPb/usr/image/main/icon_baro03_hover.png);} +.baro_cont a:nth-child(3).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro03_hover.png);} .baro_cont a:nth-child(4) i{background-image: url(/kccadrPb/usr/image/main/icon_baro04.png);} -.baro_cont a:nth-child(4):hover i{background-image: url(/kccadrPb/usr/image/main/icon_baro04_hover.png);} +.baro_cont a:nth-child(4).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro04_hover.png);} .baro_cont a:nth-child(5) i{background-image: url(/kccadrPb/usr/image/main/icon_baro05.png);} -.baro_cont a:nth-child(5):hover i{background-image: url(/kccadrPb/usr/image/main/icon_baro05_hover.png);} +.baro_cont a:nth-child(5).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro05_hover.png);} + +.baro_cont.experience_cont a i{width: 48px;} +.baro_cont.experience_cont a:nth-child(2) i{background-image: url(/kccadrPb/usr/image/main/icon_baro06.png);} +.baro_cont.experience_cont a:nth-child(2).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro06_hover.png);} +.baro_cont.experience_cont a:nth-child(3) i{background-image: url(/kccadrPb/usr/image/main/icon_baro07.png);} +.baro_cont.experience_cont a:nth-child(3).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro07_hover.png);} +.baro_cont.experience_cont a:nth-child(4) i{background-image: url(/kccadrPb/usr/image/main/icon_baro08.png);} +.baro_cont.experience_cont a:nth-child(4).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro08_hover.png);} +.baro_cont.experience_cont a:nth-child(5) i{background-image: url(/kccadrPb/usr/image/main/icon_baro09.png);} +.baro_cont.experience_cont a:nth-child(5).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro09_hover.png);} +.baro_cont.experience_cont a:nth-child(6) i{background-image: url(/kccadrPb/usr/image/main/icon_baro10.png);} +.baro_cont.experience_cont a:nth-child(6).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro10_hover.png);} + +.mask{position: fixed; display: none; width: 100%; height: 100%; left: 0; top: 0; background-color: rgba(0,0,0,0.5); z-index: 25;} +.tooltip_box{position: absolute; display: none; background-color: transparent; top: -100px; left: -10px; width: 500%; height: calc(100% - 30px); z-index: 30;} +.tooltip_type01{display: inline-flex; justify-content: space-between; align-items: center; background-color: #fff; padding: 30px 30px 30px 42px; box-sizing: border-box; z-index: 99; border-radius: 5px; line-height: 1.3; box-shadow: 4px 8px 8px rgba(0,0,0,0.2); color: #222; text-align: left; margin-left: 60px;} +.baro_cont a:nth-child(4) .tooltip_box{left: -10px; width: 400%;} +.baro_cont a:nth-child(5) .tooltip_box{left: auto; right: -10px;} +.baro_cont a:nth-child(6) .tooltip_box{left: auto; right: -10px;} +.tooltip_type01>*{display: inline-block; vertical-align: middle;} +.tooltip_tit01{font-size: 22px;} +.tooltip_tit02{font-size: 16px; margin-top: 10px;} +.tooltip_type01 button{width: 168px; height: 48px; background-color: #ea5404; border-radius: 5px; color: #fff; font-size: 18px; float: right; margin-top: 22px; margin-left: 40px} /* //바로가기 */ .btm_cont{padding: 0 20px; box-sizing: border-box;} @@ -170,6 +195,9 @@ main{width: 100%; height: 100%; margin-top: 135px; padding-bottom: 90px; backgro .baro_cont a:hover{font-size: 20px;} .baro_cont a::before{width: calc(100% + 10px); height: calc(100% + 10px);} .baro_cont i{width: 45px; height: 45px; margin: 15px auto;} + + .tooltip_box{position: fixed; max-width: 100%; width: calc(100% - 30px); height: 326px; left: 50% !important; top: 260px;transform: translateX(-50%);} + .baro_cont a:nth-child(4) .tooltip_type01{top: 260px;} /* //바로가기 */ /* 조정신청 안내 */ @@ -229,6 +257,18 @@ main{width: 100%; height: 100%; margin-top: 135px; padding-bottom: 90px; backgro /* //팝업존 */ } +@media all and (max-width: 840px){ + .tooltip_tit01{font-size: 18px; font-weight: 500;} + .tooltip_tit02{font-size: 14px;} + .tooltip_box button{margin-top: 16px; margin-left: 0;} +} + +@media all and (max-width: 700px){ + .tooltip_type01 .text_area{width: 100%; display: block;text-align: center;} + .tooltip_type01 button{float: none; display: block; text-align: center; margin: 20px auto 0;} + .tooltip_box{top: 200px;} +} + @media all and (max-width: 640px){ .btm_cont{padding-bottom: 40px;} @@ -250,6 +290,9 @@ main{width: 100%; height: 100%; margin-top: 135px; padding-bottom: 90px; backgro .area_pz .pz_img.img02{background-color: #7c50cc;} .area_pz .pz_img.img03{background-color: #506acc;} */ /* //팝업존 */ + + .mask{background-color: transparent; z-index: -1;} + .tooltip_box{display: none !important;} } @media all and (max-width: 530px){ diff --git a/src/main/webapp/kccadrPb/usr/datepicker/icon_baro06.png b/src/main/webapp/kccadrPb/usr/datepicker/icon_baro06.png new file mode 100644 index 00000000..ce846955 Binary files /dev/null and b/src/main/webapp/kccadrPb/usr/datepicker/icon_baro06.png differ diff --git a/src/main/webapp/kccadrPb/usr/datepicker/icon_baro06_hover.png b/src/main/webapp/kccadrPb/usr/datepicker/icon_baro06_hover.png new file mode 100644 index 00000000..029314b0 Binary files /dev/null and b/src/main/webapp/kccadrPb/usr/datepicker/icon_baro06_hover.png differ diff --git a/src/main/webapp/kccadrPb/usr/datepicker/icon_baro07.png b/src/main/webapp/kccadrPb/usr/datepicker/icon_baro07.png new file mode 100644 index 00000000..e35f4c65 Binary files /dev/null and b/src/main/webapp/kccadrPb/usr/datepicker/icon_baro07.png differ diff --git a/src/main/webapp/kccadrPb/usr/datepicker/icon_baro07_hover.png b/src/main/webapp/kccadrPb/usr/datepicker/icon_baro07_hover.png new file mode 100644 index 00000000..e17b903c Binary files /dev/null and b/src/main/webapp/kccadrPb/usr/datepicker/icon_baro07_hover.png differ diff --git a/src/main/webapp/kccadrPb/usr/datepicker/icon_baro08.png b/src/main/webapp/kccadrPb/usr/datepicker/icon_baro08.png new file mode 100644 index 00000000..76a6f1dd Binary files /dev/null and b/src/main/webapp/kccadrPb/usr/datepicker/icon_baro08.png differ diff --git a/src/main/webapp/kccadrPb/usr/datepicker/icon_baro08_hover.png b/src/main/webapp/kccadrPb/usr/datepicker/icon_baro08_hover.png new file mode 100644 index 00000000..cf2ff6ad Binary files /dev/null and b/src/main/webapp/kccadrPb/usr/datepicker/icon_baro08_hover.png differ diff --git a/src/main/webapp/kccadrPb/usr/datepicker/icon_baro09.png b/src/main/webapp/kccadrPb/usr/datepicker/icon_baro09.png new file mode 100644 index 00000000..b63c10f1 Binary files /dev/null and b/src/main/webapp/kccadrPb/usr/datepicker/icon_baro09.png differ diff --git a/src/main/webapp/kccadrPb/usr/datepicker/icon_baro09_hover.png b/src/main/webapp/kccadrPb/usr/datepicker/icon_baro09_hover.png new file mode 100644 index 00000000..0c434961 Binary files /dev/null and b/src/main/webapp/kccadrPb/usr/datepicker/icon_baro09_hover.png differ diff --git a/src/main/webapp/kccadrPb/usr/datepicker/icon_baro10.png b/src/main/webapp/kccadrPb/usr/datepicker/icon_baro10.png new file mode 100644 index 00000000..7c942e1c Binary files /dev/null and b/src/main/webapp/kccadrPb/usr/datepicker/icon_baro10.png differ diff --git a/src/main/webapp/kccadrPb/usr/datepicker/icon_baro10_hover.png b/src/main/webapp/kccadrPb/usr/datepicker/icon_baro10_hover.png new file mode 100644 index 00000000..995c5a55 Binary files /dev/null and b/src/main/webapp/kccadrPb/usr/datepicker/icon_baro10_hover.png differ diff --git a/src/main/webapp/kccadrPb/usr/guide.html b/src/main/webapp/kccadrPb/usr/guide.html index 0ff0261d..f5964101 100644 --- a/src/main/webapp/kccadrPb/usr/guide.html +++ b/src/main/webapp/kccadrPb/usr/guide.html @@ -43,10 +43,11 @@