Merge branch 'dev' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot into dev

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamApplyGoodsQueryBo.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.Map;
 import java.util.HashMap;
@@ -42,4 +43,20 @@ public class ExamApplyGoodsQueryBo extends BaseEntity {
 	/** $column.columnComment */
 	@ApiModelProperty("$column.columnComment")
 	private Long goodsId;
+
+	/** 科目ID */
+	@ApiModelProperty("科目ID")
+	private Long subjectId;
+
+	/** 业务层次ID */
+	@ApiModelProperty("业务层次ID")
+	private Long businessId;
+
+	/** 关键字 */
+	@ApiModelProperty("关键字")
+	private String searchKey;
+
+	/** 标准价格 */
+	@ApiModelProperty("标准价格")
+	private BigDecimal standPrice;
 }

zhongzheng-system/src/main/resources/mapper/modules/exam/ExamApplyGoodsMapper.xml

@@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="applyId != null and applyId != ''">
             and  eg.apply_id = #{applyId}
         </if>
-        <if test="subjectId != null and subjectId >0">
+        <if test="subjectId != null and subjectId != ''">
         AND (SELECT count(*) from goods_course gc LEFT JOIN course c ON gc.course_id = c.course_id where gc.goods_id = g.goods_id and c.`status` = 1
         AND c.subject_id = #{subjectId}) >0
         </if>