fix 导出错误

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

@@ -298,9 +298,9 @@ public class UserSubscribeController extends BaseController {
     @ApiOperation("导出新增错误预约")
     @PreAuthorize("@ss.hasPermi('system:profile:export')")
     @Log(title = "导出新增错误预约", businessType = BusinessType.EXPORT)
-    @GetMapping("/exportErrorNew")
-    public AjaxResult<Map<String,Object>> exportErrorNew(UserSubscribeExportErrorBo bo) {
-        List<UserSubscribeErrorImport> errorList = bo.getList();
+    @PostMapping("/exportErrorNew")
+    public AjaxResult<Map<String,Object>> exportErrorNew(@RequestBody List<UserSubscribeErrorImport> bo) {
+        List<UserSubscribeErrorImport> errorList = bo;
         ExcelUtil<UserSubscribeErrorImport> util = new ExcelUtil<UserSubscribeErrorImport>(UserSubscribeErrorImport.class);
         String timeStr= LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         return util.exportEasyExcel(util.exportEasyData(errorList), "新增预约错误数据"+timeStr);

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

@@ -423,11 +423,8 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
         }
         List<UserSubscribeImport> userSubscribeImports = new ArrayList<>();
         List<UserSubscribeImport> successImports = new ArrayList<>();
-        System.out.println(userSubscribeImportList);
         for (UserSubscribeImport userSubscribeImport : userSubscribeImportList) {
             UserSubscribeAddBo userSubscribeAddBo = new UserSubscribeAddBo();
-            System.out.println(123);
-            System.out.println(userSubscribeImport);
             if (Validator.isEmpty(userSubscribeImport.getApplyName()) ||Validator.isEmpty(userSubscribeImport.getApplySiteAddress())){
                 userSubscribeImport.setCause("考试信息错误");
                 userSubscribeImports.add(userSubscribeImport);
@@ -718,9 +715,12 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             throw new IllegalArgumentException("请勿导入空表格");
         }
         List<UserSubscribeImport> userSubscribeImports = new ArrayList<>();
+        List<UserSubscribeImport> successImports = new ArrayList<>();
         for (UserSubscribeImport userSubscribeImport : userSubscribeImportList) {
             UserSubscribe userSbusciEditBo = new UserSubscribe();
-            if (StringUtils.isEmpty(userSubscribeImport.getUserName()) && StringUtils.isEmpty(userSubscribeImport.getApplyName()) && StringUtils.isEmpty(userSubscribeImport.getUserName())){
+            if (StringUtils.isEmpty(userSubscribeImport.getApplyName()) ||StringUtils.isEmpty(userSubscribeImport.getApplySiteAddress())){
+                userSubscribeImport.setCause("考试信息错误");
+                userSubscribeImports.add(userSubscribeImport);
                 continue;
             }
             //查询商品
@@ -762,7 +762,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSbusciEditBo.setSubscribeStatus(2);
             }
 
-            if (!StringUtils.isEmpty(userSubscribeImport.getBeforeStatus())) {
+           /* if (!StringUtils.isEmpty(userSubscribeImport.getBeforeStatus())) {
                 if (userSubscribeImport.getBeforeStatus().equals("是")) {
                     if (StringUtils.isEmpty(userSubscribeImport.getBeforeName())) {
                         userSubscribeImport.setCause("前培标题有误");
@@ -781,7 +781,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 } else if (userSubscribeImport.getBeforeStatus().equals("否")) {
                     userSbusciEditBo.setBeforeStatus(0);
                 }
-            }
+            }*/
 
             if (!StringUtils.isEmpty(userSubscribeImport.getExamStatus())) {
                 if (userSubscribeImport.getExamStatus().equals("待登记")) {
@@ -917,6 +917,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             if (!StringUtils.isEmpty(userSubscribeImport.getResult())) {
                 sendExamPass(userSbusciEditBo);
             }
+            successImports.add(userSubscribeImport);
         }
         return userSubscribeImports;
     }