Merge remote-tracking branch 'origin/master'

pull/1/head
陈沅 2 years ago
commit 501b9377fa

@ -63,12 +63,15 @@ public class TrainingController {
List<Member> members = buildMembers(studentInfos, training);
if (members != null && members.size() > 0) memberService.insertAll(members);
training.setPeopleCount(members.size());
GradeWeight gradeWeight = gradeWeightService.findBySchoolId(currentUser.getSchoolId()) == null
? gradeWeightService.createDefaultWeight(currentUser)
: new GradeWeight();
training.setWeightId(gradeWeight.getWeightId());
trainingService.update(training);
//生成训练账号member
buildPracticeMembers(members);
return new ResultEntity(HttpStatus.OK);
}
@ -216,6 +219,7 @@ public class TrainingController {
member.setMajor(String.valueOf(map.get("majorName")));
member.setStudentNumber(String.valueOf(map.get("studentNo")));
member.setTrainingName(training.getTrainingName());
member.setInitialCapital(1000000.0);
members.add(member);
}
@ -223,6 +227,16 @@ public class TrainingController {
return members;
}
private void buildPracticeMembers(List<Member> members){
for (int i = 0; i < members.size(); i++) {
Member member = members.get(i);
member.setMemberId(IdUtil.simpleUUID());
member.setTrainingId("999999999");
member.setTrainingName("AdminStudentPractice");
}
memberService.insertAll(members);
}
@Permission(codes = PermissionType.TRAINING_MANAGEMENT_SEARCH)
@ApiOperation("获取我的任务列表")

Loading…
Cancel
Save