提交：七大员改造

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

@@ -268,7 +268,9 @@ public class UserSubscribeController extends BaseController {
         UserSubscribeQueryBo userSubscribeQueryBo = new UserSubscribeQueryBo();
         userSubscribeQueryBo.setApplyId(bo.getApplyId());
         userSubscribeQueryBo.setApplySiteAddress(bo.getApplySiteAddress());
-        userSubscribeQueryBo.setIdCards(bo.getIdCards());
+        if (CollectionUtils.isNotEmpty(bo.getIdCards())){
+            userSubscribeQueryBo.setIdCards(bo.getIdCards());
+        }
         userSubscribeQueryBo.setSubscribeStatus(1);
         List<UserSubscribeVo> list = iUserSubscribeService.listSubscribe(userSubscribeQueryBo);
         List<UserSubscribeExportVo> eList = new ArrayList<>();

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseBusinessQueryBo.java

@@ -77,4 +77,9 @@ public class CourseBusinessQueryBo extends BaseEntity {
 	/** 排序 */
 	@ApiModelProperty("排序")
 	private Integer sort;
+
+	@ApiModelProperty("学时审核类型：1人工，2自动")
+	private Integer periodType;
+	@ApiModelProperty("学时审核层级：1初审，2初审和复审")
+	private Integer periodNumber;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseBusinessVo.java

@@ -124,4 +124,8 @@ public class CourseBusinessVo {
 	@Excel(name = "别名")
 	@ApiModelProperty("别名")
 	private String aliasName;
+	@ApiModelProperty("学时审核类型：1人工，2自动")
+	private Integer periodType;
+	@ApiModelProperty("学时审核层级：1初审，2初审和复审")
+	private Integer periodNumber;
 }

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

@@ -192,4 +192,20 @@ public class UserSubscribeVo {
 	@com.zhongzheng.common.annotation.Excel(name = "订单商品ID")
 	@ApiModelProperty("订单商品ID")
 	private Long orderGoodsId;
+	/** 该商品下考试次数 */
+	@com.zhongzheng.common.annotation.Excel(name = "该商品下考试次数")
+	@ApiModelProperty("该商品下考试次数")
+	private Long examNumber;
+	/** 该商品下前培次数 */
+	@com.zhongzheng.common.annotation.Excel(name = "该商品下前培次数")
+	@ApiModelProperty("该商品下前培次数")
+	private Long doNumber;
+	/** 已消耗考试次数 */
+	@com.zhongzheng.common.annotation.Excel(name = "已消耗考试次数")
+	@ApiModelProperty("已消耗考试次数")
+	private Long expendNumber;
+	/** 已消耗前培次数 */
+	@com.zhongzheng.common.annotation.Excel(name = "已消耗前培次数")
+	@ApiModelProperty("已消耗前培次数")
+	private Long expendBefore;
 }

zhongzheng-system/src/main/resources/mapper/modules/user/UserSubscribeMapper.xml

@@ -79,13 +79,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             (SELECT ea.apply_start_time FROM exam_apply ea where ea.apply_id = us.apply_id) as apply_start_time,
             (SELECT ea.apply_end_time FROM exam_apply ea where ea.apply_id = us.apply_id) as apply_end_time,
             (SELECT eb.before_name FROM exam_before eb where eb.before_id = us.before_id) as before_name,
-        (SELECT ueg.do_number-ueg.expend_before FROM user_exam_goods ueg where ueg.goods_id = us.goods_id and ueg.user_id = us.user_id ORDER BY user_exam_goods_id DESC limit 1) as before_count
+            (SELECT ueg.do_number-ueg.expend_before FROM user_exam_goods ueg where ueg.goods_id = us.goods_id and ueg.user_id = us.user_id ORDER BY user_exam_goods_id DESC limit 1) as before_count,
+            ueg.exam_number,
+            ueg.do_number,
+            ueg.expend_number,
+            ueg.expend_before
         FROM
             user_subscribe us
         LEFT JOIN  exam_before eb ON us.before_id = eb.before_id
         LEFT JOIN  `user` u ON us.user_id = u.user_id
         LEFT JOIN goods g ON  us.goods_id = g.goods_id
         LEFT JOIN course_business cb on g.business_id = cb.id
+        LEFT JOIN user_exam_goods ueg ON ueg.order_goods_id = us.order_goods_id
         WHERE
             1 =1
         <if test="applySiteAddress != null and applySiteAddress != '' ">