搜索条件新增

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

@@ -84,5 +84,9 @@ public class UserSubscribeQueryBo extends BaseEntity {
 	private Integer examExpend;
 	/** 1 前培次数消耗 */
 	@ApiModelProperty("1 前培次数消耗")
-	private Integer beforeExpend;
+	private Integer beforeExpend;	
+
+	/** 1 前培次数消耗 */
+	@ApiModelProperty("前培id")
+	private Long beforeId;
 }

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

@@ -106,6 +106,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
           <if test="beforeExpend != null ">
             and us.before_expend is NOT NULL
+        </if>
+          <if test="beforeId != null ">
+            and us.before_id =#{beforeId}
         </if>
         <if test="majorId != null and majorId != '' ">
             and (SELECT m.id FROM goods g LEFT JOIN major m on g.major_id= m.id where us.goods_id = g.goods_id) = #{majorId}