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 e0dba573..97b8c0d1 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 @@ -163,6 +163,7 @@ public class ExmpAppManagerController { result = fileUtil.parseFileInf(files, "Exmp_" , 0, atchFileId, "", ""); atchFileId = fileMngService.insertFileInfs(result); } + exmpManageVO.setAtchFileId(atchFileId); exmpManageVO.setFrstRegisterId(loginVO.getUniqId()); return ResponseEntity.ok().body(exmpAppManageService.insertExmpAppManager(exmpManageVO)); diff --git a/src/main/java/kcc/kccadr/adjcclt/opinion/web/AdjstOpinionController.java b/src/main/java/kcc/kccadr/adjcclt/opinion/web/AdjstOpinionController.java index 9dd90cbb..f3dfb420 100644 --- a/src/main/java/kcc/kccadr/adjcclt/opinion/web/AdjstOpinionController.java +++ b/src/main/java/kcc/kccadr/adjcclt/opinion/web/AdjstOpinionController.java @@ -18,6 +18,8 @@ import org.springframework.web.bind.annotation.RequestMethod; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.LoginVO; +import kcc.kccadr.adjPgrMgr.exmp.app.service.ExmpAppManageService; +import kcc.kccadr.adjPgrMgr.exmp.cmm.ExmpManageVO; import kcc.kccadr.adjcclt.opinion.service.AdjstOpinionService; import kcc.kccadr.adjcclt.opinion.service.AdjstOpinionVO; import kcc.kccadr.adjcclt.service.AdjstConciliatorVO; @@ -44,7 +46,9 @@ public class AdjstOpinionController { @Resource(name = "adjstOpinionService") private AdjstOpinionService adjstOpinionService; - + + @Resource(name = "ExmpAppManageService") + private ExmpAppManageService exmpAppManageService; // @RequestMapping(value = {"/web/kccadr/adjcclt/ai/adjstOpinionList.do"}, method = RequestMethod.POST) // public ResponseEntity adjstFindByOpinion(HttpServletRequest request , @RequestBody AdjstOpinionVO adjstOpinionVO) throws Exception { @@ -52,46 +56,38 @@ public class AdjstOpinionController { // } @RequestMapping("/web/kccadr/adjcclt/ai/adjstOpinionList.do") - public String adjstOpinionList(@ModelAttribute("adjstOpinionVO") AdjstOpinionVO adjstOpinionVO, ModelMap model) throws Exception + public String adjstOpinionList(@ModelAttribute("exmpManageVO") ExmpManageVO exmpManageVO, ModelMap model) throws Exception { - String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString(); - LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); - - if (loginVO == null) { + LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); - model.addAttribute("msg", "로그인 해주세요."); - return "redirect:/web/user/login/ssoLogin.do"; - } - logger.info(" + loginVO.getName() :: [{}]", loginVO.getName()); -// adjstOpinionVO.setFrstRegisterId(loginVO.getUniqId()); + exmpManageVO.setFrstRegisterId(loginVO.getUniqId()); + if(exmpManageVO.getPageUnit() != 10) { + exmpManageVO.setPageUnit(exmpManageVO.getPageUnit()); + } -// if(adjstOpinionVO.getPageUnit() != 10) { -// adjstOpinionVO.setPageUnit(adjstOpinionVO.getPageUnit()); -// } -// -// if("".equals(adjstOpinionVO.getSearchSortCnd())){ //최초조회시 최신것 조회List -// adjstOpinionVO.setSearchSortCnd("RS.ADR_SEQ"); -// adjstOpinionVO.setSearchSortOrd("desc"); -// } + if("".equals(exmpManageVO.getSearchSortCnd())){ //최초조회시 최신것 조회List +// exmpManageVO.setSearchSortCnd("T1.Exmp_CC_TY"); +// exmpManageVO.setSearchSortOrd("asc"); + } + System.out.println("exmpManageVO.getSearchCondition() :: "+exmpManageVO.getSearchCondition()); + + /** paging */ + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(exmpManageVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(exmpManageVO.getPageUnit()); + paginationInfo.setPageSize(exmpManageVO.getPageSize()); - /** paging */ - PaginationInfo paginationInfo = new PaginationInfo(); - paginationInfo.setCurrentPageNo(adjstOpinionVO.getPageIndex()); - paginationInfo.setRecordCountPerPage(adjstOpinionVO.getPageUnit()); - paginationInfo.setPageSize(adjstOpinionVO.getPageSize()); - - adjstOpinionVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); - adjstOpinionVO.setLastIndex(paginationInfo.getLastRecordIndex()); - adjstOpinionVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - -// paginationInfo.setTotalRecordCount(adjstOpinionService.selectAdjstOpinionListCount(adjstOpinionVO)); - model.addAttribute("paginationInfo", paginationInfo); - - -// List list = adjstOpinionService.selectAdjstOpinionList(adjstOpinionVO); -// decryptInfomation(list, null); -// model.addAttribute("list", list); + exmpManageVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); + exmpManageVO.setLastIndex(paginationInfo.getLastRecordIndex()); + exmpManageVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); + + // 의견 코드 + exmpManageVO.setExmpCd("03"); + + paginationInfo.setTotalRecordCount(exmpAppManageService.selectExmpOpinionsManagerCount(exmpManageVO)); + model.addAttribute("paginationInfo", paginationInfo); + model.addAttribute("list", exmpAppManageService.selectExmpOpinionsManagerList(exmpManageVO)); return "/web/kccadr/adjcclt/opinion/adjstOpinionList"; } diff --git a/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java b/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java index d2f1833e..a15b6696 100644 --- a/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java +++ b/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java @@ -6,6 +6,7 @@ import java.time.format.TextStyle; import java.util.ArrayList; import java.util.List; import java.util.Locale; +import java.util.Map; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -14,12 +15,15 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +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.bind.annotation.RequestParam; +import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; @@ -49,6 +53,7 @@ import kcc.kccadr.adjcclt.service.AdjstConciliatorVO; import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; import kcc.kccadr.cmm.CmmUtil; import kcc.kccadr.cmm.KccadrConstants; +import kcc.kccadr.cmm.RestResponse; import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService; import kcc.kccadr.ojct.service.OjctService; import kcc.kccadr.ojct.service.OjctVO; @@ -411,10 +416,47 @@ public class AdjstConciliatorController { */ @RequestMapping("/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopList.do") public String adjstOpinionsRegistPopList(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, ModelMap model) throws Exception { -// model.addAttribute("info", adjstConciliatorService.selectAdjstRecommendationCommentDetail(adjstConciliatorVO)); return "/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopList"; } + + /** + * 의견관리 목록 > 자주쓰는 의견 상세 팝업 + */ + @RequestMapping("/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopDetail.do") + public String opinionsRegistAdjstPopDetail(@ModelAttribute("exmpManageVO") ExmpManageVO exmpManageVO, ModelMap model) throws Exception { + System.out.println(" + exmpManageVO :: "+ exmpManageVO.getExmpMgrId()); + model.addAttribute("dataInfo", exmpAppManageService.selectExmpAppManagerInfo(exmpManageVO)); + return "/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopDetail"; + } + + + @RequestMapping(value="/web/kccadr/adjcclt/insertExmpOpinionsAjax.do") + public ResponseEntity insertExmpAppManager(ExmpManageVO exmpManageVO) throws Exception { + + LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); + exmpManageVO.setFrstRegisterId(loginVO.getUniqId()); + return ResponseEntity.ok().body(exmpAppManageService.insertExmpAppManager(exmpManageVO)); + } + /* + + @RequestMapping(value="/web/kccadr/adjcclt/insertExmpOpinionsAjax.do") + public ModelAndView insertExmpAppManager(ExmpManageVO exmpManageVO) throws Exception { + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); + + System.out.println("exmpManageVO.getExmpCd : " + exmpManageVO.getExmpCd()); + System.out.println("exmpManageVO.getCcTy : " + exmpManageVO.getExmpCcTy()); + System.out.println("exmpManageVO.getExmpCn : " + exmpManageVO.getExmpCn()); + + exmpManageVO.setFrstRegisterId(loginVO.getUniqId()); + + exmpAppManageService.insertExmpAppManager(exmpManageVO); + + return modelAndView; + }*/ /** * 조정사건 목록 화면 */ 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 6850ea32..cc4c230f 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 @@ -112,7 +112,12 @@ AND T1.EXMP_CC_TY = #searchCondition# - ORDER BY 1=1 + + + T1.FRST_REGISTER_ID = #frstRegisterId# + + + ORDER BY T1.FRST_REGIST_PNTTM DESC diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/opinion/adjstOpinionList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/opinion/adjstOpinionList.jsp index e8de9f32..89f51945 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/opinion/adjstOpinionList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/opinion/adjstOpinionList.jsp @@ -32,7 +32,7 @@ function linkPage(pageNo){ var listForm = document.listForm ; listForm.pageIndex.value = pageNo ; - listForm.action = ""; + listForm.action = ""; listForm.submit(); } @@ -49,12 +49,13 @@ - -" /> -" /> -" /> - - + + " /> + " /> + " /> + + +
@@ -62,46 +63,15 @@

자주쓰는의견 목록

-
-
- - -
-
- - -
- ~ -
- - -
- -
-
- - -
- -
+
+
+ + + + + +
@@ -123,26 +93,25 @@ -<%-- --%> + -<%--

--%> - 2022-09-30 +

- 유형 + - 내용 + - 삭제버튼 + -<%--
--%> -<%-- --%> -<%-- --%> -<%-- --%> +
+ + +
@@ -160,7 +129,6 @@
- diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/popup/adjstOpinionsPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/popup/adjstOpinionsPopList.jsp index 4005b6de..ba9555c9 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/popup/adjstOpinionsPopList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/popup/adjstOpinionsPopList.jsp @@ -70,12 +70,14 @@ $(document).ready(function(){

자주쓰는 의견 목록

+ + + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopList.jsp index 7750f1cb..97546747 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopList.jsp @@ -15,19 +15,7 @@ +
+ - - -" /> -" /> - - - + +
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 addf52f7..0e64dbd1 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 @@ -1261,6 +1261,23 @@ var AdjstReq = { , "adjstOpinionsRegistPop" ); }, + opinionsRegistAdjstPopDetail : function(param){ + + console.log(' param : ', param); + + var paramObj = { + exmpMgrId : param + }; + // 이전신청데이터 팝업 호출.. + commonPopLayeropen( + "/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopDetail.do" + , 1000 + , 700 + , paramObj + , "N" + , "adjstOpinionsRegistPop" + ); + }, openExamplePop : function(exmpCd){ /* - 01 : 신청취지