Merge branch 'hylee'

src/main/java/kcc/com/cmm/util/DateUtil.java

@@ -1,5 +1,6 @@
 package kcc.com.cmm.util;
 
+import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.time.LocalDate;
@@ -194,4 +195,28 @@ public final class DateUtil {
     
     }
     
+	public static String setDiffYear(String searchYear) {
+
+		int yearChar = Integer.parseInt(searchYear);
+		Calendar cal = Calendar.getInstance();
+		cal.setTime(new Date());
+		DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+
+		cal.add(Calendar.YEAR, -yearChar);
+		
+		return df.format(cal.getTime());
+	}
+
+	public static String setDiffMonth(String searchMonth) {
+		
+		int yearChar = Integer.parseInt(searchMonth);
+		Calendar cal = Calendar.getInstance();
+		cal.setTime(new Date());
+		DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+		
+		cal.add(Calendar.MONTH, -yearChar);
+		
+		return df.format(cal.getTime());
+	}
+	
 }

src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java

@@ -16,4 +16,6 @@ public interface AdjCourtCnctnService {
 	AdjCourtCnctnVO findByid(AdjCourtCnctnVO adjCourtCnctnVO);
 
 	RestResponse updateCourtCnctn(AdjCourtCnctnVO adjCourtCnctnVO);
+
+	void updateUseYn(AdjCourtCnctnVO adjCourtCnctnVO);
 }

src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java

@@ -50,6 +50,7 @@ public class AdjCourtCnctnVO  extends ComDefaultVO implements Serializable {
 	
 	
 	private String searchCondition2 = "";
+	private String diffMonth = "";
 	
 	
 	
@@ -251,6 +252,12 @@ public class AdjCourtCnctnVO  extends ComDefaultVO implements Serializable {
 	public void setSearchCondition2(String searchCondition2) {
 		this.searchCondition2 = searchCondition2;
 	}
+	public String getDiffMonth() {
+		return diffMonth;
+	}
+	public void setDiffMonth(String diffMonth) {
+		this.diffMonth = diffMonth;
+	}
 	
 	
 	

src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java

@@ -34,4 +34,8 @@ public class AdjCourtCnctnDAO  extends EgovAbstractDAO {
 		
 	}
 
+	public void updateUseYn(AdjCourtCnctnVO adjCourtCnctnVO) {
+		update("adjCourtCnctnDAO.updateUseYn", adjCourtCnctnVO);
+	}
+
 }

src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java

@@ -6,12 +6,14 @@ import java.util.List;
 
 import javax.annotation.Resource;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 
 import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
 import egovframework.rte.fdl.idgnr.EgovIdGnrService;
 import kcc.com.cmm.service.CmmnDetailCode;
+import kcc.com.cmm.util.DateUtil;
 import kcc.com.utl.user.service.CheckAdrProcessUtil;
 import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnService;
 import kcc.kccadr.adjCourtCnctn.service.AdjCourtCnctnVO;
@@ -51,11 +53,22 @@ public class AdjCourtCnctnServiceImpl extends EgovAbstractServiceImpl implements
 
 	@Override
 	public int adjCourtCnctnListCount(AdjCourtCnctnVO adjCourtCnctnVO) {
+
+		if(StringUtils.isNotEmpty(adjCourtCnctnVO.getSearchMonth2())
+				&& adjCourtCnctnVO.getSearchMonth2() != "99")
+			adjCourtCnctnVO.setDiffMonth(DateUtil.setDiffMonth(adjCourtCnctnVO.getSearchMonth2()));
+		
+		
 		return adjCourtCnctnDAO.selectAdjCourtCnctnListCount(adjCourtCnctnVO);
 	}
 
 	@Override
 	public List<AdjCourtCnctnVO> adjCourtCnctnList(AdjCourtCnctnVO adjCourtCnctnVO) {
+
+		if(StringUtils.isNotEmpty(adjCourtCnctnVO.getSearchMonth2())
+				&& adjCourtCnctnVO.getSearchMonth2() != "99")
+			adjCourtCnctnVO.setDiffMonth(DateUtil.setDiffMonth(adjCourtCnctnVO.getSearchMonth2()));
+
 		return adjCourtCnctnDAO.selectAdjCourtCnctnList(adjCourtCnctnVO);
 	}
 
@@ -74,6 +87,11 @@ public class AdjCourtCnctnServiceImpl extends EgovAbstractServiceImpl implements
 		return new RestResponse(HttpStatus.OK, "수정 되었습니다.", LocalDateTime.now());
 	}
 
+	@Override
+	public void updateUseYn(AdjCourtCnctnVO adjCourtCnctnVO) {
+		adjCourtCnctnDAO.updateUseYn(adjCourtCnctnVO);
+	}
+	
 
 	
 }

src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
@@ -43,7 +44,7 @@ public class AdjCourtCnctnController {
 	private AdjCourtCnctnService adjCourtCnctnService;
 	
 	@RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnList.do")
-	public String adjReqMgrOffList(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO, ModelMap model) throws Exception {
+	public String adjCourtCnctnList(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO, ModelMap model) throws Exception {
 
 		if(adjCourtCnctnVO.getPageUnit() != 10) {
 			adjCourtCnctnVO.setPageUnit(adjCourtCnctnVO.getPageUnit());
@@ -53,9 +54,8 @@ public class AdjCourtCnctnController {
 			adjCourtCnctnVO.setSearchSortCnd("COURT_SEQ");
 			adjCourtCnctnVO.setSearchSortOrd("desc");
 		}
-//		if(("3".equals(adjReqMgrOffLineVO.getSearchCondition()) || "4".equals(adjReqMgrOffLineVO.getSearchCondition())) && StringUtils.isNotBlank(adjReqMgrOffLineVO.getSearchKeyword())){
+
-//			adjReqMgrOffLineVO.setSearchKeyword(egovCryptoUtil.encrypt(adjReqMgrOffLineVO.getSearchKeyword()));
+		System.out.println("searchMonth2 :: "+ adjCourtCnctnVO.getSearchMonth2());
-//		}
 		
 		/** paging */
 		PaginationInfo paginationInfo = new PaginationInfo();
@@ -76,6 +76,16 @@ public class AdjCourtCnctnController {
 		return "kccadr/adjCourtCnctn/adjCourtCnctnList";
 	}
 	
+
+	@RequestMapping("/kccadr/adjCourtCnctn/updateUseYn.do")
+	public String updateUseYn(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO adjCourtCnctnVO, HttpServletRequest request, ModelMap model) throws Exception {
+		
+		adjCourtCnctnService.updateUseYn(adjCourtCnctnVO);
+		
+		return "redirect:" + request.getContextPath() + "/kccadr/adjCourtCnctn/adjCourtCnctnList.do";
+	}
+	
+	
 	@RequestMapping("/kccadr/adjCourtCnctn/adjCourtCnctnDetail.do")
 	public String adjCourtCnctnDetail(@ModelAttribute("adjCourtCnctnVO") AdjCourtCnctnVO CourtVO, ModelMap model) throws Exception {
 		

src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java

@@ -24,6 +24,7 @@ import org.springframework.stereotype.Service;
 import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
 import egovframework.rte.fdl.cmmn.exception.FdlException;
 import egovframework.rte.fdl.idgnr.EgovIdGnrService;
+import kcc.com.cmm.util.DateUtil;
 import kcc.com.cmm.util.StringUtil;
 import kcc.com.utl.user.service.CheckAdrProcessUtil;
 import kcc.kccadr.accdnt.adr.service.AdjstDeputyReqVO;
@@ -915,7 +916,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
 		// 
 		if(StringUtils.isNotEmpty(adjReqMgrPastVO.getSearchYear())
 				&& adjReqMgrPastVO.getSearchYear() != "99")
-			adjReqMgrPastVO.setDiffYear(this.setDiffYear(adjReqMgrPastVO.getSearchYear())); 
+			adjReqMgrPastVO.setDiffYear(DateUtil.setDiffYear(adjReqMgrPastVO.getSearchYear())); 
 		
 		
 		List<AdjReqMgrPastVO> adjReqMgrPastList = adjReqMgrPastDAO.selectAdjReqMgrPastList(adjReqMgrPastVO); 
@@ -981,21 +982,11 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
 	public int selectAdjReqMgrPastListCount(AdjReqMgrPastVO adjReqMgrPastVO) {
 		if(StringUtils.isNotEmpty(adjReqMgrPastVO.getSearchYear())
 				&& adjReqMgrPastVO.getSearchYear() != "99")
-			adjReqMgrPastVO.setDiffYear(this.setDiffYear(adjReqMgrPastVO.getSearchYear())); 
+			adjReqMgrPastVO.setDiffYear(DateUtil.setDiffYear(adjReqMgrPastVO.getSearchYear())); 
 		return adjReqMgrPastDAO.selectAdjReqMgrPastListCount(adjReqMgrPastVO); 
 	}
 	
-	public String setDiffYear(String searchYear) {
 
-		int yearChar = Integer.parseInt(searchYear);
-		Calendar cal = Calendar.getInstance();
-		cal.setTime(new Date());
-		DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
-        
-        cal.add(Calendar.YEAR, -yearChar);
-		
-		return df.format(cal.getTime());
-	}
 
 
 	@Override

src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml

@@ -10,66 +10,130 @@
 		 	COUNT(1) AS TOT
 		FROM
 			ADJ_COURT_CNCTN_MGR
-		<!-- 	
+		WHERE	
-		/*작성중*/
+			USE_YN = 'Y'
+		/*조정 사건번호*/
 		<isEqual property="searchCondition" prepend="AND" compareValue="10">
-			amm.ADR_END_DE IS NULL
+			COURT_NO LIKE CONCAT('%' , #searchKeyword#, '%')
 		</isEqual>
 		
-		/*작성완료*/
+		/*내용*/
 		<isEqual property="searchCondition" prepend="AND" compareValue="20">
-			amm.ADR_END_DE IS NOT NULL
+			ACCDNT_CN LIKE CONCAT('%' , #searchKeyword#, '%')
 		</isEqual>
 
-		/*검색 조정번호:10, 조정조사관:20, 조정부:30 */
-		<isEqual property="searchCondition2" prepend="AND" compareValue="10">
-			amm.ADR_NO LIKE CONCAT('%' , #searchKeyword#, '%')
-		</isEqual>
-		<isEqual property="searchCondition2" prepend="AND" compareValue="20">
-			aamp.ASS_PST_USR_NM LIKE CONCAT('%' , #searchKeyword#, '%')
-		</isEqual> 
-		<isEqual property="searchCondition2" prepend="AND" compareValue="30">
-			amdm.MEM_DEPT_NM LIKE CONCAT('%' , #searchKeyword#, '%')
-		</isEqual>
-		
-
 		/*날짜 검색 - 기간지정*/
-		<isEqual property="searchYear" compareValue="99">
+		<isEqual property="searchMonth2" compareValue="99">
 			<isNotEmpty prepend="AND" property="searchStartDt">
-				TO_CHAR(amm.FRST_REGIST_PNTTM,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#searchStartDt#, '-' , '')
+				TO_CHAR(DCSN_DE,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#searchStartDt#, '-' , '')
 			</isNotEmpty>
 	
 			<isNotEmpty prepend="AND" property="searchEndDt">
-				TO_CHAR(amm.FRST_REGIST_PNTTM,'YYYYMMDD')<![CDATA[ <= ]]> REPLACE(#searchEndDt#, '-' , '')
+				TO_CHAR(DCSN_DE,'YYYYMMDD')<![CDATA[ <= ]]> REPLACE(#searchEndDt#, '-' , '')
 			</isNotEmpty>
 		</isEqual>
-		/*날짜 검색 - 1년 전까지*/
+		/*날짜 검색 - 1개월 전까지*/
-		<isEqual property="searchYear" compareValue="1">
+		<isEqual property="searchMonth2" compareValue="1">
-			<isNotEmpty prepend="AND" property="searchStartDt">
+			<isNotEmpty prepend="AND" property="diffMonth">
-				TO_CHAR(amm.FRST_REGIST_PNTTM,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#diffYear#, '-' , '')
+				TO_CHAR(DCSN_DE,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#diffMonth#, '-' , '')
 			</isNotEmpty>
 		</isEqual>
-		/*날짜 검색 - 3년 전까지*/
+		/*날짜 검색 - 3개월 전까지*/
-		<isEqual property="searchYear" compareValue="3">
+		<isEqual property="searchMonth2" compareValue="3">
-			<isNotEmpty prepend="AND" property="searchStartDt">
+			<isNotEmpty prepend="AND" property="diffMonth">
-				TO_CHAR(amm.FRST_REGIST_PNTTM,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#diffYear#, '-' , '')
+				TO_CHAR(DCSN_DE,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#diffMonth#, '-' , '')
 			</isNotEmpty>
 		</isEqual>
-		/*날짜 검색 - 6년 전까지*/
+		/*날짜 검색 - 6개월 전까지*/
-		<isEqual property="searchYear" compareValue="6">
+		<isEqual property="searchMonth2" compareValue="6">
-			<isNotEmpty prepend="AND" property="searchStartDt">
+			<isNotEmpty prepend="AND" property="diffMonth">
-				TO_CHAR(amm.FRST_REGIST_PNTTM,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#diffYear#, '-' , '')
+				TO_CHAR(DCSN_DE,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#diffMonth#, '-' , '')
 			</isNotEmpty>
 		</isEqual>
 	
-		
-		/*조정상태*/
-		<isNotEmpty property="searchStatCdList">
-			<iterate open="(" close=")" conjunction=","  property="searchStatCdList" prepend="AND ah.STAT_CD IN " >  #searchStatCdList[]#</iterate>
-		</isNotEmpty>
-		 -->
 	</select>
 	
+	<select id="adjCourtCnctnDAO.adjCourtCnctnList" parameterClass="adjCourtCnctnVO" resultClass="adjCourtCnctnVO">
+
+		SELECT
+			COURT_SEQ as courtSeq
+			, COURT_NUM as courtNum
+			, COURT_ORG_NO as courtOrgNo
+			, COURT_NO as courtNo
+			, TO_CHAR(DCSN_DE,'YYYY-MM-DD') as dcsnDe
+			, TO_CHAR(RCV_DE,'YYYY-MM-DD') as rcvDe
+			, TO_CHAR(ALCTN_DE,'YYYY-MM-DD') as alctnDe
+			, ALCTN_MONTH as alctnMonth
+			, TO_CHAR(OFFICE_WORK_DE,'YYYY-MM-DD') as officeworkDe
+			, TO_CHAR(RPRT_DE,'YYYY-MM-DD') as rprtDe
+			, RPRT_MONTH as rprtMonth
+			, PROCESS_DAY as processDay
+			, COURT_FLD as courtFld
+			, ACCDNT_CN as accdntCn
+			, APLCN_INFO as aplcnInfo
+			, RSPND_INFO as rspndInfo
+			, APLCN_DPTY as aplcnDpty
+			, RSPND_DPTY as rspndDpty
+			, COURT_RSLT as courtRslt
+			, COURT_DETAIL_RSLT as courtDetailRslt
+			, ADJ_CMSNR as adjCmsnr
+			, PAY as pay
+			, APP_DE as appDe
+			, PYMNT_DAY as pymntDay
+			, EXTNS as extns
+			, RMRKS as rmrks
+			, USE_YN as use_yn
+			, TO_CHAR(FRST_REGIST_PNTTM,'YYYY-MM-DD') as frstRegistPnttm
+			, FRST_REGISTER_ID as frstRegisterId
+			, TO_CHAR(LAST_UPDT_PNTTM,'YYYY-MM-DD') as lastUpdtPnttm
+			, LAST_UPDT_PNTTM as lastUpdtPnttm
+		FROM
+			ADJ_COURT_CNCTN_MGR
+		WHERE
+			USE_YN = 'Y'
+		/*조정 사건번호*/
+		<isEqual property="searchCondition" prepend="AND" compareValue="10">
+			COURT_NO LIKE CONCAT('%' , #searchKeyword#, '%')
+		</isEqual>
+		
+		/*내용*/
+		<isEqual property="searchCondition" prepend="AND" compareValue="20">
+			ACCDNT_CN LIKE CONCAT('%' , #searchKeyword#, '%')
+		</isEqual>
+
+		/*날짜 검색 - 기간지정*/
+		<isEqual property="searchMonth2" compareValue="99">
+			<isNotEmpty prepend="AND" property="searchStartDt">
+				TO_CHAR(DCSN_DE,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#searchStartDt#, '-' , '')
+			</isNotEmpty>
+	
+			<isNotEmpty prepend="AND" property="searchEndDt">
+				TO_CHAR(DCSN_DE,'YYYYMMDD')<![CDATA[ <= ]]> REPLACE(#searchEndDt#, '-' , '')
+			</isNotEmpty>
+		</isEqual>
+		/*날짜 검색 - 1개월 전까지*/
+		<isEqual property="searchMonth2" compareValue="1">
+			<isNotEmpty prepend="AND" property="diffMonth">
+				TO_CHAR(DCSN_DE,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#diffMonth#, '-' , '')
+			</isNotEmpty>
+		</isEqual>
+		/*날짜 검색 - 3개월 전까지*/
+		<isEqual property="searchMonth2" compareValue="3">
+			<isNotEmpty prepend="AND" property="diffMonth">
+				TO_CHAR(DCSN_DE,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#diffMonth#, '-' , '')
+			</isNotEmpty>
+		</isEqual>
+		/*날짜 검색 - 6개월 전까지*/
+		<isEqual property="searchMonth2" compareValue="6">
+			<isNotEmpty prepend="AND" property="diffMonth">
+				TO_CHAR(DCSN_DE,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#diffMonth#, '-' , '')
+			</isNotEmpty>
+		</isEqual>
+	 
+		LIMIT #recordCountPerPage# OFFSET #firstIndex#
+	</select>
+
+
 	
 	<select id="adjCourtCnctnDAO.findByid" parameterClass="adjCourtCnctnVO" resultClass="adjCourtCnctnVO">
 
@@ -113,110 +177,6 @@
 	
 	</select>
 	
-	<select id="adjCourtCnctnDAO.adjCourtCnctnList" parameterClass="adjCourtCnctnVO" resultClass="adjCourtCnctnVO">
-
-		SELECT
-			COURT_SEQ as courtSeq
-			, COURT_NUM as courtNum
-			, COURT_ORG_NO as courtOrgNo
-			, COURT_NO as courtNo
-			, TO_CHAR(DCSN_DE,'YYYY-MM-DD') as dcsnDe
-			, TO_CHAR(RCV_DE,'YYYY-MM-DD') as rcvDe
-			, TO_CHAR(ALCTN_DE,'YYYY-MM-DD') as alctnDe
-			, ALCTN_MONTH as alctnMonth
-			, TO_CHAR(OFFICE_WORK_DE,'YYYY-MM-DD') as officeworkDe
-			, TO_CHAR(RPRT_DE,'YYYY-MM-DD') as rprtDe
-			, RPRT_MONTH as rprtMonth
-			, PROCESS_DAY as processDay
-			, COURT_FLD as courtFld
-			, ACCDNT_CN as accdntCn
-			, APLCN_INFO as aplcnInfo
-			, RSPND_INFO as rspndInfo
-			, APLCN_DPTY as aplcnDpty
-			, RSPND_DPTY as rspndDpty
-			, COURT_RSLT as courtRslt
-			, COURT_DETAIL_RSLT as courtDetailRslt
-			, ADJ_CMSNR as adjCmsnr
-			, PAY as pay
-			, APP_DE as appDe
-			, PYMNT_DAY as pymntDay
-			, EXTNS as extns
-			, RMRKS as rmrks
-			, USE_YN as use_yn
-			, TO_CHAR(FRST_REGIST_PNTTM,'YYYY-MM-DD') as frstRegistPnttm
-			, FRST_REGISTER_ID as frstRegisterId
-			, TO_CHAR(LAST_UPDT_PNTTM,'YYYY-MM-DD') as lastUpdtPnttm
-			, LAST_UPDT_PNTTM as lastUpdtPnttm
-		FROM
-			ADJ_COURT_CNCTN_MGR
-		WHERE
-			1=1
-		<!-- 	
-		/*작성중*/
-		<isEqual property="searchCondition" prepend="AND" compareValue="10">
-			amm.ADR_END_DE IS NULL
-		</isEqual>
-		
-		/*작성완료*/
-		<isEqual property="searchCondition" prepend="AND" compareValue="20">
-			amm.ADR_END_DE IS NOT NULL
-		</isEqual>
-		
-		/*검색 조정번호:10, 조정조사관:20, 조정부:30 */
-		<isEqual property="searchCondition2" prepend="AND" compareValue="10">
-			amm.ADR_NO LIKE CONCAT('%' , #searchKeyword#, '%')
-		</isEqual>
-		<isEqual property="searchCondition2" prepend="AND" compareValue="20">
-			aamp.ASS_PST_USR_NM LIKE CONCAT('%' , #searchKeyword#, '%')
-		</isEqual>
-		<isEqual property="searchCondition2" prepend="AND" compareValue="30">
-			amdm.MEM_DEPT_NM LIKE CONCAT('%' , #searchKeyword#, '%')
-		</isEqual>
-		
-		/*조정상태*/
-		<isNotEmpty property="searchStatCdList">
-			<iterate open="(" close=")" conjunction=","  property="searchStatCdList" prepend="AND ah.STAT_CD IN " >  #searchStatCdList[]#</iterate>
-		</isNotEmpty>
-			
-
-		
-		/*날짜 검색 - 기간지정*/
-		<isEqual property="searchYear" compareValue="99">
-			<isNotEmpty prepend="AND" property="searchStartDt">
-				TO_CHAR(amm.FRST_REGIST_PNTTM,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#searchStartDt#, '-' , '')
-			</isNotEmpty>
-	
-			<isNotEmpty prepend="AND" property="searchEndDt">
-				TO_CHAR(amm.FRST_REGIST_PNTTM,'YYYYMMDD')<![CDATA[ <= ]]> REPLACE(#searchEndDt#, '-' , '')
-			</isNotEmpty>
-		</isEqual>
-		/*날짜 검색 - 1년 전까지*/
-		<isEqual property="searchYear" compareValue="1">
-			<isNotEmpty prepend="AND" property="searchStartDt">
-				TO_CHAR(amm.FRST_REGIST_PNTTM,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#diffYear#, '-' , '')
-			</isNotEmpty>
-		</isEqual>
-		/*날짜 검색 - 3년 전까지*/
-		<isEqual property="searchYear" compareValue="3">
-			<isNotEmpty prepend="AND" property="searchStartDt">
-				TO_CHAR(amm.FRST_REGIST_PNTTM,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#diffYear#, '-' , '')
-			</isNotEmpty>
-		</isEqual>
-		/*날짜 검색 - 6년 전까지*/
-		<isEqual property="searchYear" compareValue="6">
-			<isNotEmpty prepend="AND" property="searchStartDt">
-				TO_CHAR(amm.FRST_REGIST_PNTTM,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#diffYear#, '-' , '')
-			</isNotEmpty>
-		</isEqual>
-	 
-		-->
-		
-		ORDER BY COURT_SEQ
-		<isNotEmpty property="searchSortOrd">
-		 	$searchSortOrd$ 
-		</isNotEmpty>
-		LIMIT #recordCountPerPage# OFFSET #firstIndex#
-	</select>
 	
 	<insert id="adjCourtCnctnDAO.insertCourtCnctn" parameterClass="adjCourtCnctnVO">
 		INSERT INTO ADJ_COURT_CNCTN_MGR (
@@ -316,4 +276,12 @@
 	
 	</update>
 
+	<update id="adjCourtCnctnDAO.updateUseYn" parameterClass="adjCourtCnctnVO">
+		UPDATE ADJ_COURT_CNCTN_MGR SET 
+			USE_YN = #useYn#
+		where
+			COURT_SEQ			= #courtSeq#
+	
+	</update>
+	
 </sqlMap>

src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml

@@ -951,19 +951,19 @@
 		</isEqual>
 		/*날짜 검색 - 1년 전까지*/
 		<isEqual property="searchYear" compareValue="1">
-			<isNotEmpty prepend="AND" property="searchStartDt">
+			<isNotEmpty prepend="AND" property="diffYear">
 				TO_CHAR(amm.FRST_REGIST_PNTTM,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#diffYear#, '-' , '')
 			</isNotEmpty>
 		</isEqual>
 		/*날짜 검색 - 3년 전까지*/
 		<isEqual property="searchYear" compareValue="3">
-			<isNotEmpty prepend="AND" property="searchStartDt">
+			<isNotEmpty prepend="AND" property="diffYear">
 				TO_CHAR(amm.FRST_REGIST_PNTTM,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#diffYear#, '-' , '')
 			</isNotEmpty>
 		</isEqual>
 		/*날짜 검색 - 6년 전까지*/
 		<isEqual property="searchYear" compareValue="6">
-			<isNotEmpty prepend="AND" property="searchStartDt">
+			<isNotEmpty prepend="AND" property="diffYear">
 				TO_CHAR(amm.FRST_REGIST_PNTTM,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#diffYear#, '-' , '')
 			</isNotEmpty>
 		</isEqual>

src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp

@@ -28,6 +28,16 @@ $(document).ready(function(){
 		}
 	});
 	
+	
+	$('.delBtn').click(function(){
+		console.log($(this).data('info'));
+		var thisVal = $(this).data('info');
+
+		$('#delCourtSeq').val(thisVal);
+		$('#delForm').submit();
+	});
+	
+	
 });
 
 function fncGoList(){
@@ -37,7 +47,7 @@ function fncGoList(){
 function linkPage(pageNo){
     var listForm = document.listForm ;
     listForm.pageIndex.value = pageNo ;
-    listForm.action = "<c:url value='/kccadr/adjReqMgOff/adjReqMgrPastList.do'/>";
+    listForm.action = "<c:url value='/kccadr/adjCourtCnctn/adjCourtCnctnList.do'/>";
     listForm.submit();
 }
 
@@ -89,11 +99,10 @@ function fn_goDetail(courtSeq){
                                 <ul>
                                     <li>
                                         <p class="tit_text">구분</p>
-                                        <select name="searchCondition2" id="searchCondition2" title="선택">
+                                        <select name="searchCondition" id="searchCondition" title="선택">
                                             <option value="">선택</option>
-                                            <option value="10" <c:if test="${adjCourtCnctnVO.searchCondition2 == ''}">selected</c:if>>조정번호</option>
+                                            <option value="10" <c:if test="${adjCourtCnctnVO.searchCondition == '10'}">selected</c:if>>조정 사건번호</option>
-                                            <option value="20" <c:if test="${adjCourtCnctnVO.searchCondition2 == '20'}">selected</c:if>>조정조사관</option>
+                                            <option value="20" <c:if test="${adjCourtCnctnVO.searchCondition == '20'}">selected</c:if>>내용</option>
-                                            <option value="30" <c:if test="${adjCourtCnctnVO.searchCondition2 == '30'}">selected</c:if>>조정부</option>
                                         </select>
                                         <input type="text" class="search_input" id="searchKeyword" name="searchKeyword" value="<c:out value='${adjCourtCnctnVO.searchKeyword}'/>" placeholder="검색어를 입력하세요.">
                                         <button class="btnType07 btn_search" onclick="fncGoList()">검색</button>
@@ -102,20 +111,24 @@ function fn_goDetail(courtSeq){
                                         <p class="tit_text">결정일자</p>
                                         <div class="radio_wrap">
                                             <span>
-                                                <input ${adjCourtCnctnVO.searchYear eq '1' ? 'checked' : ''} value="1" type="radio" name="searchYear" id="year1">
+                                                <input ${adjCourtCnctnVO.searchMonth2 eq '' ? 'checked' : ''} value="" type="radio" name="searchMonth2" id="searchMonth">
-                                                <label for="year1">1년</label>
+                                                <label for="searchMonth">전체</label>
                                             </span>
                                             <span>
-                                                <input ${adjCourtCnctnVO.searchYear eq '3' ? 'checked' : ''} value="3" type="radio" name="searchYear" id="year3">
+                                                <input ${adjCourtCnctnVO.searchMonth2 eq '1' ? 'checked' : ''} value="1" type="radio" name="searchMonth2" id="searchMonth1">
-                                                <label for="year3">3년</label>
+                                                <label for="searchMonth1">1개월</label>
                                             </span>
                                             <span>
-                                                <input ${adjCourtCnctnVO.searchYear eq '6' ? 'checked' : ''} value="6" type="radio" name="searchYear" id="year6">
+                                                <input ${adjCourtCnctnVO.searchMonth2 eq '3' ? 'checked' : ''} value="3" type="radio" name="searchMonth2" id="searchMonth3">
-                                                <label for="year6">6년</label>
+                                                <label for="searchMonth3">3개월</label>
                                             </span>
                                             <span>
-                                                <input ${adjCourtCnctnVO.searchYear eq '99' ? 'checked' : ''} value="99" type="radio" name="searchYear" id="yearEtc">
+                                                <input ${adjCourtCnctnVO.searchMonth2 eq '6' ? 'checked' : ''} value="6" type="radio" name="searchMonth2" id="searchMonth6">
-                                                <label for="yearEtc">기간지정</label>
+                                                <label for="searchMonth6">6개월</label>
+                                            </span>
+                                            <span>
+                                                <input ${adjCourtCnctnVO.searchMonth2 eq '99' ? 'checked' : ''} value="99" type="radio" name="searchMonth2" id="searchMonth2Etc">
+                                                <label for="searchMonth2Etc">기간지정</label>
                                             </span>
 			                            	<div id="sel_date" class="sel_date">
 					                           	<div class="calendar_wrap">
@@ -146,19 +159,6 @@ function fn_goDetail(courtSeq){
                     </div>
 					<div class="list_top">
 						<p>총 <span> <c:out value="${paginationInfo.totalRecordCount }" /></span>건 입니다.</p>
-						<div class="list_util">
-<!-- 							<select name="pageUnit" id="pageUnit" onchange="linkPage(1);" title="줄 선택" style="width: 140px"> -->
-<!-- 								<option value="10" selected="">10줄</option> -->
-<!-- 								<option value="20">20줄</option> -->
-<!-- 								<option value="30">30줄</option> -->
-<!-- 								<option value="100">100줄</option> -->
-<!-- 							</select> -->
-							<select name="searchCondition" id="searchCondition" onchange="linkPage(1);" title="분류 선택" style="width: 140px">
-								<option value="">작성여부</option>
-								<option value="10" <c:if test="${adjCourtCnctnVO.searchCondition eq 10 }">selected</c:if>>작성중</option>
-								<option value="20" <c:if test="${adjCourtCnctnVO.searchCondition eq 20 }">selected</c:if>>작성완료</option>
-							</select>
-						</div>
 					</div>
 					<!-- list -->
 					<div class="list tbType01">
@@ -171,6 +171,7 @@ function fn_goDetail(courtSeq){
 								<col style="width: auto">
 								<col style="width: 70px">
 								<col style="width: 10%">
+								<col style="width: 10%">
 							</colgroup>
 							<thead>
 								<tr>
@@ -181,6 +182,7 @@ function fn_goDetail(courtSeq){
 									<th>사건번호</th>
 									<th>조정위원</th>
 									<th>결정일자</th>
+									<th>삭제</th>
 								</tr>
 							</thead>
 							<tbody>
@@ -194,7 +196,8 @@ function fn_goDetail(courtSeq){
 										</c:otherwise>
 									</c:choose>
 								
-									<tr style=" cursor: pointer;" onclick="fn_goDetail('<c:out value="${list.courtSeq }" />')">
+<!-- 									<tr style=" cursor: pointer;"> -->
+									<tr>
 										<td>
 											<c:if test="${adjCourtCnctnVO.searchSortOrd eq 'desc' }">
 												<c:out value="${ ( paginationInfo.totalRecordCount - ((adjCourtCnctnVO.pageIndex -1)*adjCourtCnctnVO.pageUnit) ) - status.index }"/>
@@ -206,13 +209,14 @@ function fn_goDetail(courtSeq){
 										<td><c:out value="${list.courtNo }" /></td>
 										<td><c:out value="${list.courtFld }" /></td>
 										<td><c:out value="${list.courtRslt }" /></td>
-										<td><c:out value="${accdntCn }" /></td>
+										<td  style=" cursor: pointer;" onclick="fn_goDetail('<c:out value="${list.courtSeq }" />')"><c:out value="${accdntCn }" /></td>
 										<td><c:out value="${list.adjCmsnr }" /></td>
 										<td><c:out value="${list.dcsnDe }" /></td>
+										<td><input type="button" class="delBtn" value="삭제" data-info="<c:out value="${list.courtSeq }" />"/></td>
 									</tr>
 								</c:forEach>
 								<c:if test="${empty list}">
-									<tr><td colspan="9"><spring:message code="common.nodata.msg" /></td></tr>
+									<tr><td colspan="8"><spring:message code="common.nodata.msg" /></td></tr>
 								</c:if>
 							</tbody>
 						</table>
@@ -236,5 +240,9 @@ function fn_goDetail(courtSeq){
 	<form id="goForm" name="goForm" action="<c:url value="/kccadr/adjCourtCnctn/adjCourtCnctnRegist.do" />" method="post">
 		<input type="hidden" id="courtSeq" name="courtSeq" value="" />
 	</form>
+	<form id="delForm" name="delForm" action="<c:url value="/kccadr/adjCourtCnctn/updateUseYn.do" />" method="post">
+		<input type="hidden" id="delCourtSeq" name="courtSeq" value="" />
+		<input type="hidden" name="useYn" value="N" />
+	</form>
 </body>
 </html>