|
|
@@ -122,7 +122,7 @@ public class BaseNewStudentTask {
|
|
|
List<BaseNewStudent> insertList = new ArrayList<>();
|
|
|
for (PbCseFeeobjupdate feeobjupdate : dataList) {
|
|
|
BaseNewStudent existsNewStudent = existsNewStudentMap.get(feeobjupdate.getPersonalid());
|
|
|
-
|
|
|
+ Long planId = planMap.get(feeobjupdate.getEnteryear() + feeobjupdate.getUserdef6());
|
|
|
if (existsNewStudent != null) {
|
|
|
existsNewStudent.setName(feeobjupdate.getFeeobjname());
|
|
|
existsNewStudent.setPaymnystate(feeobjupdate.getPaymnystate());
|
|
|
@@ -155,12 +155,12 @@ public class BaseNewStudentTask {
|
|
|
existsNewStudent.setModifyDate(new Date());
|
|
|
existsNewStudent.setStatus(0);
|
|
|
existsNewStudent.setIsCanBanding(1);
|
|
|
+ existsNewStudent.setEnrollmentPlanId(planId);
|
|
|
|
|
|
updateList.add(existsNewStudent);
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
- Long planId = planMap.get(feeobjupdate.getEnteryear() + feeobjupdate.getUserdef6());
|
|
|
insertList.add(
|
|
|
new BaseNewStudent() {{
|
|
|
setCredentialNumber(feeobjupdate.getPersonalid());
|