搜索条件新增

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

@@ -173,4 +173,8 @@ public class UserSubscribeVo {
 	@Excel(name = "业务ID")
 	@ApiModelProperty("业务ID")
 	private Long businessId;
+
+	@Excel(name = "剩余前培次数")
+	@ApiModelProperty("剩余前培次数")
+	private Long beforeCount;
 }

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

@@ -58,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="applyStartTime" column="apply_start_time"/>
         <result property="applyEndTime" column="apply_end_time"/>
         <result property="businessId" column="business_id"/>
+        <result property="beforeCount" column="before_count"/>
     </resultMap>
 
     <select id="listSubscribe" parameterType="com.zhongzheng.modules.user.bo.UserSubscribeQueryBo" resultMap="UserSubscribeVo">
@@ -72,7 +73,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             (SELECT ea.apply_name FROM exam_apply ea where ea.apply_id = us.apply_id) as apply_name,
             (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 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) as before_count
         FROM
             user_subscribe us
         WHERE