fix 导入

zhongzheng-admin/src/main/java/com/zhongzheng/controller/user/UserSubscribeController.java

@@ -350,5 +350,11 @@ public class UserSubscribeController extends BaseController {
         return util.exportEasyExcel(util.exportEasyData(errorList), "导出登记错误数据"+timeStr);
     }
 
+    @ApiOperation("导入前检查身份证是否存在")
+    @PreAuthorize("@ss.hasPermi('system:apply:import')")
+    @PostMapping("/checkIdCardData")
+    public AjaxResult<List<UserSubscribeIdsImport>> checkIdCardData(@RequestBody UserSubscribeIdsImportCheck bo) throws Exception {
+        return AjaxResult.success(iUserSubscribeService.checkIdsDataFilter(bo));
+    }
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserSubscribeService.java

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.user.service;
 import com.zhongzheng.modules.user.bo.*;
 import com.zhongzheng.modules.user.domain.UserSubscribe;
 import com.zhongzheng.modules.user.vo.UserSubscribeIdsImport;
+import com.zhongzheng.modules.user.vo.UserSubscribeIdsImportCheck;
 import com.zhongzheng.modules.user.vo.UserSubscribeImport;
 import com.zhongzheng.modules.user.vo.UserSubscribeVo;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -32,6 +33,8 @@ public interface IUserSubscribeService extends IService<UserSubscribe> {
 
 	List<UserSubscribeIdsImport> importIdsDataFilter(List<UserSubscribeIdsImport> list);
 
+	List<UserSubscribeIdsImport> checkIdsDataFilter(UserSubscribeIdsImportCheck bo);
+
 	/**
 	 * 根据新增业务对象插入用户预约考试
 	 * @param bo 用户预约考试新增业务对象

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserSubscribeServiceImpl.java

@@ -130,12 +130,32 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             User user = iUserService.getOne(new LambdaQueryWrapper<User>()
                     .eq(User::getIdCard,info.getIdCard()).last("limit 1"));
             if(Validator.isEmpty(user)){
-                throw new CustomException("学员："+info.getUserName()+"-"+info.getIdCard()+"没有符合导出的数据");
+                throw new CustomException("学员："+info.getUserName()+"-"+info.getIdCard()+"不存在没有符合导出的数据,，请先处理再继续操作");
             }
         }
         return list;
     }
 
+    @Override
+    public List<UserSubscribeIdsImport> checkIdsDataFilter(UserSubscribeIdsImportCheck bo) {
+        for(UserSubscribeIdsImport info : bo.getList()){
+            User user = iUserService.getOne(new LambdaQueryWrapper<User>()
+                    .eq(User::getIdCard,info.getIdCard()).last("limit 1"));
+            if(Validator.isEmpty(user)){
+                throw new CustomException("学员："+info.getUserName()+"-"+info.getIdCard()+"不存在，请先处理再继续操作");
+            }
+            UserSubscribe userSubscribe = this.getOne(new LambdaQueryWrapper<UserSubscribe>()
+                    .eq(UserSubscribe::getSubscribeStatus,1)
+                    .eq(UserSubscribe::getApplyId,bo.getApplyId())
+                    .eq(UserSubscribe::getApplySiteAddress,bo.getApplySiteAddress())
+                    .eq(UserSubscribe::getUserId,user.getUserId()).last("limit 1"));
+            if(Validator.isEmpty(userSubscribe)){
+                throw new CustomException("学员："+info.getUserName()+"-"+info.getIdCard()+"没有符合导出的数据，请先处理再继续操作");
+            }
+        }
+        return bo.getList();
+    }
+
     /**
      * 实体类转化成视图对象
      *

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserSubscribeIdsImportCheck.java

@@ -0,0 +1,31 @@
+package com.zhongzheng.modules.user.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 用户预约考试视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@ApiModel("用户身份证ID导入对象")
+public class UserSubscribeIdsImportCheck {
+	private static final long serialVersionUID = 1L;
+
+	/** $column.columnComment */
+	@Excel(name = "身份证数组")
+	private List<UserSubscribeIdsImport> list;
+
+	@Excel(name = "考试ID" )
+	private Long applyId;
+
+	@Excel(name = "*考试地点" )
+	private String applySiteAddress;
+
+}