pom.xml

@@ -10,7 +10,7 @@
 
     <groupId>com.steerinfo</groupId>
     <artifactId>jg_wzjl_api</artifactId>
-    <version>1.0</version>
+    <version>1.1</version>
     <packaging>jar</packaging>
     <name>jg_wzjl_api</name>
     <url>http://maven.apache.org</url>
@@ -119,7 +119,7 @@
                 <configuration>
                     <excludes>
                         <!-- 排除 classes 目录下的这两个配置文件 -->
-                        <exclude>**/application.properties</exclude>
+<!--                        <exclude>**/application.properties</exclude>-->
                         <exclude>**/application-prod.properties</exclude>
                         <exclude>**/application-dev.properties</exclude>
                         <exclude>**/jg_wzjl_api.properties</exclude>

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/meterworkdatacount/model/TruckHisTareComparison.java

@@ -25,6 +25,7 @@ public class TruckHisTareComparison {
     private Date updateTime;
     private String meterMode;
     private String meterTypeName;
+    private String upTime;
     private String note;
     private double base;
 
@@ -212,4 +213,12 @@ public class TruckHisTareComparison {
     public void setReceivingUintName(String receivingUintName) {
         this.receivingUintName = receivingUintName;
     }
+
+    public String getUpTime() {
+        return upTime;
+    }
+
+    public void setUpTime(String upTime) {
+        this.upTime = upTime;
+    }
 }

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