diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java index c71d8541..26f7d30f 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java @@ -5,7 +5,7 @@ import java.io.Serializable; import kcc.com.cmm.ComDefaultVO; @SuppressWarnings("serial") -public class PgrCmmVO extends ComDefaultVO implements Serializable { +public class PgrCmmVO implements Serializable { private String adrAdmId; // 조정조사관 private String adrAdmNm; /* 조정조사관 ( LETTNEMPLYRINFO ) */ @@ -182,6 +182,86 @@ public class PgrCmmVO extends ComDefaultVO implements Serializable { private String finalStatCdTxt; + /** 검색조건 */ + private String searchCondition = ""; + + /** 검색Keyword */ + private String searchKeyword = ""; + + /** 검색Keyword */ + private String searchEncKeyword = ""; + + /** 검색사용여부 */ + private String searchUseYn = ""; + + /** 현재페이지 */ + private int pageIndex = 1; + + /** 페이지갯수 */ + private int pageUnit = 10; + + /** 페이지사이즈 */ + private int pageSize = 10; + + /** firstIndex */ + private int firstIndex = 1; + + /** lastIndex */ + private int lastIndex = 1; + + /** recordCountPerPage */ + private int recordCountPerPage = 10; + + /** 검색KeywordFrom */ + private String searchKeywordFrom = ""; + + /** 검색KeywordTo */ + private String searchKeywordTo = ""; + + private String searchYear = ""; + private String searchMonth2 = ""; + private String searchQuarter = ""; + + /** 엑셀용 */ + private String excelYn = ""; + + private String siteId = ""; + + private String siteNm = ""; + + private String searchConditionSite; + + private String sortOver = "A"; //재정렬시 차순(A:오름차순 , D:내림차순) + + private String seCd = ""; //게시판 구분 및 게시판ID추가 구분 + + private int sort = 0; + + private int beSort = 0; //이전 sort번호 + + private int totCnt = 0; + + private String searchSortCnd = ""; // 정렬 항목 + private String searchSortOrd = ""; // 정렬 구분(오름/내림) + + private String searchNm = ""; //상세검색 이름 + + private String tempSortNum ; + + + private String searchStartDt; //검색시작일 + + private String searchEndDt; //검색종료일 + + private String searchStatus; //진행상태 + + private String searchSelStatus; //셀렉트 진행상태 + + private String[] searchStatusArr; //검색상태 + + private String searchMonth = "3"; //검색월선택 + + private String searchSbmtId ; // 결제자 검색 public String getAdrAdmId() { return adrAdmId; @@ -1270,11 +1350,285 @@ public class PgrCmmVO extends ComDefaultVO implements Serializable { public void setFinalStatCdTxt(String finalStatCdTxt) { this.finalStatCdTxt = finalStatCdTxt; } - - - - - - + + public String getSearchCondition() { + return searchCondition; + } + + public void setSearchCondition(String searchCondition) { + this.searchCondition = searchCondition; + } + + public String getSearchKeyword() { + return searchKeyword; + } + + public void setSearchKeyword(String searchKeyword) { + this.searchKeyword = searchKeyword; + } + + public String getSearchEncKeyword() { + return searchEncKeyword; + } + + public void setSearchEncKeyword(String searchEncKeyword) { + this.searchEncKeyword = searchEncKeyword; + } + + public String getSearchUseYn() { + return searchUseYn; + } + + public void setSearchUseYn(String searchUseYn) { + this.searchUseYn = searchUseYn; + } + + public int getPageIndex() { + return pageIndex; + } + + public void setPageIndex(int pageIndex) { + this.pageIndex = pageIndex; + } + + public int getPageUnit() { + return pageUnit; + } + + public void setPageUnit(int pageUnit) { + this.pageUnit = pageUnit; + } + + public int getPageSize() { + return pageSize; + } + + public void setPageSize(int pageSize) { + this.pageSize = pageSize; + } + + public int getFirstIndex() { + return firstIndex; + } + + public void setFirstIndex(int firstIndex) { + this.firstIndex = firstIndex; + } + + public int getLastIndex() { + return lastIndex; + } + + public void setLastIndex(int lastIndex) { + this.lastIndex = lastIndex; + } + + public int getRecordCountPerPage() { + return recordCountPerPage; + } + + public void setRecordCountPerPage(int recordCountPerPage) { + this.recordCountPerPage = recordCountPerPage; + } + + public String getSearchKeywordFrom() { + return searchKeywordFrom; + } + + public void setSearchKeywordFrom(String searchKeywordFrom) { + this.searchKeywordFrom = searchKeywordFrom; + } + + public String getSearchKeywordTo() { + return searchKeywordTo; + } + + public void setSearchKeywordTo(String searchKeywordTo) { + this.searchKeywordTo = searchKeywordTo; + } + + public String getSearchYear() { + return searchYear; + } + + public void setSearchYear(String searchYear) { + this.searchYear = searchYear; + } + + public String getSearchMonth2() { + return searchMonth2; + } + + public void setSearchMonth2(String searchMonth2) { + this.searchMonth2 = searchMonth2; + } + + public String getSearchQuarter() { + return searchQuarter; + } + + public void setSearchQuarter(String searchQuarter) { + this.searchQuarter = searchQuarter; + } + + public String getExcelYn() { + return excelYn; + } + + public void setExcelYn(String excelYn) { + this.excelYn = excelYn; + } + + public String getSiteId() { + return siteId; + } + + public void setSiteId(String siteId) { + this.siteId = siteId; + } + + public String getSiteNm() { + return siteNm; + } + + public void setSiteNm(String siteNm) { + this.siteNm = siteNm; + } + + public String getSearchConditionSite() { + return searchConditionSite; + } + + public void setSearchConditionSite(String searchConditionSite) { + this.searchConditionSite = searchConditionSite; + } + + public String getSortOver() { + return sortOver; + } + + public void setSortOver(String sortOver) { + this.sortOver = sortOver; + } + + public String getSeCd() { + return seCd; + } + + public void setSeCd(String seCd) { + this.seCd = seCd; + } + + public int getSort() { + return sort; + } + + public void setSort(int sort) { + this.sort = sort; + } + + public int getBeSort() { + return beSort; + } + + public void setBeSort(int beSort) { + this.beSort = beSort; + } + + public int getTotCnt() { + return totCnt; + } + + public void setTotCnt(int totCnt) { + this.totCnt = totCnt; + } + + public String getSearchSortCnd() { + return searchSortCnd; + } + + public void setSearchSortCnd(String searchSortCnd) { + this.searchSortCnd = searchSortCnd; + } + + public String getSearchSortOrd() { + return searchSortOrd; + } + + public void setSearchSortOrd(String searchSortOrd) { + this.searchSortOrd = searchSortOrd; + } + + public String getSearchNm() { + return searchNm; + } + + public void setSearchNm(String searchNm) { + this.searchNm = searchNm; + } + + public String getTempSortNum() { + return tempSortNum; + } + + public void setTempSortNum(String tempSortNum) { + this.tempSortNum = tempSortNum; + } + + public String getSearchStartDt() { + return searchStartDt; + } + + public void setSearchStartDt(String searchStartDt) { + this.searchStartDt = searchStartDt; + } + + public String getSearchEndDt() { + return searchEndDt; + } + + public void setSearchEndDt(String searchEndDt) { + this.searchEndDt = searchEndDt; + } + + public String getSearchStatus() { + return searchStatus; + } + + public void setSearchStatus(String searchStatus) { + this.searchStatus = searchStatus; + } + + public String getSearchSelStatus() { + return searchSelStatus; + } + + public void setSearchSelStatus(String searchSelStatus) { + this.searchSelStatus = searchSelStatus; + } + + public String[] getSearchStatusArr() { + return searchStatusArr; + } + + public void setSearchStatusArr(String[] searchStatusArr) { + this.searchStatusArr = searchStatusArr; + } + + public String getSearchMonth() { + return searchMonth; + } + + public void setSearchMonth(String searchMonth) { + this.searchMonth = searchMonth; + } + + public String getSearchSbmtId() { + return searchSbmtId; + } + + public void setSearchSbmtId(String searchSbmtId) { + this.searchSbmtId = searchSbmtId; + } } diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgr/AdjReqMgr_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgr/AdjReqMgr_SQL_Mysql.xml index afeb2f61..0b50c164 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgr/AdjReqMgr_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgr/AdjReqMgr_SQL_Mysql.xml @@ -312,7 +312,22 @@ ORDER BY S1.FRST_REGIST_PNTTM ) AS RES_PON_DENT_NM , ( SELECT RPPL_NM FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '30') AS DEPU_TY_NM - , ( SELECT RPPL_NM FROM ADR_RPPL s1 WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '10') AS APPLI_CANT_NM + , ( SELECT RPPL_NM FROM + (SELECT + CASE + WHEN ttt1.RPPL_USR_TY = '01' + THEN ttt1.RPPL_NM + WHEN ttt1.RPPL_USR_TY = '02' + THEN ttt1.RPPL_BIZ_NM + ELSE '3' + END RPPL_NM, + ttt1.RPPL_TY, + ttt1.adr_seq, + ttt1.frst_regist_pnttm + FROM ADR_RPPL ttt1 + ) + s1 + WHERE 1=1 AND S1.adr_seq = T1.adr_seq AND s1.RPPL_TY = '10') AS APPLI_CANT_NM ,REJECT_CN ,FRST_REGIST_PNTTM ,FRST_REGISTER_ID diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmList.jsp index cedda637..7a71771d 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmList.jsp @@ -216,19 +216,19 @@

신청일자

- + - + - + - +
diff --git a/src/main/webapp/js/kccadr/kccadrCom.js b/src/main/webapp/js/kccadr/kccadrCom.js index a98890fb..6fa7ab81 100644 --- a/src/main/webapp/js/kccadr/kccadrCom.js +++ b/src/main/webapp/js/kccadr/kccadrCom.js @@ -54,6 +54,10 @@ function fn_postCode(schBtn, test) { } new daum.Postcode({ + autoMapping: true, +// autoMappingRoad: true +// , autoMappingJibun: true +// , oncomplete: function(data) { // 팝업에서 검색결과 항목을 클릭했을때 실행할 코드를 작성하는 부분.