修改

src/main/java/com/steerinfo/baseinfo/meterbaseoperationlog/mapper/MeterBaseOperationLogMapper.xml

@@ -641,9 +641,6 @@
            B.base_spot_name,
            t.create_man_no,
            t.create_man_name,
-           B.meter_mode,
-           C.meter_type_no,
-           C.meter_type_name,
            count(1) count_resetCar
     from meter_base_operation_log t
         left join meter_work_car_actual_First B
@@ -671,10 +668,7 @@
     group by B.base_spot_no,
             B.base_spot_name,
             t.create_man_no,
-            t.create_man_name,
-            B.meter_mode,
-            C.meter_type_no,
-            C.meter_type_name
+            t.create_man_name
   </select>
 
   <select id="countAllFirstState03" parameterType="java.util.HashMap" resultType="hashmap">
@@ -682,9 +676,6 @@
           B.base_spot_name,
           t.create_man_no,
           t.create_man_name,
-          B.meter_mode,
-          C.meter_type_no,
-          C.meter_type_name,
           count(1) count_resetCar
     from meter_base_operation_log t
         left join meter_work_railway_act_first B
@@ -716,10 +707,7 @@
     group by B.base_spot_no,
             B.base_spot_name,
             t.create_man_no,
-            t.create_man_name,
-            B.meter_mode,
-            C.meter_type_no,
-            C.meter_type_name
+            t.create_man_name
   </select>
 
   <select id="countAllActualState" parameterType="java.util.HashMap" resultType="hashmap">

src/main/java/com/steerinfo/baseinfo/meterbasespotinfo/mapper/MeterBaseSpotInfoMapper.xml

@@ -1144,10 +1144,7 @@
       (select A.base_spot_no base_spot_no,
              A.base_spot_name base_spot_name,
              A.create_man_no create_man_no,
-             A.create_man_name create_man_name,
-             A.meter_mode meter_mode,
-             B.meter_type_no meter_type_no,
-             B.meter_type_name meter_type_name
+             A.create_man_name create_man_name
         from meter_work_car_actual_first A
         left join pre_track_scale B
           on A.prediction_no = B.prediction_no
@@ -1162,15 +1159,12 @@
             #{item}
           </foreach>
         </if>
-       group by A.base_spot_no, A.base_spot_name, A.create_man_no, A.create_man_name, A.meter_mode, B.meter_type_no, B.meter_type_name)
+       group by A.base_spot_no, A.base_spot_name, A.create_man_no, A.create_man_name)
       union
       (select A.net_spot3_no base_spot_no,
              A.net_spot3_name base_spot_name,
              A.net_man_no create_man_no,
-             A.net_man_name create_man_name,
-             A.net_mode meter_mode,
-             B.meter_type_no meter_type_no,
-             B.meter_type_name meter_type_name
+             A.net_man_name create_man_name
       from meter_work_car_actual A
         left join pre_track_scale B
           on A.prediction_no = B.prediction_no
@@ -1185,10 +1179,10 @@
             #{item}
           </foreach>
         </if>
-       group by A.net_spot3_no, A.net_spot3_name, A.net_man_no, A.net_man_name, A.net_mode, B.meter_type_no, B.meter_type_name)
+       group by A.net_spot3_no, A.net_spot3_name, A.net_man_no, A.net_man_name)
     union
       (
-      select B.base_spot_no, B.base_spot_name,t.create_man_no,t.create_man_name,B.meter_mode,C.meter_type_no, C.meter_type_name
+      select B.base_spot_no, B.base_spot_name,t.create_man_no,t.create_man_name
       from meter_base_operation_log t
       left join meter_work_car_actual_First B
       on t.operation_id = B.Actual_First_No
@@ -1207,7 +1201,7 @@
           #{item}
         </foreach>
       </if>
-      group by B.base_spot_no, B.base_spot_name,t.create_man_no,t.create_man_name,B.meter_mode,C.meter_type_no, C.meter_type_name)
+      group by B.base_spot_no, B.base_spot_name,t.create_man_no,t.create_man_name)
     )
     where 1 = 1
       <if test="netSpot3NoStr != null and netSpot3NoStr != ''">
@@ -1234,10 +1228,7 @@
       (select A.base_spot_no base_spot_no,
       A.base_spot_name base_spot_name,
       A.create_man_no create_man_no,
-      A.create_man_name create_man_name,
-      A.meter_mode meter_mode,
-      B.meter_type_no meter_type_no,
-      B.meter_type_name meter_type_name
+      A.create_man_name create_man_name
       from meter_work_railway_act_first A
       left join pre_railway_scale B
       on A.prediction_no = B.prediction_no
@@ -1256,15 +1247,12 @@
           #{item}
         </foreach>
       </if>
-      group by A.base_spot_no, A.base_spot_name, A.create_man_no, A.create_man_name, A.meter_mode, B.meter_type_no, B.meter_type_name)
+      group by A.base_spot_no, A.base_spot_name, A.create_man_no, A.create_man_name)
     union
       (select A.net_spot3_no base_spot_no,
       A.net_spot3_name base_spot_name,
       A.net_man_no create_man_no,
-      A.net_man_name create_man_name,
-      A.net_mode meter_mode,
-      B.meter_type_no meter_type_no,
-      B.meter_type_name meter_type_name
+      A.net_man_name create_man_name
       from meter_work_railway_actual A
       left join pre_railway_scale B
       on A.prediction_no = B.prediction_no
@@ -1283,9 +1271,9 @@
           #{item}
         </foreach>
       </if>
-      group by A.net_spot3_no, A.net_spot3_name, A.net_man_no, A.net_man_name, A.net_mode, B.meter_type_no, B.meter_type_name)
+      group by A.net_spot3_no, A.net_spot3_name, A.net_man_no, A.net_man_name)
     union
-      (select B.base_spot_no, B.base_spot_name,t.create_man_no,t.create_man_name,B.meter_mode,C.meter_type_no, C.meter_type_name
+      (select B.base_spot_no, B.base_spot_name,t.create_man_no,t.create_man_name
       from meter_base_operation_log t
       left join meter_work_railway_act_first B
       on t.operation_id = B.Actual_First_No
@@ -1308,7 +1296,7 @@
         and  B.create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
         and B.create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
       </if>
-      group by B.base_spot_no, B.base_spot_name,t.create_man_no,t.create_man_name,B.meter_mode,C.meter_type_no, C.meter_type_name)
+      group by B.base_spot_no, B.base_spot_name,t.create_man_no,t.create_man_name)
     )
     where 1 = 1
     <if test="netSpot3NoStr != null and netSpot3NoStr != ''">

src/main/java/com/steerinfo/meterwork/meterworkcaractual/mapper/MeterWorkCarActualMapper.xml

@@ -4334,9 +4334,6 @@
            A.net_spot3_name,
            A.net_man_no,
            A.net_man_name,
-           A.net_mode,
-           B.meter_type_no,
-           B.meter_type_name,
            count(1) count_actual
     from meter_work_car_actual A
         left join pre_track_scale B
@@ -4369,10 +4366,7 @@
     group by A.net_spot3_no,
             A.net_spot3_name,
             A.net_man_no,
-            A.net_man_name,
-            A.net_mode,
-            B.meter_type_no,
-            B.meter_type_name
+            A.net_man_name
   </select>
 
   <select id="smallAndNegativeNetWeightRatio" parameterType="java.util.HashMap" resultMap="BaseResultMap">

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/mapper/MeterWorkCarActualFirstMapper.xml

@@ -2984,9 +2984,6 @@
            A.base_spot_name,
            A.create_man_no,
            A.create_man_name,
-           A.meter_mode,
-           B.meter_type_no,
-           B.meter_type_name,
            count(1) count_first
     from meter_work_car_actual_first A
         left join pre_track_scale B
@@ -3016,9 +3013,6 @@
     group by A.base_spot_no,
             A.base_spot_name,
             A.create_man_no,
-            A.create_man_name,
-            A.meter_mode,
-            B.meter_type_no,
-            B.meter_type_name
+            A.create_man_name
   </select>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkdatacount/controller/MeterWorkDataCountController.java

@@ -463,6 +463,19 @@ public class MeterWorkDataCountController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "汽车衡结净数据净重核查明细-获取列表", notes = "分页模糊查询")
+    //@RequiresPermissions("meterworkcaractualfirst:view")
+    @PostMapping(value = "/carActualNetWeightComparisonDetail")
+    public RESTfulResult carActualNetWeightComparisonDetail(@RequestBody(required = false) HashMap parmas) {
+        try {
+            PageList<CarActualTareWeightComparison> list = meterWorkDataCountService.carActualNetWeightComparisonDetail(parmas);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "轨道衡结净数据同车型、同物料毛重核查-获取列表", notes = "分页模糊查询")
     //@RequiresPermissions("meterworkcaractualfirst:view")
     @PostMapping(value = "/railwayActualGrossWeightComparison")
@@ -488,4 +501,40 @@ public class MeterWorkDataCountController extends BaseRESTfulController {
             throw new MarkerMetException(500, "操作异常！！");
         }
     }
+
+    @ApiOperation(value = "轨道衡理论量与计量净重数据对比-获取列表", notes = "分页模糊查询")
+    @PostMapping(value = "/railwayNetWeightAndTheoryAmount")
+    public RESTfulResult railwayNetWeightAndTheoryAmount(@RequestBody HashMap parmas) {
+        try {
+            PageList<NetWeightAndTheoryAmount> list = meterWorkDataCountService.railwayNetWeightAndTheoryAmount(parmas);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
+    @ApiOperation(value = "轨道衡超长车与一次计量数据重量对比-获取列表", notes = "分页模糊查询")
+    @PostMapping(value = "/longCarMeterWeightComparison")
+    public RESTfulResult longCarMeterWeightComparison(@RequestBody HashMap parmas) {
+        try {
+            PageList<LongCarMeterWeightComparison> list = meterWorkDataCountService.longCarMeterWeightComparison(parmas);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
+    @ApiOperation(value = "同一委托同一车号匹配多条计量数据核查报表-获取列表", notes = "分页模糊查询")
+    @PostMapping(value = "/scaleOrCarComparison")
+    public RESTfulResult scaleOrCarComparison(@RequestBody HashMap parmas) {
+        try {
+            PageList<ScaleOrCarComparison> list = meterWorkDataCountService.scaleOrCarComparison(parmas);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
 }

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

@@ -7,6 +7,7 @@ import org.apache.shiro.crypto.hash.Hash;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface MeterWorkDataCountMapper {
@@ -26,6 +27,10 @@ public interface MeterWorkDataCountMapper {
     List<RfidIdentifyAnalysis> rfidIdentifyAnalysisSummary(HashMap<String, Object> param);
     List<CarActualTareWeightComparison> carActualTareWeightComparison(HashMap<String, Object> param);
     List<CarActualTareWeightComparison> carActualTareWeightComparisonDetail(HashMap<String, Object> param);
+    List<CarActualTareWeightComparison> carActualNetWeightComparisonDetail(HashMap<String, Object> param);
     List<RailwayActualGrossWeightComparison> railwayActualGrossWeightComparison(HashMap<String, Object> param);
     List<RailwayActualGrossWeightComparison> railwayActualGrossWeightComparisonDetail(HashMap<String, Object> param);
+    List<NetWeightAndTheoryAmount> railwayNetWeightAndTheoryAmount(Map<String, Object> params);
+    List<LongCarMeterWeightComparison> longCarMeterWeightComparison(Map<String, Object> params);
+    List<ScaleOrCarComparison> scaleOrCarComparison(Map<String, Object> params);
 }

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

@@ -209,19 +209,13 @@
         select  base_spot_no,
                 base_spot_name,
                 create_man_no,
-                create_man_name,
-                meter_mode,
-                meter_type_no,
-                meter_type_name
+                create_man_name
         from
         (
             (select A.base_spot_no base_spot_no,
             A.base_spot_name base_spot_name,
             A.create_man_no create_man_no,
-            A.create_man_name create_man_name,
-            A.meter_mode meter_mode,
-            B.meter_type_no meter_type_no,
-            B.meter_type_name meter_type_name
+            A.create_man_name create_man_name
             from meter_work_car_actual_first A
             left join pre_track_scale B
             on A.prediction_no = B.prediction_no
@@ -236,15 +230,12 @@
                     #{item}
                 </foreach>
             </if>
-            group by A.base_spot_no, A.base_spot_name, A.create_man_no, A.create_man_name, A.meter_mode, B.meter_type_no, B.meter_type_name)
+            group by A.base_spot_no, A.base_spot_name, A.create_man_no, A.create_man_name)
             union
             (select A.net_spot3_no base_spot_no,
             A.net_spot3_name base_spot_name,
             A.net_man_no create_man_no,
-            A.net_man_name create_man_name,
-            A.net_mode meter_mode,
-            B.meter_type_no meter_type_no,
-            B.meter_type_name meter_type_name
+            A.net_man_name create_man_name
             from meter_work_car_actual A
             left join pre_track_scale B
             on A.prediction_no = B.prediction_no
@@ -259,10 +250,10 @@
                     #{item}
                 </foreach>
             </if>
-            group by A.net_spot3_no, A.net_spot3_name, A.net_man_no, A.net_man_name, A.net_mode, B.meter_type_no, B.meter_type_name)
+            group by A.net_spot3_no, A.net_spot3_name, A.net_man_no, A.net_man_name)
         union
         (
-        select B.base_spot_no, B.base_spot_name,t.create_man_no,t.create_man_name,B.meter_mode,C.meter_type_no, C.meter_type_name
+        select B.base_spot_no, B.base_spot_name,t.create_man_no,t.create_man_name
         from meter_base_operation_log t
         left join meter_work_car_actual_First B
         on t.operation_id = B.Actual_First_No
@@ -281,7 +272,7 @@
                 #{item}
             </foreach>
         </if>
-        group by B.base_spot_no, B.base_spot_name,t.create_man_no,t.create_man_name,B.meter_mode,C.meter_type_no, C.meter_type_name)
+        group by B.base_spot_no, B.base_spot_name,t.create_man_no,t.create_man_name)
         )
         where 1 = 1
             <if test="netSpot3NoStr != null and netSpot3NoStr != ''">
@@ -299,29 +290,20 @@
         group by base_spot_no,
                 base_spot_name,
                 create_man_no,
-                create_man_name,
-                meter_mode,
-                meter_type_no,
-                meter_type_name
+                create_man_name
     </select>
 
     <select id="groupByDayStaticReportInfo" parameterType="java.util.HashMap" resultMap="workLoadReportInfoBaseResultMap">
         select  base_spot_no,
                 base_spot_name,
                 create_man_no,
-                create_man_name,
-                meter_mode,
-                meter_type_no,
-                meter_type_name
+                create_man_name
         from
         (
             (select A.base_spot_no base_spot_no,
             A.base_spot_name base_spot_name,
             A.create_man_no create_man_no,
-            A.create_man_name create_man_name,
-            A.meter_mode meter_mode,
-            B.meter_type_no meter_type_no,
-            B.meter_type_name meter_type_name
+            A.create_man_name create_man_name
             from meter_work_railway_act_first A
             left join pre_railway_scale B
             on A.prediction_no = B.prediction_no
@@ -340,15 +322,12 @@
                     #{item}
                 </foreach>
             </if>
-            group by A.base_spot_no, A.base_spot_name, A.create_man_no, A.create_man_name, A.meter_mode, B.meter_type_no, B.meter_type_name)
+            group by A.base_spot_no, A.base_spot_name, A.create_man_no, A.create_man_name)
         union
             (select A.net_spot3_no base_spot_no,
             A.net_spot3_name base_spot_name,
             A.net_man_no create_man_no,
-            A.net_man_name create_man_name,
-            A.net_mode meter_mode,
-            B.meter_type_no meter_type_no,
-            B.meter_type_name meter_type_name
+            A.net_man_name create_man_name
             from meter_work_railway_actual A
             left join pre_railway_scale B
             on A.prediction_no = B.prediction_no
@@ -367,9 +346,9 @@
                     #{item}
                 </foreach>
             </if>
-            group by A.net_spot3_no, A.net_spot3_name, A.net_man_no, A.net_man_name, A.net_mode, B.meter_type_no, B.meter_type_name)
+            group by A.net_spot3_no, A.net_spot3_name, A.net_man_no, A.net_man_name)
         union
-            (select B.base_spot_no, B.base_spot_name,t.create_man_no,t.create_man_name,B.meter_mode,C.meter_type_no, C.meter_type_name
+            (select B.base_spot_no, B.base_spot_name,t.create_man_no,t.create_man_name
             from meter_base_operation_log t
             left join meter_work_railway_act_first B
             on t.operation_id = B.Actual_First_No
@@ -392,7 +371,7 @@
                     #{item}
                 </foreach>
             </if>
-            group by B.base_spot_no, B.base_spot_name,t.create_man_no,t.create_man_name,B.meter_mode,C.meter_type_no, C.meter_type_name)
+            group by B.base_spot_no, B.base_spot_name,t.create_man_no,t.create_man_name)
         )
         where 1 = 1
         <if test="netSpot3NoStr != null and netSpot3NoStr != ''">
@@ -410,10 +389,7 @@
         group by base_spot_no,
                 base_spot_name,
                 create_man_no,
-                create_man_name,
-                meter_mode,
-                meter_type_no,
-                meter_type_name
+                create_man_name
     </select>
 
     <select id="truckHisTareComparison" parameterType="java.util.HashMap"
@@ -980,6 +956,21 @@
         group by A.car_no, A.matter_no, A.matter_name
     </select>
 
+    <select id="carActualNetWeightComparisonDetail" parameterType="java.util.HashMap"
+            resultType="com.steerinfo.meterwork.meterworkdatacount.model.CarActualTareWeightComparison">
+        select A.car_no carNo,
+        A.matter_no matterNo,
+        A.matter_name matterName,
+        to_char(round(avg(A.net_weight) / 1000, 2), 'FM9999999999999999.00') avgNetWeight
+        from meter_work_car_actual A
+        where 1 = 1
+        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and  A.net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
+            and A.net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        group by A.car_no, A.matter_no, A.matter_name
+    </select>
+
     <select id="railwayActualGrossWeightComparison" parameterType="java.util.HashMap"
             resultType="com.steerinfo.meterwork.meterworkdatacount.model.RailwayActualGrossWeightComparison">
         select A.actual_no actualNo,
@@ -1051,4 +1042,275 @@
                  A.matter_No,
                  A.matter_Name
     </select>
+
+    <select id="railwayNetWeightAndTheoryAmount" parameterType="java.util.HashMap"
+            resultType="com.steerinfo.meterwork.meterworkdatacount.model.NetWeightAndTheoryAmount">
+        select A.railway_type_name railwayTypeName,
+               A.railway_no railwayNo,
+               A.prediction_no predictionNo,
+               A.matter_no matterNo,
+               A.matter_name matterName,
+               to_char(round(A.gross_Weight/1000, 2),'FM9999999999999999.00') grossWeight,
+               to_char(round(A.tare_weight/1000, 2),'FM9999999999999999.00') tareWeight,
+               to_char(round(A.net_weight/1000, 2),'FM9999999999999999.00') netWeight,
+               A.theory_amount theoryAmount,
+               to_char(round(A.net_weight/1000, 2),'FM9999999999999999.00')-A.theory_amount netWeightSub,
+               A.forwarding_unit_name forwardingUnitName,
+               A.receiving_uint_name receivingUintName,
+               A.gross_time grossTime,
+               A.base_spot1_name baseSpot1Name,
+               A.tare_time tareTime,
+               A.base_spot2_name baseSpot2Name,
+               A.net_time netTime,
+               A.net_spot3_name netSpot3Name
+        from meter_work_railway_actual A
+        where A.theory_amount is not null
+            and A.actual_no is not null
+        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and  A.net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and A.net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="railwayNo != null and railwayNo != ''">
+            and A.railway_no like '%${railwayNo}%'
+        </if>
+        <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+            and A.FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+        </if>
+        <if test="forwardingUnitName != null and forwardingUnitName != ''">
+            and A.FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+        </if>
+        <if test="receivingUintNo != null and receivingUintNo != ''">
+            and A.RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+        </if>
+        <if test="receivingUintName != null and receivingUintName != ''">
+            and A.RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+        </if>
+        <if test="matterNo != null and matterNo != ''">
+            and A.matter_no LIKE '%${matterNo}%'
+        </if>
+        <if test="matterName != null and matterName != ''">
+            and A.matter_name LIKE '%${matterName}%'
+        </if>
+        order by A.net_time desc
+    </select>
+
+    <select id="longCarMeterWeightComparison" parameterType="java.util.HashMap"
+            resultType="com.steerinfo.meterwork.meterworkdatacount.model.LongCarMeterWeightComparison">
+    select A.railway_type_name railwayTypeName,
+           A.railway_no railwayNo,
+           A.lc_no lcNo,
+           A.prediction_no predictionNo,
+           case when A.weight_type = '0' then '毛重'
+                when A.weight_type = '1' then '皮重'
+                when A.weight_type = '2' then '标皮'
+                else A.weight_type end weightType,
+           to_char(round(A.meter_weight / 1000, 2), 'FM9999999999999999.00') meterWeight,
+           10 lc15,
+           to_char(round(A.meter_weight / 1000, 2), 'FM9999999999999999.00')-10 meterWeightSub,
+           A.matter_no matterNo,
+           A.matter_name matterName,
+           A.sender_remark senderRemark,
+           A.create_time createTime,
+           A.forwarding_unit_name forwardingUnitName,
+           A.receiving_uint_name receivingUintName,
+           A.base_spot_name baseSpotName,
+           A.conveyance_type conveyanceType,
+           A.create_man_name createManName,
+           case when A.meter_type_Name = 'SendToOutTms' then '外发'
+                when A.meter_type_Name = 'GM2GM' or A.meter_type_name = 'InnerTms' then '厂内转储'
+                when A.meter_type_Name = 'PO2GM' then '外进'
+                else A.meter_type_Name end meterTypeName,
+           case when A.value_flag = '0' then '作废'
+                when A.value_flag = '1' then '有效'
+                when A.value_flag = '2' then '结净'
+                else A.value_flag end valueFlag
+    from meter_work_railway_act_first A
+        where A.value_flag != '0'
+        <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>
+        <if test="railwayNo != null and railwayNo != ''">
+            and A.railway_no like '%${railwayNo}%'
+        </if>
+        <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+            and A.FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+        </if>
+        <if test="forwardingUnitName != null and forwardingUnitName != ''">
+            and A.FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+        </if>
+        <if test="receivingUintNo != null and receivingUintNo != ''">
+            and A.RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+        </if>
+        <if test="receivingUintName != null and receivingUintName != ''">
+            and A.RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+        </if>
+        <if test="matterNo != null and matterNo != ''">
+            and A.matter_no LIKE '%${matterNo}%'
+        </if>
+        <if test="matterName != null and matterName != ''">
+            and A.matter_name LIKE '%${matterName}%'
+        </if>
+        order by A.create_time desc
+    </select>
+
+    <select id="scaleOrCarComparison" parameterType="java.util.HashMap"
+            resultType="com.steerinfo.meterwork.meterworkdatacount.model.ScaleOrCarComparison">
+    select typeTemp,
+           actualNo,
+           actualPredictionNo,
+           first1PredictionNo,
+           first2PredictionNo,
+           carNo,
+           countA,
+           netTime,
+           grossWeight,
+           tareWeight,
+           netWeight,
+           matterNo,
+           matterName,
+           forwardingUnitNo,
+           forwardingUnitName,
+           receivingUintNo,
+           receivingUintName,
+           grossTime,
+           baseSpot1Name,
+           tareTime,
+           baseSpot2Name,
+           netSpot3Name,
+           valueFlag,
+           uploadFlag
+     from
+    (
+      (select '一个委托对应多个净重数据' typeTemp,
+             B.actual_no actualNo,
+             B.prediction_no actualPredictionNo,
+             C.prediction_no first1PredictionNo,
+             D.prediction_no first2PredictionNo,
+             A.car_no carNo,
+             (select count(B.prediction_no)
+                from meter_work_car_actual B
+               where B.prediction_no is not null
+                 and A.prediction_no = B.prediction_no) countA,
+             B.net_time netTime,
+             to_char(round(B.gross_Weight / 1000, 2), 'FM9999999999999999.00') grossWeight,
+             to_char(round(B.tare_weight / 1000, 2), 'FM9999999999999999.00') tareWeight,
+             to_char(round(B.net_weight / 1000, 2), 'FM9999999999999999.00') netWeight,
+             B.matter_no matterNo,
+             B.matter_name matterName,
+             B.forwarding_unit_no forwardingUnitNo,
+             B.forwarding_unit_name forwardingUnitName,
+             B.receiving_uint_no receivingUintNo,
+             B.receiving_uint_name receivingUintName,
+             B.gross_time grossTime,
+             B.base_spot1_name baseSpot1Name,
+             B.tare_time tareTime,
+             B.base_spot2_name baseSpot2Name,
+             B.net_spot3_name netSpot3Name,
+             case when B.value_flag = '0' then '作废'
+                  when B.value_flag = '1' then '有效'
+                  else B.value_flag end valueFlag,
+             case when B.upload_flag = '1' then '待上传'
+                  when B.upload_flag = '2' then '已上传'
+                  else B.upload_flag end uploadFlag
+        from pre_track_scale A
+        left join meter_work_car_actual B
+          on A.prediction_no = B.prediction_no
+        left join meter_work_car_actual_first C
+          on B.actual_first1_no = C.actual_first_no
+        left join meter_work_car_actual_first D
+          on B.actual_first2_no = D.actual_first_no
+        where (select count(B.prediction_no)
+                from meter_work_car_actual B
+               where B.prediction_no is not null
+                 and A.prediction_no = B.prediction_no
+                 and B.value_flag != '0') > 1
+        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and  B.net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and B.net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="carNo != null and carNo != ''">
+            and B.car_no like '%${carNo}%'
+        </if>
+        <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+            and B.FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+        </if>
+        <if test="forwardingUnitName != null and forwardingUnitName != ''">
+            and B.FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+        </if>
+        <if test="receivingUintNo != null and receivingUintNo != ''">
+            and B.RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+        </if>
+        <if test="receivingUintName != null and receivingUintName != ''">
+            and B.RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+        </if>
+        <if test="matterNo != null and matterNo != ''">
+            and B.matter_no LIKE '%${matterNo}%'
+        </if>
+        <if test="matterName != null and matterName != ''">
+            and B.matter_name LIKE '%${matterName}%'
+        </if>)
+    union
+      (select '净重数据毛皮委托不同' typeTemp,
+             A.actual_no actualNo,
+             A.prediction_no actualPredictionNo,
+             B.prediction_no first1PredictionNo,
+             C.prediction_no first2PredictionNo,
+             A.car_no carNo,
+             (select count(B.prediction_no)
+                from meter_work_car_actual B
+               where B.prediction_no is not null
+                 and A.prediction_no = B.prediction_no) countA,
+             A.net_time netTime,
+             to_char(round(A.gross_Weight / 1000, 2), 'FM9999999999999999.00') grossWeight,
+             to_char(round(A.tare_weight / 1000, 2), 'FM9999999999999999.00') tareWeight,
+             to_char(round(A.net_weight / 1000, 2), 'FM9999999999999999.00') netWeight,
+             A.matter_no matterNo,
+             A.matter_name matterName,
+             A.forwarding_unit_no forwardingUnitNo,
+             A.forwarding_unit_name forwardingUnitName,
+             A.receiving_uint_no receivingUintNo,
+             A.receiving_uint_name receivingUintName,
+             A.gross_time grossTime,
+             A.base_spot1_name baseSpot1Name,
+             A.tare_time tareTime,
+             A.base_spot2_name baseSpot2Name,
+             A.net_spot3_name netSpot3Name,
+             case when A.value_flag = '0' then '作废'
+                  when A.value_flag = '1' then '有效'
+                  else A.value_flag end valueFlag,
+             case when A.upload_flag = '1' then '待上传'
+                  when A.upload_flag = '2' then '已上传'
+                  else A.upload_flag end uploadFlag
+        from meter_work_car_actual A
+        left join meter_work_car_actual_first B
+          on A.actual_first1_no = B.actual_first_no
+        left join meter_work_car_actual_first C
+          on A.actual_first2_no = C.actual_first_no
+        where A.value_flag != '0'
+              and B.prediction_no != C.prediction_no
+        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and  A.net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and A.net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="carNo != null and carNo != ''">
+            and A.car_no like '%${carNo}%'
+        </if>
+        <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+            and A.FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+        </if>
+        <if test="forwardingUnitName != null and forwardingUnitName != ''">
+            and A.FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+        </if>
+        <if test="receivingUintNo != null and receivingUintNo != ''">
+            and A.RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+        </if>
+        <if test="receivingUintName != null and receivingUintName != ''">
+            and A.RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+        </if>
+        <if test="matterNo != null and matterNo != ''">
+            and A.matter_no LIKE '%${matterNo}%'
+        </if>
+        <if test="matterName != null and matterName != ''">
+            and A.matter_name LIKE '%${matterName}%'
+        </if>)
+    )
+    order by netTime desc
+    </select>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkdatacount/model/CarActualTareWeightComparison.java

@@ -17,6 +17,8 @@ public class CarActualTareWeightComparison {
     private BigDecimal avgTareWeight;
     private BigDecimal avgTareWeightSub;
     private BigDecimal netWeight;
+    private BigDecimal avgNetWeight;
+    private BigDecimal avgNetWeightSub;
     private Date grossTime;
     private Date tareTime;
     private Date netTime;
@@ -139,6 +141,22 @@ public class CarActualTareWeightComparison {
         return netWeight;
     }
 
+    public BigDecimal getAvgNetWeight() {
+        return avgNetWeight;
+    }
+
+    public void setAvgNetWeight(BigDecimal avgNetWeight) {
+        this.avgNetWeight = avgNetWeight;
+    }
+
+    public BigDecimal getAvgNetWeightSub() {
+        return avgNetWeightSub;
+    }
+
+    public void setAvgNetWeightSub(BigDecimal avgNetWeightSub) {
+        this.avgNetWeightSub = avgNetWeightSub;
+    }
+
     public void setNetWeight(BigDecimal netWeight) {
         this.netWeight = netWeight;
     }

src/main/java/com/steerinfo/meterwork/meterworkdatacount/model/LongCarMeterWeightComparison.java

@@ -0,0 +1,178 @@
+package com.steerinfo.meterwork.meterworkdatacount.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class LongCarMeterWeightComparison {
+    private String railwayTypeName;
+    private String railwayNo;
+    private String lcNo;
+    private String predictionNo;
+    private String weightType;
+    private BigDecimal meterWeight;
+    private BigDecimal lc15;
+    private BigDecimal meterWeightSub;
+    private String matterNo;
+    private String matterName;
+    private String senderRemark;
+    private Date createTime;
+    private String forwardingUnitName;
+    private String receivingUintName;
+    private String baseSpotName;
+    private String conveyanceType;
+    private String createManName;
+    private String meterTypeName;
+    private String valueFlag;
+
+    public String getRailwayTypeName() {
+        return railwayTypeName;
+    }
+
+    public void setRailwayTypeName(String railwayTypeName) {
+        this.railwayTypeName = railwayTypeName;
+    }
+
+    public String getRailwayNo() {
+        return railwayNo;
+    }
+
+    public void setRailwayNo(String railwayNo) {
+        this.railwayNo = railwayNo;
+    }
+
+    public String getLcNo() {
+        return lcNo;
+    }
+
+    public void setLcNo(String lcNo) {
+        this.lcNo = lcNo;
+    }
+
+    public String getPredictionNo() {
+        return predictionNo;
+    }
+
+    public void setPredictionNo(String predictionNo) {
+        this.predictionNo = predictionNo;
+    }
+
+    public String getWeightType() {
+        return weightType;
+    }
+
+    public void setWeightType(String weightType) {
+        this.weightType = weightType;
+    }
+
+    public BigDecimal getMeterWeight() {
+        return meterWeight;
+    }
+
+    public void setMeterWeight(BigDecimal meterWeight) {
+        this.meterWeight = meterWeight;
+    }
+
+    public BigDecimal getLc15() {
+        return lc15;
+    }
+
+    public void setLc15(BigDecimal lc15) {
+        this.lc15 = lc15;
+    }
+
+    public BigDecimal getMeterWeightSub() {
+        return meterWeightSub;
+    }
+
+    public void setMeterWeightSub(BigDecimal meterWeightSub) {
+        this.meterWeightSub = meterWeightSub;
+    }
+
+    public String getMatterNo() {
+        return matterNo;
+    }
+
+    public void setMatterNo(String matterNo) {
+        this.matterNo = matterNo;
+    }
+
+    public String getMatterName() {
+        return matterName;
+    }
+
+    public void setMatterName(String matterName) {
+        this.matterName = matterName;
+    }
+
+    public String getSenderRemark() {
+        return senderRemark;
+    }
+
+    public void setSenderRemark(String senderRemark) {
+        this.senderRemark = senderRemark;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getForwardingUnitName() {
+        return forwardingUnitName;
+    }
+
+    public void setForwardingUnitName(String forwardingUnitName) {
+        this.forwardingUnitName = forwardingUnitName;
+    }
+
+    public String getReceivingUintName() {
+        return receivingUintName;
+    }
+
+    public void setReceivingUintName(String receivingUintName) {
+        this.receivingUintName = receivingUintName;
+    }
+
+    public String getBaseSpotName() {
+        return baseSpotName;
+    }
+
+    public void setBaseSpotName(String baseSpotName) {
+        this.baseSpotName = baseSpotName;
+    }
+
+    public String getConveyanceType() {
+        return conveyanceType;
+    }
+
+    public void setConveyanceType(String conveyanceType) {
+        this.conveyanceType = conveyanceType;
+    }
+
+    public String getCreateManName() {
+        return createManName;
+    }
+
+    public void setCreateManName(String createManName) {
+        this.createManName = createManName;
+    }
+
+    public String getMeterTypeName() {
+        return meterTypeName;
+    }
+
+    public void setMeterTypeName(String meterTypeName) {
+        this.meterTypeName = meterTypeName;
+    }
+
+    public String getValueFlag() {
+        return valueFlag;
+    }
+
+    public void setValueFlag(String valueFlag) {
+        this.valueFlag = valueFlag;
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkdatacount/model/NetWeightAndTheoryAmount.java

@@ -0,0 +1,169 @@
+package com.steerinfo.meterwork.meterworkdatacount.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class NetWeightAndTheoryAmount {
+    private String railwayTypeName;
+    private String railwayNo;
+    private String predictionNo;
+    private String matterNo;
+    private String matterName;
+    private BigDecimal grossWeight;
+    private BigDecimal tareWeight;
+    private BigDecimal netWeight;
+    private BigDecimal theoryAmount;
+    private BigDecimal netWeightSub;
+    private String forwardingUnitName;
+    private String receivingUintName;
+    private Date grossTime;
+    private String baseSpot1Name;
+    private Date tareTime;
+    private String baseSpot2Name;
+    private Date netTime;
+    private String netSpot3Name;
+
+    public String getRailwayTypeName() {
+        return railwayTypeName;
+    }
+
+    public void setRailwayTypeName(String railwayTypeName) {
+        this.railwayTypeName = railwayTypeName;
+    }
+
+    public String getRailwayNo() {
+        return railwayNo;
+    }
+
+    public void setRailwayNo(String railwayNo) {
+        this.railwayNo = railwayNo;
+    }
+
+    public String getPredictionNo() {
+        return predictionNo;
+    }
+
+    public void setPredictionNo(String predictionNo) {
+        this.predictionNo = predictionNo;
+    }
+
+    public String getMatterNo() {
+        return matterNo;
+    }
+
+    public void setMatterNo(String matterNo) {
+        this.matterNo = matterNo;
+    }
+
+    public String getMatterName() {
+        return matterName;
+    }
+
+    public void setMatterName(String matterName) {
+        this.matterName = matterName;
+    }
+
+    public BigDecimal getGrossWeight() {
+        return grossWeight;
+    }
+
+    public void setGrossWeight(BigDecimal grossWeight) {
+        this.grossWeight = grossWeight;
+    }
+
+    public BigDecimal getTareWeight() {
+        return tareWeight;
+    }
+
+    public void setTareWeight(BigDecimal tareWeight) {
+        this.tareWeight = tareWeight;
+    }
+
+    public BigDecimal getNetWeight() {
+        return netWeight;
+    }
+
+    public void setNetWeight(BigDecimal netWeight) {
+        this.netWeight = netWeight;
+    }
+
+    public BigDecimal getTheoryAmount() {
+        return theoryAmount;
+    }
+
+    public void setTheoryAmount(BigDecimal theoryAmount) {
+        this.theoryAmount = theoryAmount;
+    }
+
+    public BigDecimal getNetWeightSub() {
+        return netWeightSub;
+    }
+
+    public void setNetWeightSub(BigDecimal netWeightSub) {
+        this.netWeightSub = netWeightSub;
+    }
+
+    public String getForwardingUnitName() {
+        return forwardingUnitName;
+    }
+
+    public void setForwardingUnitName(String forwardingUnitName) {
+        this.forwardingUnitName = forwardingUnitName;
+    }
+
+    public String getReceivingUintName() {
+        return receivingUintName;
+    }
+
+    public void setReceivingUintName(String receivingUintName) {
+        this.receivingUintName = receivingUintName;
+    }
+
+    public Date getGrossTime() {
+        return grossTime;
+    }
+
+    public void setGrossTime(Date grossTime) {
+        this.grossTime = grossTime;
+    }
+
+    public String getBaseSpot1Name() {
+        return baseSpot1Name;
+    }
+
+    public void setBaseSpot1Name(String baseSpot1Name) {
+        this.baseSpot1Name = baseSpot1Name;
+    }
+
+    public Date getTareTime() {
+        return tareTime;
+    }
+
+    public void setTareTime(Date tareTime) {
+        this.tareTime = tareTime;
+    }
+
+    public String getBaseSpot2Name() {
+        return baseSpot2Name;
+    }
+
+    public void setBaseSpot2Name(String baseSpot2Name) {
+        this.baseSpot2Name = baseSpot2Name;
+    }
+
+    public Date getNetTime() {
+        return netTime;
+    }
+
+    public void setNetTime(Date netTime) {
+        this.netTime = netTime;
+    }
+
+    public String getNetSpot3Name() {
+        return netSpot3Name;
+    }
+
+    public void setNetSpot3Name(String netSpot3Name) {
+        this.netSpot3Name = netSpot3Name;
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkdatacount/model/ScaleOrCarComparison.java

@@ -0,0 +1,223 @@
+package com.steerinfo.meterwork.meterworkdatacount.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class ScaleOrCarComparison {
+    private String typeTemp;
+    private String actualNo;
+    private String actualPredictionNo;
+    private String first1PredictionNo;
+    private String first2PredictionNo;
+    private String carNo;
+    private BigDecimal countA;
+    private Date netTime;
+    private BigDecimal grossWeight;
+    private BigDecimal tareWeight;
+    private BigDecimal netWeight;
+    private String matterNo;
+    private String matterName;
+    private String forwardingUnitNo;
+    private String forwardingUnitName;
+    private String receivingUintNo;
+    private String receivingUintName;
+    private Date grossTime;
+    private String baseSpot1Name;
+    private Date tareTime;
+    private String baseSpot2Name;
+    private String netSpot3Name;
+    private String valueFlag;
+    private String uploadFlag;
+
+    public String getTypeTemp() {
+        return typeTemp;
+    }
+
+    public void setTypeTemp(String typeTemp) {
+        this.typeTemp = typeTemp;
+    }
+
+    public String getActualNo() {
+        return actualNo;
+    }
+
+    public void setActualNo(String actualNo) {
+        this.actualNo = actualNo;
+    }
+
+    public String getActualPredictionNo() {
+        return actualPredictionNo;
+    }
+
+    public void setActualPredictionNo(String actualPredictionNo) {
+        this.actualPredictionNo = actualPredictionNo;
+    }
+
+    public String getFirst1PredictionNo() {
+        return first1PredictionNo;
+    }
+
+    public void setFirst1PredictionNo(String first1PredictionNo) {
+        this.first1PredictionNo = first1PredictionNo;
+    }
+
+    public String getFirst2PredictionNo() {
+        return first2PredictionNo;
+    }
+
+    public void setFirst2PredictionNo(String first2PredictionNo) {
+        this.first2PredictionNo = first2PredictionNo;
+    }
+
+    public String getCarNo() {
+        return carNo;
+    }
+
+    public void setCarNo(String carNo) {
+        this.carNo = carNo;
+    }
+
+    public BigDecimal getCountA() {
+        return countA;
+    }
+
+    public void setCountA(BigDecimal countA) {
+        this.countA = countA;
+    }
+
+    public Date getNetTime() {
+        return netTime;
+    }
+
+    public void setNetTime(Date netTime) {
+        this.netTime = netTime;
+    }
+
+    public BigDecimal getGrossWeight() {
+        return grossWeight;
+    }
+
+    public void setGrossWeight(BigDecimal grossWeight) {
+        this.grossWeight = grossWeight;
+    }
+
+    public BigDecimal getTareWeight() {
+        return tareWeight;
+    }
+
+    public void setTareWeight(BigDecimal tareWeight) {
+        this.tareWeight = tareWeight;
+    }
+
+    public BigDecimal getNetWeight() {
+        return netWeight;
+    }
+
+    public void setNetWeight(BigDecimal netWeight) {
+        this.netWeight = netWeight;
+    }
+
+    public String getMatterNo() {
+        return matterNo;
+    }
+
+    public void setMatterNo(String matterNo) {
+        this.matterNo = matterNo;
+    }
+
+    public String getMatterName() {
+        return matterName;
+    }
+
+    public void setMatterName(String matterName) {
+        this.matterName = matterName;
+    }
+
+    public String getForwardingUnitNo() {
+        return forwardingUnitNo;
+    }
+
+    public void setForwardingUnitNo(String forwardingUnitNo) {
+        this.forwardingUnitNo = forwardingUnitNo;
+    }
+
+    public String getForwardingUnitName() {
+        return forwardingUnitName;
+    }
+
+    public void setForwardingUnitName(String forwardingUnitName) {
+        this.forwardingUnitName = forwardingUnitName;
+    }
+
+    public String getReceivingUintNo() {
+        return receivingUintNo;
+    }
+
+    public void setReceivingUintNo(String receivingUintNo) {
+        this.receivingUintNo = receivingUintNo;
+    }
+
+    public String getReceivingUintName() {
+        return receivingUintName;
+    }
+
+    public void setReceivingUintName(String receivingUintName) {
+        this.receivingUintName = receivingUintName;
+    }
+
+    public Date getGrossTime() {
+        return grossTime;
+    }
+
+    public void setGrossTime(Date grossTime) {
+        this.grossTime = grossTime;
+    }
+
+    public String getBaseSpot1Name() {
+        return baseSpot1Name;
+    }
+
+    public void setBaseSpot1Name(String baseSpot1Name) {
+        this.baseSpot1Name = baseSpot1Name;
+    }
+
+    public Date getTareTime() {
+        return tareTime;
+    }
+
+    public void setTareTime(Date tareTime) {
+        this.tareTime = tareTime;
+    }
+
+    public String getBaseSpot2Name() {
+        return baseSpot2Name;
+    }
+
+    public void setBaseSpot2Name(String baseSpot2Name) {
+        this.baseSpot2Name = baseSpot2Name;
+    }
+
+    public String getNetSpot3Name() {
+        return netSpot3Name;
+    }
+
+    public void setNetSpot3Name(String netSpot3Name) {
+        this.netSpot3Name = netSpot3Name;
+    }
+
+    public String getValueFlag() {
+        return valueFlag;
+    }
+
+    public void setValueFlag(String valueFlag) {
+        this.valueFlag = valueFlag;
+    }
+
+    public String getUploadFlag() {
+        return uploadFlag;
+    }
+
+    public void setUploadFlag(String uploadFlag) {
+        this.uploadFlag = uploadFlag;
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkdatacount/service/IMeterWorkDataCountService.java

@@ -25,7 +25,11 @@ public interface IMeterWorkDataCountService{
     //汽车衡结净数据皮重核查明细
     PageList<CarActualTareWeightComparison> carActualTareWeightComparison(HashMap<String, Object> params);
     PageList<CarActualTareWeightComparison> carActualTareWeightComparisonDetail(HashMap<String, Object> params);
+    PageList<CarActualTareWeightComparison> carActualNetWeightComparisonDetail(HashMap<String, Object> params);
     //轨道衡同车型同物料毛重核查明细
     PageList<RailwayActualGrossWeightComparison> railwayActualGrossWeightComparison(HashMap<String, Object> params);
     PageList<RailwayActualGrossWeightComparison> railwayActualGrossWeightComparisonDetail(HashMap<String, Object> params);
+    PageList<NetWeightAndTheoryAmount> railwayNetWeightAndTheoryAmount(HashMap<String, Object> params);
+    PageList<LongCarMeterWeightComparison> longCarMeterWeightComparison(HashMap<String, Object> params);
+    PageList<ScaleOrCarComparison> scaleOrCarComparison(HashMap<String, Object> params);
 }

src/main/java/com/steerinfo/meterwork/meterworkdatacount/service/impl/MeterWorkDataCountServiceImpl.java

@@ -311,9 +311,6 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
 
                         for (WorkLoadReportInfo model : modelTemp) {
                             HashMap<String, Object> carMap = new HashMap<>();
-                            carMap.put("meterMode", model.getMeterMode());
-                            carMap.put("meterTypeNo", model.getMeterTypeNo());
-                            carMap.put("meterTypeName", model.getMeterTypeName());
                             carMap.put("createManNo", model.getCreateManNo());
                             carMap.put("createManName", model.getCreateManName());
                             carMap02List.add(carMap);
@@ -325,13 +322,7 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                             long carFirstLogSum = 0L;
                             if (carActualTotalTemp01 != null && carActualTotalTemp01.size() >= 1) {
                                 List<HashMap> carActualTotalTemp02 = carActualTotalTemp01.stream().filter(item ->
-                                        (item.get("NET_MODE") == null || StringUtils.isEmpty(item.get("NET_MODE").toString())
-                                                || StringUtils.isEmpty(model.getMeterMode()) || item.get("NET_MODE").equals(model.getMeterMode()))
-                                                && (item.get("METER_TYPE_NO") == null || StringUtils.isEmpty(item.get("METER_TYPE_NO").toString())
-                                                || StringUtils.isEmpty(model.getMeterTypeNo()) || item.get("METER_TYPE_NO").equals(model.getMeterTypeNo()))
-                                                && (item.get("METER_TYPE_NAME") == null || StringUtils.isEmpty(item.get("METER_TYPE_NAME").toString())
-                                                || StringUtils.isEmpty(model.getMeterTypeName()) || item.get("METER_TYPE_NAME").equals(model.getMeterTypeName()))
-                                                && (item.get("NET_MAN_NO") == null || StringUtils.isEmpty(item.get("NET_MAN_NO").toString())
+                                        (item.get("NET_MAN_NO") == null || StringUtils.isEmpty(item.get("NET_MAN_NO").toString())
                                                 || StringUtils.isEmpty(model.getCreateManNo()) || item.get("NET_MAN_NO").equals(model.getCreateManNo()))
                                                 && (item.get("NET_MAN_NAME") == null || StringUtils.isEmpty(item.get("NET_MAN_NAME").toString())
                                                 || StringUtils.isEmpty(model.getCreateManName()) || item.get("NET_MAN_NAME").equals(model.getCreateManName()))).collect(Collectors.toList());
@@ -341,13 +332,7 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                             }
                             if (carActualVoidTotalTemp01 != null && carActualVoidTotalTemp01.size() >= 1) {
                                 List<HashMap> carActualVoidTotalTemp02 = carActualVoidTotalTemp01.stream().filter(item ->
-                                        (item.get("NET_MODE") == null || StringUtils.isEmpty(item.get("NET_MODE").toString())
-                                                || StringUtils.isEmpty(model.getMeterMode()) || item.get("NET_MODE").equals(model.getMeterMode()))
-                                                && (item.get("METER_TYPE_NO") == null || StringUtils.isEmpty(item.get("METER_TYPE_NO").toString())
-                                                || StringUtils.isEmpty(model.getMeterTypeNo()) || item.get("METER_TYPE_NO").equals(model.getMeterTypeNo()))
-                                                && (item.get("METER_TYPE_NAME") == null || StringUtils.isEmpty(item.get("METER_TYPE_NAME").toString())
-                                                || StringUtils.isEmpty(model.getMeterTypeName()) || item.get("METER_TYPE_NAME").equals(model.getMeterTypeName()))
-                                                && (item.get("NET_MAN_NO") == null || StringUtils.isEmpty(item.get("NET_MAN_NO").toString())
+                                        (item.get("NET_MAN_NO") == null || StringUtils.isEmpty(item.get("NET_MAN_NO").toString())
                                                 || StringUtils.isEmpty(model.getCreateManNo()) || item.get("NET_MAN_NO").equals(model.getCreateManNo()))
                                                 && (item.get("NET_MAN_NAME") == null || StringUtils.isEmpty(item.get("NET_MAN_NAME").toString())
                                                 || StringUtils.isEmpty(model.getCreateManName()) || item.get("NET_MAN_NAME").equals(model.getCreateManName()))).collect(Collectors.toList());
@@ -357,13 +342,7 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                             }
                             if (carFirstTotalTemp01 != null && carFirstTotalTemp01.size() >= 1) {
                                 List<HashMap> carFirstTotalTemp02 = carFirstTotalTemp01.stream().filter(item ->
-                                        (item.get("METER_MODE") == null || StringUtils.isEmpty(item.get("METER_MODE").toString())
-                                                || StringUtils.isEmpty(model.getMeterMode()) || item.get("METER_MODE").equals(model.getMeterMode()))
-                                                && (item.get("METER_TYPE_NO") == null || StringUtils.isEmpty(item.get("METER_TYPE_NO").toString())
-                                                || StringUtils.isEmpty(model.getMeterTypeNo()) || item.get("METER_TYPE_NO").equals(model.getMeterTypeNo()))
-                                                && (item.get("METER_TYPE_NAME") == null || StringUtils.isEmpty(item.get("METER_TYPE_NAME").toString())
-                                                || StringUtils.isEmpty(model.getMeterTypeName()) || item.get("METER_TYPE_NAME").equals(model.getMeterTypeName()))
-                                                && (item.get("CREATE_MAN_NO") == null || StringUtils.isEmpty(item.get("CREATE_MAN_NO").toString())
+                                        (item.get("CREATE_MAN_NO") == null || StringUtils.isEmpty(item.get("CREATE_MAN_NO").toString())
                                                 || StringUtils.isEmpty(model.getCreateManNo()) || item.get("CREATE_MAN_NO").equals(model.getCreateManNo()))
                                                 && (item.get("CREATE_MAN_NAME") == null || StringUtils.isEmpty(item.get("CREATE_MAN_NAME").toString())
                                                 || StringUtils.isEmpty(model.getCreateManName()) || item.get("CREATE_MAN_NAME").equals(model.getCreateManName()))).collect(Collectors.toList());
@@ -373,13 +352,7 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                             }
                             if (carFirstLogTemp01 != null && carFirstLogTemp01.size() >= 1) {
                                 List<HashMap> carFirstLogTemp02 = carFirstLogTemp01.stream().filter(item ->
-                                        (item.get("METER_MODE") == null || StringUtils.isEmpty(item.get("METER_MODE").toString())
-                                                || StringUtils.isEmpty(model.getMeterMode()) || item.get("METER_MODE").toString().equals(model.getMeterMode()))
-                                                && (item.get("METER_TYPE_NO") == null || StringUtils.isEmpty(item.get("METER_TYPE_NO").toString())
-                                                || StringUtils.isEmpty(model.getMeterTypeNo()) || item.get("METER_TYPE_NO").toString().equals(model.getMeterTypeNo()))
-                                                && (item.get("METER_TYPE_NAME") == null || StringUtils.isEmpty(item.get("METER_TYPE_NAME").toString())
-                                                || StringUtils.isEmpty(model.getMeterTypeName()) || item.get("METER_TYPE_NAME").toString().equals(model.getMeterTypeName()))
-                                                && (item.get("CREATE_MAN_NO") == null || StringUtils.isEmpty(item.get("CREATE_MAN_NO").toString())
+                                        (item.get("CREATE_MAN_NO") == null || StringUtils.isEmpty(item.get("CREATE_MAN_NO").toString())
                                                 || StringUtils.isEmpty(model.getCreateManNo()) || item.get("CREATE_MAN_NO").toString().equals(model.getCreateManNo()))
                                                 && (item.get("CREATE_MAN_NAME") == null || StringUtils.isEmpty(item.get("CREATE_MAN_NAME").toString())
                                                 || StringUtils.isEmpty(model.getCreateManName()) || item.get("CREATE_MAN_NAME").toString().equals(model.getCreateManName()))).collect(Collectors.toList());
@@ -400,9 +373,6 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                         params02.put("childrenBase", carMap02List);
                     } else {
                         HashMap<String, Object> carMap = new HashMap<>();
-                        carMap.put("meterMode", null);
-                        carMap.put("meterTypeNo", null);
-                        carMap.put("meterTypeName", null);
                         carMap.put("createManNo", null);
                         carMap.put("createManName", null);
                         carMap02List.add(carMap);
@@ -574,9 +544,6 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                                             && item.get("BASE_SPOT_NAME").equals(spotModel.getBaseSpotName())).collect(Collectors.toList());
                             for (WorkLoadReportInfo model : modelTemp) {
                                 HashMap<String, Object> carMap = new HashMap<>();
-                                carMap.put("meterMode", model.getMeterMode());
-                                carMap.put("meterTypeNo", model.getMeterTypeNo());
-                                carMap.put("meterTypeName", model.getMeterTypeName());
                                 carMap.put("createManNo", model.getCreateManNo());
                                 carMap.put("createManName", model.getCreateManName());
                                 carMap02List.add(carMap);
@@ -588,13 +555,7 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                                 long carFirstLogSum = 0L;
                                 if (carActualTotalTemp01 != null && carActualTotalTemp01.size() >= 1) {
                                     List<HashMap> carActualTotalTemp02 = carActualTotalTemp01.stream().filter(item ->
-                                            (item.get("NET_MODE") == null || StringUtils.isEmpty(item.get("NET_MODE").toString())
-                                                    || StringUtils.isEmpty(model.getMeterMode()) || item.get("NET_MODE").equals(model.getMeterMode()))
-                                                    && (item.get("METER_TYPE_NO") == null || StringUtils.isEmpty(item.get("METER_TYPE_NO").toString())
-                                                    || StringUtils.isEmpty(model.getMeterTypeNo()) || item.get("METER_TYPE_NO").equals(model.getMeterTypeNo()))
-                                                    && (item.get("METER_TYPE_NAME") == null || StringUtils.isEmpty(item.get("METER_TYPE_NAME").toString())
-                                                    || StringUtils.isEmpty(model.getMeterTypeName()) || item.get("METER_TYPE_NAME").equals(model.getMeterTypeName()))
-                                                    && (item.get("NET_MAN_NO") == null || StringUtils.isEmpty(item.get("NET_MAN_NO").toString())
+                                            (item.get("NET_MAN_NO") == null || StringUtils.isEmpty(item.get("NET_MAN_NO").toString())
                                                     || StringUtils.isEmpty(model.getCreateManNo()) || item.get("NET_MAN_NO").equals(model.getCreateManNo()))
                                                     && (item.get("NET_MAN_NAME") == null || StringUtils.isEmpty(item.get("NET_MAN_NAME").toString())
                                                     || StringUtils.isEmpty(model.getCreateManName()) || item.get("NET_MAN_NAME").equals(model.getCreateManName()))).collect(Collectors.toList());
@@ -604,13 +565,7 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                                 }
                                 if (carActualVoidTotalTemp01 != null && carActualVoidTotalTemp01.size() >= 1) {
                                     List<HashMap> carActualVoidTotalTemp02 = carActualVoidTotalTemp01.stream().filter(item ->
-                                            (item.get("NET_MODE") == null || StringUtils.isEmpty(item.get("NET_MODE").toString())
-                                                    || StringUtils.isEmpty(model.getMeterMode()) || item.get("NET_MODE").equals(model.getMeterMode()))
-                                                    && (item.get("METER_TYPE_NO") == null || StringUtils.isEmpty(item.get("METER_TYPE_NO").toString())
-                                                    || StringUtils.isEmpty(model.getMeterTypeNo()) || item.get("METER_TYPE_NO").equals(model.getMeterTypeNo()))
-                                                    && (item.get("METER_TYPE_NAME") == null || StringUtils.isEmpty(item.get("METER_TYPE_NAME").toString())
-                                                    || StringUtils.isEmpty(model.getMeterTypeName()) || item.get("METER_TYPE_NAME").equals(model.getMeterTypeName()))
-                                                    && (item.get("NET_MAN_NO") == null || StringUtils.isEmpty(item.get("NET_MAN_NO").toString())
+                                            (item.get("NET_MAN_NO") == null || StringUtils.isEmpty(item.get("NET_MAN_NO").toString())
                                                     || StringUtils.isEmpty(model.getCreateManNo()) || item.get("NET_MAN_NO").equals(model.getCreateManNo()))
                                                     && (item.get("NET_MAN_NAME") == null || StringUtils.isEmpty(item.get("NET_MAN_NAME").toString())
                                                     || StringUtils.isEmpty(model.getCreateManName()) || item.get("NET_MAN_NAME").equals(model.getCreateManName()))).collect(Collectors.toList());
@@ -620,13 +575,7 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                                 }
                                 if (carFirstTotalTemp01 != null && carFirstTotalTemp01.size() >= 1) {
                                     List<HashMap> carFirstTotalTemp02 = carFirstTotalTemp01.stream().filter(item ->
-                                            (item.get("METER_MODE") == null || StringUtils.isEmpty(item.get("METER_MODE").toString())
-                                                    || StringUtils.isEmpty(model.getMeterMode()) || item.get("METER_MODE").equals(model.getMeterMode()))
-                                                    && (item.get("METER_TYPE_NO") == null || StringUtils.isEmpty(item.get("METER_TYPE_NO").toString())
-                                                    || StringUtils.isEmpty(model.getMeterTypeNo()) || item.get("METER_TYPE_NO").equals(model.getMeterTypeNo()))
-                                                    && (item.get("METER_TYPE_NAME") == null || StringUtils.isEmpty(item.get("METER_TYPE_NAME").toString())
-                                                    || StringUtils.isEmpty(model.getMeterTypeName()) || item.get("METER_TYPE_NAME").equals(model.getMeterTypeName()))
-                                                    && (item.get("CREATE_MAN_NO") == null || StringUtils.isEmpty(item.get("CREATE_MAN_NO").toString())
+                                            (item.get("CREATE_MAN_NO") == null || StringUtils.isEmpty(item.get("CREATE_MAN_NO").toString())
                                                     || StringUtils.isEmpty(model.getCreateManNo()) || item.get("CREATE_MAN_NO").equals(model.getCreateManNo()))
                                                     && (item.get("CREATE_MAN_NAME") == null || StringUtils.isEmpty(item.get("CREATE_MAN_NAME").toString())
                                                     || StringUtils.isEmpty(model.getCreateManName()) || item.get("CREATE_MAN_NAME").equals(model.getCreateManName()))).collect(Collectors.toList());
@@ -636,13 +585,7 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                                 }
                                 if (carFirstLogTemp01 != null && carFirstLogTemp01.size() >= 1) {
                                     List<HashMap> carFirstLogTemp02 = carFirstLogTemp01.stream().filter(item ->
-                                            (item.get("METER_MODE") == null || StringUtils.isEmpty(item.get("METER_MODE").toString())
-                                                    || StringUtils.isEmpty(model.getMeterMode()) || item.get("METER_MODE").toString().equals(model.getMeterMode()))
-                                                    && (item.get("METER_TYPE_NO") == null || StringUtils.isEmpty(item.get("METER_TYPE_NO").toString())
-                                                    || StringUtils.isEmpty(model.getMeterTypeNo()) || item.get("METER_TYPE_NO").toString().equals(model.getMeterTypeNo()))
-                                                    && (item.get("METER_TYPE_NAME") == null || StringUtils.isEmpty(item.get("METER_TYPE_NAME").toString())
-                                                    || StringUtils.isEmpty(model.getMeterTypeName()) || item.get("METER_TYPE_NAME").toString().equals(model.getMeterTypeName()))
-                                                    && (item.get("CREATE_MAN_NO") == null || StringUtils.isEmpty(item.get("CREATE_MAN_NO").toString())
+                                            (item.get("CREATE_MAN_NO") == null || StringUtils.isEmpty(item.get("CREATE_MAN_NO").toString())
                                                     || StringUtils.isEmpty(model.getCreateManNo()) || item.get("CREATE_MAN_NO").toString().equals(model.getCreateManNo()))
                                                     && (item.get("CREATE_MAN_NAME") == null || StringUtils.isEmpty(item.get("CREATE_MAN_NAME").toString())
                                                     || StringUtils.isEmpty(model.getCreateManName()) || item.get("CREATE_MAN_NAME").toString().equals(model.getCreateManName()))).collect(Collectors.toList());
@@ -663,9 +606,6 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                             params02.put("childrenBase", carMap02List);
                         } else {
                             HashMap<String, Object> carMap = new HashMap<>();
-                            carMap.put("meterMode", null);
-                            carMap.put("meterTypeNo", null);
-                            carMap.put("meterTypeName", null);
                             carMap.put("createManNo", null);
                             carMap.put("createManName", null);
                             carMap02List.add(carMap);
@@ -1169,6 +1109,41 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
         return pageInfo;
     }
 
+    @Override
+    public PageList<CarActualTareWeightComparison> carActualNetWeightComparisonDetail(HashMap<String, Object> params) {
+        PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
+        BigDecimal avgNetWeight = params.get("avgNetWeight") != null ? new BigDecimal(params.get("avgNetWeight").toString()): new BigDecimal(0);
+        //查询所有结净数据
+        List<CarActualTareWeightComparison> rowsActual = meterWorkDataCountMapper.carActualTareWeightComparison(params);
+        //根据车号、物料编号、物料名称进行分组并求平均值
+        List<CarActualTareWeightComparison> rowsDetail = meterWorkDataCountMapper.carActualNetWeightComparisonDetail(params);
+        List<CarActualTareWeightComparison> rows = new ArrayList<>();
+        if(rowsDetail.size() >= 1) {
+            //循环分组List<车号、物料编号、物料名称>
+            for(CarActualTareWeightComparison modelDetail: rowsDetail) {
+                if(rowsActual.size() >= 1) {
+                    for (CarActualTareWeightComparison modelActual: rowsActual) {
+                        //判断车号、物料编号、物料名称是否一致、一致把平均值写入，并添加
+                        if(modelDetail.getCarNo() != null && modelActual.getCarNo() != null && modelDetail.getCarNo().equals(modelActual.getCarNo())
+                                && modelDetail.getMatterNo() != null && modelActual.getMatterNo() != null && modelDetail.getMatterNo().equals(modelActual.getMatterNo())
+                                && modelDetail.getMatterName() != null && modelActual.getMatterName() != null && modelDetail.getMatterName().equals(modelActual.getMatterName())) {
+                            //结净数据皮重-平均皮重大于等于输入值，就写入
+                            BigDecimal sub = (modelActual.getNetWeight().subtract(modelDetail.getAvgNetWeight())).abs();
+                            //avgTareWeight < sub
+                            if(avgNetWeight.compareTo(sub) == -1) {
+                                modelActual.setAvgNetWeight(modelDetail.getAvgNetWeight());
+                                modelActual.setAvgNetWeightSub(sub);
+                                rows.add(modelActual);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
     @Override
     public PageList<RailwayActualGrossWeightComparison> railwayActualGrossWeightComparison(HashMap<String, Object> params) {
         PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
@@ -1211,4 +1186,28 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
         PageList pageInfo = new PageList(rows);
         return pageInfo;
     }
+
+    @Override
+    public PageList<NetWeightAndTheoryAmount> railwayNetWeightAndTheoryAmount(HashMap<String, Object> params) {
+        PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
+        List<NetWeightAndTheoryAmount> rows = meterWorkDataCountMapper.railwayNetWeightAndTheoryAmount(params);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
+    @Override
+    public PageList<LongCarMeterWeightComparison> longCarMeterWeightComparison(HashMap<String, Object> params) {
+        PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
+        List<LongCarMeterWeightComparison> rows = meterWorkDataCountMapper.longCarMeterWeightComparison(params);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
+    @Override
+    public PageList<ScaleOrCarComparison> scaleOrCarComparison(HashMap<String, Object> params) {
+        PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
+        List<ScaleOrCarComparison> rows = meterWorkDataCountMapper.scaleOrCarComparison(params);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/mapper/MeterWorkRailwayActFirstMapper.xml

@@ -3925,9 +3925,6 @@
           A.base_spot_name,
           A.create_man_no,
           A.create_man_name,
-          A.meter_mode,
-          B.meter_type_no,
-          B.meter_type_name,
           count(1) count_first
     from meter_work_railway_act_first A
         left join pre_railway_scale B
@@ -3961,9 +3958,6 @@
     group by A.base_spot_no,
             A.base_spot_name,
             A.create_man_no,
-            A.create_man_name,
-            A.meter_mode,
-            B.meter_type_no,
-            B.meter_type_name
+            A.create_man_name
   </select>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/impl/MeterWorkRailwayActFirstServiceImpl.java

@@ -2735,8 +2735,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 return "请根据一次数据从小到大的规则，依次选择三条一次数据！！";
             }
             SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
-            String fromDate = simpleFormat.format(pts1.getCreateTime());
-            String toDate = simpleFormat.format(pts2.getCreateTime());
+            String fromDate = simpleFormat.format(pts1.getTrustDateTime());
+            String toDate = simpleFormat.format(pts2.getTrustDateTime());
             long from = simpleFormat.parse(fromDate).getTime();
             long to = simpleFormat.parse(toDate).getTime();
             int hours = (int) ((to - from) / (1000 * 60 * 60));
@@ -2962,8 +2962,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 return "请根据一次数据从大到小的规则，依次选择三条一次数据！！！！";
             }
             SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
-            String fromDate = simpleFormat.format(pts1.getCreateTime());
-            String toDate = simpleFormat.format(pts2.getCreateTime());
+            String fromDate = simpleFormat.format(pts1.getTrustDateTime());
+            String toDate = simpleFormat.format(pts2.getTrustDateTime());
             long from = simpleFormat.parse(fromDate).getTime();
             long to = simpleFormat.parse(toDate).getTime();
             int minutes = (int) ((to - from) / (1000 * 60));
@@ -6743,6 +6743,18 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 String lcNo = meterWorkRailwayActFirstMapper.getLcNo(afl, models.get(0).getBaseSpotNo());
                 int count = 0;
                 for (MeterWorkRailwayActFirst model : models) {
+                    MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+                    logModel.setId(PublicMethod.IdCreate(2));
+                    logModel.setCreateManNo(model.getCreateManNo());
+                    logModel.setCreateManName(model.getCreateManName());
+                    logModel.setCreateTime(new Date());
+                    logModel.setOperationPage("C#端-静态轨道衡一次数据维护");
+                    logModel.setOperationFunction("批量生成列次号");
+                    logModel.setOperationId(model.getActualFirstNo());
+                    logModel.setOperationPredictionNo(model.getPredictionNo());
+                    logModel.setOperationCarnNo(model.getRailwayNo());
+                    logModel.setOperationBeforeFix(model.toString());
+
                     model.setLcNo(model.getBaseSpotName().replaceAll("#", "")
                             .replaceAll("轨道衡", "")
                             .replaceAll("静轨", "")
@@ -6753,6 +6765,9 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualModel.setLcNo(model.getLcNo());
                         meterWorkRailwayActualMapper.updateByPrimaryKeySelective(actualModel);
                     }
+
+                    logModel.setOperationAfterFix(model.toString());
+                    meterBaseOperationLogMapper.insertSelective(logModel);
                     count++;
                 }
                 rm.setSucceed();

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

@@ -4716,9 +4716,6 @@
           A.net_spot3_name,
           A.net_man_no,
           A.net_man_name,
-          A.net_mode,
-          B.meter_type_no,
-          B.meter_type_name,
           count(1) count_actual
     from meter_work_railway_actual A
         left join pre_railway_scale B
@@ -4755,9 +4752,6 @@
     group by A.net_spot3_no,
             A.net_spot3_name,
             A.net_man_no,
-            A.net_man_name,
-            A.net_mode,
-            B.meter_type_no,
-            B.meter_type_name
+            A.net_man_name
   </select>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkscheduledhelp/controller/MeterWorkScheduledHelpController.java

@@ -13,6 +13,7 @@ import com.steerinfo.util.StringUtils;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -82,9 +83,9 @@ public class MeterWorkScheduledHelpController extends BaseRESTfulController {
             @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
     })
     //@RequiresPermissions("meterworkscheduledhelp:view")
-    @GetMapping(value = "/HelpMsgByDesc")
-    public RESTfulResult HelpMsgByDesc(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
-        PageList<MeterWorkScheduledHelp> list = meterWorkScheduledHelpService.HelpMsgByDesc(parmas, pageNum, pageSize);
+    @PostMapping(value = "/HelpMsgByDesc")
+    public RESTfulResult HelpMsgByDesc(@RequestBody HashMap parmas){
+        PageList<MeterWorkScheduledHelp> list = meterWorkScheduledHelpService.HelpMsgByDesc(parmas, Integer.parseInt(parmas.get("pageNum").toString()), Integer.parseInt(parmas.get("pageSize").toString()));
         return success(list);
     }