|
|
@@ -632,7 +632,7 @@
|
|
|
WHERE
|
|
|
cssp.batch_no_ IS NOT NULL
|
|
|
AND cs.id_ IS NOT NULL
|
|
|
- AND ((cs.status_ = 'OVER' AND (cssp.actual_price_ IS NULL OR cssp.actual_price_ < cssp.expect_price_))
|
|
|
+ AND ((cs.status_ IN ('OVER', 'UNDERWAY') AND (cssp.actual_price_ IS NULL OR cssp.actual_price_ < cssp.expect_price_))
|
|
|
OR ( cs.status_ = 'NOT_START' AND cssp.actual_price_ IS NOT NULL AND cssp.actual_price_ > 0))
|
|
|
<if test="groupIds!=null and groupIds.size()>0">
|
|
|
AND cs.group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
|
|
|
@@ -641,7 +641,7 @@
|
|
|
#{groupId}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
- <if test="userIds!=null AND userIds.size()>0">
|
|
|
+ <if test="userIds!=null and userIds.size()>0">
|
|
|
AND cssp.user_id_ IN
|
|
|
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
|
|
|
#{userId}
|
