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

updates

This commit is contained in:
zhouwentao 2025-06-28 16:47:48 +08:00
parent 8ba5282f1e
commit 1d1fdd8f13
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -425,12 +425,7 @@ public class YxVolunteerServiceImpl extends ServiceImpl<YxVolunteerMapper, YxVol
if (activeByCreateVolunteerDto!=null && StringUtils.isNotBlank(activeByCreateVolunteerDto.getId())) { if (activeByCreateVolunteerDto!=null && StringUtils.isNotBlank(activeByCreateVolunteerDto.getId())) {
List<VolunteerRecordDTO> volunteerRecordEarlyAdmissionList = activeByCreateVolunteerDto.getVolunteerRecordEarlyAdmissionList(); List<VolunteerRecordDTO> volunteerRecordEarlyAdmissionList = activeByCreateVolunteerDto.getVolunteerRecordEarlyAdmissionList();
List<VolunteerRecordDTO> volunteerRecordUndergraduateAList = activeByCreateVolunteerDto.getVolunteerRecordUndergraduateAList();
List<VolunteerRecordDTO> volunteerRecordUndergraduateBList = activeByCreateVolunteerDto.getVolunteerRecordUndergraduateBList();
List<VolunteerRecordDTO> volunteerRecordUndergraduateList = activeByCreateVolunteerDto.getVolunteerRecordUndergraduateList(); List<VolunteerRecordDTO> volunteerRecordUndergraduateList = activeByCreateVolunteerDto.getVolunteerRecordUndergraduateList();
// 将本科批合并
volunteerRecordUndergraduateList.addAll(volunteerRecordUndergraduateAList);
volunteerRecordUndergraduateList.addAll(volunteerRecordUndergraduateBList);
volunteerRecordUndergraduateList.addAll(volunteerRecordEarlyAdmissionList); volunteerRecordUndergraduateList.addAll(volunteerRecordEarlyAdmissionList);
String volunteerId = activeByCreateVolunteerDto.getId(); String volunteerId = activeByCreateVolunteerDto.getId();
YxCalculationMajor calculationMajor = null; YxCalculationMajor calculationMajor = null;