From da52a08d2334f0a9a8215ea681a565500bfa3e64 Mon Sep 17 00:00:00 2001
From: xiaoCJ <406612557@qq.com>
Date: Sat, 21 Sep 2024 10:50:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=A2=E9=98=9F=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pc/biz/TeamMemberImportBiz.java           | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/biz/TeamMemberImportBiz.java b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/biz/TeamMemberImportBiz.java
index d65a289..b571caf 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/biz/TeamMemberImportBiz.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/biz/TeamMemberImportBiz.java
@@ -4,6 +4,7 @@ import cn.hutool.json.JSONUtil;
 import com.tz.platform.common.core.base.Result;
 import com.tz.platform.common.core.bo.MemberImport;
 import com.tz.platform.common.core.bo.MemberInfo;
+import com.tz.platform.common.core.tools.BeanUtils;
 import com.tz.platform.competitiion.pc.bo.PersonImport;
 import com.tz.platform.competitiion.pc.bo.TeamImport;
 import com.tz.platform.competitiion.pc.bo.TeamInfo;
@@ -76,7 +77,7 @@ public class TeamMemberImportBiz {
 //
         List<String> collect = personList.stream().map(p -> p.getStudentNo()).filter(Objects::nonNull).collect(Collectors.toList());
         List<User> allStu = userDao.findAllByStudentNoIn(collect);
-        if (allStu.isEmpty()){
+        if (allStu.isEmpty()) {
             return Result.error("表中用户不存在");
         }
         // 对personList进行分组，以studentNo和schoolName作为key
@@ -136,7 +137,7 @@ public class TeamMemberImportBiz {
                 .collect(Collectors.toList());
         //批量新增入库
         List<CompetitionMember> newMembers = competitionMembers.stream()
-                .filter(member -> memberDao.findByCompetitionIdAndStudentNoAndSchool(competitionId,member.getStudentNo(), member.getSchool()).isEmpty())
+                .filter(member -> memberDao.findByCompetitionIdAndStudentNoAndSchool(competitionId, member.getStudentNo(), member.getSchool()).isEmpty())
                 .collect(Collectors.toList());
         if (!competitionMembers.isEmpty()) {
             memberDao.saveAll(competitionMembers);
@@ -158,8 +159,18 @@ public class TeamMemberImportBiz {
             teamList = excelAnalysisHelper.getList(file.getInputStream(), TeamImport.class, 0, 1);
         } catch (IOException e) {
             e.printStackTrace();
+        }
 
+        //用户校验
+        assert teamList != null;
+        List<String> collect = teamList.stream().map(TeamImport::getStudentNo).collect(Collectors.toList());
+        List<User> studentNoList = userDao.findAllByStudentNoIn(collect);
+        System.out.println(studentNoList);
+        if (studentNoList == null || studentNoList.isEmpty()
+                || studentNoList.size() < teamList.size()) {
+            return Result.error("用户不存在！");
         }
+
         List<MemberImport> neesSave = new ArrayList<>();
         String temName = "";
         List<String> teamNameList = new ArrayList<>();
@@ -233,7 +244,10 @@ public class TeamMemberImportBiz {
             temName = teamName;
         }
 
-        List<MemberInfo> mList = user.batchInsert(neesSave);
+        //售卖版不做新增操作，大赛版本直接新增用户
+//        List<MemberInfo> mList = user.batchInsert(neesSave);
+
+        List<MemberInfo> mList = BeanUtils.copyProperties(studentNoList, MemberInfo.class);
 
         temamList.forEach(team -> {
             try {