feat:의견 등록 - 기일조서, 조정권고안, 조정조서, 직권조정결정서 완료

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,11 +104,11 @@ public class CmntVO implements Serializable {
     public void setLastUpdusrId(String lastUpdusrId) {
         this.lastUpdusrId = lastUpdusrId;
     }
-    public String getDeleteYn() {
+	public String getUseYn() {
-        return deleteYn;
+		return useYn;
 	}
-    public void setDeleteYn(String deleteYn) {
+	public void setUseYn(String useYn) {
-        this.deleteYn = deleteYn;
+		this.useYn = useYn;
 	}
     
     

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);
+
 }
 

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);
+	}
+
 
 }

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);
+	}
 }

src/main/java/kcc/kccadr/adjPgrMgr/exmp/cmm/ExmpManageVO.java

@@ -68,6 +68,8 @@ public class ExmpManageVO extends ConciliatorManageVO {
 
     private String atchFileId;
     
+    private String useYn;
+
 	public List<ExmpManageVO> 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;
+	}
+
 
 
     

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());

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);
+    
 }

src/main/java/kcc/kccadr/adjcclt/service/impl/AdjstConciliatorDAO.java

@@ -152,4 +152,8 @@ public class AdjstConciliatorDAO extends EgovAbstractDAO {
 		insert("adjstConciliatorDAO.insertEndAdrPdfConversionReq", adjstConciliatorVO);
 	}
 
+	public void updateAdjstRecommendationCommentDelete(AdjstConciliatorVO adjstConciliatorVO) {
+        update("adjstConciliatorDAO.updateAdjstRecommendationCommentDelete", adjstConciliatorVO);
+	}
+    
 }

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);
+	}
+
 	
 }

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,8 +63,8 @@ import kcc.kccadr.ojct.service.OjctVO;
 import kcc.let.utl.fcc.service.EgovCryptoUtil;
 
 /**
- * 대국민(사용자)
+ * 대국민(사용자) 조정사건 관한 controller 클래스를 정의한다.
- * 조정사건 관한 controller 클래스를 정의한다.
+ * 
  * @author 김봉호
  * @since 2021.08.23
  * @version 1.0
@@ -120,13 +123,16 @@ public class AdjstConciliatorController {
 
 	@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();
+		String auth = EgovUserDetailsHelper.isAuthenticated() ? null
+				: EgovUserDetailsHelper.getAuthenticatedUser().toString();
 		LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
 
 		if (loginVO == null) {
@@ -147,14 +153,16 @@ public class AdjstConciliatorController {
 		adjstConciliatorVO.setFirstIndex(0);
 		adjstConciliatorVO.setRecordCountPerPage(5);
 
-		//List<AdjstConciliatorVO> list = adjstConciliatorService.selectAdjstConciliatorDashList(adjstConciliatorVO);
+		// List<AdjstConciliatorVO> list =
+		// adjstConciliatorService.selectAdjstConciliatorDashList(adjstConciliatorVO);
 		// 대시보드 전용 > 조정 진행목록 쿼리로 수정
 		List<AdjstConciliatorVO> list = adjstConciliatorService.selectAdjstConciliatorList(adjstConciliatorVO);
 		decryptInfomation(list, null);
 		model.addAttribute("list", list);
 
 		// 조정 진행 수량 가져오기
-		//EgovMap resultMap = adjstConciliatorService.selectAdjstConciliatorDashSummary(adjstConciliatorVO);
+		// EgovMap resultMap =
+		// adjstConciliatorService.selectAdjstConciliatorDashSummary(adjstConciliatorVO);
 		// model.addAttribute("resultMap", resultMap);
 		// 대시보드 전용 > 조정 진행목록 쿼리로 수정
 		int listCnt = adjstConciliatorService.selectAdjstConciliatorCount(adjstConciliatorVO);
@@ -162,7 +170,8 @@ public class AdjstConciliatorController {
 
 		// 결재대기 수량 가져오기
 		// 대시보드 전용 > 결재 목록 조회 쿼리로 수정
-		//EgovMap resultSbmtMap = adjstConciliatorService.selectAdjstConciliatorDashSbmtSummary(adjstConciliatorVO);
+		// EgovMap resultSbmtMap =
+		// adjstConciliatorService.selectAdjstConciliatorDashSbmtSummary(adjstConciliatorVO);
 		adjstConciliatorVO.setSearchSbmtId(loginVO.getUniqId());
 		// 결재대기 조건 추가
 		String[] appliCantNmList = { "01" };
@@ -170,7 +179,6 @@ public class AdjstConciliatorController {
 		int apmCnt = adjstConciliatorService.selectAdjstConciliatorApmCount(adjstConciliatorVO);
 		model.addAttribute("apmCnt", apmCnt);
 
-		
 		// 오늘 날짜 가져오기
 		LocalDate now = LocalDate.now();
 		int year = now.getYear(); // 년
@@ -190,9 +198,11 @@ public class AdjstConciliatorController {
 	 * 조정사건 목록 화면
 	 */
 	@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();
+		String auth = EgovUserDetailsHelper.isAuthenticated() ? null
+				: EgovUserDetailsHelper.getAuthenticatedUser().toString();
 		LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
 
 		if (loginVO == null) {
@@ -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,7 +257,8 @@ 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);
 
 		// 마스터 테이블 파일 정보
@@ -261,17 +273,20 @@ public class AdjstConciliatorController {
 
 		// 신청인만 조회
 		adjstConciliatorVO.setRpplTy(KccadrConstants.ADR_RPPL_TY_REQ);
-		List<AdjstConciliatorVO> reqPerson = adjstConciliatorService.selectAdjstConciliatorPersonList(adjstConciliatorVO);
+		List<AdjstConciliatorVO> reqPerson = adjstConciliatorService
+				.selectAdjstConciliatorPersonList(adjstConciliatorVO);
 		decryptInfomation(reqPerson, null);
 		model.addAttribute("reqPerson", reqPerson);
 
 		// 피신청인
 		adjstConciliatorVO.setRpplTy(KccadrConstants.ADR_RPPL_TY_RES);
-		List<AdjstConciliatorVO> resPerson = adjstConciliatorService.selectAdjstConciliatorPersonList(adjstConciliatorVO);
+		List<AdjstConciliatorVO> resPerson = adjstConciliatorService
+				.selectAdjstConciliatorPersonList(adjstConciliatorVO);
 		decryptInfomation(resPerson, null);
 		model.addAttribute("resPerson", resPerson);
 
-		//List<AdjstConciliatorVO> list =  adjstConciliatorService.selectAdjstConciliatorAgentList(adjstConciliatorVO);
+		// List<AdjstConciliatorVO> list =
+		// adjstConciliatorService.selectAdjstConciliatorAgentList(adjstConciliatorVO);
 
 		// 신청인의 대리인 정보 불러오기
 		adjstConciliatorVO.setRpplTy(KccadrConstants.ADR_RPPL_TY_REQ_DEPUTY);
@@ -290,7 +305,8 @@ public class AdjstConciliatorController {
 
 		// 피신청인 대리인 정보 불러오기
 		adjstConciliatorVO.setRpplTy(KccadrConstants.ADR_RPPL_TY_RES_DEPUTY);
-		List<AdjstConciliatorVO> resDepuList = adjstConciliatorService.selectAdjstConciliatorPersonList(adjstConciliatorVO);
+		List<AdjstConciliatorVO> resDepuList = adjstConciliatorService
+				.selectAdjstConciliatorPersonList(adjstConciliatorVO);
 		decryptInfomation(resDepuList, null);
 
 		// 피신청인 대리인 신청 파일 정보
@@ -306,14 +322,19 @@ public class AdjstConciliatorController {
 		model.addAttribute("resDepuList", resDepuList);
 
 		// 기일정보
-		/*List<AdjstConciliatorVO> fixedDateList = adjstConciliatorService.selectAdjstConciliatorFixedDateList(adjstConciliatorVO);
+		/*
-		decryptInfomation(fixedDateList, null);
+		 * List<AdjstConciliatorVO> fixedDateList =
-		model.addAttribute("fixedDateList", fixedDateList);*/
+		 * adjstConciliatorService.selectAdjstConciliatorFixedDateList(
+		 * adjstConciliatorVO); decryptInfomation(fixedDateList, null);
+		 * model.addAttribute("fixedDateList", fixedDateList);
+		 */
 
 		// 기일정보 변경 정보로 받아오기 20220127 우영두 수정
-		//1개 이상의 기일변경을 요청한 경우 조정 기일 정보를 group_concat 으로 받아와서 현재 요청 날짜와 이전 날짜를 함께 보여줌 - 변경승인이 완료된 리스트만 불러옴
+		// 1개 이상의 기일변경을 요청한 경우 조정 기일 정보를 group_concat 으로 받아와서 현재 요청 날짜와 이전 날짜를 함께 보여줌 -
+		// 변경승인이 완료된 리스트만 불러옴
 		adjstConciliatorVO.setChgSts("Y");
-		List<AdjstConciliatorVO> fixedDateList = adjstConciliatorService.selectAdjstConciliatorChangeDateList(adjstConciliatorVO);
+		List<AdjstConciliatorVO> fixedDateList = adjstConciliatorService
+				.selectAdjstConciliatorChangeDateList(adjstConciliatorVO);
 		decryptInfomation(fixedDateList, null);
 		model.addAttribute("fixedDateList", fixedDateList);
 
@@ -337,14 +358,18 @@ public class AdjstConciliatorController {
 	 * 조정사건 목록 화면
 	 */
 	@RequestMapping("/web/kccadr/adjcclt/tab/adjstConciliatorTabDocs.do")
-	public String adjstConciliatorTabDocs(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, ModelMap model) throws Exception {
+	public String adjstConciliatorTabDocs(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO,
-		//model.addAttribute("docList", adjstConciliatorService.selectAdjstConciliatorTabDocsList(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.selectAdjstHistoryList(adjstReqStatusVO));
 		model.addAttribute("docList", adjstReqStatusService.selectAdjstDocs20211020List(adjstReqStatusVO));
 
-		//model.addAttribute("list" , adjstReqStatusService.selectAdjstHistoryList(adjstReqStatusVO));
+		// model.addAttribute("list" ,
+		// adjstReqStatusService.selectAdjstHistoryList(adjstReqStatusVO));
 		// return "/web/kccadr/accdnt/ars/tab/adjstReqStatusTabStatus";
 
 		return "/web/kccadr/adjcclt/tab/adjstConciliatorTabDocs";
@@ -354,11 +379,14 @@ public class AdjstConciliatorController {
 	 * 기일조서 상세 화면
 	 */
 	@RequestMapping("/web/kccadr/adjcclt/adjstDrtDetail.do")
-	public String adjstDrtDetail(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, PgrCmmVO cmmVO, DrtVO drtVO, ModelMap model) throws Exception {
+	public String adjstDrtDetail(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO,
+			PgrCmmVO cmmVO, DrtVO drtVO, ModelMap model) throws Exception {
 
-		/*AdjstConciliatorVO info = adjstConciliatorService.selectAdjstDrtDetail(adjstConciliatorVO);
+		/*
-		decryptInfomation(null, info);
+		 * AdjstConciliatorVO info =
-		model.addAttribute("info", info);*/
+		 * adjstConciliatorService.selectAdjstDrtDetail(adjstConciliatorVO);
+		 * decryptInfomation(null, info); model.addAttribute("info", info);
+		 */
 
 		List<AssVO> assList = drtService.selectAssList(drtVO);
 
@@ -366,7 +394,8 @@ public class AdjstConciliatorController {
 
 		// (조정위원)조정진행 목록 상세 - 기일조서
 		adjstConciliatorVO.setChgSts("Y");
-		List<AdjstConciliatorVO> fixedDateList = adjstConciliatorService.selectAdjstConciliatorChangeDateList2(adjstConciliatorVO);
+		List<AdjstConciliatorVO> fixedDateList = adjstConciliatorService
+				.selectAdjstConciliatorChangeDateList2(adjstConciliatorVO);
 		decryptInfomation(fixedDateList, null);
 		model.addAttribute("fixedDateList", fixedDateList);
 
@@ -380,7 +409,12 @@ public class AdjstConciliatorController {
 	 * 기일조서 상세 > 자주쓰는 의견 목록 팝업
 	 */
 	@RequestMapping("/web/kccadr/adjcclt/popup/adjstOpinionsPopList.do")
-	public String adjstOpinionsPopList(@ModelAttribute("exmpManageVO") ExmpManageVO exmpManageVO, ModelMap model) throws Exception {
+	public String adjstOpinionsPopList(@ModelAttribute("exmpManageVO") ExmpManageVO exmpManageVO, ModelMap model)
+			throws Exception {
+
+		LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
+		exmpManageVO.setFrstRegisterId(loginVO.getUniqId());
+		
 		if (exmpManageVO.getPageUnit() != 10) {
 			exmpManageVO.setPageUnit(exmpManageVO.getPageUnit());
 		}
@@ -415,22 +449,24 @@ 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 {
+	public String opinionsRegistAdjstPopDetail(@ModelAttribute("exmpManageVO") ExmpManageVO exmpManageVO,
-		System.out.println(" + exmpManageVO :: "+ exmpManageVO.getExmpMgrId());
+			ModelMap model) throws Exception {
-		model.addAttribute("dataInfo",  exmpAppManageService.selectExmpAppManagerInfo(exmpManageVO));
+		Map<String, Object> 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<RestResponse> insertExmpAppManager(ExmpManageVO exmpManageVO) throws Exception {
 
@@ -438,30 +474,29 @@ public class AdjstConciliatorController {
 		exmpManageVO.setFrstRegisterId(loginVO.getUniqId());
 		return ResponseEntity.ok().body(exmpAppManageService.insertExmpAppManager(exmpManageVO));
 	}
-	/*
 	
-    @RequestMapping(value="/web/kccadr/adjcclt/insertExmpOpinionsAjax.do")
+	@RequestMapping(value = "/web/kccadr/adjcclt/updateExmpOpinionsAjax.do")
-    public ModelAndView insertExmpAppManager(ExmpManageVO exmpManageVO) throws Exception {
+	public ResponseEntity<RestResponse> updateExmpAppManager(ExmpManageVO exmpManageVO) throws Exception {
-    	ModelAndView modelAndView = new ModelAndView();
-		modelAndView.setViewName("jsonView");
 		
 		LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
+		exmpManageVO.setLastUpdusrId(loginVO.getUniqId());
+		try {
+			exmpAppManageService.updateExmpManager(exmpManageVO);
 			
-    	System.out.println("exmpManageVO.getExmpCd : " + exmpManageVO.getExmpCd());
+		} catch (Exception e) {
-    	System.out.println("exmpManageVO.getCcTy : " + exmpManageVO.getExmpCcTy());
+			return ResponseEntity.ok().body(new RestResponse(HttpStatus.BAD_REQUEST, "수정이 실패하였습니다.", LocalDateTime.now()));
-    	System.out.println("exmpManageVO.getExmpCn : " + exmpManageVO.getExmpCn());
+		}
 
-    	exmpManageVO.setFrstRegisterId(loginVO.getUniqId());
 		
-    	exmpAppManageService.insertExmpAppManager(exmpManageVO);
+		return ResponseEntity.ok().body(new RestResponse(HttpStatus.OK, "정상적으로 수정되었습니다.", LocalDateTime.now()));
+	}
 
-		return modelAndView;
-    }*/
 	/**
 	 * 조정사건 목록 화면
 	 */
 	@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,7 +532,8 @@ 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");
@@ -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,8 +557,9 @@ 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) {
 			adjstConciliatorVO.setPageUnit(adjstConciliatorVO.getPageUnit());
@@ -538,6 +580,7 @@ public class AdjstConciliatorController {
 		adjstConciliatorVO.setLastIndex(paginationInfo.getLastRecordIndex());
 		adjstConciliatorVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
 
+		adjstConciliatorVO.setUseYn("Y");
 		paginationInfo.setTotalRecordCount(adjstConciliatorService.selectAdjstRecommendationCommentCount(adjstConciliatorVO));
 		model.addAttribute("paginationInfo", paginationInfo);
 		List<AdjstConciliatorVO> list = adjstConciliatorService.selectAdjstRecommendationCommentList(adjstConciliatorVO);
@@ -546,13 +589,13 @@ public class AdjstConciliatorController {
 		return "/web/kccadr/adjcclt/comment/adjstRecommendationCommentList";
 	}
 
-	
 	/**
 	 * 조정사건 목록 화면
 	 */
 	@RequestMapping("/web/kccadr/adjcclt/comment/adjstRecommendationPastCommentList.do")
-	public String adjstRecommendationPastCommentList(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, ModelMap model) throws Exception {
+	public String adjstRecommendationPastCommentList(
-		
+			@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, ModelMap model)
+			throws Exception {
 
 		if (adjstConciliatorVO.getPageUnit() != 10) {
 			adjstConciliatorVO.setPageUnit(adjstConciliatorVO.getPageUnit());
@@ -573,16 +616,20 @@ public class AdjstConciliatorController {
 		adjstConciliatorVO.setLastIndex(paginationInfo.getLastRecordIndex());
 		adjstConciliatorVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
 
-		paginationInfo.setTotalRecordCount(adjstConciliatorService.selectAdjstRecommendationCommentCount(adjstConciliatorVO));
+		paginationInfo
+				.setTotalRecordCount(adjstConciliatorService.selectAdjstRecommendationCommentCount(adjstConciliatorVO));
 		model.addAttribute("paginationInfo", paginationInfo);
-		List<AdjstConciliatorVO> list =  adjstConciliatorService.selectAdjstRecommendationCommentList(adjstConciliatorVO);
+		List<AdjstConciliatorVO> 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";
 	}
@@ -593,11 +640,13 @@ public class AdjstConciliatorController {
 	 * @exception Exception
 	 */
 	@RequestMapping(value = "/web/kccadr/adjcclt/commnet/adjstRecommendationCommentSave.do", method = RequestMethod.POST)
-	public ModelAndView adjReqMgrRegPaymentMultyPopupSave(HttpServletRequest request , @RequestBody AdjstConciliatorVO adjstConciliatorVO) throws Exception {
+	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();
+		String auth = EgovUserDetailsHelper.isAuthenticated() ? null
+				: EgovUserDetailsHelper.getAuthenticatedUser().toString();
 		LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
 
 		if (loginVO == null) {
@@ -610,6 +659,7 @@ public class AdjstConciliatorController {
 		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));
@@ -617,6 +667,47 @@ public class AdjstConciliatorController {
 		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;
+	}
 
 	/**
 	 *
@@ -624,11 +715,13 @@ public class AdjstConciliatorController {
 	 * @exception Exception
 	 */
 	@RequestMapping(value = "/web/kccadr/adjcclt/adjstEndConfirmSave.do", method = RequestMethod.POST)
-	public ModelAndView adjstEndConfirmSave(HttpServletRequest request , @RequestBody AdjstConciliatorVO adjstConciliatorVO) throws Exception {
+	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();
+		String auth = EgovUserDetailsHelper.isAuthenticated() ? null
+				: EgovUserDetailsHelper.getAuthenticatedUser().toString();
 		LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
 
 		if (loginVO == null) {
@@ -648,8 +741,10 @@ public class AdjstConciliatorController {
 	}
 
 	@RequestMapping("/web/kccadr/adjcclt/ai/adjstConciliatorApmList.do")
-	public String adjstConciliatorApmList(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, ModelMap model, HttpServletRequest request) throws Exception {
+	public String adjstConciliatorApmList(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO,
-		String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString();
+			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) {
@@ -671,8 +766,8 @@ public class AdjstConciliatorController {
 			adjstConciliatorVO.setSearchSortOrd("desc");
 		}
 
-
+		if (StringUtils.isEmpty(adjstConciliatorVO.getSearchStartDt())
-		if(StringUtils.isEmpty(adjstConciliatorVO.getSearchStartDt()) && StringUtils.isEmpty(adjstConciliatorVO.getSearchEndDt())){
+				&& StringUtils.isEmpty(adjstConciliatorVO.getSearchEndDt())) {
 			adjstConciliatorVO.setSearchStartDt(CmmUtil.getDiffMonth(1, "yyyy-MM-dd"));
 			adjstConciliatorVO.setSearchEndDt(CmmUtil.getDateNow("yyyy-MM-dd"));
 		}
@@ -700,8 +795,10 @@ public class AdjstConciliatorController {
 	 * 조정사건 상세 화면
 	 */
 	@RequestMapping("/web/kccadr/adjcclt/ai/adjstConciliatorApmDetail.do")
-	public String adjstConciliatorApmDetail(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, ModelMap model) throws Exception {
+	public String adjstConciliatorApmDetail(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO,
-		String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString();
+			ModelMap model) throws Exception {
+		String auth = EgovUserDetailsHelper.isAuthenticated() ? null
+				: EgovUserDetailsHelper.getAuthenticatedUser().toString();
 		LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
 
 		if (loginVO == null) {
@@ -721,17 +818,18 @@ public class AdjstConciliatorController {
 		// 기일통지서 요청, 기일변경 요청 상태일때 기일 제출 정보를 불러온다.
 		String statCd = info.getStatCd();
 		AdjstConciliatorVO dntInfo = new AdjstConciliatorVO();
-		if(statCd.equals(KccadrConstants.ADR_APP_NTC_REQ)
+		if (statCd.equals(KccadrConstants.ADR_APP_NTC_REQ) || statCd.equals(KccadrConstants.ADR_APP_CHG_REQ)) {
-				|| statCd.equals(KccadrConstants.ADR_APP_CHG_REQ)) {
 
 			dntInfo = adjstConciliatorService.selectAdjstConciliatorDntSbmtYnInfo(adjstConciliatorVO);
 		}
 		model.addAttribute("dntInfo", dntInfo);
 
 		// 기일정보 변경 정보로 받아오기 20220127 우영두 수정
-		//1개 이상의 기일변경을 요청한 경우 조정 기일 정보를 group_concat 으로 받아와서 현재 요청 날짜와 이전 날짜를 함께 보여줌 - 변경요청이 제출되고 결재 승인이 안된 날짜 포함해서 불러옴
+		// 1개 이상의 기일변경을 요청한 경우 조정 기일 정보를 group_concat 으로 받아와서 현재 요청 날짜와 이전 날짜를 함께 보여줌 -
+		// 변경요청이 제출되고 결재 승인이 안된 날짜 포함해서 불러옴
 		adjstConciliatorVO.setChgSts("N");
-		List<AdjstConciliatorVO> fixedDateList = adjstConciliatorService.selectAdjstConciliatorChangeDateList(adjstConciliatorVO);
+		List<AdjstConciliatorVO> fixedDateList = adjstConciliatorService
+				.selectAdjstConciliatorChangeDateList(adjstConciliatorVO);
 		decryptInfomation(fixedDateList, null);
 		model.addAttribute("fixedDateList", fixedDateList);
 
@@ -744,11 +842,13 @@ public class AdjstConciliatorController {
 	 * @exception Exception
 	 */
 	@RequestMapping(value = "/web/kccadr/adjcclt/ai/adjstConciliatorApmSave.do", method = RequestMethod.POST)
-	public ModelAndView adjstConciliatorApmSave(HttpServletRequest request , @RequestBody AdjstConciliatorVO adjstConciliatorVO) throws Exception {
+	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();
+		String auth = EgovUserDetailsHelper.isAuthenticated() ? null
+				: EgovUserDetailsHelper.getAuthenticatedUser().toString();
 		LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
 
 		if (loginVO == null) {
@@ -763,18 +863,17 @@ public class AdjstConciliatorController {
 		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();
 
-		
 		int rs = adjstConciliatorService.updateConciliatorApmSave(adjstConciliatorVO);
 		if (rs > 0) {
 			// 결재 후 상태 조회
@@ -783,19 +882,19 @@ public class AdjstConciliatorController {
 			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
+				kccadrMgrUdtService.updateAdrMgrUdt(arv, s_adrHstryMgrSeq);
-						, 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
+				kccadrMgrUdtService.updateAdrMgrUdt(arv, s_adrHstryMgrSeq);
-						, s_adrHstryMgrSeq
-						);
 			}
 			modelAndView.addObject("rs", (rs > 0));
 			modelAndView.addObject("result", KccadrConstants.SUCCESS);
@@ -821,12 +920,15 @@ public class AdjstConciliatorController {
 	 * @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 {
+	public ModelAndView dntUpdApprYnAjax(@ModelAttribute("dntVO") DntVO dntVO, ModelMap model,
+			RedirectAttributes redirectAttributes, final MultipartHttpServletRequest multiRequest) throws Exception {
 
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.setViewName("jsonView");
 
-        LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null;
+		LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()
+				? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser()
+				: null;
 		String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
 		dntVO.setFrstRegisterId(userId);
 		dntVO.setLastUpdusrId(userId);
@@ -837,20 +939,18 @@ public class AdjstConciliatorController {
 			if (dntVO.getApprYn().equals("Y")) {
 
 				// 승인 처리
-        		dntService.dntUpdApprYnY(dntVO
+				dntService.dntUpdApprYnY(dntVO, "조정진행관리>>조정진행목록>조정진행상세>기일등록>조정기일지정-통지확인요청-Y" // String p_code_desc -
-        				, "조정진행관리>>조정진행목록>조정진행상세>기일등록>조정기일지정-통지확인요청-Y"	//String p_code_desc	-	CC199
+																								// CC199
 						, "A135" // String p_stat_cd
-                		, dntVO.getAssHstrySeq()        				
+						, dntVO.getAssHstrySeq());
-        				);
 
 			} else {
 
 				// 반려 처리 - 제출 이전의 상태로 변경함 (sbmt_yn : N, appr_yn : n 상태로 만듬)
-        		dntService.dntUpdApprYnN(dntVO
+				dntService.dntUpdApprYnN(dntVO, "조정진행관리>>조정진행목록>조정진행상세>기일등록>조정기일지정-통지확인요청-N" // String p_code_desc -
-        				, "조정진행관리>>조정진행목록>조정진행상세>기일등록>조정기일지정-통지확인요청-N"	//String p_code_desc	-	CC199
+																								// CC199
 						, "A136" // String p_stat_cd
-                		, ""        				
+						, "");
-        				);
 
 			}
 
@@ -862,14 +962,15 @@ public class AdjstConciliatorController {
 
 	}
 
-    
 	/*
 	 * 조정위원 조정진행 상세 - 이의신청 목록 화면
 	 * 
-     * */
+	 */
 	@RequestMapping("/web/kccadr/adjcclt/adjstOjctList.do")
-	public String adjstOjctList(@ModelAttribute("ojctVO") OjctVO ojctVO, ModelMap model, HttpServletRequest request) throws Exception {
+	public String adjstOjctList(@ModelAttribute("ojctVO") OjctVO ojctVO, ModelMap model, HttpServletRequest request)
-		String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString();
+			throws Exception {
+		String auth = EgovUserDetailsHelper.isAuthenticated() ? null
+				: EgovUserDetailsHelper.getAuthenticatedUser().toString();
 		LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
 
 		if (loginVO == null) {
@@ -919,7 +1020,6 @@ public class AdjstConciliatorController {
 		return "/web/kccadr/adjcclt/popup/adjstOjctDetail";
 	}
 
-
 	public void decryptInfomation(List<AdjstConciliatorVO> list, AdjstConciliatorVO info) {
 		if (CollectionUtils.isNotEmpty(list)) {
 			for (AdjstConciliatorVO model : list) {
@@ -933,7 +1033,6 @@ 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()));
 
@@ -977,8 +1076,6 @@ public class AdjstConciliatorController {
 
 				}
 
-
-
 				// 피신청인 다중으로 가져왔을때..
 				if (StringUtils.isNotBlank(model.getResPonDentNms())) {
 					String[] resNms = model.getResPonDentNms().split("\\|");
@@ -1105,5 +1202,4 @@ public class AdjstConciliatorController {
 		}
 	}
 
-
 }

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

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'
 		<isNotEmpty property="searchKeyword">
 			<isEmpty prepend="AND" property="searchCondition">
 				T1.EXMP_CN LIKE CONCAT('%' , #searchKeyword#, '%')
@@ -38,18 +40,6 @@
 				AND T1.EXMP_CC_TY = #searchCondition#
 			</isNotEmpty>
 		</isNotEmpty>
-<!-- 		<isNotEmpty property="searchKeyword"> -->
-<!-- 			<isEqual prepend="AND" property="searchCondition" compareValue=""> -->
-<!-- 				( T1.EXMP_TIT LIKE CONCAT('%' , #searchKeyword#, '%') OR -->
-<!-- 				T1.EXMP_NMS LIKE CONCAT('%' , #searchKeyword#, '%') ) -->
-<!-- 			</isEqual> -->
-<!-- 			<isEqual prepend="AND" property="searchCondition" compareValue="1"> -->
-<!-- 				T1.EXMP_TIT LIKE CONCAT('%' , #searchKeyword#, '%') -->
-<!-- 			</isEqual> -->
-<!-- 			<isEqual prepend="AND" property="searchCondition" compareValue="2"> -->
-<!-- 				T1.EXMP_NMS LIKE CONCAT('%' , #searchKeyword#, '%') -->
-<!-- 			</isEqual> -->
-<!-- 		</isNotEmpty> -->
 	</select>
 
 	<select id="ExmpAppManageDAO.selectExmpManagerList" parameterClass="exmpManageVO" resultClass="exmpManageVO">
@@ -102,6 +92,8 @@
 			, T1.LAST_UPDUSR_ID     AS lastUpdusrId
 		FROM ADR_EXMP_MGR T1
 		WHERE T1.EXMP_CD = #exmpCd#
+		AND T1.FRST_REGISTER_ID = #frstRegisterId#
+		AND T1.USE_YN = 'Y'
 		<isNotEmpty property="searchKeyword">
 			<isEmpty prepend="AND" property="searchCondition">
 				T1.EXMP_CN LIKE CONCAT('%' , #searchKeyword#, '%')
@@ -142,6 +134,15 @@
 			EXMP_MGR_ID = #exmpMgrId#
 	</update>
 
+	<update id="ExmpAppManageDAO.adjstOpinionDelect" parameterClass="exmpManageVO">
+		UPDATE 
+			ADR_EXMP_MGR 
+		SET
+			USE_YN			= 'N'
+		WHERE 
+			EXMP_MGR_ID = #exmpMgrId#
+	</update>
+
 	<update id="ExmpAppManageDAO.updateExmpAppDetails" parameterClass="exmpManageVO">
 		UPDATE 
 			ADR_EXMP_DTL 
@@ -166,6 +167,7 @@
 			, ATCH_FILE_ID
 			, FRST_REGIST_PNTTM
 			, FRST_REGISTER_ID
+			, USE_YN
 		) VALUES (
 			#exmpMgrId#
 			, #exmpCd#
@@ -175,6 +177,7 @@
 			, #atchFileId#
 			, NOW()
 			, #frstRegisterId#
+			, #useYn#
 		)
 	</insert>
 

src/main/resources/egovframework/sqlmap/kccadr/adjcclt/AdjustConciliator_SQL_Mysql.xml

@@ -1328,6 +1328,7 @@
 		AND T1.ADR_SEQ = #adrSeq#
 		AND T1.ADR_SN = #adrSn#
 		AND T1.CMNT_TY = #cmntTy#
+		AND T1.USE_YN = #useYn#
 		<isNotEmpty property="memSeq">
 			AND T1.MEM_SEQ = #memSeq#
 		</isNotEmpty>
@@ -1420,7 +1421,8 @@
 			FRST_REGIST_PNTTM,
 			FRST_REGISTER_ID,
 			LAST_UPDT_PNTTM,
-			LAST_UPDUSR_ID
+			LAST_UPDUSR_ID,
+			USE_YN
 		) VALUES (
 			#adrSeq#,
 			#adrSn#,
@@ -1431,7 +1433,8 @@
 			NOW(),
 			#frstRegisterId#,
 			NOW(),
-			#lastUpdusrId#
+			#lastUpdusrId#,
+			#useYn#
 		)
 	</update>
 
@@ -1693,6 +1696,15 @@
 		AND SBMT_SEQ = #sbmtSeq#
 	</update>
 	
+	<update id="adjstConciliatorDAO.updateAdjstRecommendationCommentDelete" parameterClass="AdjstConciliatorVO">
+		UPDATE ADR_MEM_CMNT SET
+			USE_YN = #useYn#
+			,LAST_UPDT_PNTTM = NOW()
+			,LAST_UPDUSR_ID = #lastUpdusrId#
+		WHERE 1=1
+		AND CMNT_SEQ = #cmntSeq#
+	</update>
+	
 
 
 	<!-- DASH 보드  -->

src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/adjstMediationDecisionDetail.jsp

@@ -27,7 +27,8 @@
             ,{
                 "adrSeq" : $("#adrSeq").val(),
                 "adrSn" :$("#adrSn").val(),
-                "cmntTy" : KccadrConstants.ADR_CLOSE_DOC_TY_60,
+                "cmntTy" : "60",
+//                 "cmntTy" : KccadrConstants.ADR_CLOSE_DOC_TY_60,
                 "pageIndex" : pageIndex,
                 "pageUnit" : 5
             }

src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/adjstProtocolDetail.jsp

@@ -27,7 +27,8 @@
             ,{
                 "adrSeq" : $("#adrSeq").val(),
                 "adrSn" :$("#adrSn").val(),
-                "cmntTy" : KccadrConstants.ADR_CLOSE_DOC_TY_40,
+                "cmntTy" : "40",
+//                 "cmntTy" : KccadrConstants.ADR_CLOSE_DOC_TY_40,
                 "pageIndex" : pageIndex,
                 "pageUnit" : 5
             }

src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/adjstRecommendationDetail.jsp

@@ -27,7 +27,8 @@
             ,{
                 "adrSeq" : $("#adrSeq").val(),
                 "adrSn" :$("#adrSn").val(),
-                "cmntTy" : KccadrConstants.ADR_CLOSE_DOC_TY_30,
+                "cmntTy" : "30",
+//                 "cmntTy" : KccadrConstants.ADR_CLOSE_DOC_TY_30,
                 "pageIndex" : pageIndex,
                 "pageUnit" : 5
             }

src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/comment/adjstRecommendationCommentList.jsp

@@ -14,6 +14,11 @@
 <script type="text/javaScript" language="javascript">
     $(document).ready(function(){
 
+    	$('.deleteBtn').on('click', function(){
+    		fn_dataDelete($(this).data('info'));
+    	})
+    	
+    	
     });
 
     function fncSaveCommnet(){
@@ -41,6 +46,33 @@
             contentType: "application/json",
             cache: false,
             success: function (returnData, status) {
+            	commentPageLoad();
+            },
+            error: function (e) { alert("저장에 실패하였습니다."); console.log("ERROR : ", e); }
+        });
+    }
+
+    function fn_dataDelete(cmntSeq){
+    	
+    	if (!confirm("삭제 하시겠습니까?")) { 
+    		return false;
+    	}
+    	
+        var data = {
+       		cmntSeq : cmntSeq
+        }
+        $.ajax({
+            type: "POST",
+            url: "/web/kccadr/adjcclt/commnet/adjstRecommendationCommentDelete.do",
+            data: JSON.stringify(data),
+            dataType:'json',
+            async: false,
+            processData: false,
+            contentType: "application/json",
+            cache: false,
+            success: function (returnData, status) {
+            	console.log('returnData : ', returnData);
+            	alert(returnData.msg);
                 fncGoCommentList();
             },
             error: function (e) { alert("저장에 실패하였습니다."); console.log("ERROR : ", e); }
@@ -94,13 +126,15 @@
         <colgroup>
             <col style="width: 20%;">
             <col style="width: auto;">
-            <col style="width: 20%;">
+            <col style="width: 10%;">
+            <col style="width: 100px;">
         </colgroup>
         <thead>
 	        <tr>
 	            <th scope="col">일자</th>
 	            <th scope="col">내용</th>
 	            <th scope="col">조정위원</th>
+	            <th scope="col">삭제</th>
 	        </tr>
         </thead>
         <tbody>
@@ -117,6 +151,9 @@
                 <td>
                     <p><c:out value='${list.cmntNm}' /></p>
                 </td>
+                <td>
+                    <button type="button" class="btnType01 deleteBtn" data-info="${list.cmntSeq }">삭제</button>
+                </td>
             </tr>
         </c:forEach>
         <c:if test="${fn:length(list) eq 0}">

src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/opinion/adjstOpinionList.jsp

@@ -44,18 +44,29 @@
 //         listForm.submit();
     }
     
+    AdjstReq.opinionsRegistAdjstPopList();
+
+
+    $(document).ready(function(){
+    	$('.deleteBtn').click(function(){
+
+    		if(confirm("삭제를 하시겠습니까?"))
+    		{
+	    		$('#exmpMgrId').val($(this).data('info'));
+	    		$('#listForm').attr('action', "<c:url value='/web/kccadr/adjcclt/ai/adjstOpinionDelect.do'/>");
+	         	document.listForm.submit();
+    		}
+    	});
+    	
+    	
+    });
 
 </script>
 </head>
 <body>
-<form:form id="listForm" name="listForm" commandName="adjstOpinionVO" onsubmit="return false;" method="post">
+<form id="listForm" name="listForm" method="post">
-	<input type="hidden" name="pageIndex" value="<c:out value='${adjstOpinionVO.pageIndex}' default='1' />"/>
+	<input type="hidden" name="pageIndex" value="<c:out value='${exmpManageVO.pageIndex}' default='1' />"/>
-	<input type="hidden" name="searchSortCnd" value="<c:out value="${adjstOpinionVO.searchSortCnd}" />" />
+	<input type="hidden" name="exmpMgrId" id="exmpMgrId" value="" />
-	<input type="hidden" name="searchSortOrd" value="<c:out value="${adjstOpinionVO.searchSortOrd}" />" />
-	<input type="hidden" name="searchStatus" value="<c:out value="${adjstOpinionVO.searchStatus}" />" />
-	<input type="hidden" name="adrSeq" value="" />
-	<input type="hidden" name="adrSn" value="" />
-</form:form>
 
 <!-- cont -->
 	<div class="cont_wrap sub02_1" id="sub">
@@ -69,7 +80,7 @@
 		            <label for="searchCondition">검색조건 선택</label>
 		            <kc:select codeId="CC045" skipCd="10,50,70,80" name="searchCondition" id="searchCondition" defaultValue="" defaultText="전체" selectedValue="${exmpManageVO.searchCondition}"/>
 		            <label for="searchKeyword">검색 조건 입력</label>
-	            <input type="text" name="searchKeyword" id="searchKeyword" value="<c:out value='${exmpManageVO.searchKeyword}' />" placeholder="검색 조건 입력" size="20">
+		            <input type="text" name="searchKeyword" id="searchKeyword" value="<c:out value='${exmpManageVO.searchKeyword}' />" placeholder="내용 입력" size="20">
 		            <button type="button" class="btnType07" onclick="fncGoList(); return false;">검색</button>
 		        </div>
 	        </div>
@@ -102,10 +113,10 @@
 		                        <kc:code codeId="CC045" code="${list.exmpCcTy}"/> 
 	                        </td>
 	                        <td>
-                            <a href="#none" onclick="javascript:AdjstReq.opinionsRegistAdjstPopDetail('${list.exmpMgrId }');"><c:out value="${list.exmpCn}" /></a>
+	                            <a href="javascript:;" onclick="javascript:AdjstReq.opinionsRegistAdjstPopDetail('${list.exmpMgrId }');"><c:out value="${list.exmpCn}" /></a>
 	                        </td>
 	                        <td>
-							<button type="button" class="btnType01">삭제</button>
+								<button type="button" class="btnType01 deleteBtn" data-info="<c:out value="${list.exmpMgrId }" />">삭제</button>
 	                        </td>
 	                    </tr>
 	                </c:forEach>
@@ -130,5 +141,6 @@
 	        <!-- //page -->
 	    </div>
 	</div>
+</form>
 </body>
 </html>

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(){
 	    			<tr>
 	    				<td>유형</td>
 	    				<td>
-	    					<kc:select codeId="CC045" skipCd="10,50,70,80" id="exmpCcTy" name="exmpCcTy" defaultValue="" defaultText="선택" selectedValue="${dataInfo.exmpCcTy}"/>
+	    					<kc:select codeId="CC045" skipCd="10,50,70,80" id="exmpCcTy" name="exmpCcTy" defaultValue="" defaultText="선택" selectedValue="${mgrInfo.exmpCcTy }"/>
 		            	</td>
 	    			</tr>
 	<!--     			<tr> -->
@@ -112,14 +112,14 @@ $(document).ready(function(){
 	    			<tr>
 	    				<td>내용</td>
 	    				<td>
-	    					<textarea id="exmpCn" name="exmpCn" rows="5"><c:out value="${dataInfo.exmpCn}" /> </textarea>
+	    					<textarea id="exmpCn" name="exmpCn" rows="5" value="<c:out value="${mgrInfo.exmpCn }" />"><c:out value="${mgrInfo.exmpCn }" /> </textarea>
 	    				</td>
 	    			</tr>
 	    		</tbody>
 	    	</table>
 	        
 	        <div class="btn_wrap">
-	            <button class="btnType07" id="regBtn">저장</button>
+	            <button class="btnType07" id="updtBtn">수정</button>
 	            <button class="btnType01 tooltip-close" data-focus="opinion_regi_popup_close" data-focus-next="opinion_regi_popup">닫기</button>
 	        </div>
 	    </div>

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);
 					}