fix 导出身份证限制

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

@@ -169,6 +169,16 @@ public class UserSubscribeController extends BaseController {
         return getDataTable(list);
     }
 
+    @ApiOperation("预约考试身份证导入新增模板过滤不存在")
+    @PreAuthorize("@ss.hasPermi('system:apply:import')")
+    @PostMapping("/importIdsDataFilter")
+    public AjaxResult<List<UserSubscribeIdsImport>> importIdsDataFilter(MultipartFile file) throws Exception {
+        ExcelUtil<UserSubscribeIdsImport> util = new ExcelUtil<UserSubscribeIdsImport>(UserSubscribeIdsImport.class);
+        List<UserSubscribeIdsImport> userSubscribeIdsImportList = util.importExcel(file.getInputStream());
+        userSubscribeIdsImportList = iUserSubscribeService.importIdsDataFilter(userSubscribeIdsImportList);
+        return AjaxResult.success(userSubscribeIdsImportList);
+    }
+
     @ApiOperation("预约考试身份证导入新增模板")
     @PreAuthorize("@ss.hasPermi('system:apply:import')")
     @PostMapping("/importIdsData")

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

@@ -2,6 +2,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.UserSubscribeImport;
 import com.zhongzheng.modules.user.vo.UserSubscribeVo;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -29,6 +30,8 @@ public interface IUserSubscribeService extends IService<UserSubscribe> {
 	 */
 	List<UserSubscribeVo> queryList(UserSubscribeQueryBo bo);
 
+	List<UserSubscribeIdsImport> importIdsDataFilter(List<UserSubscribeIdsImport> list);
+
 	/**
 	 * 根据新增业务对象插入用户预约考试
 	 * @param bo 用户预约考试新增业务对象

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

@@ -29,12 +29,11 @@ import com.zhongzheng.modules.inform.service.IInformUserService;
 import com.zhongzheng.modules.inform.vo.InformRemindBusinessVo;
 import com.zhongzheng.modules.inform.vo.InformRemindVo;
 import com.zhongzheng.modules.user.bo.*;
+import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.domain.UserExamGoods;
 import com.zhongzheng.modules.user.service.IUserExamGoodsService;
 import com.zhongzheng.modules.user.service.IUserService;
-import com.zhongzheng.modules.user.vo.UserExamGoodsVo;
-import com.zhongzheng.modules.user.vo.UserSubscribeImport;
-import com.zhongzheng.modules.user.vo.UserVo;
+import com.zhongzheng.modules.user.vo.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -44,7 +43,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.Page;
 import com.zhongzheng.modules.user.domain.UserSubscribe;
 import com.zhongzheng.modules.user.mapper.UserSubscribeMapper;
-import com.zhongzheng.modules.user.vo.UserSubscribeVo;
 import com.zhongzheng.modules.user.service.IUserSubscribeService;
 import org.springframework.transaction.annotation.Transactional;
 import org.thymeleaf.util.StringUtils;
@@ -124,6 +122,18 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
         return entity2Vo(this.list(lqw));
     }
 
+    @Override
+    public List<UserSubscribeIdsImport> importIdsDataFilter(List<UserSubscribeIdsImport> list) {
+        for(UserSubscribeIdsImport info : list){
+            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()+"没有符合导出的数据");
+            }
+        }
+        return list;
+    }
+
     /**
      * 实体类转化成视图对象
      *
@@ -497,7 +507,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             }
             Long applyId = baseMapper.selectApplyId(userSubscribeImport.getApplyName());
             if (applyId == null) {
-                userSubscribeImport.setCause("考试标题有误");
+                userSubscribeImport.setCause("考试标题有误或已过期或未开启");
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
             }
@@ -656,7 +666,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             }
             Long applyId = baseMapper.selectApplyId(userSubscribeImport.getApplyName());
             if (applyId == null) {
-                userSubscribeImport.setCause("考试标题有误");
+                userSubscribeImport.setCause("考试标题有误或已过期或未开启");
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
             }
@@ -912,7 +922,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             }
             Long applyId = baseMapper.selectApplyId(userSubscribeImport.getApplyName());
             if (applyId == null) {
-                userSubscribeImport.setCause("考试标题有误");
+                userSubscribeImport.setCause("考试标题有误或已过期或未开启");
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
             }