'提交'

src/main/java/com/steerinfo/meterwork/meterworkcarmetertime/service/impl/MeterWorkCarMeterTimeServiceImpl.java

@@ -117,12 +117,12 @@ public class MeterWorkCarMeterTimeServiceImpl extends BaseServiceImpl<MeterWorkC
 
             //计量一班总车数
             long sumCount1 = (list1==null||list1.size()==0)?0: lists.stream().filter(item -> list1.contains(item.getCreateManNo())//判断班组中的人是否存在于班组中
-                    &&StringUtils.isNotEmpty(item.getBaseSpotNo())
-                    && StringUtils.isNotEmpty(item.getBaseSpotName())
-                    && StringUtils.isNotEmpty(carMeterTimeAndCarFirst.getBaseSpotNo())
-                    && StringUtils.isNotEmpty(carMeterTimeAndCarFirst.getBaseSpotName())
-                    && item.getBaseSpotNo().equals(carMeterTimeAndCarFirst.getBaseSpotNo())
-                    && item.getBaseSpotName().equals(carMeterTimeAndCarFirst.getBaseSpotName())).count();
+                            &&StringUtils.isNotEmpty(item.getBaseSpotNo())
+                            && StringUtils.isNotEmpty(item.getBaseSpotName())
+                            && StringUtils.isNotEmpty(carMeterTimeAndCarFirst.getBaseSpotNo())
+                            && StringUtils.isNotEmpty(carMeterTimeAndCarFirst.getBaseSpotName())
+                            && item.getBaseSpotNo().equals(carMeterTimeAndCarFirst.getBaseSpotNo())
+                            && item.getBaseSpotName().equals(carMeterTimeAndCarFirst.getBaseSpotName())).count();
             //计量二班总车数
             long sumCount2 = (list1==null||list1.size()==0)?0: lists.stream().filter(item -> list2.contains(item.getCreateManNo())//判断班组中的人是否存在于班组中
                     &&StringUtils.isNotEmpty(item.getBaseSpotNo())

src/main/java/com/steerinfo/meterwork/meterworkdatacount/mapper/MeterWorkDataCountMapper.xml

@@ -738,10 +738,6 @@
         select distinct A.operation_function operationFunction
         from meter_base_operation_log A
         where 1 = 1
-        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
-            and  A.create_Time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
-            and A.create_Time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
-        </if>
         order by a.operation_function
     </select>
 
@@ -1394,11 +1390,6 @@
     <select id="measurementAccuracyOperationPage" resultType="java.lang.String">
         select distinct A.operation_page operationPage
         from meter_base_operation_log A
-        where 1 = 1
-        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
-            and  A.create_Time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
-            and A.create_Time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
-        </if>
         order by A.operation_page
     </select>
     <select id="measurementAccuracyCreateManName" resultType="java.lang.String">
@@ -1406,10 +1397,6 @@
         from meter_base_operation_log A
         where 1 = 1
         and A.create_man_name is not null
-        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
-            and  A.create_Time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
-            and A.create_Time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
-        </if>
         order by A.create_man_name
     </select>
 </mapper>