Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/hylee/kcc_adr_advc_git

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/dnt/web/DntController.java

@@ -112,6 +112,12 @@ public class DntController {
  	@Resource(name = "egovCryptoUtil")
  	private EgovCryptoUtil egovCryptoUtil;
  	
+ 	@Value("#{globalSettings['Globals.ozFont']}")
+ 	private String ozFont;
+ 	
+ 	@Value("#{globalSettings['Globals.ozFontPath']}")
+	private String ozFontPath;
+ 	 	
     /**
      * 기일지정 상세 TODO daenge 기일지정 상세
      *
@@ -519,6 +525,11 @@ public class DntController {
     	String ozServerNm = IpUtil.getOzServerName(serverName);
     	model.addAttribute("ozServerNm", ozServerNm);
 
+    	//오즈리포트 폰트
+    	model.addAttribute("ozFont", ozFont);
+    	//오즈리포트 폰트 경로
+    	model.addAttribute("ozFontPath", ozFontPath);
+    	
     	/*
     	 * 2022.01.06 우영두 추가
     	 * 오즈 리포트 File Export 처리

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/let/main/web/EgovMainController.java

@@ -18,6 +18,9 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
+import org.apache.commons.lang.time.DateFormatUtils;
+import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
@@ -42,6 +45,7 @@ import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
 import kcc.com.cmm.ComDefaultVO;
 import kcc.com.cmm.LoginVO;
 import kcc.com.cmm.util.RedirectUrlMaker;
+import kcc.com.cmm.util.StringUtil;
 import kcc.com.uss.ion.bnr.service.BannerVO;
 import kcc.com.uss.ion.bnr.service.EgovBannerService;
 import kcc.com.uss.ion.cyb.service.CyberAlertManageService;
@@ -51,6 +55,10 @@ import kcc.com.uss.ion.pwm.service.PopupManageVO;
 import kcc.com.uss.ion.pwm.service.PopupzoneVO;
 import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmService;
 import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO;
+import kcc.kccadr.adjPgrMgr.iam.service.InternalApprovManageService;
+import kcc.kccadr.adjPgrMgr.iam.service.InternalApprovManageVO;
+import kcc.kccadr.cmm.CmmUtil;
+import kcc.kccadr.cmm.KccadrConstants;
 import kcc.let.cop.bbs.service.BoardVO;
 import kcc.let.cop.bbs.service.EgovBBSManageService;
 import kcc.let.sts.com.StatsVO;
@@ -137,6 +145,10 @@ public class EgovMainController {
 	
     @Resource(name = "pgrCmmService")
     private PgrCmmService cmmService;
+    
+    @Resource(name = "internalApprovManageService")
+    private InternalApprovManageService internalApprovManageService;
+    
 	/**
 	 * 메인 페이지에서 각 업무 화면으로 연계하는 기능을 제공한다.
 	 *
@@ -417,9 +429,18 @@ public class EgovMainController {
 	 * @throws Exception 
 	 */
 	@RequestMapping(value = "/cmm/main/exctvMainPage.do")
-	public String exctvMainPage(ModelMap model, HttpSession session) throws Exception{
+	public String exctvMainPage(PgrCmmVO cmmVO,
+								InternalApprovManageVO internalApprovManageVO,
+								ModelMap model,
+								HttpSession session) throws Exception{
+		
+		//나의 결재 요청 리스트 조회
+		model.addAttribute("approvList", approvlistPaging(internalApprovManageVO, model, internalApprovManageService));
+		
+		//사건 진행 현황 리스트 조회
+        model.addAttribute("accdntList", accdntlistPaging(cmmVO, model, cmmService));
+        
 		return "main/exctvMainView";
-//		return "main/EgovMainView";
 	}
 
 	/**
@@ -921,4 +942,92 @@ public class EgovMainController {
         System.out.println( "CPU Usage: " + usage );
     }
     
+    private List<PgrCmmVO> accdntlistPaging(PgrCmmVO cmmVO, ModelMap model, PgrCmmService cmmService) throws Exception {
+    	
+    	if (StringUtil.isEmpty(cmmVO.getSearchSortCnd())) { // 최초조회시 최신것 조회List
+            cmmVO.setSearchSortCnd("M.ADR_NO IS NULL DESC, M.ADR_NO DESC, M.SBMT_DE");
+            cmmVO.setSearchSortOrd("DESC");
+        }
+		
+		if (StringUtil.isEmpty(cmmVO.getSearchStartDt())) { // 조회일시가 null인경우
+            Date today = new Date();
+            cmmVO.setSearchStartDt(DateFormatUtils.format(DateUtils.addMonths(today, -1), "yyyyMMdd"));
+            cmmVO.setSearchEndDt(DateFormatUtils.format(today, "yyyyMMdd"));
+        }
+		
+		/** paging */
+        PaginationInfo paginationInfo = new PaginationInfo();
+        paginationInfo.setCurrentPageNo(cmmVO.getPageIndex());
+        paginationInfo.setRecordCountPerPage(cmmVO.getPageUnit());
+        paginationInfo.setPageSize(cmmVO.getPageSize());
+        
+        cmmVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
+        cmmVO.setLastIndex(paginationInfo.getLastRecordIndex());
+        cmmVO.setRecordCountPerPage(3);
+        
+        paginationInfo.setTotalRecordCount(cmmService.selectPgrCmmListCnt(cmmVO));
+        model.addAttribute("paginationInfo", paginationInfo);
+		
+        return cmmService.selectPgrCmmList(cmmVO);
+    	
+    }
+    private List<InternalApprovManageVO> approvlistPaging(InternalApprovManageVO internalApprovManageVO, ModelMap model, InternalApprovManageService internalApprovManageService) throws Exception {
+    	
+    	String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString();
+        LoginVO loginVO = "anonymousUser".equals(auth) ? null : (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
+        
+		if (loginVO == null) {
+
+			return null;
+		}
+        
+        internalApprovManageVO.setFrstRegisterId(loginVO.getUniqId());
+        internalApprovManageVO.setMemSeq(loginVO.getUniqId());
+        internalApprovManageVO.setSearchSbmtId(loginVO.getUniqId());
+
+        if("".equals(internalApprovManageVO.getSearchSortCnd())){ //최초조회시 최신것 조회List
+            internalApprovManageVO.setSearchSortCnd("RS.adrNo");
+            internalApprovManageVO.setSearchSortOrd("desc");
+        }
+        
+        //내부결재 목록 페이지 접근시 결재상태 - 결재대기(01), 결재진행중(02) 상태가 기본값으로 해달라는 요청_220225_이준호수정
+        if("".equals(internalApprovManageVO.getSearchStatusArr()) || internalApprovManageVO.getSearchStatusArr() == null){
+        	String[] defaultSearchStatusArr = {"01", "02", "03", "04"};
+        	internalApprovManageVO.setSearchStatusArr(defaultSearchStatusArr);
+        }
+
+        if(StringUtils.isEmpty(internalApprovManageVO.getSearchStartDt()) && StringUtils.isEmpty(internalApprovManageVO.getSearchEndDt())){
+            internalApprovManageVO.setSearchStartDt(CmmUtil.getDiffMonth(1 , "yyyy-MM-dd"));
+            internalApprovManageVO.setSearchEndDt(CmmUtil.getDateNow("yyyy-MM-dd"));
+        }
+
+        /** paging */
+        PaginationInfo paginationInfo = new PaginationInfo();
+        paginationInfo.setCurrentPageNo(internalApprovManageVO.getPageIndex());
+        paginationInfo.setRecordCountPerPage(3);
+        paginationInfo.setPageSize(internalApprovManageVO.getPageSize());
+        
+        //위원장 아이디는 위원장이 결재 시점에서만 조회되게
+        // 리스트 조건절 결재선 1,2 라인이 결재 완료이고 위원장 아이디 일때만 조회
+        UserManageVO userManageVO = new UserManageVO();
+		userManageVO = userManageService.selectUser(loginVO.getUniqId());
+        
+		if(KccadrConstants.ADR_SBMT_TY_40.equals(userManageVO.getOfcpsNm())) {
+			internalApprovManageVO.setUiWonJangId(loginVO.getUniqId());
+		}
+		
+		//22.02.08 이준호 내부결재목록 최고관리자의 경우 모든 결재가 보이게 처리 요청사항 적용
+		if("ROLE_ADMIN".equals(loginVO.getAuthority())) {
+			internalApprovManageVO.setAuthor(loginVO.getAuthority());
+		}
+        
+        internalApprovManageVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
+        internalApprovManageVO.setLastIndex(paginationInfo.getLastRecordIndex());
+        internalApprovManageVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+        paginationInfo.setTotalRecordCount(internalApprovManageService.selectInternalApprovManageCount(internalApprovManageVO));
+        model.addAttribute("paginationInfo", paginationInfo);
+        
+        return internalApprovManageService.selectInternalApprovManageList(internalApprovManageVO);
+    	
+    }
 }

src/main/resources/egovframework/egovProps/globals.properties

@@ -169,3 +169,12 @@ Globals.pdf.webpath=/pdf/out/
 Globals.prod.islocal=local
 #\uc2e4\uc11c\ubc84
 #Globals.prod.islocal=real
+
+#\uc624\uc988\ub9ac\ud3ec\ud2b8 \ud3f0\ud2b8 \uc800\uc7a5\uacbd\ub85c
+#\uac1c\ubc1c\uc11c\ubc84
+Globals.ozFontPath=/home/oz80/fontTestDir/
+#\uc2e4\uc11c\ubc84
+#Globals.ozFontPath=/home/oz80/fontTestDir/
+
+#\uc624\uc988\ub9ac\ud3ec\ud2b8 \ud3f0\ud2b8 \uc885\ub958
+Globals.ozFont=NanumSquareR.ttf

src/main/resources/egovframework/egovProps/globals_dev.properties

@@ -169,3 +169,12 @@ Globals.pdf.webpath=/pdf/out/
 Globals.prod.islocal=local
 #\uc2e4\uc11c\ubc84
 #Globals.prod.islocal=real
+
+#\uc624\uc988\ub9ac\ud3ec\ud2b8 \ud3f0\ud2b8 \uc800\uc7a5\uacbd\ub85c
+#\uac1c\ubc1c\uc11c\ubc84
+Globals.ozFontPath=/home/oz80/fontTestDir/
+#\uc2e4\uc11c\ubc84
+#Globals.ozFontPath=/home/oz80/fontTestDir/
+
+#\uc624\uc988\ub9ac\ud3ec\ud2b8 \ud3f0\ud2b8 \uc885\ub958
+Globals.ozFont=NanumSquareR.ttf

src/main/resources/egovframework/egovProps/globals_local.properties

@@ -169,3 +169,12 @@ Globals.pdf.webpath=/pdf/out/
 Globals.prod.islocal=local
 #\uc2e4\uc11c\ubc84
 #Globals.prod.islocal=real
+
+#\uc624\uc988\ub9ac\ud3ec\ud2b8 \ud3f0\ud2b8 \uc800\uc7a5\uacbd\ub85c
+#\uac1c\ubc1c\uc11c\ubc84
+Globals.ozFontPath=/home/oz80/fontTestDir/
+#\uc2e4\uc11c\ubc84
+#Globals.ozFontPath=/home/oz80/fontTestDir/
+
+#\uc624\uc988\ub9ac\ud3ec\ud2b8 \ud3f0\ud2b8 \uc885\ub958
+Globals.ozFont=NanumSquareR.ttf

src/main/resources/egovframework/egovProps/globals_svr.properties

@@ -167,3 +167,12 @@ Globals.pdf.webpath=/pdf/out/
 #Globals.prod.islocal=local
 #\uc2e4\uc11c\ubc84
 Globals.prod.islocal=real
+
+#\uc624\uc988\ub9ac\ud3ec\ud2b8 \ud3f0\ud2b8 \uc800\uc7a5\uacbd\ub85c
+#\uac1c\ubc1c\uc11c\ubc84
+#Globals.ozFontPath=/home/oz80/fontTestDir/
+#\uc2e4\uc11c\ubc84
+Globals.ozFontPath=/home/oz80/fontTestDir/
+
+#\uc624\uc988\ub9ac\ud3ec\ud2b8 \ud3f0\ud2b8 \uc885\ub958
+Globals.ozFont=NanumSquareR.ttf

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/resources/egovframework/sqlmap/kccadr/advcSbmt/AdrSbmtLineMgrUsr_SQL_Cubrid.xml

@@ -5,7 +5,6 @@
 	<typeAlias  alias="egovMap" type="egovframework.rte.psl.dataaccess.util.EgovMap"/>
 	<typeAlias  alias="AdrSbmtLineMgrUsrVO" type="kcc.kccadr.advcSbmt.service.AdrSbmtLineMgrUsrVO"/>	
 
-
 	<!-- 공통 테이블 명 -->
 	<sql id="AdrSbmtLineMgrUsrDAO.table_name">
 		adr_sbmt_line_mgr_usr

src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iop/insteadOfPaymentManageList.jsp

@@ -150,7 +150,7 @@
 						</tr>
 						</thead>
 						<tbody>
-							<c:forEach var="list" items="${list }" varStatus="status">
+							<c:forEach var="list" items="${list}" varStatus="status">
 								<!-- 추후 데이터 생기면 개발 -->
 								<!-- 추후 데이터 생기면 개발 -->
 								<!-- 추후 데이터 생기면 개발 -->

src/main/webapp/WEB-INF/jsp/main/exctvMainView.jsp

@@ -18,6 +18,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
 <%@ page import="java.util.Date" %>
+<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%>
 <!DOCTYPE html>
 <html>
 	<head>
@@ -53,9 +54,46 @@
 					listForm.submit();
 				}
 			}
+			
+			function fncGoApprovDetail(adrSeq, adrSn, sbmtSeq, sbmtTy){
+				var listForm = document.ApprovListForm ;
+				listForm.adrSeq.value = adrSeq;
+				listForm.adrSn.value = adrSn;
+				listForm.sbmtSeq.value = sbmtSeq;
+				if(sbmtTy == '309010'){
+					listForm.action = "<c:url value='/kccadr/adjPgrMgr/iam/internalApprovManageEndDetail.do'/>";
+				}else{
+					listForm.action = "<c:url value='/kccadr/adjPgrMgr/iam/internalApprovManageDetail.do'/>";
+				}
+				listForm.submit();
+			}
+			
+			function fncGoAccdntDetail(adrSeq, adrSn, reqOlCd) {
+				var listForm = document.AccdntListForm;
+				listForm.adrSeq.value = adrSeq;
+				listForm.adrSn.value = adrSn;
+				listForm.reqOlCd.value = reqOlCd;
+				listForm.action = "<c:url value='/kccadr/adjPgrMgr/apm/apmDetail.do'/>";
+				listForm.submit();
+			}
+			
+			function fnGoList(url){
+				location.href = url;
+			}
 		</script>
 </head>
 <body>
+	<form:form id="ApprovListForm" name="ApprovListForm" method="post" commandName="internalApprovManageVO">
+		<input type="hidden" name="adrSeq" value="" />
+		<input type="hidden" name="adrSn" value="" />
+		<input type="hidden" name="sbmtSeq" value="" />
+	</form:form>
+	<form:form id="AccdntListForm" name="AccdntListForm" commandName="cmmVO" onsubmit="return false;" method="post">
+        <input type="hidden" name="adrSeq" />
+        <input type="hidden" name="adrSn" />
+        <input type="hidden" name="reqOlCd" />
+    </form:form>
+
 	<div class="cont_wrap">
 		<div class="box">
 <!-- 			<div class="cont_tit"> -->
@@ -72,7 +110,7 @@
 				<div class="tb_tit">
 					<p>나의 결재 요청</p>
 					<div class="btn_wrap">
-						<button type="button" class="btn_plus" title="더보기"><i></i></button>
+						<button type="button" class="btn_plus" onclick="fnGoList('/kccadr/adjPgrMgr/iam/internalApprovManageList.do');" title="더보기"><i></i></button>
 					</div>
 				</div>
 				<div class="list tbType01">
@@ -96,7 +134,7 @@
 							</tr>
 						</thead>
 						<tbody>
-							<tr>
+							<!-- <tr>
 								<td>접수결재</td>
 								<td>2022조정075</td>
 								<td>컴퓨터프로그램</td>
@@ -119,14 +157,65 @@
 								<td>2022-09-01 18:00</td>
 								<td>2022-09-01 18:00</td>
 								<td>결재완료</td>
+							</tr> -->
+							<c:forEach var="list" items="${approvList}" varStatus="status">
+								<tr>
+									<td>
+										<%--<font color="white"> '${list.adrSeq}','${list.adrSn}', '${list.sbmtSeq}'</font> --%>
+										<a href="#none" onclick="fncGoApprovDetail('${list.adrSeq}', '${list.adrSn}', '${list.sbmtSeq}', '${list.sbmtTy}');"><p><kc:code codeId="CC013" code="${list.sbmtTy}"/></p></a>
+										<%--<font color="white"> '${list.adrSeq}','${list.adrSn}', '${list.sbmtSeq}'</font> --%>							
+									</td>
+									
+									<td>
+										<a href="#none" onclick="fncGoApprovDetail('${list.adrSeq}', '${list.adrSn}', '${list.sbmtSeq}', '${list.sbmtTy}');"><p>${list.adrNo}</p></a>
+									</td>
+									<td>
+										<a href="#none" onclick="fncGoApprovDetail('${list.adrSeq}', '${list.adrSn}', '${list.sbmtSeq}', '${list.sbmtTy}');"><p><kc:code codeId="CC002" code="${list.ccTy}"/></p></a>
+									</td>
+									<td>
+										<p>${list.frstRegistPnttm}</p>
+									</td>
+									<td>
+										<p>
+											${list.allYn eq 'Y' ? list.lastUpdtPnttm : '-'}
+											
+										</p>
+										<%-- 
+										<font color="white"> '${list.adrSeq}','${list.adrSn}', '${list.sbmtSeq}'</font>
+										 --%>
+									</td>
+									<td>
+										<a href="#none" onclick="fncGoApprovDetail('${list.adrSeq}', '${list.adrSn}', '${list.sbmtSeq}', '${list.sbmtTy}');">
+											<p>
+												<c:choose>
+													<c:when test="${list.cfmStatCd eq '01'}">
+														결재대기
+													</c:when>
+													<c:when test="${list.cfmStatCd eq '03'}">
+														결재완료
+													</c:when>
+													<c:when test="${list.cfmStatCd eq '04'}">
+														결재반려
+													</c:when>
+													<c:otherwise>
+														<kc:code codeId="CC041" code="${list.sbmtGradeCd}"/>
+													</c:otherwise>
+												</c:choose>
+											</p>
+										</a>
+									</td>
 								</tr>
+							</c:forEach>
+							<c:if test="${empty approvList}">
+								<tr><td colspan="6"><spring:message code="common.nodata.msg" /></td></tr>
+							</c:if>
 						</tbody>
 					</table>
 				</div>
 				<div class="tb_tit">
 					<p>사건 진행 현황</p>
 					<div class="btn_wrap">
-						<button type="button" class="btn_plus" title="더보기"><i></i></button>
+						<button type="button" class="btn_plus" onclick="fnGoList('/kccadr/adjPgrMgr/apm/apmList.do');" title="더보기"><i></i></button>
 					</div>
 				</div>
 				<div class="list tbType01">
@@ -150,7 +239,7 @@
 							</tr>
 						</thead>
 						<tbody>
-							<tr>
+							<!-- <tr>
 								<td>2022-09-01</td>
 								<td>2022조정075</td>
 								<td>홍길동</td>
@@ -173,7 +262,48 @@
 								<td>편집저작물</td>
 								<td>합의5부</td>
 								<td>배당결재요청</td>
+							</tr> -->
+							<c:forEach var="item" items="${accdntList}" varStatus="status">
+								<tr>
+                                   <td>
+                                       <a href="#" onclick="fncGoAccdntDetail('<c:out value="${item.adrSeq}" />', '<c:out value="${item.adrSn}" />', '<c:out value="${item.reqOlCd}"/>');"> <c:out value="${item.sbmtDeDay}" /></a>
+                                   </td>
+                                   <td>
+                                       <a href="#" onclick="fncGoAccdntDetail('<c:out value="${item.adrSeq}" />', '<c:out value="${item.adrSn}" />', '<c:out value="${item.reqOlCd}"/>');"><c:out value="${item.adrNo}" /></a>
+                                   </td>
+                                   <td>
+                                       <a href="#" onclick="fncGoAccdntDetail('<c:out value="${item.adrSeq}" />', '<c:out value="${item.adrSn}" />', '<c:out value="${item.reqOlCd}"/>');"> <p><c:out value="${item.appliCantNm}" /></p></a>
+                                   </td>
+                                   <td>
+                                       <a href="#" onclick="fncGoAccdntDetail('<c:out value="${item.adrSeq}" />', '<c:out value="${item.adrSn}" />', '<c:out value="${item.reqOlCd}"/>');"> <p><c:out value="${item.ccTyTx}" /></p></a>
+                                   </td>
+                                   <td>
+                                       <p><c:out value="${item.memDeptNm}" /></p>
+                                   </td>
+                                   <td>
+                                       <c:choose>
+                                           <c:when test="${item.statCdTx eq '' || item.statCdTx eq null }"></c:when>
+                                           <c:when test="${item.statCd eq '104010'}">
+                                               <p class="status_cmp">
+                                                   <c:out value="${item.statCdTx}" />
+                                               </p>
+                                           </c:when>
+                                           <c:otherwise>
+                                               <p class="status_ing">
+                                                   <c:out value="${item.statCdTx}" />
+                                               </p>
+                                           </c:otherwise>
+                                       </c:choose>
+                                   </td>
                                </tr>
+                           </c:forEach>
+                           <c:if test="${empty accdntList}">
+                               <tr>
+                                   <td colspan="6">
+                                       <spring:message code="common.nodata.msg" />
+                                   </td>
+                               </tr>
+                           </c:if>
 						</tbody>
 					</table>
 				</div>

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,21 +44,32 @@
 //         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">
+	<div class="cont_wrap sub02_1" id="sub">
 	    <div class="inner">
 	        <div class="cont_tit">
 	            <h2>자주쓰는의견 목록</h2>
@@ -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>
@@ -129,6 +140,7 @@
 	        </div>
 	        <!-- //page -->
 	    </div>
-</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);
 					}