diff --git a/src/main/java/kcc/com/cmm/util/DateUtil.java b/src/main/java/kcc/com/cmm/util/DateUtil.java index 6e1b2743..2b4ce537 100644 --- a/src/main/java/kcc/com/cmm/util/DateUtil.java +++ b/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; @@ -193,5 +194,29 @@ public final class DateUtil { return dtFormat.format(cal.getTime()); } + + 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()); + } } diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java index 137cee85..078fb1c8 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnService.java +++ b/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); } diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java index 7b8022db..2ac699b4 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/AdjCourtCnctnVO.java +++ b/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; + } diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java index 6d2d750e..522cf68b 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnDAO.java +++ b/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); + } + } diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java index 47df7b65..6c3f856c 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java +++ b/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 adjCourtCnctnList(AdjCourtCnctnVO adjCourtCnctnVO) { + + if(StringUtils.isNotEmpty(adjCourtCnctnVO.getSearchMonth2()) + && adjCourtCnctnVO.getSearchMonth2() != "99") + adjCourtCnctnVO.setDiffMonth(DateUtil.setDiffMonth(adjCourtCnctnVO.getSearchMonth2())); + return adjCourtCnctnDAO.selectAdjCourtCnctnList(adjCourtCnctnVO); } @@ -73,6 +86,11 @@ public class AdjCourtCnctnServiceImpl extends EgovAbstractServiceImpl implements } return new RestResponse(HttpStatus.OK, "수정 되었습니다.", LocalDateTime.now()); } + + @Override + public void updateUseYn(AdjCourtCnctnVO adjCourtCnctnVO) { + adjCourtCnctnDAO.updateUseYn(adjCourtCnctnVO); + } diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java b/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java index 94e4a39c..20282a61 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/web/AdjCourtCnctnController.java +++ b/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,10 +54,9 @@ 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(); paginationInfo.setCurrentPageNo(adjCourtCnctnVO.getPageIndex()); @@ -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 { diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java index f8140501..51f80855 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/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 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 diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml index 4ca41325..9171c698 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml @@ -10,65 +10,129 @@ COUNT(1) AS TOT FROM ADJ_COURT_CNCTN_MGR - + + + - - INSERT INTO ADJ_COURT_CNCTN_MGR ( COURT_SEQ @@ -315,5 +275,13 @@ COURT_SEQ = #courtSeq# + + + UPDATE ADJ_COURT_CNCTN_MGR SET + USE_YN = #useYn# + where + COURT_SEQ = #courtSeq# + + diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml index 7a8f77e7..5e0c946c 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml @@ -951,19 +951,19 @@ /*날짜 검색 - 1년 전까지*/ - + TO_CHAR(amm.FRST_REGIST_PNTTM,'YYYYMMDD') = ]]> REPLACE(#diffYear#, '-' , '') /*날짜 검색 - 3년 전까지*/ - + TO_CHAR(amm.FRST_REGIST_PNTTM,'YYYYMMDD') = ]]> REPLACE(#diffYear#, '-' , '') /*날짜 검색 - 6년 전까지*/ - + TO_CHAR(amm.FRST_REGIST_PNTTM,'YYYYMMDD') = ]]> REPLACE(#diffYear#, '-' , '') diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp index 3f8535b8..8ebba264 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp +++ b/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 = ""; + listForm.action = ""; listForm.submit(); } @@ -89,11 +99,10 @@ function fn_goDetail(courtSeq){

  • 구분

    - - - - + + @@ -102,20 +111,24 @@ function fn_goDetail(courtSeq){

    결정일자

    - - + + - - + + - - + + - - + + + + + +
    @@ -146,19 +159,6 @@ function fn_goDetail(courtSeq){

    총 건 입니다.

    -
    - - - - - - - -
    @@ -171,6 +171,7 @@ function fn_goDetail(courtSeq){ + @@ -181,6 +182,7 @@ function fn_goDetail(courtSeq){ 사건번호 조정위원 결정일자 + 삭제 @@ -194,7 +196,8 @@ function fn_goDetail(courtSeq){ - ')"> + + @@ -206,13 +209,14 @@ function fn_goDetail(courtSeq){ - + ')"> + "/> - + @@ -236,5 +240,9 @@ function fn_goDetail(courtSeq){
    " method="post">
    +
    " method="post"> + + +
    \ No newline at end of file