diff --git a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java index a4cbae36..c81bf46f 100644 --- a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java +++ b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java @@ -18,6 +18,8 @@ import kcc.com.cmm.service.FileVO; import kcc.com.utl.fcc.service.EgovStringUtil; import kcc.com.utl.user.service.CheckLoginUtil; import kcc.let.utl.fcc.service.EgovCryptoUtil; +import kcc.ve.adv.tngr.stngInfo.service.VEAStngService; +import kcc.ve.adv.tngr.stngInfo.service.VEAStngVO; import kcc.ve.cmm.VeConstants; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAsgnmMIXService; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEEduChasiInstrAsgnmService; @@ -79,6 +81,10 @@ public class CommonWebController { //강사배정 @Resource(name = "vEEduChasiInstrAsgnmService") private VEEduChasiInstrAsgnmService vEEduChasiInstrAsgnmService; + + //강의설정 + @Resource(name = "vEAStngService") + private VEAStngService vEAStngService; @RequestMapping("/popup/searchBeforeContent.do") @@ -1303,6 +1309,7 @@ public class CommonWebController { //VEEduAplctVO tChasiInfo = vEEduAplctVOList.get(i); String s_eduHopeDt = p_tChasiInfo.getEduHopeDt(); //교육희망일자 + String s_eduSlctCd = p_tChasiInfo.getEduSlctCd(); //온라인 10, 오프라인 20 //String s_addr = tChasiInfo.getAddr(); //지역명 System.out.println(s_eduHopeDt); @@ -1330,6 +1337,9 @@ public class CommonWebController { vEInstrAssiEduAplctVOList = vEAutoAsgnmMIXService.selectInstrMntAsgnmtChasiList(vEAutoAsgnmVO); //step2-2.희망 지역 강사 검색(필) + //오프라인, 온라인 구분해서 희망 지역 체크가 필요하다. + //오프라인의 경우 (완) + //온라인인 경우 (해당 강사의 zoom 가능 여부 체크) for (int j=0;j selectInstrHopeAreaList(VEAutoAsgnmVO paramVO) throws Exception; - + + //step2-2.희망 지역-온리인으로 zoom여부 확인 강사 검색(필) + List selectInstrHopeAreaZoomList(VEAutoAsgnmVO paramVO) throws Exception; //step3-1.월별시수대비할당이적은자 우선(필) List selectInstrPriorityList(VEAutoAsgnmVO paramVO) throws Exception; diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEAutoAsgnmVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEAutoAsgnmVO.java index a4417b3f..f2b27c94 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEAutoAsgnmVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEAutoAsgnmVO.java @@ -73,7 +73,44 @@ public class VEAutoAsgnmVO extends ComDefaultVO implements Serializable { private String mIscSum; //받은 시간 + private String pnltyQuery; //배정을 위한 패널티 쿼리 + private String rsdncQuery; //배정을 위한 거주지 우선 쿼리 + private String cntnsQuery; //배정을 위한 연강 쿼리 + private String orderByQuery; //배정을 위한 우선 순위 order by 쿼리 + + public String getPnltyQuery() { + return pnltyQuery; + } + + public void setPnltyQuery(String pnltyQuery) { + this.pnltyQuery = pnltyQuery; + } + + public String getRsdncQuery() { + return rsdncQuery; + } + + public void setRsdncQuery(String rsdncQuery) { + this.rsdncQuery = rsdncQuery; + } + + public String getCntnsQuery() { + return cntnsQuery; + } + + public void setCntnsQuery(String cntnsQuery) { + this.cntnsQuery = cntnsQuery; + } + + public String getOrderByQuery() { + return orderByQuery; + } + + public void setOrderByQuery(String orderByQuery) { + this.orderByQuery = orderByQuery; + } + public String getEduHopeMnt() { return eduHopeMnt; } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEAutoAsgnmMIXDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEAutoAsgnmMIXDAO.java index a6dec789..62e01a21 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEAutoAsgnmMIXDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEAutoAsgnmMIXDAO.java @@ -28,6 +28,12 @@ public class VEAutoAsgnmMIXDAO extends EgovAbstractDAO { return tlist; } + public List selectInstrHopeAreaZoomList(VEAutoAsgnmVO paramVO) { + @SuppressWarnings("unchecked") + List tlist = (List) list("VEAutoAsgnmDAO.selectInstrHopeAreaZoomList", paramVO); + return tlist; + } + public List selectInstrPriorityList(VEAutoAsgnmVO paramVO) { @SuppressWarnings("unchecked") List tlist = (List) list("VEAutoAsgnmDAO.selectInstrPriorityList", paramVO); diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEAutoAsgnmMIXServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEAutoAsgnmMIXServiceImpl.java index 5d307944..443ab193 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEAutoAsgnmMIXServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEAutoAsgnmMIXServiceImpl.java @@ -33,6 +33,11 @@ public class VEAutoAsgnmMIXServiceImpl implements VEAutoAsgnmMIXService { return vEAutoAsgnmMIXDAO.selectInstrHopeAreaList(paramVO); } + @Override + public List selectInstrHopeAreaZoomList(VEAutoAsgnmVO paramVO) throws Exception{ + return vEAutoAsgnmMIXDAO.selectInstrHopeAreaZoomList(paramVO); + } + @Override public List selectInstrPriorityList(VEAutoAsgnmVO paramVO) throws Exception{ return vEAutoAsgnmMIXDAO.selectInstrPriorityList(paramVO); diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEAutoAsgnm_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEAutoAsgnm_MIX_SQL_Tibero.xml index e888a409..a27c79da 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEAutoAsgnm_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEAutoAsgnm_MIX_SQL_Tibero.xml @@ -570,6 +570,51 @@ GROUP BY aaaaa.userId + + + 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 580f1cde..47ee38d5 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 @@ -2441,6 +2441,7 @@ SELECT b.edu_aplct_ord AS eduAplctOrd , b.edu_chasi_ord AS eduChasiOrd , b.edu_hope_dt AS eduHopeDt + , a.EDU_SLCT_CD AS eduSlctCd /* 온라인 10, 오프라인 20 */ from ve_edu_aplct a , ve_edu_chasi b , ( 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 6f44efab..6eb76a66 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 @@ -926,7 +926,7 @@ - /* VEAAsgnmStngMixDAO.selectList_VEAIMT_2 */ + /* VEAAsgnmStngMixDAO.selectList_VEAIMT_2 신청회차나 년도에 관계없이 실재 해당 년월의 배정가능한 차시를 계산한다. */ + + SELECT + sum(b.chasi) AS chasi + + FROM + ve_edu_aplct a + , ve_edu_chasi b + WHERE 1=1 + AND a.edu_aplct_ord =b.edu_aplct_ord + AND NVL(a.USE_YN, 'Y') ]]> 'N' + AND a.LCTR_DIV_CD = '10' + AND a.aprvl_cd = '60' + AND substring(b.edu_hope_dt,1,7)=#mnt# + GROUP BY substring(b.edu_hope_dt,1,7) + + + + + - +