diff --git a/src/main/java/kcc/kccadr/advc/service/AdrHstryMgrDetailService.java b/src/main/java/kcc/kccadr/advc/service/AdrHstryMgrDetailService.java index a88459a3..05c83d66 100644 --- a/src/main/java/kcc/kccadr/advc/service/AdrHstryMgrDetailService.java +++ b/src/main/java/kcc/kccadr/advc/service/AdrHstryMgrDetailService.java @@ -24,4 +24,10 @@ public interface AdrHstryMgrDetailService { //L List selectCancelList(AdrHstryMgrVO adrHstryMgrVO) throws Exception; + + List selectDocHstryList1(AdrHstryMgrVO adrHstryMgrVO) throws Exception; + + List selectDocHstryList2(AdrHstryMgrVO adrHstryMgrVO) throws Exception; + + List selectDocHstryList3(AdrHstryMgrVO adrHstryMgrVO) throws Exception; } diff --git a/src/main/java/kcc/kccadr/advc/service/AdrHstryMgrVO.java b/src/main/java/kcc/kccadr/advc/service/AdrHstryMgrVO.java index 5ce3ca18..511c47c3 100644 --- a/src/main/java/kcc/kccadr/advc/service/AdrHstryMgrVO.java +++ b/src/main/java/kcc/kccadr/advc/service/AdrHstryMgrVO.java @@ -45,6 +45,15 @@ public class AdrHstryMgrVO extends ComDefaultVO implements Serializable { private String cCodeNm; //코드명(사용자) private String eCodeNm; //코드명(추가된) + private String searchBgnDe; + private String searchEndDe; + + private String totalLogCnt; + private String adrNo; + private String minRegDt; + private String maxRegDt; + + private String userNm; public String getAdrSeq() { return adrSeq; @@ -166,5 +175,47 @@ public class AdrHstryMgrVO extends ComDefaultVO implements Serializable { } public void setStatCd(String statCd) { this.statCd = statCd; + } + public String getSearchBgnDe() { + return searchBgnDe; + } + public void setSearchBgnDe(String searchBgnDe) { + this.searchBgnDe = searchBgnDe; + } + public String getSearchEndDe() { + return searchEndDe; + } + public void setSearchEndDe(String searchEndDe) { + this.searchEndDe = searchEndDe; + } + public String getTotalLogCnt() { + return totalLogCnt; + } + public void setTotalLogCnt(String totalLogCnt) { + this.totalLogCnt = totalLogCnt; + } + public String getAdrNo() { + return adrNo; + } + public void setAdrNo(String adrNo) { + this.adrNo = adrNo; + } + public String getMinRegDt() { + return minRegDt; + } + public void setMinRegDt(String minRegDt) { + this.minRegDt = minRegDt; + } + public String getMaxRegDt() { + return maxRegDt; + } + public void setMaxRegDt(String maxRegDt) { + this.maxRegDt = maxRegDt; + } + public String getUserNm() { + return userNm; + } + public void setUserNm(String userNm) { + this.userNm = userNm; } } diff --git a/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrDetailDAO.java b/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrDetailDAO.java index a1d34085..bb867e47 100644 --- a/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrDetailDAO.java +++ b/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrDetailDAO.java @@ -84,4 +84,19 @@ public class AdrHstryMgrDetailDAO extends EgovAbstractDAO { List tlist = (List) list("AdrHstryMgrDetailDAO.selectCancelList", adrHstryMgrVO); return tlist; } + + public List selectDocHstryList1(AdrHstryMgrVO adrHstryMgrVO) throws Exception { + List tlist = (List) list("AdrHstryMgrDetailDAO.selectDocHstryList1", adrHstryMgrVO); + return tlist; + } + + public List selectDocHstryList2(AdrHstryMgrVO adrHstryMgrVO) throws Exception { + List tlist = (List) list("AdrHstryMgrDetailDAO.selectDocHstryList2", adrHstryMgrVO); + return tlist; + } + + public List selectDocHstryList3(AdrHstryMgrVO adrHstryMgrVO) throws Exception { + List tlist = (List) list("AdrHstryMgrDetailDAO.selectDocHstryList3", adrHstryMgrVO); + return tlist; + } } diff --git a/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrDetailServiceImpl.java b/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrDetailServiceImpl.java index 8ae35619..11f46720 100644 --- a/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrDetailServiceImpl.java +++ b/src/main/java/kcc/kccadr/advc/service/impl/AdrHstryMgrDetailServiceImpl.java @@ -63,4 +63,16 @@ public class AdrHstryMgrDetailServiceImpl implements AdrHstryMgrDetailService { return adrHstryMgrDetailDAO.selectCancelList(adrHstryMgrVO); } + public List selectDocHstryList1(AdrHstryMgrVO adrHstryMgrVO) throws Exception{ + return adrHstryMgrDetailDAO.selectDocHstryList1(adrHstryMgrVO); + } + + public List selectDocHstryList2(AdrHstryMgrVO adrHstryMgrVO) throws Exception{ + return adrHstryMgrDetailDAO.selectDocHstryList2(adrHstryMgrVO); + } + + public List selectDocHstryList3(AdrHstryMgrVO adrHstryMgrVO) throws Exception{ + return adrHstryMgrDetailDAO.selectDocHstryList3(adrHstryMgrVO); + } + } diff --git a/src/main/java/kcc/let/sym/log/clg/web/EgovLoginLogController.java b/src/main/java/kcc/let/sym/log/clg/web/EgovLoginLogController.java index 939aa6f7..a3b16ba0 100644 --- a/src/main/java/kcc/let/sym/log/clg/web/EgovLoginLogController.java +++ b/src/main/java/kcc/let/sym/log/clg/web/EgovLoginLogController.java @@ -34,6 +34,8 @@ import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.EgovMessageSource; import kcc.com.cmm.LoginVO; import kcc.com.cmm.util.RedirectUrlMaker; +import kcc.kccadr.advc.service.AdrHstryMgrDetailService; +import kcc.kccadr.advc.service.AdrHstryMgrVO; import kcc.let.sym.log.clg.service.EgovLoginLogService; import kcc.let.sym.log.clg.service.LoginLog; @@ -70,6 +72,10 @@ public class EgovLoginLogController { @Resource(name = "egovMessageSource") EgovMessageSource egovMessageSource; + @Resource(name = "adrHstryMgrDetailService") + private AdrHstryMgrDetailService adrHstryMgrDetailService; + + //배열 정의{"컬럼순차번호, 컬럼이름, 컬럼내용, 컬럼이름에 붙여야할 내용(엑셀코드양식다운로드시 필요)"} private String[][] logExcelValue ={ {"0" ,"번호" , "1" , "" }, @@ -707,5 +713,116 @@ public class EgovLoginLogController { } + /** + * 사건별 문서 이력 리스트1 - 사건 단위의 전체 이력 정보 + * + * @param loginLog + * @return sym/log/clg/SelectWebLogList.do + * @throws Exception + */ + @RequestMapping(value = "/sym/log/doc/SelectDocLogList1.do") + public String SelectDocLogList1(@ModelAttribute("searchVO") AdrHstryMgrVO adrHstryMgrVO, + //@RequestParam Map commandMap , + ModelMap model) throws Exception { + + System.out.println("adrHstryMgrVO.getPageIndex()"); + System.out.println(adrHstryMgrVO.getPageIndex()); + + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(adrHstryMgrVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(adrHstryMgrVO.getPageUnit()); + paginationInfo.setPageSize(adrHstryMgrVO.getPageSize()); + + adrHstryMgrVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); + adrHstryMgrVO.setLastIndex(paginationInfo.getLastRecordIndex()); + adrHstryMgrVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); + + /* + if("".equals(loginLog.getSearchSortCnd())){ //최초조회시 최신것 조회List + loginLog.setSearchSortCnd("logId"); + loginLog.setSearchSortOrd("desc"); + } + */ + + //List adminLogList = loginLogService.selectAmdinLog(loginLog); + List userMenuList = adrHstryMgrDetailService.selectDocHstryList1(adrHstryMgrVO); + + //int adminLogListCnt = loginLogService.selectAmdinLogTotCnt(loginLog); + paginationInfo.setTotalRecordCount(userMenuList.get(0).getTotCnt()); + model.addAttribute("paginationInfo", paginationInfo); + //model.addAttribute("adminLogList", adminLogList); + + + //List userMenuList = adrHstryMgrDetailService.selectDocHstryList1(adrHstryMgrVO); + model.addAttribute("userMenuList", userMenuList); + + return "sym/log/doc/SelectDocLogList1"; + } + /** + * 사건별 문서 이력 리스트2 - 사건 단위의 전체 이력 정보 + * + * @param loginLog + * @return sym/log/doc/SelectDocLogList2.do + * @throws Exception + */ + @RequestMapping(value = "/sym/log/doc/SelectDocLogList2.do") + public String SelectDocLogList2(@ModelAttribute("searchVO") AdrHstryMgrVO adrHstryMgrVO, + //@RequestParam Map commandMap , + ModelMap model) throws Exception { + + /* + System.out.println("adrHstryMgrVO.getPageIndex()"); + System.out.println(adrHstryMgrVO.getPageIndex()); + + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(adrHstryMgrVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(adrHstryMgrVO.getPageUnit()); + paginationInfo.setPageSize(adrHstryMgrVO.getPageSize()); + + adrHstryMgrVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); + adrHstryMgrVO.setLastIndex(paginationInfo.getLastRecordIndex()); + adrHstryMgrVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); + */ + /* + if("".equals(loginLog.getSearchSortCnd())){ //최초조회시 최신것 조회List + loginLog.setSearchSortCnd("logId"); + loginLog.setSearchSortOrd("desc"); + } + */ + + //List adminLogList = loginLogService.selectAmdinLog(loginLog); + List userMenuList = adrHstryMgrDetailService.selectDocHstryList2(adrHstryMgrVO); + /* + //int adminLogListCnt = loginLogService.selectAmdinLogTotCnt(loginLog); + paginationInfo.setTotalRecordCount(userMenuList.get(0).getTotCnt()); + model.addAttribute("paginationInfo", paginationInfo); + //model.addAttribute("adminLogList", adminLogList); + */ + + + //List userMenuList = adrHstryMgrDetailService.selectDocHstryList1(adrHstryMgrVO); + model.addAttribute("userMenuList", userMenuList); + + return "sym/log/doc/SelectDocLogList2"; + } + + /** + * 사건별 문서 이력 리스트2 - 사건 단위의 상세 접근 사용자 정보 + * + * @param loginLog + * @return sym/log/doc/SelectDocLogList3.do + * @throws Exception + */ + @RequestMapping(value = "/sym/log/doc/SelectDocLogList3.do") + public String SelectDocLogList3(@ModelAttribute("searchVO") AdrHstryMgrVO adrHstryMgrVO, + //@RequestParam Map commandMap , + ModelMap model) throws Exception { + + List userMenuList = adrHstryMgrDetailService.selectDocHstryList3(adrHstryMgrVO); + + model.addAttribute("userMenuList", userMenuList); + + return "sym/log/doc/SelectDocLogList3"; + } } diff --git a/src/main/resources/egovframework/sqlmap/kccadr/advc/AdrHstryMgrDetail_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/kccadr/advc/AdrHstryMgrDetail_SQL_Cubrid.xml index 26c21052..673d8fdc 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/advc/AdrHstryMgrDetail_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/advc/AdrHstryMgrDetail_SQL_Cubrid.xml @@ -207,5 +207,94 @@ ORDER BY a.adr_hstry_mgr_detail_seq desc - + + + + + + + + + +