fix 考试导出模板

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

@@ -5,6 +5,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -19,6 +20,7 @@ import com.zhongzheng.modules.exam.vo.ExamApplyVo;
 import com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo;
 import com.zhongzheng.modules.grade.vo.ClassPeriodStudentExportVo;
 import com.zhongzheng.modules.user.bo.*;
+import com.zhongzheng.modules.user.domain.UserBankRecord;
 import com.zhongzheng.modules.user.service.IUserExamGoodsService;
 import com.zhongzheng.modules.user.vo.*;
 import lombok.RequiredArgsConstructor;
@@ -176,7 +178,7 @@ public class UserSubscribeController extends BaseController {
 
 
     /**
-     * 导出资料审核列表
+     * 导出新增预约模板
      */
     @ApiOperation("导出新增预约模板")
     @PreAuthorize("@ss.hasPermi('system:profile:export')")
@@ -206,7 +208,7 @@ public class UserSubscribeController extends BaseController {
             List<UserSubscribeExport> list = new ArrayList<>();
             list.add(export);
             ExcelUtil<UserSubscribeExport> util = new ExcelUtil<UserSubscribeExport>(UserSubscribeExport.class);
-            map.put("demoExcel",util.exportEasyExcel(util.exportEasyData(list), "新增预约模板"+timeStr));
+            map.put("demoExcel",util.exportEasyExcel(util.exportEasyData(list), bo.getApplyName()+"新增预约模板"+timeStr));
         }else{
             //有考培地点
             UserSubscribeTrainExport export = new UserSubscribeTrainExport();
@@ -227,9 +229,57 @@ public class UserSubscribeController extends BaseController {
             List<UserSubscribeTrainExport> list = new ArrayList<>();
             list.add(export);
             ExcelUtil<UserSubscribeTrainExport> util = new ExcelUtil<UserSubscribeTrainExport>(UserSubscribeTrainExport.class);
-            map.put("demoExcel",util.exportEasyExcel(util.exportEasyData(list), "新增预约模板"+timeStr));
+            map.put("demoExcel",util.exportEasyExcel(util.exportEasyData(list), bo.getApplyName()+"新增预约模板"+timeStr));
         }
         return AjaxResult.success(map);
+    }
 
+    /**
+     * 导出登记模板
+     */
+    @ApiOperation("导出登记模板")
+    @PreAuthorize("@ss.hasPermi('system:profile:export')")
+    @Log(title = "导出登记模板", businessType = BusinessType.EXPORT)
+    @GetMapping("/exportRegister")
+    public AjaxResult exportRegister(UserSubscribeExportBo bo) {
+        UserSubscribeQueryBo userSubscribeQueryBo = new UserSubscribeQueryBo();
+        userSubscribeQueryBo.setApplyId(bo.getApplyId());
+        userSubscribeQueryBo.setApplySiteAddress(bo.getApplySiteAddress());
+        userSubscribeQueryBo.setIdCards(bo.getIdCards());
+        userSubscribeQueryBo.setSubscribeStatus(1);
+        List<UserSubscribeVo> list = iUserSubscribeService.listSubscribe(userSubscribeQueryBo);
+        List<UserSubscribeExportVo> eList = new ArrayList<>();
+        for(UserSubscribeVo vo : list){
+            UserSubscribeExportVo export = BeanUtil.toBean(vo, UserSubscribeExportVo.class);
+            export.setSubscribeStatus("正常");
+            if(vo.getExamStatus()==0){
+                export.setExamStatus("待登记");
+            }
+            else if(vo.getExamStatus()==1){
+                export.setExamStatus("正常");
+            }
+            else if(vo.getExamStatus()==2){
+                export.setExamStatus("缺考");
+            }
+            else if(vo.getExamStatus()==3){
+                export.setExamStatus("作弊");
+            }
+            else if(vo.getExamStatus()==4){
+                export.setExamStatus("替考");
+            }
+
+            if(Validator.isNotEmpty(vo.getResult())){
+                if(vo.getResult()==1){
+                    export.setResult("通过");
+                }
+                else if(vo.getResult()==0){
+                    export.setResult("不通过");
+                }
+            }
+            eList.add(export);
+        }
+        String timeStr= LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        ExcelUtil<UserSubscribeExportVo> util = new ExcelUtil<UserSubscribeExportVo>(UserSubscribeExportVo.class);
+        return AjaxResult.success(util.exportEasyExcel(util.exportEasyData(eList), bo.getApplyName()+"登记数据"+timeStr));
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserSubscribeExportBo.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -22,20 +23,27 @@ public class UserSubscribeExportBo extends BaseEntity {
 
 	@Excel(name = "考试计划ID")
 	@ApiModelProperty("考试计划ID")
+	@NotBlank(message = "考试计划ID不能为空")
 	private Long applyId;
 
 	/** 考试标题 */
 	@Excel(name = "考试标题")
 	@ApiModelProperty("考试标题")
+	@NotBlank(message = "考试标题不能为空")
 	private String applyName;
 
 	/** 考试地点 */
 	@Excel(name = "考试地点")
 	@ApiModelProperty("考试地点")
+	@NotBlank(message = "考试地点不能为空")
 	private String applySiteAddress;
 
 	/** 考试地点 */
 	@Excel(name = "考培地点")
 	@ApiModelProperty("考培地点")
 	private String applySiteAddressTrain;
+
+	/** 身份证号 */
+	@ApiModelProperty("身份证号列表")
+	private List<String> idCards;
 }

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

@@ -0,0 +1,84 @@
+package com.zhongzheng.modules.user.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 用户预约考试视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@ApiModel("用户预约考试视图对象")
+public class UserSubscribeExportVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 真实姓名 */
+	@Excel(name = "*学员姓名")
+	@ApiModelProperty("真实姓名")
+	private String realname;
+
+	/** 身份证号 */
+	@Excel(name = "*学员身份证",width = 30)
+	@ApiModelProperty("身份证号")
+	private String idCard;
+
+	/** 考试标题 */
+	@Excel(name = "*考试标题",width = 30)
+	@ApiModelProperty("考试标题")
+	private String applyName;
+
+
+	/** 考试地点 */
+	@Excel(name = "*考试地点",width = 30)
+	@ApiModelProperty("考试地点")
+	private String applySiteAddress;
+
+	/** 开始日期 */
+	@Excel(name = "*考试日期")
+	@ApiModelProperty("报考日期")
+	private String applySiteExamTime;
+
+	/** 考试开始时间段 */
+	@Excel(name = "*考试时间段",width = 30)
+	private String applySiteTime;
+
+
+	/** 考试开始时间段 */
+	@Excel(name = "*商品编码",width = 30)
+	private String goodsCode;
+
+	/** 考试开始时间段 */
+	@Excel(name = "*商品名称",width = 30)
+	private String goodsName;
+
+	/** 1正常 2取消 */
+	@Excel(name = "*预约状态")
+	private String subscribeStatus;
+	/** 0 待登记 1正常 2缺考 3作弊 4替考 */
+	@Excel(name = "*考试登记")
+	@ApiModelProperty("0 待登记 1正常 2缺考 3作弊 4替考")
+	private String examStatus;
+	/** 成绩 */
+	@Excel(name = "考试成绩")
+	@ApiModelProperty("成绩")
+	private Long performance;
+	/** 1通过 0不通过 */
+	@Excel(name = "考试结果")
+	@ApiModelProperty("1通过 0不通过")
+	private String result;
+	/** 证书编号 */
+	@Excel(name = "证书编号")
+	@ApiModelProperty("证书编号")
+	private String certificateCode;
+
+
+
+
+}

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

@@ -1,6 +1,6 @@
 package com.zhongzheng.modules.user.vo;
 
-import com.zhongzheng.common.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zhongzheng.modules.exam.vo.ExamApplySiteVo;
 import io.swagger.annotations.ApiModel;
@@ -23,6 +23,27 @@ import java.util.List;
 public class UserSubscribeVo {
 	private static final long serialVersionUID = 1L;
 
+	/** 真实姓名 */
+	@Excel(name = "学员姓名")
+	@ApiModelProperty("真实姓名")
+	private String realname;
+
+	/** 身份证号 */
+	@Excel(name = "学员身份证")
+	@ApiModelProperty("身份证号")
+	private String idCard;
+
+	/** 考试标题 */
+	@Excel(name = "考试标题")
+	@ApiModelProperty("考试标题")
+	private String applyName;
+
+
+	/** 考试地点 */
+	@Excel(name = "考试地点")
+	@ApiModelProperty("考试地点")
+	private String applySiteAddress;
+
 	/** $pkColumn.columnComment */
 	@ApiModelProperty("$pkColumn.columnComment")
 	private Long subscribeId;
@@ -64,14 +85,8 @@ public class UserSubscribeVo {
 	@ApiModelProperty("学员ID")
 	private Long userId;
 
-	/** 真实姓名 */
-	@Excel(name = "真实姓名")
-	@ApiModelProperty("真实姓名")
-	private String realname;
-	/** 身份证号 */
-	@Excel(name = "身份证号")
-	@ApiModelProperty("身份证号")
-	private String idCard;
+
+
 
 	/** 1正常 2取消 */
 	@Excel(name = "1正常 2取消")
@@ -106,10 +121,6 @@ public class UserSubscribeVo {
 	@ApiModelProperty("$column.columnComment")
 	private Long applyId;
 
-	/** 考试标题 */
-	@Excel(name = "考试标题")
-	@ApiModelProperty("考试标题")
-	private String applyName;
 
 	/** 1非补考学员 2补考学员 */
 	@Excel(name = "1非补考学员 2补考学员")
@@ -136,10 +147,6 @@ public class UserSubscribeVo {
 	@ApiModelProperty("前培标题")
 	private String beforeName;
 
-	/** 考试地点 */
-	@Excel(name = "考试地点")
-	@ApiModelProperty("考试地点")
-	private String applySiteAddress;
 	/** 考试开始时间段 */
 	@Excel(name = "考试开始时间段")
 	@ApiModelProperty("考试开始时间段")