|
@@ -26,7 +26,22 @@
|
|
|
a.cases_name As casesName,
|
|
|
a.name as name,
|
|
|
b.msg As msg,
|
|
|
- b.score as score,
|
|
|
+ <choose>
|
|
|
+ <when test='isPlacefile == "0"'>
|
|
|
+ b.score_run AS score,
|
|
|
+ </when>
|
|
|
+ <otherwise>
|
|
|
+ b.score AS score,
|
|
|
+ </otherwise>
|
|
|
+ </choose>
|
|
|
+ <choose>
|
|
|
+ <when test='isPlacefile == "0"'>
|
|
|
+ b.is_used_run AS isUsed,
|
|
|
+ </when>
|
|
|
+ <otherwise>
|
|
|
+ b.is_used AS isUsed,
|
|
|
+ </otherwise>
|
|
|
+ </choose>
|
|
|
b.is_reject As isReject,
|
|
|
b.is_used AS isUsed,
|
|
|
a.rule_type
|
|
@@ -45,12 +60,22 @@
|
|
|
<if test="name != null and name != ''">
|
|
|
AND UPPER(a.name) LIKE CONCAT('%', UPPER(trim(#{name})), '%')
|
|
|
</if>
|
|
|
+ <choose>
|
|
|
+ <when test='isUsed != null and isPlacefile == "0"'>
|
|
|
+ AND b.is_used_run =#{isUsed}
|
|
|
+ </when>
|
|
|
+ <otherwise>
|
|
|
+ AND b.is_used =#{isUsed}
|
|
|
+ </otherwise>
|
|
|
+ </choose>
|
|
|
+
|
|
|
<if test="isReject != null ">
|
|
|
AND b.is_reject = #{isReject}
|
|
|
</if>
|
|
|
- <if test="isUsed != null ">
|
|
|
- AND b.is_used =#{isUsed}
|
|
|
- </if>
|
|
|
+<!-- <if test="isUsed != null ">-->
|
|
|
+<!-- AND b.is_used =#{isUsed}-->
|
|
|
+<!-- </if>-->
|
|
|
+
|
|
|
<if test="ruleType != null">
|
|
|
AND a.rule_type = #{ruleType}
|
|
|
</if>
|