From 927ee4809d47f022b858d03e7ce3e7202985a64b Mon Sep 17 00:00:00 2001 From: myname Date: Wed, 6 Dec 2023 11:47:26 +0900 Subject: [PATCH] =?UTF-8?q?2023-12-06=2011:47=20=EC=84=B1=EC=9D=B8=20?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/kcc/ve/cmm/VeInstrFeeMng.java | 65 +-- .../web/EduAsgnmCnfrmMngAdultController.java | 3 + .../web/EduRsltMngAdultController.java | 84 ++++ .../web/EduAsgnmCnfrmMngTngrController.java | 2 +- .../web/EduRsltMngTngrController.java | 2 +- .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml | 19 + .../adultVisitEdu/eduAsgnmCnfrmMngList.jsp | 21 +- .../adultVisitEdu/eduInstrFeeMngList.jsp | 391 ++++++++++++++++++ .../oprtn/tngrVisitEdu/eduInstrFeeMngList.jsp | 23 +- 9 files changed, 573 insertions(+), 37 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduInstrFeeMngList.jsp diff --git a/src/main/java/kcc/ve/cmm/VeInstrFeeMng.java b/src/main/java/kcc/ve/cmm/VeInstrFeeMng.java index 52f7140c..5299ad99 100644 --- a/src/main/java/kcc/ve/cmm/VeInstrFeeMng.java +++ b/src/main/java/kcc/ve/cmm/VeInstrFeeMng.java @@ -65,44 +65,53 @@ public class VeInstrFeeMng { // 거리비교 200Km 이상 : 40000원, 100Km 이상 : 30000원, 12Km 이상 : 20000원, 1Km 이상 10000원 int dstnc = (Integer.parseInt(vEInstrFeeAcmdtVO.getOnewayDstnc()) * 2); - - - String[] scholArea = vEInstrFeeAcmdtVO.getScholArea().split(" "); - String[] instrRsdnc = vEInstrFeeAcmdtVO.getInstrRsdnc().split(" "); - - - System.out.println("학교 : "+scholArea[0]+" "+scholArea[1]+" _강사 :"+instrRsdnc[0]+" "+instrRsdnc[1]+" _거리 :" + dstnc); - /* - 강원도,경기도,경상북도,경상남도,충청북도,충청남도,전라북도,전라남도,제주특별자치도 - 광주광역시,대구광역시,대전광역시,부산광역시,서울특별시,세종특별자치시,울산광역시,인천광역시 - */ - String passCityList = "강원도,경기도,경상북도,경상남도,충청북도,충청남도,전라북도,전라남도,제주특별자치도"; String[] passCityArray = passCityList.split(","); - - // 주소 앞자리 비교 + boolean passCity = true; - if(scholArea[0].contains(instrRsdnc[0])){ + + try { + + String[] scholArea = vEInstrFeeAcmdtVO.getScholArea().split(" "); + String[] instrRsdnc = vEInstrFeeAcmdtVO.getInstrRsdnc().split(" "); - for(int i=0; i < passCityArray.length; i++) { - if(passCityArray[i].equals(scholArea[0])) { - if(!scholArea[1].equals(instrRsdnc[1])){ - System.out.println("타지역 "); - passCity = false; - break; - }else { - System.out.println("거주지"); - break; + + System.out.println("학교 : "+scholArea[0]+" "+scholArea[1]+" _강사 :"+instrRsdnc[0]+" "+instrRsdnc[1]+" _거리 :" + dstnc); + + /* + 강원도,경기도,경상북도,경상남도,충청북도,충청남도,전라북도,전라남도,제주특별자치도 + 광주광역시,대구광역시,대전광역시,부산광역시,서울특별시,세종특별자치시,울산광역시,인천광역시 + */ + + + + // 주소 앞자리 비교 + passCity = true; + if(scholArea[0].contains(instrRsdnc[0])){ + + for(int i=0; i < passCityArray.length; i++) { + if(passCityArray[i].equals(scholArea[0])) { + if(!scholArea[1].equals(instrRsdnc[1])){ + System.out.println("타지역 "); + passCity = false; + break; + }else { + System.out.println("거주지"); + break; + } } } - } - }else{ - // 다르면 끝 - passCity = false; + }else{ + // 다르면 끝 + passCity = false; + } + }catch(Exception ex) { + System.out.println(ex.getMessage()); } + // 장거리교육수당 확인(거주지 : 10000) if(passCity || dstnc < 12){ // 거주지 인경우 System.out.println("거주지"); diff --git a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngAdultController.java b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngAdultController.java index 52e9a13b..1a907df4 100644 --- a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngAdultController.java +++ b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngAdultController.java @@ -188,6 +188,9 @@ public class EduAsgnmCnfrmMngAdultController { vEEduAplctVO = this.setPagingStep2(vEEduAplctVO, paginationInfo); vEEduAplctVO.setNotiUserId(user.getUniqId()); vEEduAplctVO.setMenuNo(session.getAttribute("menuNo").toString()); + + vEEduAplctVO.setSearchAsgnmAprvlCd("30"); //교육배치확정 대상은 강사가 배정확정되어야 한다. + List vEEduAplctVOList = vEEduMIXService.selectAdultPagingList(vEEduAplctVO); //이름 복호화 VEEduAplctVO vo = new VEEduAplctVO(); diff --git a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java index 31cd18ca..ba3d9fb2 100644 --- a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java +++ b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java @@ -36,8 +36,11 @@ import kcc.let.uss.olp.qri.service.EgovQustnrRespondInfoService; import kcc.let.uss.olp.qri.service.QustnrRespondInfoVO; import kcc.let.utl.fcc.service.EgovCryptoUtil; import kcc.ve.cmm.VeConstants; +import kcc.ve.cmm.VeInstrFeeMng; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAsgnmMIXService; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEEduPnltyService; +import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrFeeAcmdtVO; +import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrFeeService; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctService; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiService; @@ -152,6 +155,10 @@ public class EduRsltMngAdultController { @Resource(name = "qustnrCommonUtil") private QustnrCommonUtil qustnrCommonUtil; + // 강사료 + @Resource(name = "vEInstrFeeService") + private VEInstrFeeService vEInstrFeeService; + /** * 교육결과관리 목록 화면 */ @@ -186,6 +193,7 @@ public class EduRsltMngAdultController { vEEduAplctVO.setAprvlCd("60"); vEEduAplctVO.setNotiUserId(user.getUniqId()); vEEduAplctVO.setMenuNo(session.getAttribute("menuNo").toString()); + vEEduAplctVO.setSearchAsgnmAprvlCd("30"); //결과관리는 강사배정확정된 경우만 vEEduAplctVO = egovCryptoUtil.encryptVEEduAplctVOInfo(vEEduAplctVO); @@ -428,6 +436,82 @@ public class EduRsltMngAdultController { return "oprtn/adultVisitEdu/popup/eduRsltMngDetailRfslSecurityPopup"; } + /** + * 강사료 확정 처리 목록 화면 + */ + @RequestMapping("eduInstrFeeMngList.do") + public String eduInstrFeeMngList( + @ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO + , ModelMap model + ) throws Exception { + + //로그인 처리==================================== + //로그인 정보 가져오기 + + //String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model); + //if (!"".equals(s_oprtnLoginCheckNInfo)) return s_oprtnLoginCheckNInfo; + + //로그인 처리==================================== + + try { + //담당자 검색 시 이름 암호화 + if("2".equals(vEEduAplctVO.getSearchCondition())) { + vEEduAplctVO.setSearchKeyword(egovCryptoUtil.encrypt(vEEduAplctVO.getSearchKeyword())); + } + model.addAttribute("cryptoUtil", egovCryptoUtil); + + //1.pageing step1 + PaginationInfo paginationInfo = this.setPagingStep1(vEEduAplctVO); + + //2. pageing step2 + vEEduAplctVO = this.setPagingStep2(vEEduAplctVO, paginationInfo); + //vEEduAplctVO.setLctrDivCd("30"); // 저작권 체험교실 코드 + vEEduAplctVO.setInstrDiv("20"); // 성인교육 코드 + vEEduAplctVO.setLctrDivCd("20"); // 성인교육 코드 + vEEduAplctVO.setAprvlCd("60"); + vEEduAplctVO.setAsgnmAprvlCd("30"); //강사배정 교육승인 +// vEEduAplctVO.setSearchSubmitYn("Y"); //제출에 대한 강사료 확정 여부 + vEEduAplctVO.setSearchAsgnmAprvlCd("30"); + vEEduAplctVO.setSearchTableJoin("tngrResult"); + + System.out.println("11111111111111113"); + + vEEduAplctVO = egovCryptoUtil.encryptVEEduAplctVOInfo(vEEduAplctVO); + List vEEduAplctVOList = vEEduMIXService.selectTngrFeePagingList(vEEduAplctVO); + VEEduAplctVO vo = new VEEduAplctVO(); + for(int i=0; i < vEEduAplctVOList.size(); i++) { + vo = egovCryptoUtil.decryptVEEduAplctVOInfo(vEEduAplctVOList.get(i)); + System.out.println(" @@@@@@@@@@@@@ "+vo.getChrgNm()); + vEEduAplctVOList.get(i).setChrgNm(vo.getChrgNm()); + + // 강사료 계산 + VeInstrFeeMng veInstrFeeMng = new VeInstrFeeMng(); + VEInstrFeeAcmdtVO vEInstrFeeAcmdtVO = veInstrFeeMng.VeInstrFeeMng(vEInstrFeeService, vEEduAplctVOList.get(i).getEduAplctOrd(), vEEduAplctVOList.get(i).getEduChasiOrd()); + vEEduAplctVOList.get(i).setInstrFeeSum(Integer.toString(vEInstrFeeAcmdtVO.getInstrFeeSum())); + } + + System.out.println("11111111111111112"); + + //3.pageing step3 + paginationInfo = this.setPagingStep3(vEEduAplctVOList, paginationInfo); + + + model.addAttribute("paginationInfo", paginationInfo); + + + //대상 리스트, 페이징 정보 전달 + model.addAttribute("list", vEEduAplctVOList); + + System.out.println("1111111111111111"); + + //대상 리스트, 페이징 정보 전달 + //model.addAttribute("resultList", vEEduAplctVOList); + }catch(Exception ex) { + ex.printStackTrace(); + } + + return "oprtn/adultVisitEdu/eduInstrFeeMngList"; + } @SuppressWarnings("rawtypes") @RequestMapping(value = "eduRsltSrvyExcelDownLoad.do") diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngTngrController.java index 72f21bec..ee1c4cd5 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngTngrController.java @@ -205,7 +205,7 @@ public class EduAsgnmCnfrmMngTngrController { vEEduAplctVO.setNotiUserId(user.getUniqId()); vEEduAplctVO.setMenuNo(session.getAttribute("menuNo").toString()); - vEEduAplctVO.setSearchAsgnmAprvlCd("30"); + vEEduAplctVO.setSearchAsgnmAprvlCd("30"); //교육배치확정 대상은 강사가 배정확정되어야 한다. List vEEduAplctVOList = vEEduMIXService.selectPagingList(vEEduAplctVO); //이름 복호화 diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java index 790d7a5a..c0e1cbf0 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java @@ -213,7 +213,7 @@ public class EduRsltMngTngrController { vEEduAplctVO.setAprvlCd("60"); vEEduAplctVO.setNotiUserId(user.getUniqId()); vEEduAplctVO.setMenuNo(session.getAttribute("menuNo").toString()); - vEEduAplctVO.setSearchAsgnmAprvlCd("30"); + vEEduAplctVO.setSearchAsgnmAprvlCd("30"); //결과관리는 강사배정확정된 경우만 vEEduAplctVO.setSearchTableJoin("tngrResult"); diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml index 6ef6ad27..a98d61b1 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml @@ -1910,6 +1910,16 @@ AND A.LCTR_DIV_CD = #lctrDivCd# + + + + AND DD.asgnm_aprvl_cd is null + + + AND DD.asgnm_aprvl_cd = #searchAsgnmAprvlCd# + + + AND A.APRVL_CD=#aprvlCd# @@ -2228,6 +2238,15 @@ AND a.edu_aplct_ord=b.edu_aplct_ord AND a.lctr_div_cd=#instrDiv# + + + AND DD.asgnm_aprvl_cd is null + + + AND DD.asgnm_aprvl_cd = #searchAsgnmAprvlCd# + + + AND a.edu_aplct_ord=#eduAplctOrd# diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngList.jsp index 88971ab9..36bcb8f5 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngList.jsp @@ -204,9 +204,24 @@ - - - ~ + + + + + + + ${list.strtTm} + + + ~ + + + + + + ${list.strtTm} + + (분) diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduInstrFeeMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduInstrFeeMngList.jsp new file mode 100644 index 00000000..2c65d7ac --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduInstrFeeMngList.jsp @@ -0,0 +1,391 @@ + +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> + +<% + /** + * @Class Name : eduInstrFeeMngList.jsp + * @Description : 강사료 확정 관리 > 강사료 확정 목록 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2022.12.7 안주영 최초 생성 + * @author 안주영 + * @since 2022.2.7 + * @version 1.0 + * @see + * + */ +%> + + + + + + 신청관리 + + +
+ + +
+ + + " /> + " /> + + + + + + +
+
+ + +
+

강사료 확정 처리 목록

+
    +
    • +
  • +

    청소년 찾아가는 저작권 교육

    +
    • +
  • 강사료 확정 관리
    • +
+
+ + +
+ +
+
+
+

구분

+
+
+ + +
+
+
+
+

교육일자

+
+
+
+ +
+ ~ +
+ +
+ + + + + + + +
+
+
+ + + +
+

총 건수 : 건

+
+ +
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
교육일자차시기관구분신청유형기관(단체)명강사이름강사료확정여부
+ + + ${list.eduHopeDt} +<%-- --%> +<%-- --%> + + + + + + + ${list.strtTm} + + + ~ + + + + + + ${list.strtTm} + + + (분) + + + + + + + + + +
(${fn:split(list.userId,'_')[1]*1}) + + 		+ ',''); return false;"> + + + + 확정 + 미확정 +
+
+ + +
+ +
+ +
+
+ + +
+
+
+
+ +
+
+
+
+
+ + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduInstrFeeMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduInstrFeeMngList.jsp index 35447f5d..b1386b10 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduInstrFeeMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduInstrFeeMngList.jsp @@ -296,7 +296,7 @@ 교육결과 - 차시 + 교육일자 차시 학교구분 지역 @@ -321,9 +321,24 @@ <%-- --%> - - ~ - (분) + + + + + + ${list.strtTm} + + + ~ + + + + + + ${list.strtTm} + + + (분)