|
|
@@ -138,17 +138,17 @@
|
|
|
<if test="substationName!=null and substationName!=''">
|
|
|
and substation_name like concat('%', #{substationName}, '%')
|
|
|
</if>
|
|
|
- <if test="testPlanDate_Start!=null">
|
|
|
- and test_plan_date <![CDATA[ >= ]]> #{testPlanDate_Start}
|
|
|
+ <if test="testPlanDateStart!=null">
|
|
|
+ and test_plan_date <![CDATA[ >= ]]> #{testPlanDateStart}
|
|
|
</if>
|
|
|
- <if test="testPlanDate_End!=null">
|
|
|
- and test_plan_date <![CDATA[ <= ]]> #{testPlanDate_End}
|
|
|
+ <if test="testPlanDateEnd!=null">
|
|
|
+ and test_plan_date <![CDATA[ <= ]]> #{testPlanDateEnd}
|
|
|
</if>
|
|
|
- <if test="completionDate_Start!=null">
|
|
|
- and completion_date <![CDATA[ >= ]]> #{completionDate_Start}
|
|
|
+ <if test="completionDateStart!=null">
|
|
|
+ and completion_date <![CDATA[ >= ]]> #{completionDateStart}
|
|
|
</if>
|
|
|
- <if test="completionDate_End!=null">
|
|
|
- and completion_date <![CDATA[ <= ]]> #{completionDate_End}
|
|
|
+ <if test="completionDateEnd!=null">
|
|
|
+ and completion_date <![CDATA[ <= ]]> #{completionDateEnd}
|
|
|
</if>
|
|
|
<if test="fileId!=null ">
|
|
|
and file_id=#{fileId}
|