Explorar o código

调整数据统计接口时间筛选字段

liuyaowen hai 10 meses
pai
achega
23b987271e

+ 2 - 2
src/main/resources/mapper/FmsTaskMapper.xml

@@ -319,8 +319,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where t.taskType >= 0 and tb1.taskrcdAuditstatus = '2' and t.tid = #{tid}
         <if test="landId != null  and landId != ''"> and t.landId = #{landId}</if>
         <if test="blockId != null  and blockId != ''"> and t.blockId = #{blockId}</if>
-        <if test="startDate != null  and startDate != ''"> and t.taskCompletedate <![CDATA[ >= ]]> #{startDate}</if>
-        <if test="endDate != null  and endDate != ''"> and t.taskCompletedate <![CDATA[ <= ]]> #{endDate}</if>
+        <if test="startDate != null  and startDate != ''"> and t.taskPlanstartdate <![CDATA[ >= ]]> #{startDate}</if>
+        <if test="endDate != null  and endDate != ''"> and t.taskPlanstartdate <![CDATA[ <= ]]> #{endDate}</if>
         <if test="dataFilter == true and landIds != null and landIds.size() > 0">
             AND t.landId in
             <foreach collection="landIds" item="item" open="(" separator="," close=")">

+ 2 - 2
src/main/resources/mapper/FmsTaskassetMapper.xml

@@ -188,8 +188,8 @@
             <if test="landId != null  and landId != ''"> and t.landId = #{landId}</if>
             <if test="blockId != null  and blockId != ''"> and t.blockId = #{blockId}</if>
             <if test="planId != null and planId != '' ">and t.planId = #{planId}</if>
-            <if test="startDate != null  and startDate != ''"> and t.taskCompletedate <![CDATA[ >= ]]> #{startDate}</if>
-            <if test="endDate != null  and endDate != ''"> and t.taskCompletedate <![CDATA[ <= ]]> #{endDate}</if>
+            <if test="startDate != null  and startDate != ''"> and t.taskPlanstartdate <![CDATA[ >= ]]> #{startDate}</if>
+            <if test="endDate != null  and endDate != ''"> and t.taskPlanstartdate <![CDATA[ <= ]]> #{endDate}</if>
             <if test="dataFilter == true and landIds != null and landIds.size() > 0">
                 AND t.landId in
                 <foreach collection="landIds" item="item" open="(" separator="," close=")">

+ 2 - 2
src/main/resources/mapper/FmsTaskmachineMapper.xml

@@ -51,8 +51,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="landId != null  and landId != ''"> and t.landId = #{landId}</if>
             <if test="blockId != null  and blockId != ''"> and t.blockId = #{blockId}</if>
             <if test="planId != null and planId != '' ">and t.planId = #{planId}</if>
-            <if test="startDate != null  and startDate != ''"> and t.taskCompletedate <![CDATA[ >= ]]> #{startDate}</if>
-            <if test="endDate != null  and endDate != ''"> and t.taskCompletedate <![CDATA[ <= ]]> #{endDate}</if>
+            <if test="startDate != null  and startDate != ''"> and t.taskPlanstartdate <![CDATA[ >= ]]> #{startDate}</if>
+            <if test="endDate != null  and endDate != ''"> and t.taskPlanstartdate <![CDATA[ <= ]]> #{endDate}</if>
             <if test="dataFilter == true and landIds != null and landIds.size() > 0">
                 AND t.landId in
                 <foreach collection="landIds" item="item" open="(" separator="," close=")">

+ 2 - 2
src/main/resources/mapper/FmsTaskpickMapper.xml

@@ -102,10 +102,10 @@
             and t.landId =  #{landId}
         </if>
         <if test="startDate != null  and startDate != ''">
-            and t.taskCompletedate >=  #{startDate}
+            and t.taskPlanstartdate >=  #{startDate}
         </if>
         <if test="endDate != null  and endDate != ''">
-            and t.taskCompletedate <![CDATA[ <= ]]>  #{endDate}
+            and t.taskPlanstartdate <![CDATA[ <= ]]>  #{endDate}
         </if>
         <if test="dataFilter == true and landIds != null and landIds.size() > 0">
             AND t.landId in