sumit

zhongzheng-admin-data/src/main/java/com/zhongzheng/controller/ExamSubscribeController.java

@@ -55,6 +55,12 @@ public class ExamSubscribeController extends BaseController {
         return AjaxResult.success(voList);
     }
 
+    @ApiOperation("批量预约考试")
+    @PostMapping("/batch/subscribe")
+    public AjaxResult<Void> batchSubscribe(CdUserExamSubscribeQueryBo bo) {
+        return AjaxResult.success();
+    }
+
     @ApiOperation("可预约学员列表")
     @GetMapping("/subscribe/list")
     public TableDataInfo<CdUserExamSubscribeVo> getExamSubscribeList(CdUserExamSubscribeQueryBo bo) {

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseHandoutsServiceImpl.java

@@ -114,7 +114,7 @@ public class CourseHandoutsServiceImpl extends ServiceImpl<CourseHandoutsMapper,
                         matchingFile(addBo.getUrlName(), add.getHandoutsId(), 0L, fromPath);
                     } catch (Exception e) {
                         e.printStackTrace();
-                        throw new CustomException("解压/上传zip包失败");
+                        throw new CustomException("解压/上传zip包失败:"+ e.getMessage());
                     }
                 } else {
                     File file = new File(fromPath);

zhongzheng-system/src/main/java/com/zhongzheng/modules/middleground/record/bo/BatchSubscribeBo.java

@@ -0,0 +1,15 @@
+package com.zhongzheng.modules.middleground.record.bo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author yangdamao
+ * @date 2023年07月19日 16:19
+ */
+@Data
+public class BatchSubscribeBo implements Serializable {
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/middleground/record/bo/CdUserSubscribeBo.java

@@ -30,6 +30,8 @@ public class CdUserSubscribeBo implements Serializable {
     /** 业务层次名称 */
     @ApiModelProperty("业务层次名称")
     private String businessName;
+    @ApiModelProperty("专业")
+    private String major;
     /** 考试次数 */
     @ApiModelProperty("考试次数")
     private Integer examNum;
@@ -49,4 +51,8 @@ public class CdUserSubscribeBo implements Serializable {
     private Long dataFrom;
     @ApiModelProperty("类型：1七大员新考")
     private Integer type;
+    /** 公司名称 */
+    @ApiModelProperty("公司名称")
+    private String companyName;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/middleground/record/domain/CdExamSubscribe.java

@@ -41,6 +41,8 @@ public class CdExamSubscribe implements Serializable {
     private Integer reportStatus;
     /** 0 待登记 1正常 2缺考 3作弊 4替考 */
     private Integer examStatus;
+    /** 考试专业 */
+    private String examMajor;
     /** 成绩 */
     private BigDecimal performance;
     /** 成绩回填时间 */
@@ -65,5 +67,7 @@ public class CdExamSubscribe implements Serializable {
     private Integer dataFrom;
     /** 类型：1七大员新考 */
     private Integer type;
+    /** 预约类型：1新考 2补考 */
+    private Integer examType;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/middleground/record/domain/CdUserSubscribe.java

@@ -58,5 +58,9 @@ public class CdUserSubscribe implements Serializable {
     private Long tenantId;
     /** 类型：1七大员新考 */
     private Integer type;
+    /** 专业 */
+    private String major;
+    /** 公司名称 */
+    private String companyName;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/middleground/record/vo/CdUserExamSubscribeVo.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * @author yangdamao
@@ -23,23 +24,28 @@ public class CdUserExamSubscribeVo implements Serializable {
     private String userCard;
     @ApiModelProperty("用户手机号码")
     private String userPhone;
+    @ApiModelProperty("公司名称")
+    private String companyName;
+
     @ApiModelProperty("预约状态：1正常 2取消 3过期 4未约")
     private Integer subscribeStatus;
-    @ApiModelProperty("报送时间")
-    private Long submissionTime;
-    @ApiModelProperty("提醒时间")
-    private Long applyRemindTime;
-    @ApiModelProperty("是否签署承诺书 0 未签署 1已签署")
-    private Integer reportStatus;
+    @ApiModelProperty("考试时间")
+    private Long examTime;
+    @ApiModelProperty("考试状态")
+    private Long examStatus;
+    @ApiModelProperty("成绩")
+    private BigDecimal performance;
+    @ApiModelProperty("类型：1新考 2补考")
+    private Integer examType;
+    @ApiModelProperty("补考次数")
+    private Integer examNum;
+
+    @ApiModelProperty("可预约次数")
+    private Integer subscribeNum;
+
     @ApiModelProperty("证书编号")
     private String certificateCode;
-    @ApiModelProperty("证书名称")
-    private String certificateName;
-    @ApiModelProperty("预约结果")
-    private String subscribeResult;
-    @ApiModelProperty("是否新考")
-    private Integer newApply;
-
-    private Integer dataFrom;
-    private Long tenantId;
+    @ApiModelProperty("审核时间")
+    private Long performanceTime;
+
 }