sup 线下录单

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -654,7 +654,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                 List<String> SubjectList = Arrays.asList(itemImport.getSubjectNames().split(","));
                 List<Long> sIdList = new ArrayList<>();
                 for (String subject : SubjectList) {
-                    System.out.println(subject);
                     Long subjectId = findSubjectId(subject);
                     if(Validator.isNotEmpty(subjectId)){
                         //科目存在
@@ -667,6 +666,15 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             User user = getOne(new LambdaQueryWrapper<User>()
                     .eq(User::getTelphone,itemImport.getTelphone()).last("limit 1"));
             if(Validator.isNotNull(user)){
+                if(Validator.isNotEmpty(user.getIdCard())&&!itemImport.getIdCard().equals(user.getIdCard())){
+                    throw new CustomException(itemImport.getRealname()+"身份证号码不一致");
+                }
+                if(Validator.isEmpty(user.getIdCard())){
+                    //更新身份证和姓名
+                    user.setIdCard(itemImport.getIdCard());
+                    user.setRealname(itemImport.getRealname());
+                    updateById(user);
+                }
                 //手机号已存在
                 itemImport.setUserId(user.getUserId());
                 itemImport.setImportNo(importNo);
@@ -681,23 +689,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                     updateById(user);
                 }
                 continue;
-            }
-            User user2 = getOne(new LambdaQueryWrapper<User>()
-                    .eq(User::getIdCard,itemImport.getIdCard()).last("limit 1"));
-            if(Validator.isNotNull(user2)){
-                //身份证已存在
-                itemImport.setUserId(user2.getUserId());
-                itemImport.setImportNo(importNo);
-                itemImport.setStudentCode(user2.getUserAccount());
-                itemImport.setRealname(user2.getRealname());
-                itemImport.setTelphone(user2.getTelphone());
-                successList.add(itemImport);
-                //如果学员公司信息不一样则更新公司信息
-                if (Validator.isNotEmpty(itemImport.getCompanyName())&&!itemImport.getCompanyName().equals(user2.getCompanyName())){
-                    user2.setCompanyName(itemImport.getCompanyName());
-                    updateById(user2);
+            }else{
+                User user2 = getOne(new LambdaQueryWrapper<User>()
+                        .eq(User::getIdCard,itemImport.getIdCard()).last("limit 1"));
+                if(Validator.isNotEmpty(user2)){
+                    throw new CustomException(itemImport.getRealname()+"身份证号码已存在，创建失败");
                 }
-                continue;
             }
             User inertData = new User();
             inertData.setTelphone(itemImport.getTelphone());
@@ -768,20 +765,34 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             if(Validator.isEmpty(bo.getIdCard())){
                 throw new CustomException("用户身份证缺失");
             }
+            if(Validator.isEmpty(bo.getTelphone())){
+                throw new CustomException("用户手机号码缺失");
+            }
+            if(Validator.isEmpty(bo.getRealname())){
+                throw new CustomException("用户姓名缺失");
+            }
             User user1 = getOne(new LambdaQueryWrapper<User>()
-                    .eq(User::getIdCard,bo.getIdCard()).last("limit 1"));
-            //身份证号存在
+                    .eq(User::getTelphone,bo.getTelphone()).last("limit 1"));
+            //手机号码存在
             if(Validator.isNotEmpty(user1)){
                 UserIdCardBatchVo user = BeanUtil.toBean(bo, UserIdCardBatchVo.class);
+                if(Validator.isNotEmpty(user1.getIdCard())&&!bo.getIdCard().equals(user1.getIdCard())){
+                    throw new CustomException(bo.getRealname()+"身份证号码不一致");
+                }
+                if(Validator.isEmpty(user1.getIdCard())){
+                    //更新身份证和姓名
+                    user1.setIdCard(bo.getIdCard());
+                    user1.setRealname(bo.getRealname());
+                    updateById(user1);
+                }
                 user.setUserId(user1.getUserId());
                 list1.add(user);
                 continue;
             }else{
-                if(Validator.isEmpty(bo.getTelphone())){
-                    throw new CustomException("用户手机号码缺失");
-                }
-                if(Validator.isEmpty(bo.getRealname())){
-                    throw new CustomException("用户姓名缺失");
+                User user2 = getOne(new LambdaQueryWrapper<User>()
+                        .eq(User::getIdCard,bo.getIdCard()).last("limit 1"));
+                if(Validator.isNotEmpty(user2)){
+                    throw new CustomException(bo.getRealname()+"身份证号码已存在，创建失败");
                 }
                 UserSystemRegisterBo registerBo = BeanUtil.toBean(bo, UserSystemRegisterBo.class);
                 registerBo.setTel(bo.getTelphone());