From 98ca10151e1403f6f3b988e3fec2afbe2a17b844 Mon Sep 17 00:00:00 2001 From: hylee Date: Wed, 19 Oct 2022 10:03:01 +0900 Subject: [PATCH] =?UTF-8?q?feat:=EC=9D=98=EA=B2=AC=20=EB=93=B1=EB=A1=9D=20?= =?UTF-8?q?-=20=EA=B8=B0=EC=9D=BC=EC=A1=B0=EC=84=9C,=20=EC=A1=B0=EC=A0=95?= =?UTF-8?q?=EA=B6=8C=EA=B3=A0=EC=95=88,=20=EC=A1=B0=EC=A0=95=EC=A1=B0?= =?UTF-8?q?=EC=84=9C,=20=EC=A7=81=EA=B6=8C=EC=A1=B0=EC=A0=95=EA=B2=B0?= =?UTF-8?q?=EC=A0=95=EC=84=9C=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kccadr/adjPgrMgr/arm/service/CmntVO.java | 14 +- .../app/service/ExmpAppManageService.java | 2 + .../app/service/impl/ExmpAppManageDAO.java | 4 + .../impl/ExmpAppManageServiceImpl.java | 6 + .../adjPgrMgr/exmp/cmm/ExmpManageVO.java | 10 + .../opinion/web/AdjstOpinionController.java | 16 +- .../service/AdjstConciliatorService.java | 2 + .../service/impl/AdjstConciliatorDAO.java | 4 + .../impl/AdjstConciliatorServiceImpl.java | 6 + .../web/AdjstConciliatorController.java | 930 ++++++++++-------- .../kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml | 4 +- .../adjPgrMgr/exmp/ExmpManage_SQL_Mysql.xml | 27 +- .../adjcclt/AdjustConciliator_SQL_Mysql.xml | 16 +- .../adjcclt/adjstMediationDecisionDetail.jsp | 3 +- .../kccadr/adjcclt/adjstProtocolDetail.jsp | 3 +- .../adjcclt/adjstRecommendationDetail.jsp | 3 +- .../adjstRecommendationCommentList.jsp | 39 +- .../adjcclt/opinion/adjstOpinionList.jsp | 170 ++-- .../popup/adjstOpinionsRegistPopDetail.jsp | 12 +- .../popup/adjstOpinionsRegistPopList.jsp | 1 - 20 files changed, 740 insertions(+), 532 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/arm/service/CmntVO.java b/src/main/java/kcc/kccadr/adjPgrMgr/arm/service/CmntVO.java index 079dac74..db1ee914 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/arm/service/CmntVO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/arm/service/CmntVO.java @@ -17,7 +17,7 @@ public class CmntVO implements Serializable { private String lastUpdtPnttm;/* 수정일시 */ private String lastUpdtDay; /* 최종변경일 */ private String lastUpdusrId; /* 수정자 */ - private String deleteYn; /* 삭제여부 */ + private String useYn; /* 삭제여부 */ private String closeDocTy; // 종결문서구분 40 조정조서, 50 취하종결통보서, 60 직권조정결정서, 30 조정권고안, 70 불성립종결통보서 public String getCloseDocTy() { @@ -104,12 +104,12 @@ public class CmntVO implements Serializable { public void setLastUpdusrId(String lastUpdusrId) { this.lastUpdusrId = lastUpdusrId; } - public String getDeleteYn() { - return deleteYn; - } - public void setDeleteYn(String deleteYn) { - this.deleteYn = deleteYn; - } + public String getUseYn() { + return useYn; + } + public void setUseYn(String useYn) { + this.useYn = useYn; + } 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 c4d34057..247f1195 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 @@ -26,5 +26,7 @@ public interface ExmpAppManageService { RestResponse existsExmpManagerDataCheck(ExmpManageVO exmpManageVO); + void adjstOpinionDelect(ExmpManageVO exmpManageVO); + } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/impl/ExmpAppManageDAO.java b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/impl/ExmpAppManageDAO.java index 3d7d2983..987d47b9 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/impl/ExmpAppManageDAO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/impl/ExmpAppManageDAO.java @@ -63,5 +63,9 @@ public class ExmpAppManageDAO extends EgovAbstractDAO { return (int) select("ExmpAppManageDAO.existsExmpManagerDataCheck", exmpManageVO); } + public void adjstOpinionDelect(ExmpManageVO exmpManageVO) { + update("ExmpAppManageDAO.adjstOpinionDelect", exmpManageVO); + } + } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/impl/ExmpAppManageServiceImpl.java b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/impl/ExmpAppManageServiceImpl.java index 4bb85cc0..e2dd894f 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/impl/ExmpAppManageServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/app/service/impl/ExmpAppManageServiceImpl.java @@ -84,6 +84,7 @@ public class ExmpAppManageServiceImpl implements ExmpAppManageService { try { exmpManageVO.setExmpMgrId(idgenExmpMrgService.getNextStringId()); + exmpManageVO.setUseYn("Y"); exmpAppManageDAO.insertExmpAppManager(exmpManageVO); // for(ExmpManageVO model : exmpManageVO.getExmpList()){ // model.setExmpMgrId(exmpManageVO.getExmpMgrId()); @@ -124,4 +125,9 @@ public class ExmpAppManageServiceImpl implements ExmpAppManageService { } + + @Override + public void adjstOpinionDelect(ExmpManageVO exmpManageVO) { + exmpAppManageDAO.adjstOpinionDelect(exmpManageVO); + } } diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/cmm/ExmpManageVO.java b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/cmm/ExmpManageVO.java index b17dedb5..35bcc084 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/cmm/ExmpManageVO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/cmm/ExmpManageVO.java @@ -67,6 +67,8 @@ public class ExmpManageVO extends ConciliatorManageVO { private String exmpCn; private String atchFileId; + + private String useYn; public List getExmpList() { return exmpList; @@ -156,6 +158,14 @@ public class ExmpManageVO extends ConciliatorManageVO { this.atchFileId = atchFileId; } + public String getUseYn() { + return useYn; + } + + public void setUseYn(String useYn) { + this.useYn = useYn; + } + 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 f3dfb420..e9cf9198 100644 --- a/src/main/java/kcc/kccadr/adjcclt/opinion/web/AdjstOpinionController.java +++ b/src/main/java/kcc/kccadr/adjcclt/opinion/web/AdjstOpinionController.java @@ -14,6 +14,7 @@ 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.mvc.support.RedirectAttributes; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; @@ -55,6 +56,19 @@ public class AdjstOpinionController { // return ResponseEntity.ok().body(adjstOpinionService.adjstFindByOpinion(adjstOpinionVO)); // } + @RequestMapping("/web/kccadr/adjcclt/ai/adjstOpinionDelect.do") + public String adjstOpinionDelect(@ModelAttribute("exmpManageVO") ExmpManageVO exmpManageVO, RedirectAttributes re) throws Exception + { + + exmpAppManageService.adjstOpinionDelect(exmpManageVO); + + re.addAttribute("searchCondition", exmpManageVO.getSearchCondition()); + re.addAttribute("searchKeyword", exmpManageVO.getSearchKeyword()); + re.addAttribute("pageIndex", exmpManageVO.getPageIndex()); + return "redirect:/web/kccadr/adjcclt/ai/adjstOpinionList.do"; + } + + @RequestMapping("/web/kccadr/adjcclt/ai/adjstOpinionList.do") public String adjstOpinionList(@ModelAttribute("exmpManageVO") ExmpManageVO exmpManageVO, ModelMap model) throws Exception { @@ -70,8 +84,6 @@ public class AdjstOpinionController { // 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()); diff --git a/src/main/java/kcc/kccadr/adjcclt/service/AdjstConciliatorService.java b/src/main/java/kcc/kccadr/adjcclt/service/AdjstConciliatorService.java index 9f9d1495..45c3a91b 100644 --- a/src/main/java/kcc/kccadr/adjcclt/service/AdjstConciliatorService.java +++ b/src/main/java/kcc/kccadr/adjcclt/service/AdjstConciliatorService.java @@ -73,4 +73,6 @@ public interface AdjstConciliatorService { void insertEndAdrPdfConversionReq(AdjstConciliatorVO adjstConciliatorVO) throws Exception; + void updateAdjstRecommendationCommentDelete(AdjstConciliatorVO adjstConciliatorVO); + } diff --git a/src/main/java/kcc/kccadr/adjcclt/service/impl/AdjstConciliatorDAO.java b/src/main/java/kcc/kccadr/adjcclt/service/impl/AdjstConciliatorDAO.java index e6e67e7d..b2009ace 100644 --- a/src/main/java/kcc/kccadr/adjcclt/service/impl/AdjstConciliatorDAO.java +++ b/src/main/java/kcc/kccadr/adjcclt/service/impl/AdjstConciliatorDAO.java @@ -151,5 +151,9 @@ public class AdjstConciliatorDAO extends EgovAbstractDAO { public void insertEndAdrPdfConversionReq(AdjstConciliatorVO adjstConciliatorVO) throws Exception { insert("adjstConciliatorDAO.insertEndAdrPdfConversionReq", adjstConciliatorVO); } + + public void updateAdjstRecommendationCommentDelete(AdjstConciliatorVO adjstConciliatorVO) { + update("adjstConciliatorDAO.updateAdjstRecommendationCommentDelete", adjstConciliatorVO); + } } diff --git a/src/main/java/kcc/kccadr/adjcclt/service/impl/AdjstConciliatorServiceImpl.java b/src/main/java/kcc/kccadr/adjcclt/service/impl/AdjstConciliatorServiceImpl.java index a7e48913..8f7e9a58 100644 --- a/src/main/java/kcc/kccadr/adjcclt/service/impl/AdjstConciliatorServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjcclt/service/impl/AdjstConciliatorServiceImpl.java @@ -223,11 +223,17 @@ public class AdjstConciliatorServiceImpl implements AdjstConciliatorService { exmpManageVO.setExmpCcTy(adjstConciliatorVO.getCmntTy()); exmpManageVO.setExmpCn(adjstConciliatorVO.getCmntCn()); exmpManageVO.setFrstRegisterId(adjstConciliatorVO.getFrstRegisterId()); + exmpManageVO.setUseYn("Y"); exmpAppManageDAO.insertExmpAppManager(exmpManageVO); } } + @Override + public void updateAdjstRecommendationCommentDelete(AdjstConciliatorVO adjstConciliatorVO) { + adjstConciliatorDAO.updateAdjstRecommendationCommentDelete(adjstConciliatorVO); + } + } diff --git a/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java b/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java index a15b6696..587301af 100644 --- a/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java +++ b/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java @@ -2,6 +2,7 @@ package kcc.kccadr.adjcclt.web; import java.time.DayOfWeek; import java.time.LocalDate; +import java.time.LocalDateTime; import java.time.format.TextStyle; import java.util.ArrayList; import java.util.List; @@ -10,11 +11,13 @@ import java.util.Map; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import javax.ws.rs.core.Response.Status; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; @@ -60,50 +63,50 @@ import kcc.kccadr.ojct.service.OjctVO; import kcc.let.utl.fcc.service.EgovCryptoUtil; /** - * 대국민(사용자) - * 조정사건 관한 controller 클래스를 정의한다. + * 대국민(사용자) 조정사건 관한 controller 클래스를 정의한다. + * * @author 김봉호 * @since 2021.08.23 * @version 1.0 * @see * - * 
+ *      
  * << 개정이력(Modification Information) >>
  *
  *   수정일      수정자           수정내용
  *  -------    --------    ---------------------------
  *   2021.08.23  김봉호          최초 생성
  *
- * 

+ *
*/ @Controller public class AdjstConciliatorController { private static final Logger LOGGER = LoggerFactory.getLogger(AdjstConciliatorController.class); - @Resource(name = "pgrCmmService") - private PgrCmmService cmmService; - - @Resource(name="adjstConciliatorService") + @Resource(name = "pgrCmmService") + private PgrCmmService cmmService; + + @Resource(name = "adjstConciliatorService") private AdjstConciliatorService adjstConciliatorService; - - @Resource(name = "drtService") - private DrtService drtService; - - @Resource(name = "dntService") - private DntService dntService; - - //이의신청 - @Resource(name="ojctService") + + @Resource(name = "drtService") + private DrtService drtService; + + @Resource(name = "dntService") + private DntService dntService; + + // 이의신청 + @Resource(name = "ojctService") private OjctService ojctService; @Resource(name = "EgovFileMngService") private EgovFileMngService fileService; - @Resource(name="adjstReqStatusService") + @Resource(name = "adjstReqStatusService") private AdjstReqStatusService adjstReqStatusService; - - //암복호화 유틸 + + // 암복호화 유틸 @Resource(name = "egovCryptoUtil") EgovCryptoUtil egovCryptoUtil; @@ -111,104 +114,111 @@ public class AdjstConciliatorController { @Resource(name = "checkAdrProcessUtil") private CheckAdrProcessUtil checkAdrProcessUtil; - @Resource(name="KccadrMgrUdtService") + @Resource(name = "KccadrMgrUdtService") private KccadrMgrUdtService kccadrMgrUdtService; - //조정사건 이력관리 일련번호 - @Resource(name="adrHstryMgrSeqGnrService") + // 조정사건 이력관리 일련번호 + @Resource(name = "adrHstryMgrSeqGnrService") private EgovIdGnrService adrHstryMgrSeqGnrService; - @Resource(name = "ExmpAppManageService") - private ExmpAppManageService exmpAppManageService; + @Resource(name = "ExmpAppManageService") + private ExmpAppManageService exmpAppManageService; + /** * 조정위원 대시보드 화면 */ @RequestMapping("/web/kccadr/adjcclt/ai/adjstConciliatorDashList.do") - public String adjstConciliatorDashList(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, ModelMap model, HttpServletRequest request) throws Exception { + public String adjstConciliatorDashList(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, + ModelMap model, HttpServletRequest request) throws Exception { + + String auth = EgovUserDetailsHelper.isAuthenticated() ? null + : EgovUserDetailsHelper.getAuthenticatedUser().toString(); + LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); - 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"; } - + adjstConciliatorVO.setFrstRegisterId(loginVO.getUniqId()); adjstConciliatorVO.setMemSeq(loginVO.getUniqId()); - if("".equals(adjstConciliatorVO.getSearchSortCnd())){ //최초조회시 최신것 조회List + if ("".equals(adjstConciliatorVO.getSearchSortCnd())) { // 최초조회시 최신것 조회List adjstConciliatorVO.setSearchSortCnd("RS.ADR_SEQ"); adjstConciliatorVO.setSearchSortOrd("desc"); } - //최신 5건 조회 + // 최신 5건 조회 adjstConciliatorVO.setFirstIndex(0); adjstConciliatorVO.setRecordCountPerPage(5); - //List list = adjstConciliatorService.selectAdjstConciliatorDashList(adjstConciliatorVO); - //대시보드 전용 > 조정 진행목록 쿼리로 수정 + // List list = + // adjstConciliatorService.selectAdjstConciliatorDashList(adjstConciliatorVO); + // 대시보드 전용 > 조정 진행목록 쿼리로 수정 List list = adjstConciliatorService.selectAdjstConciliatorList(adjstConciliatorVO); decryptInfomation(list, null); model.addAttribute("list", list); - //조정 진행 수량 가져오기 - //EgovMap resultMap = adjstConciliatorService.selectAdjstConciliatorDashSummary(adjstConciliatorVO); - //model.addAttribute("resultMap", resultMap); - //대시보드 전용 > 조정 진행목록 쿼리로 수정 + // 조정 진행 수량 가져오기 + // EgovMap resultMap = + // adjstConciliatorService.selectAdjstConciliatorDashSummary(adjstConciliatorVO); + // model.addAttribute("resultMap", resultMap); + // 대시보드 전용 > 조정 진행목록 쿼리로 수정 int listCnt = adjstConciliatorService.selectAdjstConciliatorCount(adjstConciliatorVO); model.addAttribute("listCnt", listCnt); - - //결재대기 수량 가져오기 - //대시보드 전용 > 결재 목록 조회 쿼리로 수정 - //EgovMap resultSbmtMap = adjstConciliatorService.selectAdjstConciliatorDashSbmtSummary(adjstConciliatorVO); + + // 결재대기 수량 가져오기 + // 대시보드 전용 > 결재 목록 조회 쿼리로 수정 + // EgovMap resultSbmtMap = + // adjstConciliatorService.selectAdjstConciliatorDashSbmtSummary(adjstConciliatorVO); adjstConciliatorVO.setSearchSbmtId(loginVO.getUniqId()); - //결재대기 조건 추가 - String[] appliCantNmList = {"01"}; + // 결재대기 조건 추가 + String[] appliCantNmList = { "01" }; adjstConciliatorVO.setSearchStatusArr(appliCantNmList); int apmCnt = adjstConciliatorService.selectAdjstConciliatorApmCount(adjstConciliatorVO); model.addAttribute("apmCnt", apmCnt); - - //오늘 날짜 가져오기 + // 오늘 날짜 가져오기 LocalDate now = LocalDate.now(); - int year = now.getYear(); //년 - int month = now.getMonthValue(); //월 - int day = now.getDayOfMonth(); //일 + int year = now.getYear(); // 년 + int month = now.getMonthValue(); // 월 + int day = now.getDayOfMonth(); // 일 DayOfWeek dayOfWeek = now.getDayOfWeek(); - String today = dayOfWeek.getDisplayName(TextStyle.FULL, Locale.KOREAN); //요일 + String today = dayOfWeek.getDisplayName(TextStyle.FULL, Locale.KOREAN); // 요일 model.addAttribute("year", year); model.addAttribute("month", month); model.addAttribute("day", day); model.addAttribute("today", today); - + return "/web/kccadr/adjcclt/adjstConciliatorDashList"; } - + /** * 조정사건 목록 화면 */ @RequestMapping("/web/kccadr/adjcclt/ai/adjstConciliatorList.do") - public String adjstDeputyReqList(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, ModelMap model, HttpServletRequest request) throws Exception { + public String adjstDeputyReqList(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, + ModelMap model, HttpServletRequest request) throws Exception { + + String auth = EgovUserDetailsHelper.isAuthenticated() ? null + : EgovUserDetailsHelper.getAuthenticatedUser().toString(); + LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); - 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"; } - + adjstConciliatorVO.setFrstRegisterId(loginVO.getUniqId()); adjstConciliatorVO.setMemSeq(loginVO.getUniqId()); - if(adjstConciliatorVO.getPageUnit() != 10) { + if (adjstConciliatorVO.getPageUnit() != 10) { adjstConciliatorVO.setPageUnit(adjstConciliatorVO.getPageUnit()); } - if("".equals(adjstConciliatorVO.getSearchSortCnd())){ //최초조회시 최신것 조회List + if ("".equals(adjstConciliatorVO.getSearchSortCnd())) { // 최초조회시 최신것 조회List adjstConciliatorVO.setSearchSortCnd("RS.ADR_SEQ"); adjstConciliatorVO.setSearchSortOrd("desc"); } @@ -224,10 +234,10 @@ public class AdjstConciliatorController { adjstConciliatorVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); List list = adjstConciliatorService.selectAdjstConciliatorList(adjstConciliatorVO); - + paginationInfo.setTotalRecordCount(list.size() != 0 ? list.get(0).getTotCnt() : 0); model.addAttribute("paginationInfo", paginationInfo); - + decryptInfomation(list, null); model.addAttribute("list", list); @@ -238,7 +248,8 @@ public class AdjstConciliatorController { * 조정사건 목록 화면 */ @RequestMapping("/web/kccadr/adjcclt/adjstConciliatorDetail.do") - public String adjstConciliatorDetail(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, ModelMap model) throws Exception { + public String adjstConciliatorDetail(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, + ModelMap model) throws Exception { return "/web/kccadr/adjcclt/adjstConciliatorDetail"; } @@ -246,40 +257,44 @@ public class AdjstConciliatorController { * 조정진행 상세 사건정보 탭 화면 */ @RequestMapping("/web/kccadr/adjcclt/tab/adjstConciliatorTabInfo.do") - public String adjstConciliatorTabInfo(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, ModelMap model) throws Exception { + public String adjstConciliatorTabInfo(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, + ModelMap model) throws Exception { AdjstConciliatorVO master = adjstConciliatorService.selectAdjstConciliatorMaster(adjstConciliatorVO); - + // 마스터 테이블 파일 정보 - if(StringUtils.isNotBlank(master.getAtchFileId())){ + if (StringUtils.isNotBlank(master.getAtchFileId())) { FileVO fileVO = new FileVO(); fileVO.setAtchFileId(master.getAtchFileId()); List fileList = fileService.selectFileInfs(fileVO); master.setFileList(fileList); } - + model.addAttribute("master", master); - + // 신청인만 조회 adjstConciliatorVO.setRpplTy(KccadrConstants.ADR_RPPL_TY_REQ); - List reqPerson = adjstConciliatorService.selectAdjstConciliatorPersonList(adjstConciliatorVO); + List reqPerson = adjstConciliatorService + .selectAdjstConciliatorPersonList(adjstConciliatorVO); decryptInfomation(reqPerson, null); model.addAttribute("reqPerson", reqPerson); // 피신청인 adjstConciliatorVO.setRpplTy(KccadrConstants.ADR_RPPL_TY_RES); - List resPerson = adjstConciliatorService.selectAdjstConciliatorPersonList(adjstConciliatorVO); + List resPerson = adjstConciliatorService + .selectAdjstConciliatorPersonList(adjstConciliatorVO); decryptInfomation(resPerson, null); model.addAttribute("resPerson", resPerson); - //List list = adjstConciliatorService.selectAdjstConciliatorAgentList(adjstConciliatorVO); - - //신청인의 대리인 정보 불러오기 + // List list = + // adjstConciliatorService.selectAdjstConciliatorAgentList(adjstConciliatorVO); + + // 신청인의 대리인 정보 불러오기 adjstConciliatorVO.setRpplTy(KccadrConstants.ADR_RPPL_TY_REQ_DEPUTY); List list = adjstConciliatorService.selectAdjstConciliatorPersonList(adjstConciliatorVO); decryptInfomation(list, null); // 대리인 신청 파일 정보 - for(AdjstConciliatorVO rsModel : list){ - if(StringUtils.isNotBlank(rsModel.getAtchFileId())){ + for (AdjstConciliatorVO rsModel : list) { + if (StringUtils.isNotBlank(rsModel.getAtchFileId())) { FileVO fileVO = new FileVO(); fileVO.setAtchFileId(master.getAtchFileId()); List fileList = fileService.selectFileInfs(fileVO); @@ -288,48 +303,54 @@ public class AdjstConciliatorController { } model.addAttribute("agentList", list); - //피신청인 대리인 정보 불러오기 + // 피신청인 대리인 정보 불러오기 adjstConciliatorVO.setRpplTy(KccadrConstants.ADR_RPPL_TY_RES_DEPUTY); - List resDepuList = adjstConciliatorService.selectAdjstConciliatorPersonList(adjstConciliatorVO); + List resDepuList = adjstConciliatorService + .selectAdjstConciliatorPersonList(adjstConciliatorVO); decryptInfomation(resDepuList, null); - - //피신청인 대리인 신청 파일 정보 - for(AdjstConciliatorVO depModel : resDepuList){ - if(StringUtils.isNotBlank(depModel.getAtchFileId())){ + + // 피신청인 대리인 신청 파일 정보 + for (AdjstConciliatorVO depModel : resDepuList) { + if (StringUtils.isNotBlank(depModel.getAtchFileId())) { FileVO fileVO = new FileVO(); fileVO.setAtchFileId(master.getAtchFileId()); List fileList = fileService.selectFileInfs(fileVO); depModel.setFileList(fileList); } } - + model.addAttribute("resDepuList", resDepuList); - + // 기일정보 - /*List fixedDateList = adjstConciliatorService.selectAdjstConciliatorFixedDateList(adjstConciliatorVO); - decryptInfomation(fixedDateList, null); - model.addAttribute("fixedDateList", fixedDateList);*/ - - //기일정보 변경 정보로 받아오기 20220127 우영두 수정 - //1개 이상의 기일변경을 요청한 경우 조정 기일 정보를 group_concat 으로 받아와서 현재 요청 날짜와 이전 날짜를 함께 보여줌 - 변경승인이 완료된 리스트만 불러옴 + /* + * List fixedDateList = + * adjstConciliatorService.selectAdjstConciliatorFixedDateList( + * adjstConciliatorVO); decryptInfomation(fixedDateList, null); + * model.addAttribute("fixedDateList", fixedDateList); + */ + + // 기일정보 변경 정보로 받아오기 20220127 우영두 수정 + // 1개 이상의 기일변경을 요청한 경우 조정 기일 정보를 group_concat 으로 받아와서 현재 요청 날짜와 이전 날짜를 함께 보여줌 - + // 변경승인이 완료된 리스트만 불러옴 adjstConciliatorVO.setChgSts("Y"); - List fixedDateList = adjstConciliatorService.selectAdjstConciliatorChangeDateList(adjstConciliatorVO); + List fixedDateList = adjstConciliatorService + .selectAdjstConciliatorChangeDateList(adjstConciliatorVO); decryptInfomation(fixedDateList, null); model.addAttribute("fixedDateList", fixedDateList); // 상세 종결관련 데이터 조회 model.addAttribute("endInfo", adjstConciliatorService.selectAdjstConciliatorEndInfo(adjstConciliatorVO)); - - //이의신청 정보 불러오기 + + // 이의신청 정보 불러오기 OjctVO ojctVO = new OjctVO(); ojctVO.setAdrSeq(adjstConciliatorVO.getAdrSeq()); ojctVO.setAdrSn(adjstConciliatorVO.getAdrSn()); - + int ojctCnt = 0; ojctCnt = ojctService.selectOjctListCount(ojctVO); - + model.addAttribute("ojctCnt", ojctCnt); - + return "/web/kccadr/adjcclt/tab/adjstConciliatorTabInfo"; } @@ -337,16 +358,20 @@ public class AdjstConciliatorController { * 조정사건 목록 화면 */ @RequestMapping("/web/kccadr/adjcclt/tab/adjstConciliatorTabDocs.do") - public String adjstConciliatorTabDocs(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, ModelMap model) throws Exception { - //model.addAttribute("docList", adjstConciliatorService.selectAdjstConciliatorTabDocsList(adjstConciliatorVO)); + public String adjstConciliatorTabDocs(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, + ModelMap model) throws Exception { + // model.addAttribute("docList", + // adjstConciliatorService.selectAdjstConciliatorTabDocsList(adjstConciliatorVO)); AdjstReqStatusVO adjstReqStatusVO = new AdjstReqStatusVO(); adjstReqStatusVO.setAdrSeq(adjstConciliatorVO.getAdrSeq()); - //model.addAttribute("docList", adjstReqStatusService.selectAdjstHistoryList(adjstReqStatusVO)); - model.addAttribute("docList" , adjstReqStatusService.selectAdjstDocs20211020List(adjstReqStatusVO)); - - //model.addAttribute("list" , adjstReqStatusService.selectAdjstHistoryList(adjstReqStatusVO)); - //return "/web/kccadr/accdnt/ars/tab/adjstReqStatusTabStatus"; - + // model.addAttribute("docList", + // adjstReqStatusService.selectAdjstHistoryList(adjstReqStatusVO)); + model.addAttribute("docList", adjstReqStatusService.selectAdjstDocs20211020List(adjstReqStatusVO)); + + // model.addAttribute("list" , + // adjstReqStatusService.selectAdjstHistoryList(adjstReqStatusVO)); + // return "/web/kccadr/accdnt/ars/tab/adjstReqStatusTabStatus"; + return "/web/kccadr/adjcclt/tab/adjstConciliatorTabDocs"; } @@ -354,25 +379,29 @@ public class AdjstConciliatorController { * 기일조서 상세 화면 */ @RequestMapping("/web/kccadr/adjcclt/adjstDrtDetail.do") - public String adjstDrtDetail(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, PgrCmmVO cmmVO, DrtVO drtVO, ModelMap model) throws Exception { - - /*AdjstConciliatorVO info = adjstConciliatorService.selectAdjstDrtDetail(adjstConciliatorVO); - decryptInfomation(null, info); - model.addAttribute("info", info);*/ - - List assList = drtService.selectAssList(drtVO); + public String adjstDrtDetail(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, + PgrCmmVO cmmVO, DrtVO drtVO, ModelMap model) throws Exception { - PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); - - //(조정위원)조정진행 목록 상세 - 기일조서 - adjstConciliatorVO.setChgSts("Y"); - List fixedDateList = adjstConciliatorService.selectAdjstConciliatorChangeDateList2(adjstConciliatorVO); + /* + * AdjstConciliatorVO info = + * adjstConciliatorService.selectAdjstDrtDetail(adjstConciliatorVO); + * decryptInfomation(null, info); model.addAttribute("info", info); + */ + + List assList = drtService.selectAssList(drtVO); + + PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); + + // (조정위원)조정진행 목록 상세 - 기일조서 + adjstConciliatorVO.setChgSts("Y"); + List fixedDateList = adjstConciliatorService + .selectAdjstConciliatorChangeDateList2(adjstConciliatorVO); decryptInfomation(fixedDateList, null); model.addAttribute("fixedDateList", fixedDateList); - - model.addAttribute("assList", assList); - model.addAttribute("info", info); - + + model.addAttribute("assList", assList); + model.addAttribute("info", info); + return "/web/kccadr/adjcclt/adjstDrtDetail"; } @@ -380,34 +409,39 @@ public class AdjstConciliatorController { * 기일조서 상세 > 자주쓰는 의견 목록 팝업 */ @RequestMapping("/web/kccadr/adjcclt/popup/adjstOpinionsPopList.do") - public String adjstOpinionsPopList(@ModelAttribute("exmpManageVO") ExmpManageVO exmpManageVO, ModelMap model) throws Exception { - if(exmpManageVO.getPageUnit() != 10) { - exmpManageVO.setPageUnit(exmpManageVO.getPageUnit()); - } + public String adjstOpinionsPopList(@ModelAttribute("exmpManageVO") ExmpManageVO exmpManageVO, ModelMap model) + throws Exception { - if("".equals(exmpManageVO.getSearchSortCnd())){ //최초조회시 최신것 조회List + LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); + exmpManageVO.setFrstRegisterId(loginVO.getUniqId()); + + if (exmpManageVO.getPageUnit() != 10) { + exmpManageVO.setPageUnit(exmpManageVO.getPageUnit()); + } + + 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()); + } + System.out.println("exmpManageVO.getSearchCondition() :: " + exmpManageVO.getSearchCondition()); + + /** 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.setExmpCd("03"); + + paginationInfo.setTotalRecordCount(exmpAppManageService.selectExmpOpinionsManagerCount(exmpManageVO)); + model.addAttribute("paginationInfo", paginationInfo); + model.addAttribute("list", exmpAppManageService.selectExmpOpinionsManagerList(exmpManageVO)); - 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/popup/adjstOpinionsPopList"; } @@ -415,53 +449,54 @@ public class AdjstConciliatorController { * 의견관리 목록 > 자주쓰는 의견 등록 팝업 */ @RequestMapping("/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopList.do") - public String adjstOpinionsRegistPopList(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, ModelMap model) throws Exception { + public String adjstOpinionsRegistPopList( + @ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, ModelMap model) + throws Exception { 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)); + public String opinionsRegistAdjstPopDetail(@ModelAttribute("exmpManageVO") ExmpManageVO exmpManageVO, + ModelMap model) throws Exception { + Map resultMap = exmpAppManageService.selectExmpAppManagerInfo(exmpManageVO);; + + model.addAttribute("mgrInfo", resultMap.get("mgrInfo")); return "/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopDetail"; } - - @RequestMapping(value="/web/kccadr/adjcclt/insertExmpOpinionsAjax.do") - public ResponseEntity insertExmpAppManager(ExmpManageVO exmpManageVO) throws Exception { + @RequestMapping(value = "/web/kccadr/adjcclt/insertExmpOpinionsAjax.do") + public ResponseEntity insertExmpAppManager(ExmpManageVO exmpManageVO) throws Exception { - LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); - exmpManageVO.setFrstRegisterId(loginVO.getUniqId()); + 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"); + } + + @RequestMapping(value = "/web/kccadr/adjcclt/updateExmpOpinionsAjax.do") + public ResponseEntity updateExmpAppManager(ExmpManageVO exmpManageVO) throws Exception { - 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; - }*/ + LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); + exmpManageVO.setLastUpdusrId(loginVO.getUniqId()); + try { + exmpAppManageService.updateExmpManager(exmpManageVO); + + } catch (Exception e) { + return ResponseEntity.ok().body(new RestResponse(HttpStatus.BAD_REQUEST, "수정이 실패하였습니다.", LocalDateTime.now())); + } + + + return ResponseEntity.ok().body(new RestResponse(HttpStatus.OK, "정상적으로 수정되었습니다.", LocalDateTime.now())); + } + /** * 조정사건 목록 화면 */ @RequestMapping("/web/kccadr/adjcclt/adjstCancleDetail.do") - public String adjstCancleDetail(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, ModelMap model) throws Exception { + public String adjstCancleDetail(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, + ModelMap model) throws Exception { AdjstConciliatorVO info = adjstConciliatorService.selectAdjstCancleDetail(adjstConciliatorVO); decryptInfomation(null, info); model.addAttribute("info", info); @@ -472,7 +507,9 @@ public class AdjstConciliatorController { * 불성립종결통보서 상세 화면 */ @RequestMapping("/web/kccadr/adjcclt/adjstNoEstablishmentDetail.do") - public String adjstNoEstablishmentDetail(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, ModelMap model) throws Exception { + public String adjstNoEstablishmentDetail( + @ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, ModelMap model) + throws Exception { AdjstConciliatorVO info = adjstConciliatorService.selectAdjstCancleDetail(adjstConciliatorVO); decryptInfomation(null, info); model.addAttribute("info", info); @@ -483,7 +520,8 @@ public class AdjstConciliatorController { * 조정사건 목록 화면 */ @RequestMapping("/web/kccadr/adjcclt/adjstRecommendationDetail.do") - public String adjstRecommendationDetail(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, ModelMap model) throws Exception { + public String adjstRecommendationDetail(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, + ModelMap model) throws Exception { AdjstConciliatorVO info = adjstConciliatorService.selectAdjstCancleDetail(adjstConciliatorVO); decryptInfomation(null, info); model.addAttribute("info", info); @@ -494,8 +532,9 @@ public class AdjstConciliatorController { * 조정사건 목록 화면 */ @RequestMapping("/web/kccadr/adjcclt/adjstProtocolDetail.do") - public String adjstProtocolDetail(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, ModelMap model) throws Exception { - + public String adjstProtocolDetail(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, + ModelMap model) throws Exception { + adjstConciliatorVO.setStatCd(KccadrConstants.ADR_JJOSU_APPR_REQ); adjstConciliatorVO.setDlvryDocTy("40"); AdjstConciliatorVO info = adjstConciliatorService.selectAdjstCancleDetail(adjstConciliatorVO); @@ -505,7 +544,9 @@ public class AdjstConciliatorController { } @RequestMapping("/web/kccadr/adjcclt/adjstMediationDecisionDetail.do") - public String adjstMediationDecisionDetail(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, ModelMap model) throws Exception { + public String adjstMediationDecisionDetail( + @ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, ModelMap model) + throws Exception { AdjstConciliatorVO info = adjstConciliatorService.selectAdjstCancleDetail(adjstConciliatorVO); decryptInfomation(null, info); model.addAttribute("info", info); @@ -516,14 +557,15 @@ public class AdjstConciliatorController { * 조정사건 목록 화면 */ @RequestMapping("/web/kccadr/adjcclt/comment/adjstRecommendationCommentList.do") - public String adjstRecommendationCommentList(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, ModelMap model) throws Exception { + public String adjstRecommendationCommentList( + @ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, ModelMap model) + throws Exception { - - if(adjstConciliatorVO.getPageUnit() != 10) { + if (adjstConciliatorVO.getPageUnit() != 10) { adjstConciliatorVO.setPageUnit(adjstConciliatorVO.getPageUnit()); } - if("".equals(adjstConciliatorVO.getSearchSortCnd())){ //최초조회시 최신것 조회List + if ("".equals(adjstConciliatorVO.getSearchSortCnd())) { // 최초조회시 최신것 조회List adjstConciliatorVO.setSearchSortCnd("T1.FRST_REGIST_PNTTM"); adjstConciliatorVO.setSearchSortOrd("desc"); } @@ -538,51 +580,56 @@ public class AdjstConciliatorController { adjstConciliatorVO.setLastIndex(paginationInfo.getLastRecordIndex()); adjstConciliatorVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); + adjstConciliatorVO.setUseYn("Y"); paginationInfo.setTotalRecordCount(adjstConciliatorService.selectAdjstRecommendationCommentCount(adjstConciliatorVO)); model.addAttribute("paginationInfo", paginationInfo); - List list = adjstConciliatorService.selectAdjstRecommendationCommentList(adjstConciliatorVO); + List list = adjstConciliatorService.selectAdjstRecommendationCommentList(adjstConciliatorVO); decryptInfomation(list, null); model.addAttribute("list", list); return "/web/kccadr/adjcclt/comment/adjstRecommendationCommentList"; } - - + /** * 조정사건 목록 화면 */ @RequestMapping("/web/kccadr/adjcclt/comment/adjstRecommendationPastCommentList.do") - public String adjstRecommendationPastCommentList(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, ModelMap model) throws Exception { - - - if(adjstConciliatorVO.getPageUnit() != 10) { + public String adjstRecommendationPastCommentList( + @ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, ModelMap model) + throws Exception { + + if (adjstConciliatorVO.getPageUnit() != 10) { adjstConciliatorVO.setPageUnit(adjstConciliatorVO.getPageUnit()); } - - if("".equals(adjstConciliatorVO.getSearchSortCnd())){ //최초조회시 최신것 조회List + + if ("".equals(adjstConciliatorVO.getSearchSortCnd())) { // 최초조회시 최신것 조회List adjstConciliatorVO.setSearchSortCnd("T1.FRST_REGIST_PNTTM"); adjstConciliatorVO.setSearchSortOrd("desc"); } - + /** paging */ PaginationInfo paginationInfo = new PaginationInfo(); paginationInfo.setCurrentPageNo(adjstConciliatorVO.getPageIndex()); paginationInfo.setRecordCountPerPage(adjstConciliatorVO.getPageUnit()); paginationInfo.setPageSize(adjstConciliatorVO.getPageSize()); - + adjstConciliatorVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); adjstConciliatorVO.setLastIndex(paginationInfo.getLastRecordIndex()); adjstConciliatorVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - - paginationInfo.setTotalRecordCount(adjstConciliatorService.selectAdjstRecommendationCommentCount(adjstConciliatorVO)); + + paginationInfo + .setTotalRecordCount(adjstConciliatorService.selectAdjstRecommendationCommentCount(adjstConciliatorVO)); model.addAttribute("paginationInfo", paginationInfo); - List list = adjstConciliatorService.selectAdjstRecommendationCommentList(adjstConciliatorVO); + List list = adjstConciliatorService + .selectAdjstRecommendationCommentList(adjstConciliatorVO); decryptInfomation(list, null); model.addAttribute("list", list); return "/web/kccadr/adjcclt/comment/adjstRecommendationPastCommentList"; } @RequestMapping("/web/kccadr/adjcclt/popup/adjstRecommendationCommentDetail.do") - public String adjstRecommendationCommentDetail(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, ModelMap model) throws Exception { + public String adjstRecommendationCommentDetail( + @ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, ModelMap model) + throws Exception { model.addAttribute("info", adjstConciliatorService.selectAdjstRecommendationCommentDetail(adjstConciliatorVO)); return "/web/kccadr/adjcclt/popup/adjstRecommendationCommentDetail"; } @@ -592,88 +639,136 @@ public class AdjstConciliatorController { * @return String * @exception Exception */ - @RequestMapping(value="/web/kccadr/adjcclt/commnet/adjstRecommendationCommentSave.do", method = RequestMethod.POST) - public ModelAndView adjReqMgrRegPaymentMultyPopupSave(HttpServletRequest request , @RequestBody AdjstConciliatorVO adjstConciliatorVO) throws Exception { + @RequestMapping(value = "/web/kccadr/adjcclt/commnet/adjstRecommendationCommentSave.do", method = RequestMethod.POST) + public ModelAndView adjReqMgrRegPaymentMultyPopupSave(HttpServletRequest request, + @RequestBody AdjstConciliatorVO adjstConciliatorVO) throws Exception { ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("jsonView"); - String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString(); - LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); - + String auth = EgovUserDetailsHelper.isAuthenticated() ? null + : EgovUserDetailsHelper.getAuthenticatedUser().toString(); + LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); + if (loginVO == null) { modelAndView.addObject("result", "fail"); modelAndView.addObject("message", "로그인 해주세요."); return modelAndView; } - + adjstConciliatorVO.setFrstRegisterId(loginVO.getUniqId()); adjstConciliatorVO.setLastUpdusrId(loginVO.getUniqId()); adjstConciliatorVO.setMemSeq(loginVO.getUniqId()); + adjstConciliatorVO.setUseYn("Y"); int rs = adjstConciliatorService.insertAdjstRecommendationCommentSave(adjstConciliatorVO); - modelAndView.addObject("rs", (rs>0)); + modelAndView.addObject("rs", (rs > 0)); modelAndView.addObject("rs", 0); return modelAndView; } + + /** + * @methodName : adjstRecommendationCommentDelete + * @author : 이호영 + * @date : 2022.10.18 + * @description : 삭제 처리 (useYn='N' 처리) + * @param request + * @param adjstConciliatorVO + * @return + * @throws Exception + */ + @RequestMapping(value = "/web/kccadr/adjcclt/commnet/adjstRecommendationCommentDelete.do", method = RequestMethod.POST) + public ModelAndView adjstRecommendationCommentDelete(HttpServletRequest request, + @RequestBody AdjstConciliatorVO adjstConciliatorVO) throws Exception { + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + String auth = EgovUserDetailsHelper.isAuthenticated() ? null + : EgovUserDetailsHelper.getAuthenticatedUser().toString(); + LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); + + if (loginVO == null) { + + modelAndView.addObject("result", "fail"); + modelAndView.addObject("message", "로그인 해주세요."); + return modelAndView; + } + adjstConciliatorVO.setLastUpdusrId(loginVO.getUniqId()); + adjstConciliatorVO.setUseYn("N"); + try { + adjstConciliatorService.updateAdjstRecommendationCommentDelete(adjstConciliatorVO); + modelAndView.addObject("rs", "OK"); + modelAndView.addObject("msg", "삭제처리 되었습니다."); + } catch (Exception e) { + modelAndView.addObject("rs", "FALSE"); + modelAndView.addObject("msg", "오류가 발생하였습니다.\n관리자에게 문의해 주세요"); + // TODO: handle exception + } + + return modelAndView; + } /** * * @return String * @exception Exception */ - @RequestMapping(value="/web/kccadr/adjcclt/adjstEndConfirmSave.do", method = RequestMethod.POST) - public ModelAndView adjstEndConfirmSave(HttpServletRequest request , @RequestBody AdjstConciliatorVO adjstConciliatorVO) throws Exception { + @RequestMapping(value = "/web/kccadr/adjcclt/adjstEndConfirmSave.do", method = RequestMethod.POST) + public ModelAndView adjstEndConfirmSave(HttpServletRequest request, + @RequestBody AdjstConciliatorVO adjstConciliatorVO) throws Exception { ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("jsonView"); - String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString(); - LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); - + String auth = EgovUserDetailsHelper.isAuthenticated() ? null + : EgovUserDetailsHelper.getAuthenticatedUser().toString(); + LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); + if (loginVO == null) { modelAndView.addObject("result", "fail"); modelAndView.addObject("message", "로그인 해주세요."); return modelAndView; } - + adjstConciliatorVO.setFrstRegisterId(loginVO.getUniqId()); adjstConciliatorVO.setLastUpdusrId(loginVO.getUniqId()); adjstConciliatorVO.setMemSeq(loginVO.getUniqId()); int rs = adjstConciliatorService.updateAdjstEndConfirmSave(adjstConciliatorVO); - modelAndView.addObject("rs", (rs>0)); + modelAndView.addObject("rs", (rs > 0)); return modelAndView; } @RequestMapping("/web/kccadr/adjcclt/ai/adjstConciliatorApmList.do") - public String adjstConciliatorApmList(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, ModelMap model, HttpServletRequest request) throws Exception { - String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString(); - LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); - + public String adjstConciliatorApmList(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, + 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"; } - + adjstConciliatorVO.setFrstRegisterId(loginVO.getUniqId()); adjstConciliatorVO.setMemSeq(loginVO.getUniqId()); adjstConciliatorVO.setSearchSbmtId(loginVO.getUniqId()); - if(adjstConciliatorVO.getPageUnit() != 10) { + if (adjstConciliatorVO.getPageUnit() != 10) { adjstConciliatorVO.setPageUnit(adjstConciliatorVO.getPageUnit()); } - if("".equals(adjstConciliatorVO.getSearchSortCnd())){ //최초조회시 최신것 조회List + if ("".equals(adjstConciliatorVO.getSearchSortCnd())) { // 최초조회시 최신것 조회List adjstConciliatorVO.setSearchSortCnd("RS.frstRegistPnttm"); adjstConciliatorVO.setSearchSortOrd("desc"); } - - if(StringUtils.isEmpty(adjstConciliatorVO.getSearchStartDt()) && StringUtils.isEmpty(adjstConciliatorVO.getSearchEndDt())){ - adjstConciliatorVO.setSearchStartDt(CmmUtil.getDiffMonth(1 , "yyyy-MM-dd")); + if (StringUtils.isEmpty(adjstConciliatorVO.getSearchStartDt()) + && StringUtils.isEmpty(adjstConciliatorVO.getSearchEndDt())) { + adjstConciliatorVO.setSearchStartDt(CmmUtil.getDiffMonth(1, "yyyy-MM-dd")); adjstConciliatorVO.setSearchEndDt(CmmUtil.getDateNow("yyyy-MM-dd")); } @@ -700,41 +795,44 @@ public class AdjstConciliatorController { * 조정사건 상세 화면 */ @RequestMapping("/web/kccadr/adjcclt/ai/adjstConciliatorApmDetail.do") - public String adjstConciliatorApmDetail(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, ModelMap model) throws Exception { - String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString(); - LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); - + public String adjstConciliatorApmDetail(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, + ModelMap model) 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"; } - + adjstConciliatorVO.setSearchSbmtId(loginVO.getUniqId()); AdjstConciliatorVO info = adjstConciliatorService.selectAdjstConciliatorApmDetail(adjstConciliatorVO); - //처리여부 + // 처리여부 AdjstConciliatorVO sbmtYn = adjstConciliatorService.selectAdjstConciliatorApmSbmtYn(adjstConciliatorVO); decryptInfomation(null, info); model.addAttribute("info", info); model.addAttribute("sbmtYn", sbmtYn); - - //기일통지서 요청, 기일변경 요청 상태일때 기일 제출 정보를 불러온다. + + // 기일통지서 요청, 기일변경 요청 상태일때 기일 제출 정보를 불러온다. String statCd = info.getStatCd(); AdjstConciliatorVO dntInfo = new AdjstConciliatorVO(); - if(statCd.equals(KccadrConstants.ADR_APP_NTC_REQ) - || statCd.equals(KccadrConstants.ADR_APP_CHG_REQ)) { - + if (statCd.equals(KccadrConstants.ADR_APP_NTC_REQ) || statCd.equals(KccadrConstants.ADR_APP_CHG_REQ)) { + dntInfo = adjstConciliatorService.selectAdjstConciliatorDntSbmtYnInfo(adjstConciliatorVO); } model.addAttribute("dntInfo", dntInfo); - - //기일정보 변경 정보로 받아오기 20220127 우영두 수정 - //1개 이상의 기일변경을 요청한 경우 조정 기일 정보를 group_concat 으로 받아와서 현재 요청 날짜와 이전 날짜를 함께 보여줌 - 변경요청이 제출되고 결재 승인이 안된 날짜 포함해서 불러옴 + + // 기일정보 변경 정보로 받아오기 20220127 우영두 수정 + // 1개 이상의 기일변경을 요청한 경우 조정 기일 정보를 group_concat 으로 받아와서 현재 요청 날짜와 이전 날짜를 함께 보여줌 - + // 변경요청이 제출되고 결재 승인이 안된 날짜 포함해서 불러옴 adjstConciliatorVO.setChgSts("N"); - List fixedDateList = adjstConciliatorService.selectAdjstConciliatorChangeDateList(adjstConciliatorVO); + List fixedDateList = adjstConciliatorService + .selectAdjstConciliatorChangeDateList(adjstConciliatorVO); decryptInfomation(fixedDateList, null); model.addAttribute("fixedDateList", fixedDateList); - + return "/web/kccadr/adjcclt/adjstConciliatorApmDetail"; } @@ -743,145 +841,148 @@ public class AdjstConciliatorController { * @return String * @exception Exception */ - @RequestMapping(value="/web/kccadr/adjcclt/ai/adjstConciliatorApmSave.do", method = RequestMethod.POST) - public ModelAndView adjstConciliatorApmSave(HttpServletRequest request , @RequestBody AdjstConciliatorVO adjstConciliatorVO) throws Exception { + @RequestMapping(value = "/web/kccadr/adjcclt/ai/adjstConciliatorApmSave.do", method = RequestMethod.POST) + public ModelAndView adjstConciliatorApmSave(HttpServletRequest request, + @RequestBody AdjstConciliatorVO adjstConciliatorVO) throws Exception { ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("jsonView"); - String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString(); - LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); - + String auth = EgovUserDetailsHelper.isAuthenticated() ? null + : EgovUserDetailsHelper.getAuthenticatedUser().toString(); + LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); + if (loginVO == null) { modelAndView.addObject("result", "fail"); modelAndView.addObject("message", "로그인 해주세요."); return modelAndView; } - + adjstConciliatorVO.setFrstRegisterId(loginVO.getUniqId()); adjstConciliatorVO.setLastUpdusrId(loginVO.getUniqId()); adjstConciliatorVO.setSbmtId(loginVO.getUniqId()); - //결제 전 상태를 체크한다.. - String s_process_check_result = checkAdrProcessUtil.processCheck(adjstConciliatorVO.getAdrSeq(), adjstConciliatorVO.getSbmtTy()); + // 결제 전 상태를 체크한다.. + String s_process_check_result = checkAdrProcessUtil.processCheck(adjstConciliatorVO.getAdrSeq(), + adjstConciliatorVO.getSbmtTy()); if (!"".equals(s_process_check_result)) { modelAndView.addObject("result", KccadrConstants.FAIL); modelAndView.addObject("message", s_process_check_result); return modelAndView; } - - - //이력관리를 위한 adr_hstry_mgr_detail - 2022-09-07 controller #1 - String s_adrHstryMgrSeq = adrHstryMgrSeqGnrService.getNextStringId(); - - + + // 이력관리를 위한 adr_hstry_mgr_detail - 2022-09-07 controller #1 + String s_adrHstryMgrSeq = adrHstryMgrSeqGnrService.getNextStringId(); + int rs = adjstConciliatorService.updateConciliatorApmSave(adjstConciliatorVO); - if(rs > 0 ){ + if (rs > 0) { // 결재 후 상태 조회 AdjstConciliatorVO statInfo = adjstConciliatorService.selectAdjstConciliatorAPmStatus(adjstConciliatorVO); // 모든 결재가 끝났다면... - if("Y".equals(statInfo.getAllYn())){ + if ("Y".equals(statInfo.getAllYn())) { AdjReqMgrVO arv = new AdjReqMgrVO(); arv.setAdrSeq(adjstConciliatorVO.getAdrSeq()); // 조정일련번호 - arv.setStatCd(CmmUtil.getDynamicStatCd(adjstConciliatorVO.getSbmtTy(), KccadrConstants.ADR_STAT_CRM)); // 최종 변경 상태값 + arv.setStatCd(CmmUtil.getDynamicStatCd(adjstConciliatorVO.getSbmtTy(), KccadrConstants.ADR_STAT_CRM)); // 최종 + // 변경 + // 상태값 arv.setLastUpdusrId(loginVO.getUniqId()); // 최종 변경자 - kccadrMgrUdtService.updateAdrMgrUdt(arv - , s_adrHstryMgrSeq - ); - }else if("Y".equals(statInfo.getRejectYn())){ + kccadrMgrUdtService.updateAdrMgrUdt(arv, s_adrHstryMgrSeq); + } else if ("Y".equals(statInfo.getRejectYn())) { AdjReqMgrVO arv = new AdjReqMgrVO(); arv.setAdrSeq(adjstConciliatorVO.getAdrSeq()); // 조정일련번호 - arv.setStatCd(CmmUtil.getDynamicStatCd(adjstConciliatorVO.getSbmtTy(), KccadrConstants.ADR_STAT_RJT)); // 최종 변경 상태값 + arv.setStatCd(CmmUtil.getDynamicStatCd(adjstConciliatorVO.getSbmtTy(), KccadrConstants.ADR_STAT_RJT)); // 최종 + // 변경 + // 상태값 arv.setLastUpdusrId(loginVO.getUniqId()); // 최종 변경자 - kccadrMgrUdtService.updateAdrMgrUdt(arv - , s_adrHstryMgrSeq - ); + kccadrMgrUdtService.updateAdrMgrUdt(arv, s_adrHstryMgrSeq); } - modelAndView.addObject("rs", (rs>0)); + modelAndView.addObject("rs", (rs > 0)); modelAndView.addObject("result", KccadrConstants.SUCCESS); modelAndView.addObject("adrHstryMgrSeq", s_adrHstryMgrSeq); - + System.out.println("s_adrHstryMgrSeq=================="); System.out.println(s_adrHstryMgrSeq); System.out.println("s_adrHstryMgrSeq==================="); - - }else{ - modelAndView.addObject("rs", (rs>0)); + + } else { + modelAndView.addObject("rs", (rs > 0)); modelAndView.addObject("result", KccadrConstants.FAIL); } return modelAndView; } - - /** - * 기일 결재 승인 여부 수정 TODO daenge 기일 결재 승인 여부 수정 - * - * @param dntVO - * @param model - * @return - * @throws Exception - */ - @RequestMapping("/web/kccadr/adjcclt/ai/dntUpdApprYnAjax.do") - public ModelAndView dntUpdApprYnAjax(@ModelAttribute("dntVO") DntVO dntVO, ModelMap model, RedirectAttributes redirectAttributes, final MultipartHttpServletRequest multiRequest) throws Exception { - ModelAndView modelAndView = new ModelAndView(); - modelAndView.setViewName("jsonView"); + /** + * 기일 결재 승인 여부 수정 TODO daenge 기일 결재 승인 여부 수정 + * + * @param dntVO + * @param model + * @return + * @throws Exception + */ + @RequestMapping("/web/kccadr/adjcclt/ai/dntUpdApprYnAjax.do") + public ModelAndView dntUpdApprYnAjax(@ModelAttribute("dntVO") DntVO dntVO, ModelMap model, + RedirectAttributes redirectAttributes, final MultipartHttpServletRequest multiRequest) throws Exception { - LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null; - String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); - dntVO.setFrstRegisterId(userId); - dntVO.setLastUpdusrId(userId); + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); - //기일통지서 요청, 기일변경요청 상태의 승인/반려 처리 상태 및 일자 업데이트 처리 - if(StringUtil.isNotEmpty(dntVO.getApprYn())) { - - if(dntVO.getApprYn().equals("Y")) { - - //승인 처리 - dntService.dntUpdApprYnY(dntVO - , "조정진행관리>>조정진행목록>조정진행상세>기일등록>조정기일지정-통지확인요청-Y" //String p_code_desc - CC199 - , "A135" //String p_stat_cd - , dntVO.getAssHstrySeq() - ); - - }else { - - //반려 처리 - 제출 이전의 상태로 변경함 (sbmt_yn : N, appr_yn : n 상태로 만듬) - dntService.dntUpdApprYnN(dntVO - , "조정진행관리>>조정진행목록>조정진행상세>기일등록>조정기일지정-통지확인요청-N" //String p_code_desc - CC199 - , "A136" //String p_stat_cd - , "" - ); - - } - - } - - modelAndView.addObject("result", "SUCCESS"); + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() + ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() + : null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + dntVO.setFrstRegisterId(userId); + dntVO.setLastUpdusrId(userId); - return modelAndView; + // 기일통지서 요청, 기일변경요청 상태의 승인/반려 처리 상태 및 일자 업데이트 처리 + if (StringUtil.isNotEmpty(dntVO.getApprYn())) { - } - - - /* - * 조정위원 조정진행 상세 - 이의신청 목록 화면 - * - * */ + if (dntVO.getApprYn().equals("Y")) { + + // 승인 처리 + dntService.dntUpdApprYnY(dntVO, "조정진행관리>>조정진행목록>조정진행상세>기일등록>조정기일지정-통지확인요청-Y" // String p_code_desc - + // CC199 + , "A135" // String p_stat_cd + , dntVO.getAssHstrySeq()); + + } else { + + // 반려 처리 - 제출 이전의 상태로 변경함 (sbmt_yn : N, appr_yn : n 상태로 만듬) + dntService.dntUpdApprYnN(dntVO, "조정진행관리>>조정진행목록>조정진행상세>기일등록>조정기일지정-통지확인요청-N" // String p_code_desc - + // CC199 + , "A136" // String p_stat_cd + , ""); + + } + + } + + modelAndView.addObject("result", "SUCCESS"); + + return modelAndView; + + } + + /* + * 조정위원 조정진행 상세 - 이의신청 목록 화면 + * + */ @RequestMapping("/web/kccadr/adjcclt/adjstOjctList.do") - public String adjstOjctList(@ModelAttribute("ojctVO") OjctVO ojctVO, ModelMap model, HttpServletRequest request) throws Exception { - String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString(); - LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); - + public String adjstOjctList(@ModelAttribute("ojctVO") OjctVO ojctVO, 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"; } - - if(ojctVO.getPageUnit() != 10) { + + if (ojctVO.getPageUnit() != 10) { ojctVO.setPageUnit(ojctVO.getPageUnit()); } - + /** paging */ PaginationInfo paginationInfo = new PaginationInfo(); paginationInfo.setCurrentPageNo(ojctVO.getPageIndex()); @@ -894,35 +995,34 @@ public class AdjstConciliatorController { ojctVO.setOjctCd("02"); paginationInfo.setTotalRecordCount(ojctService.selectOjctListCount(ojctVO)); - + List ojctList = ojctService.selectOjctList(ojctVO); - + model.addAttribute("paginationInfo", paginationInfo); model.addAttribute("ojctList", ojctList); model.addAttribute("ojctVO", ojctVO); return "/web/kccadr/adjcclt/adjstOjctList"; } - + @RequestMapping("/web/kccadr/adjcclt/popup/adjstOjctDetail.do") public String adjstOjctDetail(@ModelAttribute("ojctVO") OjctVO ojctVO, ModelMap model) throws Exception { - + OjctVO result = ojctService.selectOjctDetail(ojctVO); // 상세 조회 model.addAttribute("result", result); PgrCmmVO cmmVO = new PgrCmmVO(); cmmVO.setAdrSeq(ojctVO.getAdrSeq()); - - // 조정사건일반 - model.addAttribute("info", cmmService.selectPgrCmm(cmmVO)); - + + // 조정사건일반 + model.addAttribute("info", cmmService.selectPgrCmm(cmmVO)); + return "/web/kccadr/adjcclt/popup/adjstOjctDetail"; } - - public void decryptInfomation(List list, AdjstConciliatorVO info){ - if(CollectionUtils.isNotEmpty(list)){ - for(AdjstConciliatorVO model : list){ + public void decryptInfomation(List list, AdjstConciliatorVO info) { + if (CollectionUtils.isNotEmpty(list)) { + for (AdjstConciliatorVO model : list) { model.setRpplNm(egovCryptoUtil.decrypt(model.getRpplNm())); model.setRpplAddr(egovCryptoUtil.decrypt(model.getRpplAddr())); model.setRpplAddrDtl(egovCryptoUtil.decrypt(model.getRpplAddrDtl())); @@ -933,97 +1033,94 @@ public class AdjstConciliatorController { model.setRpplRealAddr(egovCryptoUtil.decrypt(model.getRpplRealAddr())); model.setRpplRealAddrDtl(egovCryptoUtil.decrypt(model.getRpplRealAddrDtl())); - model.setDepuTyNm(egovCryptoUtil.decrypt(model.getDepuTyNm())); // model.setResPonDentNm(egovCryptoUtil.decrypt(model.getResPonDentNm())); - - //피신청인 명수 표시 '외 N명' 처리_이준호_220801 + + // 피신청인 명수 표시 '외 N명' 처리_이준호_220801 if (!StringUtil.isEmpty(model.getResPonDentNm())) { String tmpStr = ""; - if(model.getResPonDentNm().contains("외")) { - tmpStr = model.getResPonDentNm().substring(model.getResPonDentNm().length()-3); - } - model.setResPonDentNm(egovCryptoUtil.decrypt(model.getResPonDentNm()) + " " + tmpStr); + if (model.getResPonDentNm().contains("외")) { + tmpStr = model.getResPonDentNm().substring(model.getResPonDentNm().length() - 3); + } + model.setResPonDentNm(egovCryptoUtil.decrypt(model.getResPonDentNm()) + " " + tmpStr); } - + model.setAppliCantNm(egovCryptoUtil.decrypt(model.getAppliCantNm())); model.setAdrAdmNm(egovCryptoUtil.decrypt(model.getAdrAdmNm())); model.setCmntNm(egovCryptoUtil.decrypt(model.getCmntNm())); model.setRpplRespddSeq(model.getRpplRespddSeq()); model.setAppPlaceTy(model.getAppPlaceTy()); model.setAppPlaceAddrTy(model.getAppPlaceAddrTy()); - - //조정부장 이름 복호화 - if(StringUtils.isNotBlank(model.getAdrCdnt())) { - - model.setAdrCdnt(egovCryptoUtil.decrypt(model.getAdrCdnt())); - - } - - //조정위원 복호화 - if(StringUtils.isNotBlank(model.getAdrCclt())) { - - String[] strSplit = model.getAdrCclt().split(","); - - if(strSplit.length > 1) { - List names = new ArrayList<>(); - for(String cclt : strSplit) { - names.add(egovCryptoUtil.decrypt(cclt)); - } - model.setAdrCclt(String.join(",", names)); - }else { - model.setAdrCclt(egovCryptoUtil.decrypt(strSplit[0])); - } - - } - + // 조정부장 이름 복호화 + if (StringUtils.isNotBlank(model.getAdrCdnt())) { + + model.setAdrCdnt(egovCryptoUtil.decrypt(model.getAdrCdnt())); + + } + + // 조정위원 복호화 + if (StringUtils.isNotBlank(model.getAdrCclt())) { + + String[] strSplit = model.getAdrCclt().split(","); + + if (strSplit.length > 1) { + List names = new ArrayList<>(); + for (String cclt : strSplit) { + names.add(egovCryptoUtil.decrypt(cclt)); + } + model.setAdrCclt(String.join(",", names)); + } else { + model.setAdrCclt(egovCryptoUtil.decrypt(strSplit[0])); + } + + } // 피신청인 다중으로 가져왔을때.. - if(StringUtils.isNotBlank(model.getResPonDentNms())){ + if (StringUtils.isNotBlank(model.getResPonDentNms())) { String[] resNms = model.getResPonDentNms().split("\\|"); - if(resNms.length > 1 ){ + if (resNms.length > 1) { List names = new ArrayList<>(); - for(String name : resNms){ + for (String name : resNms) { names.add(egovCryptoUtil.decrypt(name)); } model.setResPonDentNms(String.join(",", names)); - }else{ + } else { model.setResPonDentNms(egovCryptoUtil.decrypt(resNms[0])); } } // 신청인 대리인 다중으로 가져왔을때.. - if(StringUtils.isNotBlank(model.getDepuTyNms())){ + if (StringUtils.isNotBlank(model.getDepuTyNms())) { String[] resNms = model.getDepuTyNms().split("\\|"); - if(resNms.length > 1 ){ + if (resNms.length > 1) { List names = new ArrayList<>(); - for(String name : resNms){ + for (String name : resNms) { names.add(egovCryptoUtil.decrypt(name)); } model.setDepuTyNms(String.join(",", names)); - }else{ + } else { model.setDepuTyNms(egovCryptoUtil.decrypt(resNms[0])); } } // 피신청인 대리인 다중으로 가져왔을때.. - if(StringUtils.isNotBlank(model.getResPonAgntNms())){ + if (StringUtils.isNotBlank(model.getResPonAgntNms())) { String[] resNms = model.getResPonAgntNms().split("\\|"); - if(resNms.length > 1 ){ + if (resNms.length > 1) { List names = new ArrayList<>(); - for(String name : resNms){ + for (String name : resNms) { names.add(egovCryptoUtil.decrypt(name)); } model.setResPonAgntNms(String.join(",", names)); - }else{ + } else { model.setResPonAgntNms(egovCryptoUtil.decrypt(resNms[0])); } } } } - if(info != null){ + if (info != null) { info.setRpplNm(egovCryptoUtil.decrypt(info.getRpplNm())); info.setRpplAddr(egovCryptoUtil.decrypt(info.getRpplAddr())); info.setRpplAddrDtl(egovCryptoUtil.decrypt(info.getRpplAddrDtl())); @@ -1040,70 +1137,69 @@ public class AdjstConciliatorController { info.setCmntNm(egovCryptoUtil.decrypt(info.getCmntNm())); info.setCcTyTx(info.getCcTyTx()); // 피신청인 다중으로 가져왔을때.. - if(StringUtils.isNotBlank(info.getResPonDentNms())){ + if (StringUtils.isNotBlank(info.getResPonDentNms())) { String[] resNms = info.getResPonDentNms().split(","); - if(resNms.length > 1 ){ + if (resNms.length > 1) { List names = new ArrayList<>(); - for(String name : resNms){ + for (String name : resNms) { names.add(egovCryptoUtil.decrypt(name)); } info.setResPonDentNms(String.join(",", names)); - }else{ + } else { info.setResPonDentNms(egovCryptoUtil.decrypt(resNms[0])); } } // 신청인 대리인 다중으로 가져왔을때.. - if(StringUtils.isNotBlank(info.getDepuTyNms())){ + if (StringUtils.isNotBlank(info.getDepuTyNms())) { String[] resNms = info.getDepuTyNms().split(","); - if(resNms.length > 1 ){ + if (resNms.length > 1) { List names = new ArrayList<>(); - for(String name : resNms){ + for (String name : resNms) { names.add(egovCryptoUtil.decrypt(name)); } info.setDepuTyNms(String.join(",", names)); - }else{ + } else { info.setDepuTyNms(egovCryptoUtil.decrypt(resNms[0])); } } // 피신청인 대리인 다중으로 가져왔을때.. - if(StringUtils.isNotBlank(info.getResPonAgntNms())){ + if (StringUtils.isNotBlank(info.getResPonAgntNms())) { String[] resNms = info.getResPonAgntNms().split(","); - if(resNms.length > 1 ){ + if (resNms.length > 1) { List names = new ArrayList<>(); - for(String name : resNms){ + for (String name : resNms) { names.add(egovCryptoUtil.decrypt(name)); } info.setResPonAgntNms(String.join(",", names)); - }else{ + } else { info.setResPonAgntNms(egovCryptoUtil.decrypt(resNms[0])); } } - //조정부장 이름 복호화 - if(StringUtils.isNotBlank(info.getAdrCdnt())) { - + // 조정부장 이름 복호화 + if (StringUtils.isNotBlank(info.getAdrCdnt())) { + info.setAdrCdnt(egovCryptoUtil.decrypt(info.getAdrCdnt())); - - } - //조정위원 복호화 - if(StringUtils.isNotBlank(info.getAdrCclt())) { - - String[] strSplit = info.getAdrCclt().split(","); - - if(strSplit.length > 1) { - List names = new ArrayList<>(); - for(String cclt : strSplit) { - names.add(egovCryptoUtil.decrypt(cclt)); - } - info.setAdrCclt(String.join(",", names)); - }else { - info.setAdrCclt(egovCryptoUtil.decrypt(strSplit[0])); - } - - } + + } + // 조정위원 복호화 + if (StringUtils.isNotBlank(info.getAdrCclt())) { + + String[] strSplit = info.getAdrCclt().split(","); + + if (strSplit.length > 1) { + List names = new ArrayList<>(); + for (String cclt : strSplit) { + names.add(egovCryptoUtil.decrypt(cclt)); + } + info.setAdrCclt(String.join(",", names)); + } else { + info.setAdrCclt(egovCryptoUtil.decrypt(strSplit[0])); + } + + } } } - } diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml index 2805dfb5..4604642c 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml @@ -738,7 +738,7 @@ , A.FRST_REGISTER_ID AS frstRegisterId /* 등록자" */ , A.LAST_UPDT_PNTTM AS lastUpdtPnttm /* 수정일시" */ , A.LAST_UPDUSR_ID AS lastUpdusrId /* 수정자" */ - , A.DELETE_YN AS deleteYn /* 삭제여부" */ + , A.USE_YN AS useYn /* 사용여부" */ , M.MEM_NAME AS memName /* 조정위원명" */ FROM ADR_MEM_CMNT A LEFT JOIN ADR_MEM_MGR M ON A.MEM_SEQ = M.MEM_SEQ @@ -761,7 +761,7 @@ , A.FRST_REGISTER_ID AS frstRegisterId /* 등록자" */ , A.LAST_UPDT_PNTTM AS lastUpdtPnttm /* 수정일시" */ , A.LAST_UPDUSR_ID AS lastUpdusrId /* 수정자" */ - , A.DELETE_YN AS deleteYn /* 삭제여부" */ + , A.USE_YN AS useYn /* 사용여부" */ , M.MEM_NAME AS memName /* 조정위원명" */ FROM ADR_MEM_CMNT A LEFT JOIN ADR_MEM_MGR M ON A.MEM_SEQ = M.MEM_SEQ 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 cc4c230f..5db34aee 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 @@ -28,6 +28,8 @@ COUNT(1) AS TOT FROM ADR_EXMP_MGR T1 WHERE T1.EXMP_CD = #exmpCd# + AND T1.FRST_REGISTER_ID = #frstRegisterId# + AND T1.USE_YN = 'Y' T1.EXMP_CN LIKE CONCAT('%' , #searchKeyword#, '%') @@ -38,18 +40,6 @@ AND T1.EXMP_CC_TY = #searchCondition# - - - - - - - - - - - - - " /> - " /> - " /> - - - +
+ + -
-
-
-

자주쓰는의견 목록

-
- -
-
- - - - - +
+
+
+

자주쓰는의견 목록

-
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
등록일유형내용삭제
-

- 		- - - - - -
-
- - - -
- -
- - - -
- -
- -
-
+ +
+
+ + + + + +
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
등록일유형내용삭제
+

+ 		+ + + + + +
+
+ + + +
+ +
+ + + +
+ +
+ +
+
+ diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopDetail.jsp index 0323c60e..4e11eb32 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopDetail.jsp @@ -27,7 +27,7 @@ $(document).ready(function(){ }); // 레이어팝업 포커싱 이동 수정 - $("#regBtn").click(function(){ + $("#updtBtn").click(function(){ if($('#exmpCcTy').val() == '') { @@ -42,7 +42,7 @@ $(document).ready(function(){ } - if(confirm("등록하시겠습니까?")) + if(confirm("수정하시겠습니까?")) { // var data = { // exmpCcTy : $("#exmpCcTy").val() @@ -53,7 +53,7 @@ $(document).ready(function(){ var data = new FormData(document.createForm); $.ajax({ type:"POST", - url: "/web/kccadr/adjcclt/insertExmpOpinionsAjax.do", + url: "/web/kccadr/adjcclt/updateExmpOpinionsAjax.do", data: data, dataType:'json', async: false, @@ -100,7 +100,7 @@ $(document).ready(function(){ 유형 - + @@ -112,14 +112,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 97546747..9eb5f1ad 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 @@ -63,7 +63,6 @@ $(document).ready(function(){ success:function(returnData){ if(returnData.status == "OK"){ alert(returnData.data); - window.location.reload(); }else{ alert(returnData.data); }