|
|
@ -30,9 +30,7 @@ import org.w3c.dom.stylesheets.LinkStyle;
|
|
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.*;
|
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
import java.util.Map;
|
|
|
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
|
|
@Api(tags = "实训管理")
|
|
|
|
@Api(tags = "实训管理")
|
|
|
@ -60,6 +58,9 @@ public class TrainingController {
|
|
|
|
.map(String::valueOf)
|
|
|
|
.map(String::valueOf)
|
|
|
|
.collect(Collectors.joining(","));
|
|
|
|
.collect(Collectors.joining(","));
|
|
|
|
List<Map<String, Object>> studentInfos = TzApi.GetStudentInfoByClassIdForForeignExchangeTrading(classIds, currentUser);
|
|
|
|
List<Map<String, Object>> studentInfos = TzApi.GetStudentInfoByClassIdForForeignExchangeTrading(classIds, currentUser);
|
|
|
|
|
|
|
|
if (bo.getAddUserInfos() != null && bo.getAddUserInfos().size() > 0) {
|
|
|
|
|
|
|
|
studentInfos.addAll(bo.getAddUserInfos());
|
|
|
|
|
|
|
|
}
|
|
|
|
List<Member> members = buildMembers(studentInfos, training);
|
|
|
|
List<Member> members = buildMembers(studentInfos, training);
|
|
|
|
if (members != null && members.size() > 0) memberService.insertAll(members);
|
|
|
|
if (members != null && members.size() > 0) memberService.insertAll(members);
|
|
|
|
training.setPeopleCount(members.size());
|
|
|
|
training.setPeopleCount(members.size());
|
|
|
@ -191,6 +192,7 @@ public class TrainingController {
|
|
|
|
memberService.insert(member);
|
|
|
|
memberService.insert(member);
|
|
|
|
buildPracticeMember(member);
|
|
|
|
buildPracticeMember(member);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
trainingService.updatePeopleNum(true,trainingId);
|
|
|
|
return new ResultEntity(HttpStatus.OK);
|
|
|
|
return new ResultEntity(HttpStatus.OK);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -202,14 +204,19 @@ public class TrainingController {
|
|
|
|
Assert.notNull(trainingId, "实训记录不存在");
|
|
|
|
Assert.notNull(trainingId, "实训记录不存在");
|
|
|
|
Assert.notNull(memberId, "参赛用户不存在");
|
|
|
|
Assert.notNull(memberId, "参赛用户不存在");
|
|
|
|
memberService.deleteById(memberId);
|
|
|
|
memberService.deleteById(memberId);
|
|
|
|
|
|
|
|
trainingService.updatePeopleNum(false,trainingId);
|
|
|
|
return new ResultEntity(HttpStatus.OK);
|
|
|
|
return new ResultEntity(HttpStatus.OK);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private List<Member> buildMembers(List<Map<String, Object>> list, Training training) {
|
|
|
|
private List<Member> buildMembers(List<Map<String, Object>> list, Training training) {
|
|
|
|
List<Member> members = new ArrayList<>();
|
|
|
|
List<Member> members = new ArrayList<>();
|
|
|
|
|
|
|
|
Set<String> userNos = new HashSet<>();
|
|
|
|
if (list != null && list.size() > 0) {
|
|
|
|
if (list != null && list.size() > 0) {
|
|
|
|
for (Map<String, Object> map : list) {
|
|
|
|
for (Map<String, Object> map : list) {
|
|
|
|
|
|
|
|
if (!userNos.add(String.valueOf(map.get("studentNo")))) {
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
}
|
|
|
|
Member member = new Member();
|
|
|
|
Member member = new Member();
|
|
|
|
member.setMemberId(IdUtil.simpleUUID());
|
|
|
|
member.setMemberId(IdUtil.simpleUUID());
|
|
|
|
member.setName(String.valueOf(map.get("name")));
|
|
|
|
member.setName(String.valueOf(map.get("name")));
|
|
|
|