fix 导出错误

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

@@ -300,8 +300,8 @@ public class UserSubscribeController extends BaseController {
     @Log(title = "导出新增错误预约", businessType = BusinessType.EXPORT)
     @GetMapping("/exportErrorNew")
     public AjaxResult<Map<String,Object>> exportErrorNew(UserSubscribeExportErrorBo bo) {
-        List<UserSubscribeImport> errorList = bo.getList();
-        ExcelUtil<UserSubscribeImport> util = new ExcelUtil<UserSubscribeImport>(UserSubscribeImport.class);
+        List<UserSubscribeErrorImport> errorList = bo.getList();
+        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/bo/UserSubscribeExportErrorBo.java

@@ -2,6 +2,7 @@ package com.zhongzheng.modules.user.bo;
 
 import com.zhongzheng.common.annotation.Excel;
 import com.zhongzheng.common.core.domain.BaseEntity;
+import com.zhongzheng.modules.user.vo.UserSubscribeErrorImport;
 import com.zhongzheng.modules.user.vo.UserSubscribeImport;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -23,5 +24,5 @@ import java.util.List;
 public class UserSubscribeExportErrorBo extends BaseEntity {
 
 	@ApiModelProperty("错误数组")
-	List<UserSubscribeImport> list;
+	List<UserSubscribeErrorImport> list;
 }

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

@@ -423,8 +423,11 @@ 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);

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

@@ -0,0 +1,91 @@
+package com.zhongzheng.modules.user.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+ * 用户预约考试视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@ApiModel("用户预约考试导入对象")
+public class UserSubscribeErrorImport {
+	private static final long serialVersionUID = 1L;
+
+	/** $column.columnComment */
+	@Excel(name = "*学员姓名")
+	private String userName;
+
+	@Excel(name = "*学员身份证" )
+	private Long idCard;
+
+	/** 考试标题 */
+	@Excel(name = "*考试标题")
+	private String applyName;
+
+	@Excel(name = "*考试日期")
+	private Date applySiteExamTime;
+
+	/** 考试地点 */
+	@Excel(name = "*考试地点")
+	private String applySiteAddress;
+
+	/** 考试开始时间段 */
+	@Excel(name = "*考试时间段")
+	private String applySiteTime;
+
+	/** 考试开始时间段 */
+	@Excel(name = "*商品编码")
+	private String code;
+
+	/** 考试开始时间段 */
+	@Excel(name = "*商品名称")
+	private String goodsName;
+
+
+	/** 1非补考学员 2补考学员 */
+	@Excel(name = "*学员报名类型")
+	private String studentTypeName;
+
+	@Excel(name = "前培标题")
+	private String beforeName;
+
+	@Excel(name = "前培标记")
+	private String beforeStatus;
+
+	@Excel(name = "*考培地点")
+	private String applySiteAddressTrain;
+
+	@Excel(name = "*考培日期")
+	private Date applySiteExamTrainTime;
+
+	@Excel(name = "*考培时间段")
+	private String applySiteTrainTime;
+
+	/** 1正常 2取消 */
+	@Excel(name = "*预约状态")
+	private String subscribeStatus;
+
+	@Excel(name = "*考试登记")
+	private String examStatus;
+
+	@Excel(name = "考试成绩")
+	private BigDecimal performance;
+
+	/** 1通过 0不通过 */
+	@Excel(name = "考试结果")
+	private String result;
+
+	@Excel(name = "证书编号")
+	private String certificateCode;
+
+	@Excel(name = "失败原因")
+	private String cause;
+}

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

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.user.vo;
 
-import cn.afterturn.easypoi.excel.annotation.Excel;
+
+import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;