|
@@ -430,8 +430,8 @@
|
|
|
<if test="gradeId != null and gradeId !='' ">
|
|
|
and cgu.grade_id = #{gradeId}
|
|
|
</if>
|
|
|
- <if test="orderGoodsId != null and orderGoodsId != ''">
|
|
|
- AND cgu.order_goods_id = #{orderGoodsId}
|
|
|
+ <if test="orderGoodsId != null and orderGoodsId != '' ">
|
|
|
+ AND cgu.order_goods_id = #{orderGoodsId}
|
|
|
</if>
|
|
|
LIMIT 1
|
|
|
</select>
|
|
@@ -473,8 +473,8 @@
|
|
|
<if test="gradeId != null and gradeId !=''">
|
|
|
AND grade_id = #{gradeId}
|
|
|
</if>
|
|
|
- <if test="orderGoodsId != null and orderGoodsId != ''">
|
|
|
- AND order_goods_id = #{orderGoodsId}
|
|
|
+ <if test="orderGoodsId != null and orderGoodsId != '' ">
|
|
|
+ AND order_goods_id = #{orderGoodsId}
|
|
|
</if>
|
|
|
AND course_id = #{courseId} ORDER BY record_id DESC LIMIT 9999 ) usr
|
|
|
GROUP BY
|
|
@@ -519,8 +519,8 @@
|
|
|
<if test="gradeId != null and gradeId !=''">
|
|
|
AND grade_id = #{gradeId}
|
|
|
</if>
|
|
|
- <if test="orderGoodsId != null and orderGoodsId != ''">
|
|
|
- AND order_goods_id = #{orderGoodsId}
|
|
|
+ <if test="orderGoodsId != null and orderGoodsId != '' ">
|
|
|
+ AND order_goods_id = #{orderGoodsId}
|
|
|
</if>
|
|
|
AND module_id = 0
|
|
|
AND course_id = #{courseId} ORDER BY record_id DESC LIMIT 9999 ) usr
|
|
@@ -569,6 +569,9 @@
|
|
|
<if test="gradeId != null and gradeId !=''">
|
|
|
AND grade_id = #{gradeId}
|
|
|
</if>
|
|
|
+ <if test="orderGoodsId != null and orderGoodsId != '' ">
|
|
|
+ AND order_goods_id = #{orderGoodsId}
|
|
|
+ </if>
|
|
|
AND course_id = #{courseId} ORDER BY record_id DESC LIMIT 9999 ) usr
|
|
|
GROUP BY
|
|
|
usr.section_id,usr.module_id,
|
|
@@ -1116,6 +1119,9 @@
|
|
|
AND usr.goods_id = 0
|
|
|
</otherwise>
|
|
|
</choose>
|
|
|
+ <if test="orderGoodsId != null and orderGoodsId != '' ">
|
|
|
+ AND usr.order_goods_id = #{orderGoodsId}
|
|
|
+ </if>
|
|
|
AND usr.plan_id =#{planId}
|
|
|
</select>
|
|
|
|