tolag3/koipa_edu_2025-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hylee' into advc

Browse Source
This commit is contained in:
hylee 2023-06-30 14:30:19 +09:00
commit 3205c63c03
6 changed files with 77 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEAsgnmMIXService.java
View File

@ -27,6 +27,8 @@ public interface VEAsgnmMIXService {
//배정 강사 확정 리스트
List<VEInstrAsgnmVO> selectAsgnmPagingList(VEInstrAsgnmVO paramVO) throws Exception;
VEInstrAsgnmVO findByAcmdtCnfrm(VEInstrAsgnmVO vEInstrAsgnmVO) throws Exception;
//R
VEInstrAsgnmVO selectAsgnmRqstDetail(VEInstrAsgnmVO paramVO) throws Exception;
@ -117,4 +119,5 @@ public interface VEAsgnmMIXService {
//배정 최대값 제한 산술식을 위한 해당 교육 차시에 속한 달의 강사 교육접수차시 가져오기
//R
VEInstrAsgnmVO selectTtlMntChasiSumDetail(VEInstrAsgnmVO paramVO) throws Exception;
}

5
src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIXDAO.java
View File

@ -58,6 +58,11 @@ public class VEAsgnmMIXDAO extends EgovAbstractDAO {
return tlist;
}
public VEInstrAsgnmVO findByAcmdtCnfrm(VEInstrAsgnmVO paramVO) throws Exception {
VEInstrAsgnmVO tlist = (VEInstrAsgnmVO) select("VEAsgnmMIXDAO.findByAcmdtCnfrm", paramVO);
return tlist;
}
public VEInstrAsgnmVO selectAsgnmRqstDetail(VEInstrAsgnmVO paramVO) throws Exception {
return (VEInstrAsgnmVO) select("VEAsgnmMIXDAO.selectAsgnmRqstDetail", paramVO);
}

4
src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/impl/VEAsgnmMIXServiceImpl.java
View File

@ -49,6 +49,10 @@ public class VEAsgnmMIXServiceImpl implements VEAsgnmMIXService {
return vEAsgnmMIXDAO.selectAsgnmPagingList(paramVO);
}
public VEInstrAsgnmVO findByAcmdtCnfrm(VEInstrAsgnmVO paramVO) throws Exception{
return vEAsgnmMIXDAO.findByAcmdtCnfrm(paramVO);
}
//R
public VEInstrAsgnmVO selectAsgnmRqstDetail(VEInstrAsgnmVO paramVO) throws Exception {
return vEAsgnmMIXDAO.selectAsgnmRqstDetail(paramVO);

33
src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/web/VEAsgnmController.java
View File

@ -260,6 +260,28 @@ public class VEAsgnmController {
List<VEInstrAsgnmVO> vEInstrAsgnmVOList = vEAsgnmMIXService.selectAsgnmPagingList(vEInstrAsgnmVO);
vEInstrAsgnmVOList.stream().forEach(t-> {
try {
VEInstrAsgnmVO acmdtCnfrmVO = vEAsgnmMIXService.findByAcmdtCnfrm(t);
if(acmdtCnfrmVO != null)
{
if(StringUtils.isNotEmpty(acmdtCnfrmVO.getAcmdtSbmtYn()))
t.setAcmdtSbmtYn(acmdtCnfrmVO.getAcmdtSbmtYn());
if(StringUtils.isNotEmpty(acmdtCnfrmVO.getAcmdtSbmtYn()))
t.setAcmdtAprvlCd(acmdtCnfrmVO.getAcmdtSbmtYn());
if(StringUtils.isNotEmpty(acmdtCnfrmVO.getAcmdtSbmtYn()))
t.setAcmdtFee(acmdtCnfrmVO.getAcmdtSbmtYn());
}
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
});
System.out.println("=========================================== ");
//6.pageing step3
paginationInfo = this.setPagingStep3(vEInstrAsgnmVOList, paginationInfo);
model.addAttribute("paginationInfo", paginationInfo);
@ -448,9 +470,11 @@ public class VEAsgnmController {
//숙박
VEInstrFeeAcmdtVO acmdtAplct = new VEInstrFeeAcmdtVO();
acmdtAplct.setFrstRegisterId(loginVO.getUniqId());
acmdtAplct.setEduAplctOrd(vEInstrAsgnmVO.getEduAplctOrd());
acmdtAplct.setEduChasiOrd(vEInstrAsgnmVO.getEduChasiOrd());
// acmdtAplct.setEduAplctOrd(vEInstrAsgnmVO.getEduAplctOrd());
// acmdtAplct.setEduChasiOrd(vEInstrAsgnmVO.getEduChasiOrd());
acmdtAplct.setInstrDiv("10");
acmdtAplct.setEduHopeDt(vEInstrAsgnmVOInfo.getEduHopeDt());
//=== 20230627 이호영
//=== 숙박신청 차시 제거
@ -458,6 +482,11 @@ public class VEAsgnmController {
// acmdtAplct = vEAcmdtAplctService.selectDetailByUser(acmdtAplct);
acmdtAplct = vEAcmdtAplctService.selectDetailByUser_r2(acmdtAplct);
System.out.println("=========================================== ");
String acmdtAplctCheck = "N";
// if(StringUtils.isNotEmpty(acmdtAplct.getAcmdtAplctOrd())) {
if(acmdtAplct != null) {

20
src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Cubrid.xml
View File

@ -162,15 +162,17 @@
<!-- 강사 정보 R -->
<select id="VEAcmdtAplctDAO.selectDetailByUser_r2" parameterClass="VEInstrFeeAcmdtVO" resultClass="VEInstrFeeAcmdtVO">
select
aprvl_cd as aprvlCd
, aplct_cn as aplctCn
, acmdt_fee as acmdtFee
, acmdt_aplct_ord as AcmdtAplctOrd
from
ve_acmdt_aplct
where
edu_aplct_ord = #eduAplctOrd#
and aplct_cn is not null
vaa.aprvl_cd as aprvlCd
, vaa.aplct_cn as aplctCn
, vaa.acmdt_fee as acmdtFee
, vaa.acmdt_aplct_ord as AcmdtAplctOrd
FROM ve_acmdt_aplct vaa
, ve_edu_chasi vee
WHERE vee.instr_cnfrm_cd ='Y'
AND vee.instr_cnfrm_id = #frstRegisterId#
AND vee.edu_hope_dt = #eduHopeDt#
AND vee.edu_chasi_ord = vaa.edu_chasi_ord
ORDER BY aprvl_cd desc
limit 1

23
src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Cubrid.xml
View File

@ -4789,4 +4789,27 @@
</select>
<!-- 강의내역(확정) 목록. 배정테이블 ID가 본인이면서 코드30(교육확정)-->
<select id="VEAsgnmMIXDAO.findByAcmdtCnfrm" parameterClass="VEInstrAsgnmVO" resultClass="VEInstrAsgnmVO">
SELECT
vaa.sbmt_yn as acmdtSbmtYn
, vaa.aprvl_cd as acmdtAprvlCd
, vaa.acmdt_fee as acmdtFee
FROM ve_acmdt_aplct vaa
, ve_edu_chasi vee
WHERE vee.instr_cnfrm_cd ='Y'
AND vee.instr_cnfrm_id = #userId#
AND vee.edu_hope_dt = #eduHopeDt#
AND vee.edu_aplct_ord = vaa.edu_aplct_ord
AND vee.edu_chasi_ord = vaa.edu_chasi_ord
ORDER BY aprvl_cd desc
limit 1
</select>
</sqlMap>