添加内容修改

src/main/java/com/steerinfo/baseinfo/meterreportwide/mapper/MeterReportWideMapper.xml

@@ -194,6 +194,10 @@
       <if test="timeDiffSeconds != null">
         and TIME_DIFF_SECONDS = #{timeDiffSeconds}
       </if>
+      <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+        AND OPERATION_TIME >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
+        AND OPERATION_TIME &lt;= TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+      </if>
     </where>
   </sql>
   <sql id="whereLike">

src/main/java/com/steerinfo/baseinfo/trucktarecheckwide/mapper/TruckTareCheckWideMapper.xml

@@ -267,7 +267,7 @@
       <if test="calcDate != null">
         and TO_CHAR(CALC_DATE,'yyyy-MM-dd') = #{calcDate}
       </if>
-      <if test="isValid != null">
+      <if test="isValid != null">meterreportwides
         and IS_VALID = #{isValid}
       </if>
       <if test="baseSpotNameStr != null and baseSpotNameStr.length > 0">
@@ -276,6 +276,10 @@
           #{item}
         </foreach>
       </if>
+      <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+        AND create_time >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
+        AND create_time &lt;= TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/mapper/MeterWorkRailwayActualMapper.xml

@@ -4295,6 +4295,12 @@
       <foreach collection="baseSpotNames" item="id" open="(" close=")" separator=",">
         #{id}
       </foreach>
+    </if>
+      <if test="baseSpotNos != null and baseSpotNos.size() != 0">
+      and NET_SPOT3_NO in
+      <foreach collection="baseSpotNos" item="id" open="(" close=")" separator=",">
+        #{id}
+      </foreach>
     </if>
     and value_flag != '0'
     order by net_time desc