diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java index b30aa329..8b9f9278 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java @@ -195,6 +195,17 @@ public class VEInstrDetailVO extends ComDefaultVO implements Serializable { private String docuNmbr; private String docuNmbrDp; + private String yNowEduCnt; + private String yNowMoneEduCnt; + private String yNowMtwoEduCnt; + private String yNowMthreeEduCnt; + private String yNowMfourEduCnt; + private String yNowStsfc; + private String yNowMoneStsfc; + private String yNowMtwoStsfc; + private String yNowMthreeStsfc; + private String yNowMfourStsfc; + public String getDesc1() { return desc1; @@ -972,5 +983,65 @@ public class VEInstrDetailVO extends ComDefaultVO implements Serializable { public void setDocuNmbrDp(String docuNmbrDp) { this.docuNmbrDp = docuNmbrDp; } + public String getyNowEduCnt() { + return yNowEduCnt; + } + public void setyNowEduCnt(String yNowEduCnt) { + this.yNowEduCnt = yNowEduCnt; + } + public String getyNowMoneEduCnt() { + return yNowMoneEduCnt; + } + public void setyNowMoneEduCnt(String yNowMoneEduCnt) { + this.yNowMoneEduCnt = yNowMoneEduCnt; + } + public String getyNowMtwoEduCnt() { + return yNowMtwoEduCnt; + } + public void setyNowMtwoEduCnt(String yNowMtwoEduCnt) { + this.yNowMtwoEduCnt = yNowMtwoEduCnt; + } + public String getyNowMthreeEduCnt() { + return yNowMthreeEduCnt; + } + public void setyNowMthreeEduCnt(String yNowMthreeEduCnt) { + this.yNowMthreeEduCnt = yNowMthreeEduCnt; + } + public String getyNowMfourEduCnt() { + return yNowMfourEduCnt; + } + public void setyNowMfourEduCnt(String yNowMfourEduCnt) { + this.yNowMfourEduCnt = yNowMfourEduCnt; + } + public String getyNowStsfc() { + return yNowStsfc; + } + public void setyNowStsfc(String yNowStsfc) { + this.yNowStsfc = yNowStsfc; + } + public String getyNowMoneStsfc() { + return yNowMoneStsfc; + } + public void setyNowMoneStsfc(String yNowMoneStsfc) { + this.yNowMoneStsfc = yNowMoneStsfc; + } + public String getyNowMtwoStsfc() { + return yNowMtwoStsfc; + } + public void setyNowMtwoStsfc(String yNowMtwoStsfc) { + this.yNowMtwoStsfc = yNowMtwoStsfc; + } + public String getyNowMthreeStsfc() { + return yNowMthreeStsfc; + } + public void setyNowMthreeStsfc(String yNowMthreeStsfc) { + this.yNowMthreeStsfc = yNowMthreeStsfc; + } + public String getyNowMfourStsfc() { + return yNowMfourStsfc; + } + public void setyNowMfourStsfc(String yNowMfourStsfc) { + this.yNowMfourStsfc = yNowMfourStsfc; + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrExcelVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrExcelVO.java new file mode 100644 index 00000000..8c18de52 --- /dev/null +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrExcelVO.java @@ -0,0 +1,153 @@ +package kcc.ve.instr.tngrVisitEdu.instrInfo.service; + +import java.io.Serializable; + +import kcc.com.cmm.ComDefaultVO; + + +public class VEInstrExcelVO extends ComDefaultVO implements Serializable { + /* + * 강사테이블 + * */ + + private static final long serialVersionUID = 1L; + + + private String instrNm; + private String apptYr; + private String DBirth; + private String blng; + private String pstn; + private String phone; + private String email; + private String prfsnFld; + private String addr; + private String YNowEduCnt; + private String YNowMoneEduCnt; + private String YNowMtwoEduCnt; + private String YNowMthreeEduCnt; + private String YNowMfourEduCnt; + private String YNowStsfc; + private String YNowMoneStsfc; + private String YNowMtwoStsfc; + private String YNowMthreeStsfc; + private String YNowMfourStsfc; + public String getInstrNm() { + return instrNm; + } + public void setInstrNm(String instrNm) { + this.instrNm = instrNm; + } + public String getApptYr() { + return apptYr; + } + public void setApptYr(String apptYr) { + this.apptYr = apptYr; + } + public String getBlng() { + return blng; + } + public void setBlng(String blng) { + this.blng = blng; + } + public String getPstn() { + return pstn; + } + public void setPstn(String pstn) { + this.pstn = pstn; + } + public String getPhone() { + return phone; + } + public void setPhone(String phone) { + this.phone = phone; + } + public String getEmail() { + return email; + } + public void setEmail(String email) { + this.email = email; + } + public String getPrfsnFld() { + return prfsnFld; + } + public void setPrfsnFld(String prfsnFld) { + this.prfsnFld = prfsnFld; + } + public String getAddr() { + return addr; + } + public void setAddr(String addr) { + this.addr = addr; + } + public String getDBirth() { + return DBirth; + } + public void setDBirth(String dBirth) { + DBirth = dBirth; + } + public String getYNowEduCnt() { + return YNowEduCnt; + } + public void setYNowEduCnt(String yNowEduCnt) { + YNowEduCnt = yNowEduCnt; + } + public String getYNowMoneEduCnt() { + return YNowMoneEduCnt; + } + public void setYNowMoneEduCnt(String yNowMoneEduCnt) { + YNowMoneEduCnt = yNowMoneEduCnt; + } + public String getYNowMtwoEduCnt() { + return YNowMtwoEduCnt; + } + public void setYNowMtwoEduCnt(String yNowMtwoEduCnt) { + YNowMtwoEduCnt = yNowMtwoEduCnt; + } + public String getYNowMthreeEduCnt() { + return YNowMthreeEduCnt; + } + public void setYNowMthreeEduCnt(String yNowMthreeEduCnt) { + YNowMthreeEduCnt = yNowMthreeEduCnt; + } + public String getYNowMfourEduCnt() { + return YNowMfourEduCnt; + } + public void setYNowMfourEduCnt(String yNowMfourEduCnt) { + YNowMfourEduCnt = yNowMfourEduCnt; + } + public String getYNowStsfc() { + return YNowStsfc; + } + public void setYNowStsfc(String yNowStsfc) { + YNowStsfc = yNowStsfc; + } + public String getYNowMoneStsfc() { + return YNowMoneStsfc; + } + public void setYNowMoneStsfc(String yNowMoneStsfc) { + YNowMoneStsfc = yNowMoneStsfc; + } + public String getYNowMtwoStsfc() { + return YNowMtwoStsfc; + } + public void setYNowMtwoStsfc(String yNowMtwoStsfc) { + YNowMtwoStsfc = yNowMtwoStsfc; + } + public String getYNowMthreeStsfc() { + return YNowMthreeStsfc; + } + public void setYNowMthreeStsfc(String yNowMthreeStsfc) { + YNowMthreeStsfc = yNowMthreeStsfc; + } + public String getYNowMfourStsfc() { + return YNowMfourStsfc; + } + public void setYNowMfourStsfc(String yNowMfourStsfc) { + YNowMfourStsfc = yNowMfourStsfc; + } + + + + +} diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrMixService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrMixService.java index c422a64a..3f8c5d9d 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrMixService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrMixService.java @@ -111,4 +111,6 @@ public interface VEInstrMixService { int updateInstrDetailSbmtY(VEInstrDetailVO vEInstrDetailVO) throws Exception; List selectWhereInDetailReport(VEInstrDetailVO vEInstrDetailVO); + + List selectInstrExcelList(VEInstrDetailVO vEInstrDetailVO); } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixDAO.java index 92b59192..22883a9d 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixDAO.java @@ -240,4 +240,9 @@ public class VEInstrMixDAO extends EgovAbstractDAO { List tlist = (List) list("VEInstrMixDAO.selectWhereInDetailReport", vEInstrDetailVO); return tlist; } + + public List selectInstrExcelList(VEInstrDetailVO vEInstrDetailVO) { + List tlist = (List) list("VEInstrMixDAO.selectInstrExcelList", vEInstrDetailVO); + return tlist; + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixServiceImpl.java index 81606056..4256ddfc 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixServiceImpl.java @@ -191,4 +191,9 @@ public class VEInstrMixServiceImpl implements VEInstrMixService { public List selectWhereInDetailReport(VEInstrDetailVO vEInstrDetailVO) { return vEInstrMixDAO.selectWhereInDetailReport(vEInstrDetailVO); } + + @Override + public List selectInstrExcelList(VEInstrDetailVO vEInstrDetailVO) { + return vEInstrMixDAO.selectInstrExcelList(vEInstrDetailVO); + } } diff --git a/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java b/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java index 9903404e..44a542e0 100644 --- a/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java +++ b/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java @@ -1,6 +1,7 @@ package kcc.ve.oprtn.instr.adultVisitEdu.instrInfo.web; import java.text.SimpleDateFormat; +import java.time.Year; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -51,6 +52,7 @@ import kcc.ve.aplct.cpyrgExprnClsrm.exprnClsrmAplct.service.ScholInfoService; import kcc.ve.aplct.cpyrgExprnClsrm.exprnClsrmAplct.service.ScholInfoVO; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailService; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrExcelVO; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrMixService; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrService; import kcc.ve.instr.tngrVisitEdu.instrInfo.web.InstrPrflController; @@ -1087,66 +1089,112 @@ public class OprtnInstrAdultPrflContoller { @ModelAttribute("vEInstrDetailVO") VEInstrDetailVO vEInstrDetailVO , ModelMap model) throws Exception { - vEInstrDetailVO.setRecordCountPerPage(10000000); + System.out.println("userIdList :: "+ vEInstrDetailVO.getUserIdList().toString()); +// vEInstrDetailVO.setRecordCountPerPage(10000000); +// +// //1.pageing step1 +// PaginationInfo paginationInfo = this.setPagingStep1(vEInstrDetailVO); +// +// +// //2. pageing step2 +// vEInstrDetailVO = this.setPagingStep2(vEInstrDetailVO, paginationInfo); +// +// //3. SelectPagingListQuery set 할 조건 설정 +// String selectCondition = new String(); +// //3.1 제출 완료 후 사용중인 데이터 조회 +// //selectCondition += "AND a.sbmt_yn='Y' AND a.use_yn = 'Y'"; +// selectCondition += "AND a0.sbmt_yn='Y' AND a0.use_yn = 'Y'"; +// //3.2 강사 테이블 성인강사여부 Y인것만 조회 +// //selectCondition += "AND (b.adult_instr_yn ='Y' OR a.qlfct_end_yn = 'Y') "; +// selectCondition += "AND (b0.adult_instr_yn ='Y' OR a0.qlfct_end_yn = 'Y') "; +// //3.3 이름 검색 시 +// if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchKeyword())){ +// //selectCondition += "AND a.instr_nm LIKE CONCAT ('%', '" +vEInstrDetailVO.getSearchKeyword() + "', '%')"; +// //이름 암호화 - comDefaultVO 검색단어 공통 암호화 +// ComDefaultVO comDefaultVO = new ComDefaultVO(); +// comDefaultVO.setSearchKeyword(vEInstrDetailVO.getSearchKeyword()); +// comDefaultVO = egovCryptoUtil.encryptComDefaultVO(comDefaultVO); +// vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword()); +// //selectCondition += "AND a.instr_nm LIKE CONCAT ('%', '" +vEInstrDetailVO.getSearchKeyword() + "', '%')"; +// selectCondition += "AND a0.instr_nm LIKE '%'||'" +vEInstrDetailVO.getSearchKeyword() + "'||'%'"; +// comDefaultVO = egovCryptoUtil.decryptComDefaultVO(comDefaultVO); +// vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword()); +// } +// //3.4 요청일 시작일 검색 시 +// if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchStartDt())){ +// selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') >= REPLACE('"+vEInstrDetailVO.getSearchStartDt()+"', '.', '')"; +// } +// //3.5 요청일 종료일 검색 시 +// if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchEndDt())){ +// selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') <= REPLACE('"+vEInstrDetailVO.getSearchEndDt()+"', '.', '')"; +// } +// vEInstrDetailVO.setSelectPagingListQuery(selectCondition); - //1.pageing step1 - PaginationInfo paginationInfo = this.setPagingStep1(vEInstrDetailVO); + + + vEInstrDetailVO.setInstrDiv("20"); - - //2. pageing step2 - vEInstrDetailVO = this.setPagingStep2(vEInstrDetailVO, paginationInfo); - - //3. SelectPagingListQuery set 할 조건 설정 - String selectCondition = new String(); - //3.1 제출 완료 후 사용중인 데이터 조회 - //selectCondition += "AND a.sbmt_yn='Y' AND a.use_yn = 'Y'"; - selectCondition += "AND a0.sbmt_yn='Y' AND a0.use_yn = 'Y'"; - //3.2 강사 테이블 성인강사여부 Y인것만 조회 - //selectCondition += "AND (b.adult_instr_yn ='Y' OR a.qlfct_end_yn = 'Y') "; - selectCondition += "AND (b0.adult_instr_yn ='Y' OR a0.qlfct_end_yn = 'Y') "; - //3.3 이름 검색 시 - if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchKeyword())){ - //selectCondition += "AND a.instr_nm LIKE CONCAT ('%', '" +vEInstrDetailVO.getSearchKeyword() + "', '%')"; - //이름 암호화 - comDefaultVO 검색단어 공통 암호화 - ComDefaultVO comDefaultVO = new ComDefaultVO(); - comDefaultVO.setSearchKeyword(vEInstrDetailVO.getSearchKeyword()); - comDefaultVO = egovCryptoUtil.encryptComDefaultVO(comDefaultVO); - vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword()); - //selectCondition += "AND a.instr_nm LIKE CONCAT ('%', '" +vEInstrDetailVO.getSearchKeyword() + "', '%')"; - selectCondition += "AND a0.instr_nm LIKE '%'||'" +vEInstrDetailVO.getSearchKeyword() + "'||'%'"; - comDefaultVO = egovCryptoUtil.decryptComDefaultVO(comDefaultVO); - vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword()); - } - //3.4 요청일 시작일 검색 시 - if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchStartDt())){ - selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') >= REPLACE('"+vEInstrDetailVO.getSearchStartDt()+"', '.', '')"; - } - //3.5 요청일 종료일 검색 시 - if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchEndDt())){ - selectCondition += "AND TO_CHAR(a.sbmt_pnttm, 'YYYYMMDD') <= REPLACE('"+vEInstrDetailVO.getSearchEndDt()+"', '.', '')"; - } - vEInstrDetailVO.setInstrDiv("20"); - vEInstrDetailVO.setSelectPagingListQuery(selectCondition); - - List vEInstrDetailVOList = vEInstrMixService.selectPagingDetailList(vEInstrDetailVO); + List vEInstrDetailVOList = vEInstrMixService.selectInstrExcelList(vEInstrDetailVO); +// List vEInstrDetailsVOList = vEInstrMixService.selectPagingDetailList(vEInstrDetailVO); vEInstrDetailVOList = egovCryptoUtil.decryptVEInstrDetailVOList(vEInstrDetailVOList); + + List vEInstrExcelVOList = new ArrayList<>(); + + for(VEInstrDetailVO aa : vEInstrDetailVOList) { + + VEInstrExcelVO vEInstrExcelVO = new VEInstrExcelVO(); + vEInstrExcelVO.setInstrNm( aa.getInstrNm()); + vEInstrExcelVO.setApptYr( aa.getApptYr()); + vEInstrExcelVO.setDBirth( aa.getdBirth()); + vEInstrExcelVO.setBlng( aa.getBlng()); + vEInstrExcelVO.setPstn( aa.getPstn()); + vEInstrExcelVO.setPhone( aa.getPhone()); + vEInstrExcelVO.setEmail( aa.getEmail()); + vEInstrExcelVO.setPrfsnFld( aa.getPrfsnFld()); + vEInstrExcelVO.setAddr( aa.getAddr()); + vEInstrExcelVO.setYNowEduCnt( aa.getyNowEduCnt()); + vEInstrExcelVO.setYNowMoneEduCnt( aa.getyNowMoneEduCnt()); + vEInstrExcelVO.setYNowMtwoEduCnt( aa.getyNowMtwoEduCnt()); + vEInstrExcelVO.setYNowMthreeEduCnt( aa.getyNowMthreeEduCnt()); + vEInstrExcelVO.setYNowMfourEduCnt( aa.getyNowMfourEduCnt()); + vEInstrExcelVO.setYNowStsfc( aa.getyNowStsfc()); + vEInstrExcelVO.setYNowMoneStsfc( aa.getyNowMoneStsfc()); + vEInstrExcelVO.setYNowMtwoStsfc( aa.getyNowMtwoStsfc()); + vEInstrExcelVO.setYNowMthreeStsfc( aa.getyNowMthreeStsfc()); + vEInstrExcelVO.setYNowMfourStsfc( aa.getyNowMfourStsfc()); + + vEInstrExcelVOList.add(vEInstrExcelVO); + } + List excelData = new ArrayList<>(); - excelData.addAll(vEInstrDetailVOList); + excelData.addAll(vEInstrExcelVOList); // 세팅값 String title = "성인 찾아가는 저작권 교육 - 강사 목록"; int[] width = { 4000, 4000, 4000, 4000, 4000 + , 4000, 4000, 4000, 4000, 4000 + , 4000, 4000, 4000, 4000, 4000 }; // 너비 + + // 현재년도 + int currentYear = Year.now().getValue(); + String[] header = { - "강사명", "거주지", "휴대전화", "이메일", "주소" + "강사명", "위촉년도", "생년월일", "소속", "직함" + ,"연락처", "이메일", "전문분야", "주소" + , "교육횟수("+currentYear+")", "교육횟수("+(currentYear-1)+")", "교육횟수("+(currentYear-2)+")", "교육횟수("+(currentYear-3)+")", "교육횟수("+(currentYear-4)+")" + , "교육만족도("+currentYear+")", "교육만족도("+(currentYear-1)+")", "교육만족도("+(currentYear-2)+")", "교육만족도("+(currentYear-3)+")", "교육만족도("+(currentYear-4)+")" }; String[] order = { - "InstrNm", "Rsdne", "Phone", "Email", "Addr" + "InstrNm", "ApptYr", "DBirth", "Blng", "Pstn" + , "Phone", "Email", "PrfsnFld", "Addr" + , "YNowEduCnt", "YNowMoneEduCnt", "YNowMtwoEduCnt", "YNowMthreeEduCnt", "YNowMfourEduCnt" + , "YNowStsfc", "YNowMoneStsfc", "YNowMtwoStsfc", "YNowMthreeStsfc", "YNowMfourStsfc" }; // 호출 @@ -1160,6 +1208,7 @@ public class OprtnInstrAdultPrflContoller { modelAndView.addObject(model); + return modelAndView; } diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml index fcf76093..fbea6a62 100644 --- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml @@ -1076,6 +1076,122 @@ + + + + + + + + + + + + + + <%-- --%>