diff --git a/src/main/java/kcc/com/cmm/LoginVO.java b/src/main/java/kcc/com/cmm/LoginVO.java
index d030d097..05d4f0ab 100644
--- a/src/main/java/kcc/com/cmm/LoginVO.java
+++ b/src/main/java/kcc/com/cmm/LoginVO.java
@@ -117,6 +117,9 @@ public class LoginVO implements Serializable{
private String isSelect;
+ /*20221012 대시보드를 위해 직급 코드 추가*/
+ private String ofcpsNm;
+
public String getId() {
return id;
}
@@ -402,6 +405,12 @@ public class LoginVO implements Serializable{
public void setIsSelect(String isSelect) {
this.isSelect = isSelect;
}
+ public String getOfcpsNm() {
+ return ofcpsNm;
+ }
+ public void setOfcpsNm(String ofcpsNm) {
+ this.ofcpsNm = ofcpsNm;
+ }
}
diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/answer/web/ExmpAnswerManagerController.java b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/answer/web/ExmpAnswerManagerController.java
index 5f527c18..c0110ca5 100644
--- a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/answer/web/ExmpAnswerManagerController.java
+++ b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/answer/web/ExmpAnswerManagerController.java
@@ -1,53 +1,33 @@
package kcc.kccadr.adjPgrMgr.exmp.answer.web;
+import java.util.Map;
+import javax.annotation.Resource;
-import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
-import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
-import kcc.com.cmm.LoginVO;
-import kcc.com.cmm.service.EgovFileMngService;
-import kcc.com.cmm.service.EgovFileMngUtil;
-import kcc.com.cmm.service.FileVO;
-import kcc.kccadr.adjPgrMgr.exmp.app.service.ExmpAppManageService;
-import kcc.kccadr.adjPgrMgr.exmp.cmm.ExmpManageVO;
-import kcc.kccadr.cmm.KccadrConstants;
-import kcc.kccadr.cmm.RestResponse;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.http.HttpStatus;
-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.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Map;
+import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
+import kcc.com.cmm.service.EgovFileMngService;
+import kcc.com.cmm.service.EgovFileMngUtil;
+import kcc.kccadr.adjPgrMgr.exmp.app.service.ExmpAppManageService;
+import kcc.kccadr.adjPgrMgr.exmp.cmm.ExmpManageVO;
/**
- * 조정위원 관리 구현 클래스
- *
- * @author 김봉호
- * @since 2021.08.21
- * @version 1.0
- * @see
- * << 개정이력(Modification Information) >>
- *
- * 수정일 수정자 수정내용
- * ------- -------- ---------------------------
- * 2021.08.21 김봉호 최초 생성
- *
+ *
+ * @author : 이호영
+ * @fileName : ExmpAnswerManagerController.java
+ * @date : 2022.10.11
+ * @description : 답변서 관리
+ * ===========================================================
+ * DATE AUTHOR NOTE
+ * ----------------------------------------------------------- *
+ * 2022.10.11 이호영 최초 생성
+ *
+ *
+ *
*/
-
@Controller
public class ExmpAnswerManagerController {
@@ -82,17 +62,21 @@ public class ExmpAnswerManagerController {
exmpManageVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
exmpManageVO.setLastIndex(paginationInfo.getLastRecordIndex());
exmpManageVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+
+ // 답변서 코드
+ exmpManageVO.setCodeId("CC003");
+
paginationInfo.setTotalRecordCount(exmpAppManageService.selectExmpAppManagerCount(exmpManageVO));
model.addAttribute("paginationInfo", paginationInfo);
model.addAttribute("list", exmpAppManageService.selectExmpAppManagerList(exmpManageVO));
- return "kccadr/adjPgrMgr/exmp/exmpAnswerManagerList";
+ return "kccadr/adjPgrMgr/exmp/answer/exmpAnswerManagerList";
}
@RequestMapping(value = "/kccadr/adjPgrMgr/exmp/exmpAnswerManagerCreate.do")
public String exmpAnswerManagerCreate(ExmpManageVO exmpManageVO) throws Exception {
- return "kccadr/adjPgrMgr/exmp/exmpAnswerManagerCreate";
+ return "kccadr/adjPgrMgr/exmp/answer/exmpAnswerManagerCreate";
}
@RequestMapping(value = "/kccadr/adjPgrMgr/exmp/exmpAnswerManagerModify.do")
@@ -103,7 +87,7 @@ public class ExmpAnswerManagerController {
model.addAttribute("fileList", resultMap.get("fileList"));
model.addAttribute("mgrInfo", resultMap.get("mgrInfo"));
model.addAttribute("list", resultMap.get("list"));
- return "kccadr/adjPgrMgr/exmp/exmpAnswerManagerModify";
+ return "kccadr/adjPgrMgr/exmp/answer/exmpAnswerManagerModify";
}
@RequestMapping(value = "/kccadr/adjPgrMgr/exmp/exmpAnswerManagerDetail.do")
@@ -115,7 +99,7 @@ public class ExmpAnswerManagerController {
model.addAttribute("mgrInfo", resultMap.get("mgrInfo"));
model.addAttribute("list", resultMap.get("list"));
- return "kccadr/adjPgrMgr/exmp/exmpAnswerManagerDetail";
+ return "kccadr/adjPgrMgr/exmp/answer/exmpAnswerManagerDetail";
}
diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/ExmpAppManageService.java b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/ExmpAppManageService.java
index 0bfb8f2f..f882cf3a 100644
--- a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/ExmpAppManageService.java
+++ b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/ExmpAppManageService.java
@@ -1,12 +1,11 @@
package kcc.kccadr.adjPgrMgr.exmp.app.service;
-import kcc.kccadr.adjPgrMgr.adjDept.service.AdjustDeptManageVO;
-import kcc.kccadr.adjPgrMgr.exmp.cmm.ExmpManageVO;
-import kcc.kccadr.cmm.RestResponse;
-
import java.util.List;
import java.util.Map;
+import kcc.kccadr.adjPgrMgr.exmp.cmm.ExmpManageVO;
+import kcc.kccadr.cmm.RestResponse;
+
public interface ExmpAppManageService {
Integer selectExmpAppManagerCount(ExmpManageVO exmpManageVO) throws Exception;
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 ddd0802f..5aa6e04d 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
@@ -1,19 +1,13 @@
package kcc.kccadr.adjPgrMgr.exmp.app.web;
-import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
-import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
-import kcc.com.cmm.LoginVO;
-import kcc.com.cmm.service.EgovFileMngService;
-import kcc.com.cmm.service.EgovFileMngUtil;
-import kcc.com.cmm.service.FileVO;
-import kcc.kccadr.adjPgrMgr.exmp.app.service.ExmpAppManageService;
-import kcc.kccadr.adjPgrMgr.exmp.cmm.ExmpManageVO;
-import kcc.kccadr.cmm.KccadrConstants;
-import kcc.kccadr.cmm.RestResponse;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
-import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
@@ -25,12 +19,16 @@ import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Map;
+import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
+import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
+import kcc.com.cmm.LoginVO;
+import kcc.com.cmm.service.EgovFileMngService;
+import kcc.com.cmm.service.EgovFileMngUtil;
+import kcc.com.cmm.service.FileVO;
+import kcc.kccadr.adjPgrMgr.exmp.app.service.ExmpAppManageService;
+import kcc.kccadr.adjPgrMgr.exmp.cmm.ExmpManageVO;
+import kcc.kccadr.cmm.KccadrConstants;
+import kcc.kccadr.cmm.RestResponse;
/**
@@ -61,7 +59,16 @@ public class ExmpAppManagerController {
private EgovFileMngService fileMngService;
-///kccadr/adjPgrMgr/expm/AdjustExpmManagerList.do
+ /**
+ * @methodName : exmpAppManagerList
+ * @author : 이호영
+ * @date : 2022.10.11
+ * @description : 예문관리 LIST
+ * @param exmpAppManageVO
+ * @param model
+ * @return
+ * @throws Exception
+ */
@RequestMapping(value = "/kccadr/adjPgrMgr/exmp/exmpAppManagerList.do")
public String exmpAppManagerList(@ModelAttribute("exmpAppManageVO") ExmpManageVO exmpAppManageVO , ModelMap model) throws Exception {
if(exmpAppManageVO.getPageUnit() != 10) {
@@ -88,13 +95,13 @@ public class ExmpAppManagerController {
model.addAttribute("paginationInfo", paginationInfo);
model.addAttribute("list", exmpAppManageService.selectExmpAppManagerList(exmpAppManageVO));
- return "kccadr/adjPgrMgr/exmp/exmpAppManagerList";
+ return "kccadr/adjPgrMgr/exmp/app/exmpAppManagerList";
}
@RequestMapping(value = "/kccadr/adjPgrMgr/exmp/exmpAppManagerCreate.do")
public String exmpAppManagerCreate(ExmpManageVO exmpAppManageVO, ModelMap model) throws Exception {
- return "kccadr/adjPgrMgr/exmp/exmpAppManagerCreate";
+ return "kccadr/adjPgrMgr/exmp/app/exmpAppManagerCreate";
}
@RequestMapping(value = "/kccadr/adjPgrMgr/exmp/exmpAppManagerModify.do")
@@ -105,7 +112,7 @@ public class ExmpAppManagerController {
model.addAttribute("fileList", resultMap.get("fileList"));
model.addAttribute("mgrInfo", resultMap.get("mgrInfo"));
model.addAttribute("list", resultMap.get("list"));
- return "kccadr/adjPgrMgr/exmp/exmpAppManagerModify";
+ return "kccadr/adjPgrMgr/exmp/app/exmpAppManagerModify";
}
@RequestMapping(value = "/kccadr/adjPgrMgr/exmp/updateExmpManager.do")
@@ -169,7 +176,7 @@ public class ExmpAppManagerController {
model.addAttribute("mgrInfo", resultMap.get("mgrInfo"));
model.addAttribute("list", resultMap.get("list"));
- return "kccadr/adjPgrMgr/exmp/exmpAppManagerDetail";
+ return "kccadr/adjPgrMgr/exmp/app/exmpAppManagerDetail";
}
diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/effect/web/ExmpEffectManagerController.java b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/effect/web/ExmpEffectManagerController.java
new file mode 100644
index 00000000..bab1653c
--- /dev/null
+++ b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/effect/web/ExmpEffectManagerController.java
@@ -0,0 +1,136 @@
+package kcc.kccadr.adjPgrMgr.exmp.effect.web;
+
+
+import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
+import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
+import kcc.com.cmm.LoginVO;
+import kcc.com.cmm.service.EgovFileMngService;
+import kcc.com.cmm.service.EgovFileMngUtil;
+import kcc.com.cmm.service.FileVO;
+import kcc.kccadr.adjPgrMgr.exmp.app.service.ExmpAppManageService;
+import kcc.kccadr.adjPgrMgr.exmp.cmm.ExmpManageVO;
+import kcc.kccadr.cmm.KccadrConstants;
+import kcc.kccadr.cmm.RestResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.HttpStatus;
+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.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ *
+ * @author : 이호영
+ * @fileName : ExmpEffectManagerController.java
+ * @date : 2022.10.11
+ * @description : 예문관리 - 신청취지
+ * ===========================================================
+ * DATE AUTHOR NOTE
+ * ----------------------------------------------------------- *
+ * 2022.10.11 이호영 최초 생성
+ *
+ *
+ *
+ */
+@Controller
+public class ExmpEffectManagerController {
+
+ @Resource(name = "ExmpAppManageService")
+ private ExmpAppManageService exmpAppManageService;
+
+ @Resource(name="EgovFileMngUtil")
+ private EgovFileMngUtil fileUtil;
+
+ @Resource(name="EgovFileMngService")
+ private EgovFileMngService fileMngService;
+
+
+
+ /**
+ * @methodName : exmpEffectManagerList
+ * @author : 이호영
+ * @date : 2022.10.11
+ * @description : 도움말 목록
+ * @param exmpManageVO
+ * @param model
+ * @return
+ * @throws Exception
+ */
+ @RequestMapping(value = "/kccadr/adjPgrMgr/exmp/exmpEffectManagerList.do")
+ public String exmpEffectManagerList(@ModelAttribute("exmpManageVO") ExmpManageVO exmpManageVO , ModelMap model) throws Exception {
+ if(exmpManageVO.getPageUnit() != 10) {
+ exmpManageVO.setPageUnit(exmpManageVO.getPageUnit());
+ }
+
+ if("".equals(exmpManageVO.getSearchSortCnd())){ //최초조회시 최신것 조회List
+ exmpManageVO.setSearchSortCnd("T1.Exmp_CC_TY");
+ exmpManageVO.setSearchSortOrd("asc");
+ }
+
+ /** paging */
+ PaginationInfo paginationInfo = new PaginationInfo();
+ paginationInfo.setCurrentPageNo(exmpManageVO.getPageIndex());
+ paginationInfo.setRecordCountPerPage(exmpManageVO.getPageUnit());
+ paginationInfo.setPageSize(exmpManageVO.getPageSize());
+
+ exmpManageVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
+ exmpManageVO.setLastIndex(paginationInfo.getLastRecordIndex());
+ exmpManageVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+
+ // 의견 코드
+ exmpManageVO.setCodeId("05");
+
+ paginationInfo.setTotalRecordCount(exmpAppManageService.selectExmpAppManagerCount(exmpManageVO));
+ model.addAttribute("paginationInfo", paginationInfo);
+ model.addAttribute("list", exmpAppManageService.selectExmpAppManagerList(exmpManageVO));
+
+ return "kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerList";
+ }
+
+
+ @RequestMapping(value = "/kccadr/adjPgrMgr/exmp/exmpEffectManagerCreate.do")
+ public String exmpEffectManagerCreate(ExmpManageVO exmpManageVO) throws Exception {
+ return "kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerCreate";
+ }
+
+ @RequestMapping(value = "/kccadr/adjPgrMgr/exmp/exmpEffectManagerModify.do")
+ public String exmpEffectManagerModify(@ModelAttribute("exmpManageVO") ExmpManageVO exmpManageVO , ModelMap model) throws Exception {
+
+ Map resultMap = exmpAppManageService.selectExmpAppManagerInfo(exmpManageVO);;
+
+ model.addAttribute("fileList", resultMap.get("fileList"));
+ model.addAttribute("mgrInfo", resultMap.get("mgrInfo"));
+ model.addAttribute("list", resultMap.get("list"));
+ return "kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerModify";
+ }
+
+ @RequestMapping(value = "/kccadr/adjPgrMgr/exmp/exmpEffectManagerDetail.do")
+ public String exmpEffectManagerDetail( ExmpManageVO exmpManageVO , ModelMap model) throws Exception {
+
+ Map resultMap = exmpAppManageService.selectExmpAppManagerInfo(exmpManageVO);;
+
+ model.addAttribute("fileList", resultMap.get("fileList"));
+ model.addAttribute("mgrInfo", resultMap.get("mgrInfo"));
+ model.addAttribute("list", resultMap.get("list"));
+
+ return "kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerDetail";
+ }
+
+
+
+}
diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/help/web/ExmpHelpManagerController.java b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/help/web/ExmpHelpManagerController.java
new file mode 100644
index 00000000..7e889473
--- /dev/null
+++ b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/help/web/ExmpHelpManagerController.java
@@ -0,0 +1,134 @@
+package kcc.kccadr.adjPgrMgr.exmp.help.web;
+
+
+import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
+import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
+import kcc.com.cmm.LoginVO;
+import kcc.com.cmm.service.EgovFileMngService;
+import kcc.com.cmm.service.EgovFileMngUtil;
+import kcc.com.cmm.service.FileVO;
+import kcc.kccadr.adjPgrMgr.exmp.app.service.ExmpAppManageService;
+import kcc.kccadr.adjPgrMgr.exmp.cmm.ExmpManageVO;
+import kcc.kccadr.cmm.KccadrConstants;
+import kcc.kccadr.cmm.RestResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.HttpStatus;
+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.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ * @author : 이호영
+ * @fileName : ExmpHelpManagerController.java
+ * @date : 2022.10.11
+ * @description :
+ * ===========================================================
+ * DATE AUTHOR NOTE
+ * ----------------------------------------------------------- *
+ * 2022.10.11 이호영 최초 생성
+ *
+ *
+ *
+ */
+@Controller
+public class ExmpHelpManagerController {
+
+ @Resource(name = "ExmpAppManageService")
+ private ExmpAppManageService exmpAppManageService;
+
+ @Resource(name="EgovFileMngUtil")
+ private EgovFileMngUtil fileUtil;
+
+ @Resource(name="EgovFileMngService")
+ private EgovFileMngService fileMngService;
+
+
+
+ /**
+ * @methodName : exmpHelpManagerList
+ * @author : 이호영
+ * @date : 2022.10.11
+ * @description : 도움말 목록
+ * @param exmpManageVO
+ * @param model
+ * @return
+ * @throws Exception
+ */
+ @RequestMapping(value = "/kccadr/adjPgrMgr/exmp/exmpHelpManagerList.do")
+ public String exmpHelpManagerList(@ModelAttribute("exmpManageVO") ExmpManageVO exmpManageVO , ModelMap model) throws Exception {
+ if(exmpManageVO.getPageUnit() != 10) {
+ exmpManageVO.setPageUnit(exmpManageVO.getPageUnit());
+ }
+
+ if("".equals(exmpManageVO.getSearchSortCnd())){ //최초조회시 최신것 조회List
+ exmpManageVO.setSearchSortCnd("T1.Exmp_CC_TY");
+ exmpManageVO.setSearchSortOrd("asc");
+ }
+
+ /** paging */
+ PaginationInfo paginationInfo = new PaginationInfo();
+ paginationInfo.setCurrentPageNo(exmpManageVO.getPageIndex());
+ paginationInfo.setRecordCountPerPage(exmpManageVO.getPageUnit());
+ paginationInfo.setPageSize(exmpManageVO.getPageSize());
+
+ exmpManageVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
+ exmpManageVO.setLastIndex(paginationInfo.getLastRecordIndex());
+ exmpManageVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+
+ // 의견 코드
+ exmpManageVO.setCodeId("05");
+
+ paginationInfo.setTotalRecordCount(exmpAppManageService.selectExmpAppManagerCount(exmpManageVO));
+ model.addAttribute("paginationInfo", paginationInfo);
+ model.addAttribute("list", exmpAppManageService.selectExmpAppManagerList(exmpManageVO));
+
+ return "kccadr/adjPgrMgr/exmp/help/exmpHelpManagerList";
+ }
+
+
+ @RequestMapping(value = "/kccadr/adjPgrMgr/exmp/exmpHelpManagerCreate.do")
+ public String exmpHelpManagerCreate(ExmpManageVO exmpManageVO) throws Exception {
+ return "kccadr/adjPgrMgr/exmp/help/exmpHelpManagerCreate";
+ }
+
+ @RequestMapping(value = "/kccadr/adjPgrMgr/exmp/exmpHelpManagerModify.do")
+ public String exmpHelpManagerModify(@ModelAttribute("exmpManageVO") ExmpManageVO exmpManageVO , ModelMap model) throws Exception {
+
+ Map resultMap = exmpAppManageService.selectExmpAppManagerInfo(exmpManageVO);;
+
+ model.addAttribute("fileList", resultMap.get("fileList"));
+ model.addAttribute("mgrInfo", resultMap.get("mgrInfo"));
+ model.addAttribute("list", resultMap.get("list"));
+ return "kccadr/adjPgrMgr/exmp/help/exmpHelpManagerModify";
+ }
+
+ @RequestMapping(value = "/kccadr/adjPgrMgr/exmp/exmpHelpManagerDetail.do")
+ public String exmpHelpManagerDetail( ExmpManageVO exmpManageVO , ModelMap model) throws Exception {
+
+ Map resultMap = exmpAppManageService.selectExmpAppManagerInfo(exmpManageVO);;
+
+ model.addAttribute("fileList", resultMap.get("fileList"));
+ model.addAttribute("mgrInfo", resultMap.get("mgrInfo"));
+ model.addAttribute("list", resultMap.get("list"));
+
+ return "kccadr/adjPgrMgr/exmp/help/exmpHelpManagerDetail";
+ }
+
+
+}
diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/opinion/web/ExmpOpinionManagerController.java b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/opinion/web/ExmpOpinionManagerController.java
index 0e73af75..cc511ece 100644
--- a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/opinion/web/ExmpOpinionManagerController.java
+++ b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/opinion/web/ExmpOpinionManagerController.java
@@ -1,53 +1,36 @@
package kcc.kccadr.adjPgrMgr.exmp.opinion.web;
-import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
-import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
-import kcc.com.cmm.LoginVO;
-import kcc.com.cmm.service.EgovFileMngService;
-import kcc.com.cmm.service.EgovFileMngUtil;
-import kcc.com.cmm.service.FileVO;
-import kcc.kccadr.adjPgrMgr.exmp.app.service.ExmpAppManageService;
-import kcc.kccadr.adjPgrMgr.exmp.cmm.ExmpManageVO;
-import kcc.kccadr.cmm.KccadrConstants;
-import kcc.kccadr.cmm.RestResponse;
+import java.util.Map;
+
+import javax.annotation.Resource;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.http.HttpStatus;
-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.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Map;
+import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
+import kcc.com.cmm.service.EgovFileMngService;
+import kcc.com.cmm.service.EgovFileMngUtil;
+import kcc.kccadr.adjPgrMgr.exmp.app.service.ExmpAppManageService;
+import kcc.kccadr.adjPgrMgr.exmp.cmm.ExmpManageVO;
/**
- * 조정위원 관리 구현 클래스
- *
- * @author 김봉호
- * @since 2021.08.21
- * @version 1.0
- * @see
- * << 개정이력(Modification Information) >>
- *
- * 수정일 수정자 수정내용
- * ------- -------- ---------------------------
- * 2021.08.21 김봉호 최초 생성
- *
+ *
+ * @author : 이호영
+ * @fileName : ExmpOpinionManagerController.java
+ * @date : 2022.10.11
+ * @description : 의견 예문관리
+ * ===========================================================
+ * DATE AUTHOR NOTE
+ * ----------------------------------------------------------- *
+ * 2022.10.11 이호영 최초 생성
+ *
+ *
+ *
*/
-
@Controller
public class ExmpOpinionManagerController {
@@ -62,6 +45,16 @@ public class ExmpOpinionManagerController {
+ /**
+ * @methodName : exmpOpinionManagerList
+ * @author : 이호영
+ * @date : 2022.10.11
+ * @description : 의견 목록
+ * @param exmpManageVO
+ * @param model
+ * @return
+ * @throws Exception
+ */
@RequestMapping(value = "/kccadr/adjPgrMgr/exmp/exmpOpinionManagerList.do")
public String exmpOpinionManagerList(@ModelAttribute("exmpManageVO") ExmpManageVO exmpManageVO , ModelMap model) throws Exception {
if(exmpManageVO.getPageUnit() != 10) {
@@ -82,17 +75,21 @@ public class ExmpOpinionManagerController {
exmpManageVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
exmpManageVO.setLastIndex(paginationInfo.getLastRecordIndex());
exmpManageVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+
+ // 의견 코드
+ exmpManageVO.setCodeId("CC007");
+
paginationInfo.setTotalRecordCount(exmpAppManageService.selectExmpAppManagerCount(exmpManageVO));
model.addAttribute("paginationInfo", paginationInfo);
model.addAttribute("list", exmpAppManageService.selectExmpAppManagerList(exmpManageVO));
- return "kccadr/adjPgrMgr/exmp/exmpOpinionManagerList";
+ return "kccadr/adjPgrMgr/exmp/opinion/exmpOpinionManagerList";
}
@RequestMapping(value = "/kccadr/adjPgrMgr/exmp/exmpOpinionManagerCreate.do")
public String exmpOpinionManagerCreate(ExmpManageVO exmpManageVO) throws Exception {
- return "kccadr/adjPgrMgr/exmp/exmpOpinionManagerCreate";
+ return "kccadr/adjPgrMgr/exmp/opinion/exmpOpinionManagerCreate";
}
@RequestMapping(value = "/kccadr/adjPgrMgr/exmp/exmpOpinionManagerModify.do")
@@ -103,7 +100,7 @@ public class ExmpOpinionManagerController {
model.addAttribute("fileList", resultMap.get("fileList"));
model.addAttribute("mgrInfo", resultMap.get("mgrInfo"));
model.addAttribute("list", resultMap.get("list"));
- return "kccadr/adjPgrMgr/exmp/exmpOpinionManagerModify";
+ return "kccadr/adjPgrMgr/exmp/opinion/exmpOpinionManagerModify";
}
@RequestMapping(value = "/kccadr/adjPgrMgr/exmp/exmpOpinionManagerDetail.do")
@@ -115,7 +112,7 @@ public class ExmpOpinionManagerController {
model.addAttribute("mgrInfo", resultMap.get("mgrInfo"));
model.addAttribute("list", resultMap.get("list"));
- return "kccadr/adjPgrMgr/exmp/exmpOpinionManagerDetail";
+ return "kccadr/adjPgrMgr/exmp/opinion/exmpOpinionManagerDetail";
}
diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/iop/service/InsteadOfPaymentManageVO.java b/src/main/java/kcc/kccadr/adjPgrMgr/iop/service/InsteadOfPaymentManageVO.java
new file mode 100644
index 00000000..5cc4bea3
--- /dev/null
+++ b/src/main/java/kcc/kccadr/adjPgrMgr/iop/service/InsteadOfPaymentManageVO.java
@@ -0,0 +1,251 @@
+package kcc.kccadr.adjPgrMgr.iop.service;
+
+
+
+import kcc.com.cmm.ComDefaultVO;
+
+public class InsteadOfPaymentManageVO extends ComDefaultVO {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -3466869341114607249L;
+
+
+
+ /* adr_sbmt_mgr :: 조정사건결재 TB */
+ private String adr_seq; /* 조정일련번호 */
+ private String adr_sn; /* 조정회차 */
+ private String sbmt_seq; /* 결재일련번호 */
+ private String sbmt_ty; /* 결재종류구분 */
+ private String sbmt_mem_ty; /* 조정부결재구분 10-승인, 20-결재 */
+ private String sbmt_step_cnt; /* 총결재단계수 */
+ private String sbmt_id1; /* 결재자ID1 */
+ private String sbmt_yn1; /* 결재여부1 - Y/N/A */
+ private String sbmt_de1; /* 결재일시1 */
+ private String sbmt_id2; /* 결재자ID2 */
+ private String sbmt_yn2; /* 결재여부2 */
+ private String sbmt_de2; /* 결재일시2 */
+ private String sbmt_id3; /* 결재자ID3 */
+ private String sbmt_yn3; /* 결재여부3 */
+ private String sbmt_de3; /* 결재일시3 */
+ private String sbmt_id4; /* 결재자ID4 */
+ private String sbmt_yn4; /* 결재여부4 */
+ private String sbmt_de4; /* 결재일시4 */
+ private String sbmt_id5; /* 결재자ID5 */
+ private String sbmt_yn5; /* 결재여부5 */
+ private String sbmt_de5; /* 결재일시5 */
+ private String sbmt_id6; /* 결재자ID6 */
+ private String sbmt_yn6; /* 결재여부6 */
+ private String sbmt_de6; /* 결재일시6 */
+
+ /* adr_sbmt_mgr_hstry :: 조정사건결재히스토리 TB */
+ private String sbmt_sbstt_seq; /* 결재대리인일련번호 */
+ private String agnt_sbmt_id; /* 대상결재자ID-ID1,ID2,ID3,ID4,ID5,ID6*/
+ private String sbmt_id_sbstt; /* 대리결재자ID */
+ private String sbmt_id_bef; /* 이전결재자ID */
+
+
+ /* 공통 */
+ private String frst_regist_pnttm; /* 등록일시 */
+ private String frst_register_id; /* 등록자 */
+ private String last_updt_pnttm; /* 수정일시 */
+ private String last_updusr_id; /* 수정자 */
+ public String getAdr_seq() {
+ return adr_seq;
+ }
+ public void setAdr_seq(String adr_seq) {
+ this.adr_seq = adr_seq;
+ }
+ public String getAdr_sn() {
+ return adr_sn;
+ }
+ public void setAdr_sn(String adr_sn) {
+ this.adr_sn = adr_sn;
+ }
+ public String getSbmt_seq() {
+ return sbmt_seq;
+ }
+ public void setSbmt_seq(String sbmt_seq) {
+ this.sbmt_seq = sbmt_seq;
+ }
+ public String getSbmt_ty() {
+ return sbmt_ty;
+ }
+ public void setSbmt_ty(String sbmt_ty) {
+ this.sbmt_ty = sbmt_ty;
+ }
+ public String getSbmt_mem_ty() {
+ return sbmt_mem_ty;
+ }
+ public void setSbmt_mem_ty(String sbmt_mem_ty) {
+ this.sbmt_mem_ty = sbmt_mem_ty;
+ }
+ public String getSbmt_step_cnt() {
+ return sbmt_step_cnt;
+ }
+ public void setSbmt_step_cnt(String sbmt_step_cnt) {
+ this.sbmt_step_cnt = sbmt_step_cnt;
+ }
+ public String getSbmt_id1() {
+ return sbmt_id1;
+ }
+ public void setSbmt_id1(String sbmt_id1) {
+ this.sbmt_id1 = sbmt_id1;
+ }
+ public String getSbmt_yn1() {
+ return sbmt_yn1;
+ }
+ public void setSbmt_yn1(String sbmt_yn1) {
+ this.sbmt_yn1 = sbmt_yn1;
+ }
+ public String getSbmt_de1() {
+ return sbmt_de1;
+ }
+ public void setSbmt_de1(String sbmt_de1) {
+ this.sbmt_de1 = sbmt_de1;
+ }
+ public String getSbmt_id2() {
+ return sbmt_id2;
+ }
+ public void setSbmt_id2(String sbmt_id2) {
+ this.sbmt_id2 = sbmt_id2;
+ }
+ public String getSbmt_yn2() {
+ return sbmt_yn2;
+ }
+ public void setSbmt_yn2(String sbmt_yn2) {
+ this.sbmt_yn2 = sbmt_yn2;
+ }
+ public String getSbmt_de2() {
+ return sbmt_de2;
+ }
+ public void setSbmt_de2(String sbmt_de2) {
+ this.sbmt_de2 = sbmt_de2;
+ }
+ public String getSbmt_id3() {
+ return sbmt_id3;
+ }
+ public void setSbmt_id3(String sbmt_id3) {
+ this.sbmt_id3 = sbmt_id3;
+ }
+ public String getSbmt_yn3() {
+ return sbmt_yn3;
+ }
+ public void setSbmt_yn3(String sbmt_yn3) {
+ this.sbmt_yn3 = sbmt_yn3;
+ }
+ public String getSbmt_de3() {
+ return sbmt_de3;
+ }
+ public void setSbmt_de3(String sbmt_de3) {
+ this.sbmt_de3 = sbmt_de3;
+ }
+ public String getSbmt_id4() {
+ return sbmt_id4;
+ }
+ public void setSbmt_id4(String sbmt_id4) {
+ this.sbmt_id4 = sbmt_id4;
+ }
+ public String getSbmt_yn4() {
+ return sbmt_yn4;
+ }
+ public void setSbmt_yn4(String sbmt_yn4) {
+ this.sbmt_yn4 = sbmt_yn4;
+ }
+ public String getSbmt_de4() {
+ return sbmt_de4;
+ }
+ public void setSbmt_de4(String sbmt_de4) {
+ this.sbmt_de4 = sbmt_de4;
+ }
+ public String getSbmt_id5() {
+ return sbmt_id5;
+ }
+ public void setSbmt_id5(String sbmt_id5) {
+ this.sbmt_id5 = sbmt_id5;
+ }
+ public String getSbmt_yn5() {
+ return sbmt_yn5;
+ }
+ public void setSbmt_yn5(String sbmt_yn5) {
+ this.sbmt_yn5 = sbmt_yn5;
+ }
+ public String getSbmt_de5() {
+ return sbmt_de5;
+ }
+ public void setSbmt_de5(String sbmt_de5) {
+ this.sbmt_de5 = sbmt_de5;
+ }
+ public String getSbmt_id6() {
+ return sbmt_id6;
+ }
+ public void setSbmt_id6(String sbmt_id6) {
+ this.sbmt_id6 = sbmt_id6;
+ }
+ public String getSbmt_yn6() {
+ return sbmt_yn6;
+ }
+ public void setSbmt_yn6(String sbmt_yn6) {
+ this.sbmt_yn6 = sbmt_yn6;
+ }
+ public String getSbmt_de6() {
+ return sbmt_de6;
+ }
+ public void setSbmt_de6(String sbmt_de6) {
+ this.sbmt_de6 = sbmt_de6;
+ }
+ public String getSbmt_sbstt_seq() {
+ return sbmt_sbstt_seq;
+ }
+ public void setSbmt_sbstt_seq(String sbmt_sbstt_seq) {
+ this.sbmt_sbstt_seq = sbmt_sbstt_seq;
+ }
+ public String getAgnt_sbmt_id() {
+ return agnt_sbmt_id;
+ }
+ public void setAgnt_sbmt_id(String agnt_sbmt_id) {
+ this.agnt_sbmt_id = agnt_sbmt_id;
+ }
+ public String getSbmt_id_sbstt() {
+ return sbmt_id_sbstt;
+ }
+ public void setSbmt_id_sbstt(String sbmt_id_sbstt) {
+ this.sbmt_id_sbstt = sbmt_id_sbstt;
+ }
+ public String getSbmt_id_bef() {
+ return sbmt_id_bef;
+ }
+ public void setSbmt_id_bef(String sbmt_id_bef) {
+ this.sbmt_id_bef = sbmt_id_bef;
+ }
+ public String getFrst_regist_pnttm() {
+ return frst_regist_pnttm;
+ }
+ public void setFrst_regist_pnttm(String frst_regist_pnttm) {
+ this.frst_regist_pnttm = frst_regist_pnttm;
+ }
+ public String getFrst_register_id() {
+ return frst_register_id;
+ }
+ public void setFrst_register_id(String frst_register_id) {
+ this.frst_register_id = frst_register_id;
+ }
+ public String getLast_updt_pnttm() {
+ return last_updt_pnttm;
+ }
+ public void setLast_updt_pnttm(String last_updt_pnttm) {
+ this.last_updt_pnttm = last_updt_pnttm;
+ }
+ public String getLast_updusr_id() {
+ return last_updusr_id;
+ }
+ public void setLast_updusr_id(String last_updusr_id) {
+ this.last_updusr_id = last_updusr_id;
+ }
+
+
+
+
+
+}
diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/iop/web/InsteadOfPaymentManageController.java b/src/main/java/kcc/kccadr/adjPgrMgr/iop/web/InsteadOfPaymentManageController.java
new file mode 100644
index 00000000..db4b1d86
--- /dev/null
+++ b/src/main/java/kcc/kccadr/adjPgrMgr/iop/web/InsteadOfPaymentManageController.java
@@ -0,0 +1,104 @@
+package kcc.kccadr.adjPgrMgr.iop.web;
+
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
+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.servlet.ModelAndView;
+
+import egovframework.rte.fdl.idgnr.EgovIdGnrService;
+import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
+import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
+import kcc.com.cmm.LoginVO;
+import kcc.com.cmm.service.EgovFileMngService;
+import kcc.com.cmm.service.FileVO;
+import kcc.com.cmm.util.DateUtil;
+import kcc.com.cmm.util.IpUtil;
+import kcc.com.cmm.util.StringUtil;
+import kcc.com.utl.user.service.CheckAdrProcessUtil;
+import kcc.kccadr.adjPgrMgr.apm.service.ApmService;
+import kcc.kccadr.adjPgrMgr.apm.service.ApmVO;
+import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmService;
+import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO;
+import kcc.kccadr.adjPgrMgr.drt.service.DrtService;
+import kcc.kccadr.adjPgrMgr.drt.service.DrtVO;
+import kcc.kccadr.adjPgrMgr.ent.service.EntService;
+import kcc.kccadr.adjPgrMgr.ent.service.EntVO;
+import kcc.kccadr.adjPgrMgr.iam.service.InternalApprovManageService;
+import kcc.kccadr.adjPgrMgr.iam.service.InternalApprovManageVO;
+import kcc.kccadr.adjPgrMgr.iop.service.InsteadOfPaymentManageVO;
+import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO;
+import kcc.kccadr.adjcclt.service.AdjstConciliatorService;
+import kcc.kccadr.adjcclt.service.AdjstConciliatorVO;
+import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO;
+import kcc.kccadr.adjreqmgr.web.AdjReqMgrController;
+import kcc.kccadr.adjst.service.AdjstReqService;
+import kcc.kccadr.adjst.service.AdjstReqVO;
+import kcc.kccadr.cmm.CmmUtil;
+import kcc.kccadr.cmm.KccadrConstants;
+import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService;
+import kcc.kccadr.ozSchd.web.OzSchdExportUtil;
+import kcc.let.uss.umt.service.EgovUserManageService;
+import kcc.let.uss.umt.service.UserManageVO;
+import kcc.let.utl.fcc.service.EgovCryptoUtil;
+
+@Controller
+public class InsteadOfPaymentManageController {
+
+// @Resource(name = "apmService")
+// private ApmService apmService;
+
+
+ @RequestMapping(value = "/kccadr/adjPgrMgr/iop/insteadOfPaymentManageList.do")
+ public String insteadOfPaymentManageList(@ModelAttribute("insteadOfPaymentManageVO") InsteadOfPaymentManageVO insteadOfPaymentManageVO , ModelMap model, HttpServletRequest request) throws Exception {
+
+ String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString();
+ LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
+
+ if (loginVO == null) {
+ model.addAttribute("msg", "로그인 해주세요.");
+ return "redirect:/web/user/login/ssoLogin.do";
+ }
+
+ PaginationInfo paginationInfo = new PaginationInfo();
+ paginationInfo.setCurrentPageNo(insteadOfPaymentManageVO.getPageIndex());
+ paginationInfo.setRecordCountPerPage(insteadOfPaymentManageVO.getPageUnit());
+ paginationInfo.setPageSize(insteadOfPaymentManageVO.getPageSize());
+
+ insteadOfPaymentManageVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
+ insteadOfPaymentManageVO.setLastIndex(paginationInfo.getLastRecordIndex());
+ insteadOfPaymentManageVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+
+// paginationInfo.setTotalRecordCount(adjReqMgrPastService.selectAdjReqMgrPastListCount(insteadOfPaymentManageVO));
+ model.addAttribute("paginationInfo", paginationInfo);
+ // list
+// List list = adjReqMgrPastService.selectAdjReqMgrPastList(adjReqMgrPastVO);
+ List list = new ArrayList();
+
+ // 임시
+ model.addAttribute("list", list);
+
+
+
+ return "kccadr/adjPgrMgr/iop/insteadOfPaymentManageList";
+ }
+
+
+}
diff --git a/src/main/java/kcc/let/main/web/EgovMainController.java b/src/main/java/kcc/let/main/web/EgovMainController.java
index 0a17924a..7a7f6fc5 100644
--- a/src/main/java/kcc/let/main/web/EgovMainController.java
+++ b/src/main/java/kcc/let/main/web/EgovMainController.java
@@ -162,6 +162,20 @@ public class EgovMainController {
@SuppressWarnings("unchecked")
@RequestMapping(value = "/cmm/main/mainPage.do")
public String selectGetMgtMainPage(HttpServletRequest request, ModelMap model, HttpSession session) throws Exception{
+
+ LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
+ System.out.println("loginVO.getOfcpsNm() :: "+ loginVO.getOfcpsNm());
+
+ /*
+ * 30 : 센터장(부서장)
+ * 40 : 위원장
+ * */
+ if("40".equals(loginVO.getOfcpsNm()) || "30".equals(loginVO.getOfcpsNm()))
+ {
+ //executives -> exctv
+ return "redirect:/cmm/main/exctvMainPage.do";
+ }
+
{//관리자 오늘 사용자수
StatsVO statsVO = new StatsVO();
List> conectStats = conectStatsService.selectMainConectStats(statsVO);
@@ -392,6 +406,22 @@ public class EgovMainController {
return "main/EgovMainView";
}
+ /**
+ * @methodName : exctvMainPage
+ * @author : 이호영
+ * @date : 2022.10.12
+ * @description :
+ * @param model
+ * @param session
+ * @return
+ * @throws Exception
+ */
+ @RequestMapping(value = "/cmm/main/exctvMainPage.do")
+ public String exctvMainPage(ModelMap model, HttpSession session) throws Exception{
+ return "main/exctvMainView";
+// return "main/EgovMainView";
+ }
+
/**
* Head메뉴를 조회한다.
* @param menuManageVO MenuManageVO
diff --git a/src/main/java/kcc/let/uat/uia/service/impl/EgovSessionMapping.java b/src/main/java/kcc/let/uat/uia/service/impl/EgovSessionMapping.java
index 6562e9fe..482f1b03 100644
--- a/src/main/java/kcc/let/uat/uia/service/impl/EgovSessionMapping.java
+++ b/src/main/java/kcc/let/uat/uia/service/impl/EgovSessionMapping.java
@@ -64,6 +64,7 @@ public class EgovSessionMapping extends EgovUsersByUsernameMapping {
String strOrgnztNm = rs.getString("orgnzt_nm");
String strAuthority = rs.getString("authority");
String strMberSeq = rs.getString("mber_seq");
+ String ofcpsNm = rs.getString("ofcps_nm");
// 세션 항목 설정
@@ -79,6 +80,9 @@ public class EgovSessionMapping extends EgovUsersByUsernameMapping {
loginVO.setOrgnztNm(strOrgnztNm);
loginVO.setAuthority(strAuthority);
loginVO.setMembSeq(strMberSeq);
+
+ /*20221012 대시보드를 위해 직급 코드 추가*/
+ loginVO.setOfcpsNm(ofcpsNm);
return new EgovUserDetails(strUserId, strPassWord, strEnabled, loginVO);
}
diff --git a/src/main/resources/egovframework/spring/com/context-security.xml b/src/main/resources/egovframework/spring/com/context-security.xml
index 9e46c61f..7b070098 100644
--- a/src/main/resources/egovframework/spring/com/context-security.xml
+++ b/src/main/resources/egovframework/spring/com/context-security.xml
@@ -31,7 +31,7 @@
jdbcUsersByUsernameQuery="SELECT USER_ID, ESNTL_ID AS PASSWORD, 1 ENABLED, USER_NM, USER_ZIP,
USER_ADRES, USER_EMAIL, USER_SE, '-' ORGNZT_ID, ESNTL_ID,
- '-' ORGNZT_NM, AUTHOR_CODE AS AUTHORITY, mber_seq AS mber_seq
+ '-' ORGNZT_NM, AUTHOR_CODE AS AUTHORITY, mber_seq AS mber_seq, ofcps_nm as ofcps_nm
FROM COMVNUSERMASTER A
INNER JOIN LETTNEMPLYRSCRTYESTBS B ON A.ESNTL_ID = B.SCRTY_DTRMN_TRGET_ID
WHERE CONCAT(USER_SE, USER_ID) = ?"
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 a4684384..6ae15902 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
@@ -48,7 +48,7 @@
ELSE S2.CODE_NM ||' 외'|| (COUNT(*)-1) || '건'
END EXMP_NMS
FROM ADR_EXMP_DTL S1 INNER JOIN LETTCCMMNDETAILCODE S2
- ON S1.EXMP_CD = S2.CODE AND CODE_ID = 'CC040'
+ ON S1.EXMP_CD = S2.CODE AND CODE_ID = #codeId#
WHERE 1=1
AND S1.EXMP_CC_TY = T1.EXMP_CC_TY
GROUP BY S1.EXMP_CC_TY
diff --git a/src/main/resources/rebel.xml b/src/main/resources/rebel.xml
index 0e85c739..c2e2c0bc 100644
--- a/src/main/resources/rebel.xml
+++ b/src/main/resources/rebel.xml
@@ -7,18 +7,18 @@
-
+
-
+
-
+
diff --git a/src/main/webapp/WEB-INF/decorators.xml b/src/main/webapp/WEB-INF/decorators.xml
index 35f60363..f6df4ec0 100644
--- a/src/main/webapp/WEB-INF/decorators.xml
+++ b/src/main/webapp/WEB-INF/decorators.xml
@@ -76,6 +76,7 @@
/cop/*
/sys/research/userResearch.do
/cmm/main/mainPage.do
+ /cmm/main/exctvMainPage.do
/kccadr/*
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/exmpAnswerManagerCreate.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/answer/exmpAnswerManagerCreate.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/exmpAnswerManagerCreate.jsp
rename to src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/answer/exmpAnswerManagerCreate.jsp
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/exmpAnswerManagerDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/answer/exmpAnswerManagerDetail.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/exmpAnswerManagerDetail.jsp
rename to src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/answer/exmpAnswerManagerDetail.jsp
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/exmpAnswerManagerList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/answer/exmpAnswerManagerList.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/exmpAnswerManagerList.jsp
rename to src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/answer/exmpAnswerManagerList.jsp
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/exmpAnswerManagerModify.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/answer/exmpAnswerManagerModify.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/exmpAnswerManagerModify.jsp
rename to src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/answer/exmpAnswerManagerModify.jsp
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/exmpAppManagerCreate.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerCreate.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/exmpAppManagerCreate.jsp
rename to src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerCreate.jsp
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/exmpAppManagerDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerDetail.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/exmpAppManagerDetail.jsp
rename to src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerDetail.jsp
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/exmpAppManagerList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerList.jsp
similarity index 98%
rename from src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/exmpAppManagerList.jsp
rename to src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerList.jsp
index 92f04d16..74d0906d 100644
--- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/exmpAppManagerList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerList.jsp
@@ -90,13 +90,13 @@
-
신청서예문관리
+
신청원인예문관리
-
조정진행관리
- - 신청서예문관리
+ - 신청원인예문관리
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/exmpAppManagerModify.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerModify.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/exmpAppManagerModify.jsp
rename to src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/app/exmpAppManagerModify.jsp
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerCreate.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerCreate.jsp
new file mode 100644
index 00000000..e7b9fd80
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerCreate.jsp
@@ -0,0 +1,352 @@
+
+<%@ 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" %>
+<%
+ /**
+ * @Class Name : AdjustDeptManagerCreate.jsp
+ * @Description : 관리자 일정관리
+ * @Modification Information
+ * @
+ * @ 수정일 수정자 수정내용
+ * @ ------- -------- ---------------------------
+ * @ 2021.08.16 김봉호 최초 생성
+ * @author 김봉호
+ * @since 2021.08.21
+ * @version 1.0
+ * @see
+ *
+ */
+%>
+
+
+예문관리
+
+
+
+
+
+
+
+
+
+
+ " />
+
+
+
+
+
+
신청서예문등록
+
+
+ 조정진행관리
+ 신청서예문관리
+ - 신청서예문등록
+
+
+
+
+
+
예문 저작물종류
+
+
+
+
+
+
+
+
+
+
+
+ | 항목 |
+ 예문내용 |
+
+
+
+
+ |
+
+ |
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerDetail.jsp
new file mode 100644
index 00000000..407ccd97
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerDetail.jsp
@@ -0,0 +1,174 @@
+
+<%@ 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" %>
+<%pageContext.setAttribute("crlf", "\r\n"); %>
+<%
+ /**
+ * @Class Name : AdjustDeptManagerCreate.jsp
+ * @Description : 관리자 일정관리
+ * @Modification Information
+ * @
+ * @ 수정일 수정자 수정내용
+ * @ ------- -------- ---------------------------
+ * @ 2021.08.16 김봉호 최초 생성
+ * @author 김봉호
+ * @since 2021.08.21
+ * @version 1.0
+ * @see
+ *
+ */
+%>
+
+
+예문관리
+
+
+
+
+
+
+
+
+
+" />
+" />
+
+
+
+
+
+
신청서예문상세
+
+
+ 조정진행관리
+ 신청서예문관리
+ - 신청서예문상세
+
+
+
+
+
+
예문 저작물종류
+
+
+
+
+
+
+
+
+
+
+
+ | 제목 |
+
+
+ |
+ 저작물종류 |
+
+
+ |
+
+
+
+ | 첨부파일 |
+
+
+ |
+
+
+
+
+
+
+
+
항목추가
+ <%--
+
+
+
--%>
+
+
+
+
+
+
+
+
+
+ | 항목 |
+ 예문내용 |
+
+
+
+
+
+
+ |
+
+ |
+
+
+ |
+
+
+
+
+
+ |
+
+ |
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerList.jsp
new file mode 100644
index 00000000..7bd51dfd
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerList.jsp
@@ -0,0 +1,189 @@
+
+<%@ 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
+ *
+ */
+%>
+
+
+
+
+신청서예문관리
+
+
+
+
+ " />
+ " />
+ " />
+
+
+
+
+
+
+
+
+
신청취지예문관리
+
+
+ -
+
조정진행관리
+
+ - 신청취지예문관리
+
+
+
+
+
+
+
+
총 건수 : 건
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | 번호 |
+ 저작물 |
+ 제목 |
+ 항목 |
+ 등록일 |
+
+
+
+
+
+ |
+
+
+
+
+
+
+ |
+
+
+ |
+
+
+ |
+
+
+ |
+
+
+ |
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+<%--
--%>
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerModify.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerModify.jsp
new file mode 100644
index 00000000..12edb050
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/effect/exmpEffectManagerModify.jsp
@@ -0,0 +1,372 @@
+
+<%@ 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" %>
+<%
+ /**
+ * @Class Name : AdjustDeptManagerCreate.jsp
+ * @Description : 관리자 일정관리
+ * @Modification Information
+ * @
+ * @ 수정일 수정자 수정내용
+ * @ ------- -------- ---------------------------
+ * @ 2021.08.16 김봉호 최초 생성
+ * @author 김봉호
+ * @since 2021.08.21
+ * @version 1.0
+ * @see
+ *
+ */
+%>
+
+
+예문관리
+
+
+
+
+
+
+
+
+
+
+
+"/>
+
+
+
+
+
+
+
+
+
신청서예문수정
+
+
+ 조정진행관리
+ 신청서예문관리
+ - 신청서예문수정
+
+
+
+
+
+
예문 저작물종류
+
+
+
+
+
+
+
+
+
+
+
+ | 항목 |
+ 예문내용 |
+
+
+
+
+
+
+ |
+
+ |
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/exmpOpinionManagerCreate.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/help/exmpHelpManagerCreate.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/exmpOpinionManagerCreate.jsp
rename to src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/help/exmpHelpManagerCreate.jsp
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/exmpOpinionManagerDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/help/exmpHelpManagerDetail.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/exmpOpinionManagerDetail.jsp
rename to src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/help/exmpHelpManagerDetail.jsp
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/help/exmpHelpManagerList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/help/exmpHelpManagerList.jsp
new file mode 100644
index 00000000..9a278804
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/help/exmpHelpManagerList.jsp
@@ -0,0 +1,178 @@
+
+<%@ 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
+ *
+ */
+%>
+
+
+
+
+의견예문관리
+
+
+
+
+ " />
+ " />
+ " />
+
+
+
+
+
+
+
+
진행단계 도움말 관리
+
+
+ -
+
조정진행관리
+
+ - 진행단계 도움말 관리
+
+
+
+
+
+
+
+
총 건수 : 건
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | 번호 |
+ 제목 |
+ 등록일 |
+
+
+
+
+
+ |
+
+
+
+
+
+
+ |
+
+
+ |
+
+
+ |
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/exmpOpinionManagerModify.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/help/exmpHelpManagerModify.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/exmpOpinionManagerModify.jsp
rename to src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/help/exmpHelpManagerModify.jsp
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/opinion/exmpOpinionManagerCreate.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/opinion/exmpOpinionManagerCreate.jsp
new file mode 100644
index 00000000..34ff5b8d
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/opinion/exmpOpinionManagerCreate.jsp
@@ -0,0 +1,386 @@
+
+<%@ 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" %>
+<%
+ /**
+ * @Class Name : AdjustDeptManagerCreate.jsp
+ * @Description : 관리자 일정관리
+ * @Modification Information
+ * @
+ * @ 수정일 수정자 수정내용
+ * @ ------- -------- ---------------------------
+ * @ 2021.08.16 김봉호 최초 생성
+ * @author 김봉호
+ * @since 2021.08.21
+ * @version 1.0
+ * @see
+ *
+ */
+%>
+
+
+의견예문등록
+
+
+
+
+
+
+
+
+
+
+
+" />
+
+
+
+
+
+
+
+
+
+
의견예문등록
+
+
+ 조정진행관리
+ 의견예문관리
+ - 의견예문등록
+
+
+
+
+
+
의견
+
+
+
+
+
+
+<%-- --%>
+
+
+
+
+
+ | 예문내용 |
+
+
+
+
+
+
+
+<%-- --%>
+
+ |
+
+ |
+
+
+
+
+
+
+<%-- --%>
+
+ |
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/opinion/exmpOpinionManagerDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/opinion/exmpOpinionManagerDetail.jsp
new file mode 100644
index 00000000..22647e2b
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/opinion/exmpOpinionManagerDetail.jsp
@@ -0,0 +1,151 @@
+
+<%@ 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" %>
+<%pageContext.setAttribute("crlf", "\r\n"); %>
+<%
+ /**
+ * @Class Name : AdjustDeptManagerCreate.jsp
+ * @Description : 관리자 일정관리
+ * @Modification Information
+ * @
+ * @ 수정일 수정자 수정내용
+ * @ ------- -------- ---------------------------
+ * @ 2021.08.16 김봉호 최초 생성
+ * @author 김봉호
+ * @since 2021.08.21
+ * @version 1.0
+ * @see
+ *
+ */
+%>
+
+
+예문관리
+
+
+
+
+
+
+
+
+
+" />
+" />
+
+
+
+
+
+
의견예문상세
+
+
+ 조정진행관리
+ 의견예문관리
+ - 의견예문상세
+
+
+
+
+
+
의견
+
+
+
+
+
+
+
+
+
+
+
+ | 제목 |
+
+
+ |
+
+
+
+ | 첨부파일 |
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | 예문내용 |
+
+
+
+
+
+ |
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/exmpOpinionManagerList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/opinion/exmpOpinionManagerList.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/exmpOpinionManagerList.jsp
rename to src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/opinion/exmpOpinionManagerList.jsp
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/opinion/exmpOpinionManagerModify.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/opinion/exmpOpinionManagerModify.jsp
new file mode 100644
index 00000000..361ed88e
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/opinion/exmpOpinionManagerModify.jsp
@@ -0,0 +1,357 @@
+
+<%@ 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" %>
+<%
+ /**
+ * @Class Name : AdjustDeptManagerCreate.jsp
+ * @Description : 관리자 일정관리
+ * @Modification Information
+ * @
+ * @ 수정일 수정자 수정내용
+ * @ ------- -------- ---------------------------
+ * @ 2021.08.16 김봉호 최초 생성
+ * @author 김봉호
+ * @since 2021.08.21
+ * @version 1.0
+ * @see
+ *
+ */
+%>
+
+
+의견예문수정
+
+
+
+
+
+
+
+
+
+
+
+"/>
+
+
+
+
+
+
+
+
+
의견예문수정
+
+
+ 조정진행관리
+ 의견예문관리
+ - 의견예문수정
+
+
+
+
+
+
의견
+
+
+
+
+
+
+
+
+
+
+ | 예문내용 |
+
+
+
+
+
+
+ |
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageList.jsp
new file mode 100644
index 00000000..eead8918
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageList.jsp
@@ -0,0 +1,181 @@
+
+<%@ 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
+ * @
+ * @ 수정일 수정자 수정내용
+ * @ ------- -------- ---------------------------
+ * @ 2022.10.11 이호영 최초 생성
+ * @author 이호영
+ * @since 2021.08.21
+ * @version 1.0
+ * @see
+ *
+ */
+%>
+
+
+
+
+결제 및 대결 관리 목록
+
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/main/exctvMainView.jsp b/src/main/webapp/WEB-INF/jsp/main/exctvMainView.jsp
new file mode 100644
index 00000000..b4567b07
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/main/exctvMainView.jsp
@@ -0,0 +1,189 @@
+<%--
+ Class Name : EgovMainView.jsp
+ Description : 메인화면
+ Modification Information
+
+ 수정일 수정자 수정내용
+ ------- -------- ---------------------------
+ 2011.08.31 JJY 경량환경 버전 생성
+
+ author : 실행환경개발팀 JJY
+ since : 2011.08.31
+--%>
+<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ page import="java.util.Date" %>
+
+
+
+
+
+
+
+ 관리자 대시보드
+
+
+
+<%-- --%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | 결재구분 |
+ 조정번호 |
+ 신청내용 |
+ 결재요청일 |
+ 결재완료일 |
+ 결재이동 |
+
+
+
+
+ | 접수결재 |
+ 2022조정075 |
+ 컴퓨터프로그램 |
+ 2022-09-01 18:00 |
+ 2022-09-01 18:00 |
+ |
+
+
+ | 접수결재 |
+ 2022조정074 |
+ 편집저작물 |
+ 2022-09-01 18:00 |
+ 2022-09-01 18:00 |
+ 결재진행(위원장) |
+
+
+ | 접수결재 |
+ 2022조정073 |
+ 편집저작물 |
+ 2022-09-01 18:00 |
+ 2022-09-01 18:00 |
+ 결재완료 |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | 신청일자 |
+ 조정번호 |
+ 신청인 |
+ 신청내용 |
+ 조정부 |
+ 조정상태 |
+
+
+
+
+ | 2022-09-01 |
+ 2022조정075 |
+ 홍길동 |
+ 컴퓨터프로그램 |
+ 합의5부 |
+ 기일통지서승인 |
+
+
+ | 2022-09-01 |
+ 2022조정074 |
+ 홍길동 |
+ 편집저작물 |
+ 합의5부 |
+ 접수결재요청 |
+
+
+ | 2022-09-01 |
+ 2022조정073 |
+ 홍길동 |
+ 편집저작물 |
+ 합의5부 |
+ 배당결재요청 |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/mainExpPage.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/mainExpPage.jsp
index e749feb6..e8451120 100644
--- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/mainExpPage.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/mainExpPage.jsp
@@ -100,6 +100,11 @@ function goExpPage(num) {
{//접수페이지
goUrl = "";
}
+ else if(num==3)
+ {// 진행사항
+ goUrl = "";
+ frm.searchStatus.value = '';
+ }
else if(num==4)
{// 열랍 발급
goUrl = "";
@@ -111,7 +116,6 @@ function goExpPage(num) {
}
else
{
-// return false;
goUrl = ""
}
diff --git a/src/main/webapp/kccadrPb/adm/css/content.css b/src/main/webapp/kccadrPb/adm/css/content.css
index 0027acfa..11730c9c 100644
--- a/src/main/webapp/kccadrPb/adm/css/content.css
+++ b/src/main/webapp/kccadrPb/adm/css/content.css
@@ -172,7 +172,7 @@ p+.list_util{width: auto;}
.btn_wrap .btn_check i{width: 20px; height: 20px; display: inline-block; background-image: url(/kccadrPb/adm/image/btn_check.png); vertical-align: middle; margin-top: -5px;}
/* //btn */
-.cont .list{width: 100%; min-height: 465px; border-top: 1px solid #000; border-bottom: 1px solid #cccccc; overflow: hidden;}
+.cont .list{width: 100%; border-top: 1px solid #000; border-bottom: 1px solid #cccccc; overflow: hidden;}
.tb_tit{font-size: 22px; padding-left: 20px; position: relative; font-weight: 500; margin-bottom: 18px; margin-top: 60px; display: flex; justify-content: space-between; align-items: center;}
.tb_tit:first-child{margin-top: 0;}