yitisheng
/
yitisheng-new-api
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates

This commit is contained in:
zhouwentao 2024-03-20 18:30:58 +08:00
parent 7a21d94bf0
commit 129e68b202
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVolunteerServiceImpl.java
View File

@ -13,6 +13,8 @@ import org.jeecg.common.util.AssertUtils;
import org.jeecg.modules.art.dto.RecommendMajorDTO; import org.jeecg.modules.art.dto.RecommendMajorDTO;
import org.jeecg.modules.art.vo.SaveVolunteerRecordVO; import org.jeecg.modules.art.vo.SaveVolunteerRecordVO;
import org.jeecg.modules.art.vo.SaveVolunteerVO; import org.jeecg.modules.art.vo.SaveVolunteerVO;
import org.jeecg.modules.mini.dto.VipDTO;
import org.jeecg.modules.mini.service.MiniUserService;
import org.jeecg.modules.yx.constant.YxConstant; import org.jeecg.modules.yx.constant.YxConstant;
import org.jeecg.modules.yx.dto.VolunteerDTO; import org.jeecg.modules.yx.dto.VolunteerDTO;
import org.jeecg.modules.yx.dto.VolunteerRecordDTO; import org.jeecg.modules.yx.dto.VolunteerRecordDTO;
@ -50,6 +52,8 @@ public class YxVolunteerServiceImpl extends ServiceImpl<YxVolunteerMapper, YxVol
private IYxVolunteerRecordService yxVolunteerRecordService; private IYxVolunteerRecordService yxVolunteerRecordService;
@Resource @Resource
private IYxHistoryMajorEnrollService yxHistoryMajorEnrollService; private IYxHistoryMajorEnrollService yxHistoryMajorEnrollService;
@Resource
private MiniUserService miniUserService;
final static BigDecimal bigDecimal100 = new BigDecimal("100");//100倍率 final static BigDecimal bigDecimal100 = new BigDecimal("100");//100倍率
@ -159,6 +163,11 @@ public class YxVolunteerServiceImpl extends ServiceImpl<YxVolunteerMapper, YxVol
//获取已填报的志愿单 //获取已填报的志愿单
List<VolunteerRecordDTO> recordDTOList = yxVolunteerRecordService.listDTOByVolunteerId(userScore.getId(),userScore.getCalculationTableName(),volunteer.getId()); List<VolunteerRecordDTO> recordDTOList = yxVolunteerRecordService.listDTOByVolunteerId(userScore.getId(),userScore.getCalculationTableName(),volunteer.getId());
//获取上一年的招生人数 //获取上一年的招生人数
VipDTO userVip = miniUserService.getUserVip(userScore.getCreateBy());
if (userVip==null || userVip.getVipLevel()==null || userVip.getVipLevel()<2) {
recordDTOList.forEach(r->r.setEnrollProbability(new BigDecimal(0)));
}
yxHistoryMajorEnrollService.volunteerRecordDTOListSetHistoryInfo(recordDTOList); yxHistoryMajorEnrollService.volunteerRecordDTOListSetHistoryInfo(recordDTOList);
//填报志愿明细信息-提前批 //填报志愿明细信息-提前批
List<VolunteerRecordDTO> volunteerRecordEarlyAdmissionList = recordDTOList.stream().filter(r -> r.getBatch().equals("提前批")).collect(Collectors.toList()); List<VolunteerRecordDTO> volunteerRecordEarlyAdmissionList = recordDTOList.stream().filter(r -> r.getBatch().equals("提前批")).collect(Collectors.toList());