修改

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

@@ -87,4 +87,5 @@ public interface MeterWorkCarActualFirstMapper extends IBaseMapper<MeterWorkCarA
     //根据时间查询所有秤点的一次毛重、一次皮重、一次期限皮、一次有效、一次作废
     List<MeterWorkCarActualFirst> countAllState(Map<String, Object> params);
     List<MeterWorkCarActualFirst> allStateView(Map<String, Object> params);
-}
+
+}

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

@@ -94,41 +94,41 @@
     <result column="IS_PRE_SCALE" jdbcType="VARCHAR" property="isPreScale" />
   </resultMap>
   <sql id="columns">
-    ACTUAL_FIRST_NO, PREDICTION_NO, NOTICE_NO, CAR_NO, TRAILER_NO, MATTER_NO, MATTER_NAME, 
-    CONTRACT_NO, BATCH_NO, CUSTOMER_SUPPLIER_NO, CUSTOMER_SUPPLIER_NAME, FORWARDING_UNIT_NO, 
-    FORWARDING_UNIT_NAME, RECEIVING_UINT_NO, RECEIVING_UINT_NAME, MATERIAL_NO, MATERIAL_NAME, 
-    SPEC_NO, SPEC_NAME, SHIPMENT_GROSS_WEIGHT, SHIPMENT_NET_WEIGHT, SHIPMENT_NUM, BIND_CARD_NO, 
-    LOAD_POINT_NO, LOAD_POINT_NAME, SAMPLE_NO, SAMPLE_VOUCHER, CARRIER_UNIT_NO, CARRIER_UNIT_NAME, 
-    PREDICTION_TYPE, PREDICTION_COMBINATION, METER_TYPE_NO, METER_TYPE_NAME, RAILWAY_NO, 
-    METER_PROCESS_NO, METER_PROCESS_EDITION_NO, METER_WEIGHT, ADD_WEIGHT, METER_NUM, 
-    WEIGHT_TYPE, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, BASE_SPOT_NO, BASE_SPOT_NAME, 
-    METER_CLASS, METER_GROUP, MEMO, VALUE_FLAG, UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
-    CHECK_FLAG, CHECK_MAN_NO, CHECK_MAN_NAME, CHECK_TIME, METER_MODE, METER_REASON_NO, 
-    METER_REASON_NAME, LOAD_END_TIME, ADD_WGT_NO, ADD_WGT_PK, LIMS_SAMPLING_FLAG, HEAT_NO, 
-    METER_PIER_NAME, METER_PIER_NO, SHIP_NO, NOTE, VOUCHER_IDENTITY, VOUCHER_ITEM, BUSINESS_GROUP, 
-    TEMP_CONVEYANCE, CONVEYANCE_TYPE, RESOURCE_SYSTEM, GROUP_PACKAGE_AMOUNT, GROUP_PACKAGE_UNIT, 
-    PACKAGE_AMOUNT, PACKAGE_UNIT, THEORY_AMOUNT, MEASURE_BATCH, MEASURE_BATCH_COUNT, 
-    SENDER_TYPE, SENDER_REMARK, RECEIVER_TYPE, RECEIVER_REMARK, AMOUNT_UNIT, MEASURE_OBJECT_TYPE, 
+    ACTUAL_FIRST_NO, PREDICTION_NO, NOTICE_NO, CAR_NO, TRAILER_NO, MATTER_NO, MATTER_NAME,
+    CONTRACT_NO, BATCH_NO, CUSTOMER_SUPPLIER_NO, CUSTOMER_SUPPLIER_NAME, FORWARDING_UNIT_NO,
+    FORWARDING_UNIT_NAME, RECEIVING_UINT_NO, RECEIVING_UINT_NAME, MATERIAL_NO, MATERIAL_NAME,
+    SPEC_NO, SPEC_NAME, SHIPMENT_GROSS_WEIGHT, SHIPMENT_NET_WEIGHT, SHIPMENT_NUM, BIND_CARD_NO,
+    LOAD_POINT_NO, LOAD_POINT_NAME, SAMPLE_NO, SAMPLE_VOUCHER, CARRIER_UNIT_NO, CARRIER_UNIT_NAME,
+    PREDICTION_TYPE, PREDICTION_COMBINATION, METER_TYPE_NO, METER_TYPE_NAME, RAILWAY_NO,
+    METER_PROCESS_NO, METER_PROCESS_EDITION_NO, METER_WEIGHT, ADD_WEIGHT, METER_NUM,
+    WEIGHT_TYPE, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, BASE_SPOT_NO, BASE_SPOT_NAME,
+    METER_CLASS, METER_GROUP, MEMO, VALUE_FLAG, UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME,
+    CHECK_FLAG, CHECK_MAN_NO, CHECK_MAN_NAME, CHECK_TIME, METER_MODE, METER_REASON_NO,
+    METER_REASON_NAME, LOAD_END_TIME, ADD_WGT_NO, ADD_WGT_PK, LIMS_SAMPLING_FLAG, HEAT_NO,
+    METER_PIER_NAME, METER_PIER_NO, SHIP_NO, NOTE, VOUCHER_IDENTITY, VOUCHER_ITEM, BUSINESS_GROUP,
+    TEMP_CONVEYANCE, CONVEYANCE_TYPE, RESOURCE_SYSTEM, GROUP_PACKAGE_AMOUNT, GROUP_PACKAGE_UNIT,
+    PACKAGE_AMOUNT, PACKAGE_UNIT, THEORY_AMOUNT, MEASURE_BATCH, MEASURE_BATCH_COUNT,
+    SENDER_TYPE, SENDER_REMARK, RECEIVER_TYPE, RECEIVER_REMARK, AMOUNT_UNIT, MEASURE_OBJECT_TYPE,
     MEASURE_TASK_NUM, DATA_SOURCE, IS_PRE_SCALE
   </sql>
   <sql id="columns_alias">
-    t.ACTUAL_FIRST_NO, t.PREDICTION_NO, t.NOTICE_NO, t.CAR_NO, t.TRAILER_NO, t.MATTER_NO, 
-    t.MATTER_NAME, t.CONTRACT_NO, t.BATCH_NO, t.CUSTOMER_SUPPLIER_NO, t.CUSTOMER_SUPPLIER_NAME, 
-    t.FORWARDING_UNIT_NO, t.FORWARDING_UNIT_NAME, t.RECEIVING_UINT_NO, t.RECEIVING_UINT_NAME, 
-    t.MATERIAL_NO, t.MATERIAL_NAME, t.SPEC_NO, t.SPEC_NAME, t.SHIPMENT_GROSS_WEIGHT, 
-    t.SHIPMENT_NET_WEIGHT, t.SHIPMENT_NUM, t.BIND_CARD_NO, t.LOAD_POINT_NO, t.LOAD_POINT_NAME, 
-    t.SAMPLE_NO, t.SAMPLE_VOUCHER, t.CARRIER_UNIT_NO, t.CARRIER_UNIT_NAME, t.PREDICTION_TYPE, 
-    t.PREDICTION_COMBINATION, t.METER_TYPE_NO, t.METER_TYPE_NAME, t.RAILWAY_NO, t.METER_PROCESS_NO, 
-    t.METER_PROCESS_EDITION_NO, t.METER_WEIGHT, t.ADD_WEIGHT, t.METER_NUM, t.WEIGHT_TYPE, 
-    t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME, t.BASE_SPOT_NO, t.BASE_SPOT_NAME, 
-    t.METER_CLASS, t.METER_GROUP, t.MEMO, t.VALUE_FLAG, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, 
-    t.UPDATE_TIME, t.CHECK_FLAG, t.CHECK_MAN_NO, t.CHECK_MAN_NAME, t.CHECK_TIME, t.METER_MODE, 
-    t.METER_REASON_NO, t.METER_REASON_NAME, t.LOAD_END_TIME, t.ADD_WGT_NO, t.ADD_WGT_PK, 
-    t.LIMS_SAMPLING_FLAG, t.HEAT_NO, t.METER_PIER_NAME, t.METER_PIER_NO, t.SHIP_NO, t.NOTE, 
-    t.VOUCHER_IDENTITY, t.VOUCHER_ITEM, t.BUSINESS_GROUP, t.TEMP_CONVEYANCE, t.CONVEYANCE_TYPE, 
-    t.RESOURCE_SYSTEM, t.GROUP_PACKAGE_AMOUNT, t.GROUP_PACKAGE_UNIT, t.PACKAGE_AMOUNT, 
-    t.PACKAGE_UNIT, t.THEORY_AMOUNT, t.MEASURE_BATCH, t.MEASURE_BATCH_COUNT, t.SENDER_TYPE, 
-    t.SENDER_REMARK, t.RECEIVER_TYPE, t.RECEIVER_REMARK, t.AMOUNT_UNIT, t.MEASURE_OBJECT_TYPE, 
+    t.ACTUAL_FIRST_NO, t.PREDICTION_NO, t.NOTICE_NO, t.CAR_NO, t.TRAILER_NO, t.MATTER_NO,
+    t.MATTER_NAME, t.CONTRACT_NO, t.BATCH_NO, t.CUSTOMER_SUPPLIER_NO, t.CUSTOMER_SUPPLIER_NAME,
+    t.FORWARDING_UNIT_NO, t.FORWARDING_UNIT_NAME, t.RECEIVING_UINT_NO, t.RECEIVING_UINT_NAME,
+    t.MATERIAL_NO, t.MATERIAL_NAME, t.SPEC_NO, t.SPEC_NAME, t.SHIPMENT_GROSS_WEIGHT,
+    t.SHIPMENT_NET_WEIGHT, t.SHIPMENT_NUM, t.BIND_CARD_NO, t.LOAD_POINT_NO, t.LOAD_POINT_NAME,
+    t.SAMPLE_NO, t.SAMPLE_VOUCHER, t.CARRIER_UNIT_NO, t.CARRIER_UNIT_NAME, t.PREDICTION_TYPE,
+    t.PREDICTION_COMBINATION, t.METER_TYPE_NO, t.METER_TYPE_NAME, t.RAILWAY_NO, t.METER_PROCESS_NO,
+    t.METER_PROCESS_EDITION_NO, t.METER_WEIGHT, t.ADD_WEIGHT, t.METER_NUM, t.WEIGHT_TYPE,
+    t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME, t.BASE_SPOT_NO, t.BASE_SPOT_NAME,
+    t.METER_CLASS, t.METER_GROUP, t.MEMO, t.VALUE_FLAG, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME,
+    t.UPDATE_TIME, t.CHECK_FLAG, t.CHECK_MAN_NO, t.CHECK_MAN_NAME, t.CHECK_TIME, t.METER_MODE,
+    t.METER_REASON_NO, t.METER_REASON_NAME, t.LOAD_END_TIME, t.ADD_WGT_NO, t.ADD_WGT_PK,
+    t.LIMS_SAMPLING_FLAG, t.HEAT_NO, t.METER_PIER_NAME, t.METER_PIER_NO, t.SHIP_NO, t.NOTE,
+    t.VOUCHER_IDENTITY, t.VOUCHER_ITEM, t.BUSINESS_GROUP, t.TEMP_CONVEYANCE, t.CONVEYANCE_TYPE,
+    t.RESOURCE_SYSTEM, t.GROUP_PACKAGE_AMOUNT, t.GROUP_PACKAGE_UNIT, t.PACKAGE_AMOUNT,
+    t.PACKAGE_UNIT, t.THEORY_AMOUNT, t.MEASURE_BATCH, t.MEASURE_BATCH_COUNT, t.SENDER_TYPE,
+    t.SENDER_REMARK, t.RECEIVER_TYPE, t.RECEIVER_REMARK, t.AMOUNT_UNIT, t.MEASURE_OBJECT_TYPE,
     t.MEASURE_TASK_NUM, t.DATA_SOURCE, t.IS_PRE_SCALE
   </sql>
   <sql id="select">
@@ -138,7 +138,7 @@
     SELECT <include refid="columns_alias"/> FROM METER_WORK_CAR_ACTUAL_FIRST t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="actualFirstNo != null and actualFirstNo != ''">
         and ACTUAL_FIRST_NO = #{actualFirstNo}
       </if>
@@ -412,7 +412,7 @@
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="actualFirstNo != null and actualFirstNo != ''">
         and ACTUAL_FIRST_NO LIKE '%${actualFirstNo}%'
       </if>
@@ -694,7 +694,7 @@
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from METER_WORK_CAR_ACTUAL_FIRST
-    where 1!=1 
+    where 1!=1
       <if test="predictionNo != null and predictionNo != ''">
         or PREDICTION_NO = #{predictionNo}
       </if>
@@ -964,68 +964,68 @@
       </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst">
-    insert into METER_WORK_CAR_ACTUAL_FIRST (ACTUAL_FIRST_NO, PREDICTION_NO, NOTICE_NO, 
-      CAR_NO, TRAILER_NO, MATTER_NO, 
-      MATTER_NAME, CONTRACT_NO, BATCH_NO, 
-      CUSTOMER_SUPPLIER_NO, CUSTOMER_SUPPLIER_NAME, 
-      FORWARDING_UNIT_NO, FORWARDING_UNIT_NAME, RECEIVING_UINT_NO, 
-      RECEIVING_UINT_NAME, MATERIAL_NO, MATERIAL_NAME, 
-      SPEC_NO, SPEC_NAME, SHIPMENT_GROSS_WEIGHT, 
-      SHIPMENT_NET_WEIGHT, SHIPMENT_NUM, BIND_CARD_NO, 
-      LOAD_POINT_NO, LOAD_POINT_NAME, SAMPLE_NO, 
-      SAMPLE_VOUCHER, CARRIER_UNIT_NO, CARRIER_UNIT_NAME, 
-      PREDICTION_TYPE, PREDICTION_COMBINATION, 
-      METER_TYPE_NO, METER_TYPE_NAME, RAILWAY_NO, 
-      METER_PROCESS_NO, METER_PROCESS_EDITION_NO, 
-      METER_WEIGHT, ADD_WEIGHT, METER_NUM, 
-      WEIGHT_TYPE, CREATE_MAN_NO, CREATE_MAN_NAME, 
-      CREATE_TIME, BASE_SPOT_NO, BASE_SPOT_NAME, 
-      METER_CLASS, METER_GROUP, MEMO, 
-      VALUE_FLAG, UPDATE_MAN_NO, UPDATE_MAN_NAME, 
-      UPDATE_TIME, CHECK_FLAG, CHECK_MAN_NO, 
-      CHECK_MAN_NAME, CHECK_TIME, METER_MODE, 
-      METER_REASON_NO, METER_REASON_NAME, LOAD_END_TIME, 
-      ADD_WGT_NO, ADD_WGT_PK, LIMS_SAMPLING_FLAG, 
-      HEAT_NO, METER_PIER_NAME, METER_PIER_NO, 
-      SHIP_NO, NOTE, VOUCHER_IDENTITY, 
-      VOUCHER_ITEM, BUSINESS_GROUP, TEMP_CONVEYANCE, 
-      CONVEYANCE_TYPE, RESOURCE_SYSTEM, GROUP_PACKAGE_AMOUNT, 
-      GROUP_PACKAGE_UNIT, PACKAGE_AMOUNT, PACKAGE_UNIT, 
-      THEORY_AMOUNT, MEASURE_BATCH, MEASURE_BATCH_COUNT, 
-      SENDER_TYPE, SENDER_REMARK, RECEIVER_TYPE, 
-      RECEIVER_REMARK, AMOUNT_UNIT, MEASURE_OBJECT_TYPE, 
+    insert into METER_WORK_CAR_ACTUAL_FIRST (ACTUAL_FIRST_NO, PREDICTION_NO, NOTICE_NO,
+      CAR_NO, TRAILER_NO, MATTER_NO,
+      MATTER_NAME, CONTRACT_NO, BATCH_NO,
+      CUSTOMER_SUPPLIER_NO, CUSTOMER_SUPPLIER_NAME,
+      FORWARDING_UNIT_NO, FORWARDING_UNIT_NAME, RECEIVING_UINT_NO,
+      RECEIVING_UINT_NAME, MATERIAL_NO, MATERIAL_NAME,
+      SPEC_NO, SPEC_NAME, SHIPMENT_GROSS_WEIGHT,
+      SHIPMENT_NET_WEIGHT, SHIPMENT_NUM, BIND_CARD_NO,
+      LOAD_POINT_NO, LOAD_POINT_NAME, SAMPLE_NO,
+      SAMPLE_VOUCHER, CARRIER_UNIT_NO, CARRIER_UNIT_NAME,
+      PREDICTION_TYPE, PREDICTION_COMBINATION,
+      METER_TYPE_NO, METER_TYPE_NAME, RAILWAY_NO,
+      METER_PROCESS_NO, METER_PROCESS_EDITION_NO,
+      METER_WEIGHT, ADD_WEIGHT, METER_NUM,
+      WEIGHT_TYPE, CREATE_MAN_NO, CREATE_MAN_NAME,
+      CREATE_TIME, BASE_SPOT_NO, BASE_SPOT_NAME,
+      METER_CLASS, METER_GROUP, MEMO,
+      VALUE_FLAG, UPDATE_MAN_NO, UPDATE_MAN_NAME,
+      UPDATE_TIME, CHECK_FLAG, CHECK_MAN_NO,
+      CHECK_MAN_NAME, CHECK_TIME, METER_MODE,
+      METER_REASON_NO, METER_REASON_NAME, LOAD_END_TIME,
+      ADD_WGT_NO, ADD_WGT_PK, LIMS_SAMPLING_FLAG,
+      HEAT_NO, METER_PIER_NAME, METER_PIER_NO,
+      SHIP_NO, NOTE, VOUCHER_IDENTITY,
+      VOUCHER_ITEM, BUSINESS_GROUP, TEMP_CONVEYANCE,
+      CONVEYANCE_TYPE, RESOURCE_SYSTEM, GROUP_PACKAGE_AMOUNT,
+      GROUP_PACKAGE_UNIT, PACKAGE_AMOUNT, PACKAGE_UNIT,
+      THEORY_AMOUNT, MEASURE_BATCH, MEASURE_BATCH_COUNT,
+      SENDER_TYPE, SENDER_REMARK, RECEIVER_TYPE,
+      RECEIVER_REMARK, AMOUNT_UNIT, MEASURE_OBJECT_TYPE,
       MEASURE_TASK_NUM, DATA_SOURCE, IS_PRE_SCALE
       )
-    values (#{actualFirstNo,jdbcType=VARCHAR}, #{predictionNo,jdbcType=VARCHAR}, #{noticeNo,jdbcType=VARCHAR}, 
-      #{carNo,jdbcType=VARCHAR}, #{trailerNo,jdbcType=VARCHAR}, #{matterNo,jdbcType=VARCHAR}, 
-      #{matterName,jdbcType=VARCHAR}, #{contractNo,jdbcType=VARCHAR}, #{batchNo,jdbcType=VARCHAR}, 
-      #{customerSupplierNo,jdbcType=VARCHAR}, #{customerSupplierName,jdbcType=VARCHAR}, 
-      #{forwardingUnitNo,jdbcType=VARCHAR}, #{forwardingUnitName,jdbcType=VARCHAR}, #{receivingUintNo,jdbcType=VARCHAR}, 
-      #{receivingUintName,jdbcType=VARCHAR}, #{materialNo,jdbcType=VARCHAR}, #{materialName,jdbcType=VARCHAR}, 
-      #{specNo,jdbcType=VARCHAR}, #{specName,jdbcType=VARCHAR}, #{shipmentGrossWeight,jdbcType=DECIMAL}, 
-      #{shipmentNetWeight,jdbcType=DECIMAL}, #{shipmentNum,jdbcType=DECIMAL}, #{bindCardNo,jdbcType=VARCHAR}, 
-      #{loadPointNo,jdbcType=VARCHAR}, #{loadPointName,jdbcType=VARCHAR}, #{sampleNo,jdbcType=VARCHAR}, 
-      #{sampleVoucher,jdbcType=VARCHAR}, #{carrierUnitNo,jdbcType=VARCHAR}, #{carrierUnitName,jdbcType=VARCHAR}, 
-      #{predictionType,jdbcType=VARCHAR}, #{predictionCombination,jdbcType=VARCHAR}, 
-      #{meterTypeNo,jdbcType=VARCHAR}, #{meterTypeName,jdbcType=VARCHAR}, #{railwayNo,jdbcType=VARCHAR}, 
-      #{meterProcessNo,jdbcType=VARCHAR}, #{meterProcessEditionNo,jdbcType=VARCHAR}, 
-      #{meterWeight,jdbcType=DECIMAL}, #{addWeight,jdbcType=DECIMAL}, #{meterNum,jdbcType=DECIMAL}, 
-      #{weightType,jdbcType=VARCHAR}, #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{baseSpotNo,jdbcType=VARCHAR}, #{baseSpotName,jdbcType=VARCHAR}, 
-      #{meterClass,jdbcType=VARCHAR}, #{meterGroup,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, 
-      #{valueFlag,jdbcType=VARCHAR}, #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{checkFlag,jdbcType=VARCHAR}, #{checkManNo,jdbcType=VARCHAR}, 
-      #{checkManName,jdbcType=VARCHAR}, #{checkTime,jdbcType=TIMESTAMP}, #{meterMode,jdbcType=VARCHAR}, 
-      #{meterReasonNo,jdbcType=VARCHAR}, #{meterReasonName,jdbcType=VARCHAR}, #{loadEndTime,jdbcType=TIMESTAMP}, 
-      #{addWgtNo,jdbcType=VARCHAR}, #{addWgtPk,jdbcType=VARCHAR}, #{limsSamplingFlag,jdbcType=VARCHAR}, 
-      #{heatNo,jdbcType=VARCHAR}, #{meterPierName,jdbcType=VARCHAR}, #{meterPierNo,jdbcType=VARCHAR}, 
-      #{shipNo,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, #{voucherIdentity,jdbcType=VARCHAR}, 
-      #{voucherItem,jdbcType=VARCHAR}, #{businessGroup,jdbcType=VARCHAR}, #{tempConveyance,jdbcType=VARCHAR}, 
-      #{conveyanceType,jdbcType=VARCHAR}, #{resourceSystem,jdbcType=VARCHAR}, #{groupPackageAmount,jdbcType=DECIMAL}, 
-      #{groupPackageUnit,jdbcType=VARCHAR}, #{packageAmount,jdbcType=DECIMAL}, #{packageUnit,jdbcType=VARCHAR}, 
-      #{theoryAmount,jdbcType=DECIMAL}, #{measureBatch,jdbcType=VARCHAR}, #{measureBatchCount,jdbcType=DECIMAL}, 
-      #{senderType,jdbcType=VARCHAR}, #{senderRemark,jdbcType=VARCHAR}, #{receiverType,jdbcType=VARCHAR}, 
-      #{receiverRemark,jdbcType=VARCHAR}, #{amountUnit,jdbcType=VARCHAR}, #{measureObjectType,jdbcType=VARCHAR}, 
+    values (#{actualFirstNo,jdbcType=VARCHAR}, #{predictionNo,jdbcType=VARCHAR}, #{noticeNo,jdbcType=VARCHAR},
+      #{carNo,jdbcType=VARCHAR}, #{trailerNo,jdbcType=VARCHAR}, #{matterNo,jdbcType=VARCHAR},
+      #{matterName,jdbcType=VARCHAR}, #{contractNo,jdbcType=VARCHAR}, #{batchNo,jdbcType=VARCHAR},
+      #{customerSupplierNo,jdbcType=VARCHAR}, #{customerSupplierName,jdbcType=VARCHAR},
+      #{forwardingUnitNo,jdbcType=VARCHAR}, #{forwardingUnitName,jdbcType=VARCHAR}, #{receivingUintNo,jdbcType=VARCHAR},
+      #{receivingUintName,jdbcType=VARCHAR}, #{materialNo,jdbcType=VARCHAR}, #{materialName,jdbcType=VARCHAR},
+      #{specNo,jdbcType=VARCHAR}, #{specName,jdbcType=VARCHAR}, #{shipmentGrossWeight,jdbcType=DECIMAL},
+      #{shipmentNetWeight,jdbcType=DECIMAL}, #{shipmentNum,jdbcType=DECIMAL}, #{bindCardNo,jdbcType=VARCHAR},
+      #{loadPointNo,jdbcType=VARCHAR}, #{loadPointName,jdbcType=VARCHAR}, #{sampleNo,jdbcType=VARCHAR},
+      #{sampleVoucher,jdbcType=VARCHAR}, #{carrierUnitNo,jdbcType=VARCHAR}, #{carrierUnitName,jdbcType=VARCHAR},
+      #{predictionType,jdbcType=VARCHAR}, #{predictionCombination,jdbcType=VARCHAR},
+      #{meterTypeNo,jdbcType=VARCHAR}, #{meterTypeName,jdbcType=VARCHAR}, #{railwayNo,jdbcType=VARCHAR},
+      #{meterProcessNo,jdbcType=VARCHAR}, #{meterProcessEditionNo,jdbcType=VARCHAR},
+      #{meterWeight,jdbcType=DECIMAL}, #{addWeight,jdbcType=DECIMAL}, #{meterNum,jdbcType=DECIMAL},
+      #{weightType,jdbcType=VARCHAR}, #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR},
+      #{createTime,jdbcType=TIMESTAMP}, #{baseSpotNo,jdbcType=VARCHAR}, #{baseSpotName,jdbcType=VARCHAR},
+      #{meterClass,jdbcType=VARCHAR}, #{meterGroup,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR},
+      #{valueFlag,jdbcType=VARCHAR}, #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR},
+      #{updateTime,jdbcType=TIMESTAMP}, #{checkFlag,jdbcType=VARCHAR}, #{checkManNo,jdbcType=VARCHAR},
+      #{checkManName,jdbcType=VARCHAR}, #{checkTime,jdbcType=TIMESTAMP}, #{meterMode,jdbcType=VARCHAR},
+      #{meterReasonNo,jdbcType=VARCHAR}, #{meterReasonName,jdbcType=VARCHAR}, #{loadEndTime,jdbcType=TIMESTAMP},
+      #{addWgtNo,jdbcType=VARCHAR}, #{addWgtPk,jdbcType=VARCHAR}, #{limsSamplingFlag,jdbcType=VARCHAR},
+      #{heatNo,jdbcType=VARCHAR}, #{meterPierName,jdbcType=VARCHAR}, #{meterPierNo,jdbcType=VARCHAR},
+      #{shipNo,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, #{voucherIdentity,jdbcType=VARCHAR},
+      #{voucherItem,jdbcType=VARCHAR}, #{businessGroup,jdbcType=VARCHAR}, #{tempConveyance,jdbcType=VARCHAR},
+      #{conveyanceType,jdbcType=VARCHAR}, #{resourceSystem,jdbcType=VARCHAR}, #{groupPackageAmount,jdbcType=DECIMAL},
+      #{groupPackageUnit,jdbcType=VARCHAR}, #{packageAmount,jdbcType=DECIMAL}, #{packageUnit,jdbcType=VARCHAR},
+      #{theoryAmount,jdbcType=DECIMAL}, #{measureBatch,jdbcType=VARCHAR}, #{measureBatchCount,jdbcType=DECIMAL},
+      #{senderType,jdbcType=VARCHAR}, #{senderRemark,jdbcType=VARCHAR}, #{receiverType,jdbcType=VARCHAR},
+      #{receiverRemark,jdbcType=VARCHAR}, #{amountUnit,jdbcType=VARCHAR}, #{measureObjectType,jdbcType=VARCHAR},
       #{measureTaskNum,jdbcType=VARCHAR}, #{dataSource,jdbcType=VARCHAR}, #{isPreScale,jdbcType=VARCHAR}
       )
   </insert>
@@ -1956,81 +1956,81 @@
   </select>
 
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into METER_WORK_CAR_ACTUAL_FIRST 
-      (ACTUAL_FIRST_NO, 
-      PREDICTION_NO, NOTICE_NO, CAR_NO, 
-      TRAILER_NO, MATTER_NO, MATTER_NAME, 
-      CONTRACT_NO, BATCH_NO, CUSTOMER_SUPPLIER_NO, 
-      CUSTOMER_SUPPLIER_NAME, FORWARDING_UNIT_NO, 
-      FORWARDING_UNIT_NAME, RECEIVING_UINT_NO, 
-      RECEIVING_UINT_NAME, MATERIAL_NO, 
-      MATERIAL_NAME, SPEC_NO, SPEC_NAME, 
-      SHIPMENT_GROSS_WEIGHT, SHIPMENT_NET_WEIGHT, 
-      SHIPMENT_NUM, BIND_CARD_NO, LOAD_POINT_NO, 
-      LOAD_POINT_NAME, SAMPLE_NO, SAMPLE_VOUCHER, 
-      CARRIER_UNIT_NO, CARRIER_UNIT_NAME, 
-      PREDICTION_TYPE, PREDICTION_COMBINATION, 
-      METER_TYPE_NO, METER_TYPE_NAME, RAILWAY_NO, 
-      METER_PROCESS_NO, METER_PROCESS_EDITION_NO, 
-      METER_WEIGHT, ADD_WEIGHT, METER_NUM, 
-      WEIGHT_TYPE, CREATE_MAN_NO, CREATE_MAN_NAME, 
-      CREATE_TIME, BASE_SPOT_NO, BASE_SPOT_NAME, 
-      METER_CLASS, METER_GROUP, MEMO, 
-      VALUE_FLAG, UPDATE_MAN_NO, UPDATE_MAN_NAME, 
-      UPDATE_TIME, CHECK_FLAG, CHECK_MAN_NO, 
-      CHECK_MAN_NAME, CHECK_TIME, METER_MODE, 
-      METER_REASON_NO, METER_REASON_NAME, 
-      LOAD_END_TIME, ADD_WGT_NO, ADD_WGT_PK, 
-      LIMS_SAMPLING_FLAG, HEAT_NO, METER_PIER_NAME, 
-      METER_PIER_NO, SHIP_NO, NOTE, 
-      VOUCHER_IDENTITY, VOUCHER_ITEM, 
-      BUSINESS_GROUP, TEMP_CONVEYANCE, 
-      CONVEYANCE_TYPE, RESOURCE_SYSTEM, 
-      GROUP_PACKAGE_AMOUNT, GROUP_PACKAGE_UNIT, 
-      PACKAGE_AMOUNT, PACKAGE_UNIT, THEORY_AMOUNT, 
-      MEASURE_BATCH, MEASURE_BATCH_COUNT, 
-      SENDER_TYPE, SENDER_REMARK, RECEIVER_TYPE, 
-      RECEIVER_REMARK, AMOUNT_UNIT, MEASURE_OBJECT_TYPE, 
+    insert into METER_WORK_CAR_ACTUAL_FIRST
+      (ACTUAL_FIRST_NO,
+      PREDICTION_NO, NOTICE_NO, CAR_NO,
+      TRAILER_NO, MATTER_NO, MATTER_NAME,
+      CONTRACT_NO, BATCH_NO, CUSTOMER_SUPPLIER_NO,
+      CUSTOMER_SUPPLIER_NAME, FORWARDING_UNIT_NO,
+      FORWARDING_UNIT_NAME, RECEIVING_UINT_NO,
+      RECEIVING_UINT_NAME, MATERIAL_NO,
+      MATERIAL_NAME, SPEC_NO, SPEC_NAME,
+      SHIPMENT_GROSS_WEIGHT, SHIPMENT_NET_WEIGHT,
+      SHIPMENT_NUM, BIND_CARD_NO, LOAD_POINT_NO,
+      LOAD_POINT_NAME, SAMPLE_NO, SAMPLE_VOUCHER,
+      CARRIER_UNIT_NO, CARRIER_UNIT_NAME,
+      PREDICTION_TYPE, PREDICTION_COMBINATION,
+      METER_TYPE_NO, METER_TYPE_NAME, RAILWAY_NO,
+      METER_PROCESS_NO, METER_PROCESS_EDITION_NO,
+      METER_WEIGHT, ADD_WEIGHT, METER_NUM,
+      WEIGHT_TYPE, CREATE_MAN_NO, CREATE_MAN_NAME,
+      CREATE_TIME, BASE_SPOT_NO, BASE_SPOT_NAME,
+      METER_CLASS, METER_GROUP, MEMO,
+      VALUE_FLAG, UPDATE_MAN_NO, UPDATE_MAN_NAME,
+      UPDATE_TIME, CHECK_FLAG, CHECK_MAN_NO,
+      CHECK_MAN_NAME, CHECK_TIME, METER_MODE,
+      METER_REASON_NO, METER_REASON_NAME,
+      LOAD_END_TIME, ADD_WGT_NO, ADD_WGT_PK,
+      LIMS_SAMPLING_FLAG, HEAT_NO, METER_PIER_NAME,
+      METER_PIER_NO, SHIP_NO, NOTE,
+      VOUCHER_IDENTITY, VOUCHER_ITEM,
+      BUSINESS_GROUP, TEMP_CONVEYANCE,
+      CONVEYANCE_TYPE, RESOURCE_SYSTEM,
+      GROUP_PACKAGE_AMOUNT, GROUP_PACKAGE_UNIT,
+      PACKAGE_AMOUNT, PACKAGE_UNIT, THEORY_AMOUNT,
+      MEASURE_BATCH, MEASURE_BATCH_COUNT,
+      SENDER_TYPE, SENDER_REMARK, RECEIVER_TYPE,
+      RECEIVER_REMARK, AMOUNT_UNIT, MEASURE_OBJECT_TYPE,
       MEASURE_TASK_NUM, DATA_SOURCE, IS_PRE_SCALE
       )
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.actualFirstNo,jdbcType=VARCHAR}, 
-      #{item.predictionNo,jdbcType=VARCHAR}, #{item.noticeNo,jdbcType=VARCHAR}, #{item.carNo,jdbcType=VARCHAR}, 
-      #{item.trailerNo,jdbcType=VARCHAR}, #{item.matterNo,jdbcType=VARCHAR}, #{item.matterName,jdbcType=VARCHAR}, 
-      #{item.contractNo,jdbcType=VARCHAR}, #{item.batchNo,jdbcType=VARCHAR}, #{item.customerSupplierNo,jdbcType=VARCHAR}, 
-      #{item.customerSupplierName,jdbcType=VARCHAR}, #{item.forwardingUnitNo,jdbcType=VARCHAR}, 
-      #{item.forwardingUnitName,jdbcType=VARCHAR}, #{item.receivingUintNo,jdbcType=VARCHAR}, 
-      #{item.receivingUintName,jdbcType=VARCHAR}, #{item.materialNo,jdbcType=VARCHAR}, 
-      #{item.materialName,jdbcType=VARCHAR}, #{item.specNo,jdbcType=VARCHAR}, #{item.specName,jdbcType=VARCHAR}, 
-      #{item.shipmentGrossWeight,jdbcType=DECIMAL}, #{item.shipmentNetWeight,jdbcType=DECIMAL}, 
-      #{item.shipmentNum,jdbcType=DECIMAL}, #{item.bindCardNo,jdbcType=VARCHAR}, #{item.loadPointNo,jdbcType=VARCHAR}, 
-      #{item.loadPointName,jdbcType=VARCHAR}, #{item.sampleNo,jdbcType=VARCHAR}, #{item.sampleVoucher,jdbcType=VARCHAR}, 
-      #{item.carrierUnitNo,jdbcType=VARCHAR}, #{item.carrierUnitName,jdbcType=VARCHAR}, 
-      #{item.predictionType,jdbcType=VARCHAR}, #{item.predictionCombination,jdbcType=VARCHAR}, 
-      #{item.meterTypeNo,jdbcType=VARCHAR}, #{item.meterTypeName,jdbcType=VARCHAR}, #{item.railwayNo,jdbcType=VARCHAR}, 
-      #{item.meterProcessNo,jdbcType=VARCHAR}, #{item.meterProcessEditionNo,jdbcType=VARCHAR}, 
-      #{item.meterWeight,jdbcType=DECIMAL}, #{item.addWeight,jdbcType=DECIMAL}, #{item.meterNum,jdbcType=DECIMAL}, 
-      #{item.weightType,jdbcType=VARCHAR}, #{item.createManNo,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR}, 
-      #{item.createTime,jdbcType=TIMESTAMP}, #{item.baseSpotNo,jdbcType=VARCHAR}, #{item.baseSpotName,jdbcType=VARCHAR}, 
-      #{item.meterClass,jdbcType=VARCHAR}, #{item.meterGroup,jdbcType=VARCHAR}, #{item.memo,jdbcType=VARCHAR}, 
-      #{item.valueFlag,jdbcType=VARCHAR}, #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR}, 
-      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.checkFlag,jdbcType=VARCHAR}, #{item.checkManNo,jdbcType=VARCHAR}, 
-      #{item.checkManName,jdbcType=VARCHAR}, #{item.checkTime,jdbcType=TIMESTAMP}, #{item.meterMode,jdbcType=VARCHAR}, 
-      #{item.meterReasonNo,jdbcType=VARCHAR}, #{item.meterReasonName,jdbcType=VARCHAR}, 
-      #{item.loadEndTime,jdbcType=TIMESTAMP}, #{item.addWgtNo,jdbcType=VARCHAR}, #{item.addWgtPk,jdbcType=VARCHAR}, 
-      #{item.limsSamplingFlag,jdbcType=VARCHAR}, #{item.heatNo,jdbcType=VARCHAR}, #{item.meterPierName,jdbcType=VARCHAR}, 
-      #{item.meterPierNo,jdbcType=VARCHAR}, #{item.shipNo,jdbcType=VARCHAR}, #{item.note,jdbcType=VARCHAR}, 
-      #{item.voucherIdentity,jdbcType=VARCHAR}, #{item.voucherItem,jdbcType=VARCHAR}, 
-      #{item.businessGroup,jdbcType=VARCHAR}, #{item.tempConveyance,jdbcType=VARCHAR}, 
-      #{item.conveyanceType,jdbcType=VARCHAR}, #{item.resourceSystem,jdbcType=VARCHAR}, 
-      #{item.groupPackageAmount,jdbcType=DECIMAL}, #{item.groupPackageUnit,jdbcType=VARCHAR}, 
-      #{item.packageAmount,jdbcType=DECIMAL}, #{item.packageUnit,jdbcType=VARCHAR}, #{item.theoryAmount,jdbcType=DECIMAL}, 
-      #{item.measureBatch,jdbcType=VARCHAR}, #{item.measureBatchCount,jdbcType=DECIMAL}, 
-      #{item.senderType,jdbcType=VARCHAR}, #{item.senderRemark,jdbcType=VARCHAR}, #{item.receiverType,jdbcType=VARCHAR}, 
-      #{item.receiverRemark,jdbcType=VARCHAR}, #{item.amountUnit,jdbcType=VARCHAR}, #{item.measureObjectType,jdbcType=VARCHAR}, 
+    ( <foreach collection="list" item="item" separator="union all">
+   select
+      #{item.actualFirstNo,jdbcType=VARCHAR},
+      #{item.predictionNo,jdbcType=VARCHAR}, #{item.noticeNo,jdbcType=VARCHAR}, #{item.carNo,jdbcType=VARCHAR},
+      #{item.trailerNo,jdbcType=VARCHAR}, #{item.matterNo,jdbcType=VARCHAR}, #{item.matterName,jdbcType=VARCHAR},
+      #{item.contractNo,jdbcType=VARCHAR}, #{item.batchNo,jdbcType=VARCHAR}, #{item.customerSupplierNo,jdbcType=VARCHAR},
+      #{item.customerSupplierName,jdbcType=VARCHAR}, #{item.forwardingUnitNo,jdbcType=VARCHAR},
+      #{item.forwardingUnitName,jdbcType=VARCHAR}, #{item.receivingUintNo,jdbcType=VARCHAR},
+      #{item.receivingUintName,jdbcType=VARCHAR}, #{item.materialNo,jdbcType=VARCHAR},
+      #{item.materialName,jdbcType=VARCHAR}, #{item.specNo,jdbcType=VARCHAR}, #{item.specName,jdbcType=VARCHAR},
+      #{item.shipmentGrossWeight,jdbcType=DECIMAL}, #{item.shipmentNetWeight,jdbcType=DECIMAL},
+      #{item.shipmentNum,jdbcType=DECIMAL}, #{item.bindCardNo,jdbcType=VARCHAR}, #{item.loadPointNo,jdbcType=VARCHAR},
+      #{item.loadPointName,jdbcType=VARCHAR}, #{item.sampleNo,jdbcType=VARCHAR}, #{item.sampleVoucher,jdbcType=VARCHAR},
+      #{item.carrierUnitNo,jdbcType=VARCHAR}, #{item.carrierUnitName,jdbcType=VARCHAR},
+      #{item.predictionType,jdbcType=VARCHAR}, #{item.predictionCombination,jdbcType=VARCHAR},
+      #{item.meterTypeNo,jdbcType=VARCHAR}, #{item.meterTypeName,jdbcType=VARCHAR}, #{item.railwayNo,jdbcType=VARCHAR},
+      #{item.meterProcessNo,jdbcType=VARCHAR}, #{item.meterProcessEditionNo,jdbcType=VARCHAR},
+      #{item.meterWeight,jdbcType=DECIMAL}, #{item.addWeight,jdbcType=DECIMAL}, #{item.meterNum,jdbcType=DECIMAL},
+      #{item.weightType,jdbcType=VARCHAR}, #{item.createManNo,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR},
+      #{item.createTime,jdbcType=TIMESTAMP}, #{item.baseSpotNo,jdbcType=VARCHAR}, #{item.baseSpotName,jdbcType=VARCHAR},
+      #{item.meterClass,jdbcType=VARCHAR}, #{item.meterGroup,jdbcType=VARCHAR}, #{item.memo,jdbcType=VARCHAR},
+      #{item.valueFlag,jdbcType=VARCHAR}, #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR},
+      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.checkFlag,jdbcType=VARCHAR}, #{item.checkManNo,jdbcType=VARCHAR},
+      #{item.checkManName,jdbcType=VARCHAR}, #{item.checkTime,jdbcType=TIMESTAMP}, #{item.meterMode,jdbcType=VARCHAR},
+      #{item.meterReasonNo,jdbcType=VARCHAR}, #{item.meterReasonName,jdbcType=VARCHAR},
+      #{item.loadEndTime,jdbcType=TIMESTAMP}, #{item.addWgtNo,jdbcType=VARCHAR}, #{item.addWgtPk,jdbcType=VARCHAR},
+      #{item.limsSamplingFlag,jdbcType=VARCHAR}, #{item.heatNo,jdbcType=VARCHAR}, #{item.meterPierName,jdbcType=VARCHAR},
+      #{item.meterPierNo,jdbcType=VARCHAR}, #{item.shipNo,jdbcType=VARCHAR}, #{item.note,jdbcType=VARCHAR},
+      #{item.voucherIdentity,jdbcType=VARCHAR}, #{item.voucherItem,jdbcType=VARCHAR},
+      #{item.businessGroup,jdbcType=VARCHAR}, #{item.tempConveyance,jdbcType=VARCHAR},
+      #{item.conveyanceType,jdbcType=VARCHAR}, #{item.resourceSystem,jdbcType=VARCHAR},
+      #{item.groupPackageAmount,jdbcType=DECIMAL}, #{item.groupPackageUnit,jdbcType=VARCHAR},
+      #{item.packageAmount,jdbcType=DECIMAL}, #{item.packageUnit,jdbcType=VARCHAR}, #{item.theoryAmount,jdbcType=DECIMAL},
+      #{item.measureBatch,jdbcType=VARCHAR}, #{item.measureBatchCount,jdbcType=DECIMAL},
+      #{item.senderType,jdbcType=VARCHAR}, #{item.senderRemark,jdbcType=VARCHAR}, #{item.receiverType,jdbcType=VARCHAR},
+      #{item.receiverRemark,jdbcType=VARCHAR}, #{item.amountUnit,jdbcType=VARCHAR}, #{item.measureObjectType,jdbcType=VARCHAR},
       #{item.measureTaskNum,jdbcType=VARCHAR}, #{item.dataSource,jdbcType=VARCHAR}, #{item.isPreScale,jdbcType=VARCHAR}
-       from dual  
+       from dual
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -2396,14 +2396,14 @@
        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
           when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.isPreScale,jdbcType=VARCHAR}
        </foreach>
-     where ACTUAL_FIRST_NO in 
+     where ACTUAL_FIRST_NO in
      <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
     #{item.actualFirstNo,jdbcType=VARCHAR}
-     </foreach> 
+     </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from METER_WORK_CAR_ACTUAL_FIRST
-    where ACTUAL_FIRST_NO in 
+    where ACTUAL_FIRST_NO in
     <foreach collection="list" item="id" open="(" close=")" separator=",">
       #{id}
     </foreach>
@@ -2956,4 +2956,4 @@
       and  base_spot_name like '%${baseSpotName}%'
     </if>
   </select>
-</mapper>
+</mapper>

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/IMeterWorkCarActualFirstService.java

@@ -153,4 +153,6 @@ public interface IMeterWorkCarActualFirstService extends IBaseService<MeterWorkC
     RESTfulResult doNetAddMuchGrossDouble(List<MeterWorkCarActualFirst> gross,MeterWorkCarActualFirst tare, MeterMonitorNote note) throws Exception;
 
     PageList<MeterWorkCarActualFirst> allStateView(HashMap<String, Object> params, Integer pageNum, Integer pageSize);
+
+
 }

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/impl/MeterWorkCarActualFirstServiceImpl.java

@@ -7031,6 +7031,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         return pageInfo;
     }
 
+
     @Override
     public RESTfulResult doNetAddMuchGross(List<MeterWorkCarActualFirst> gross, MeterWorkCarActualFirst tare, MeterMonitorNote note) throws Exception {
         RESTfulResult rm = new RESTfulResult();

src/main/java/com/steerinfo/meterwork/meterworkcarmetertime/controller/MeterWorkCarMeterTimeController.java

@@ -2,10 +2,15 @@ package com.steerinfo.meterwork.meterworkcarmetertime.controller;
 
 import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
 import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.framework.utils.collection.ListUtils;
+import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
+import com.steerinfo.meterwork.meterworkcaractualfirst.service.IMeterWorkCarActualFirstService;
 import com.steerinfo.meterwork.meterworkcarmetertime.model.GroupTimeVo;
 import com.steerinfo.meterwork.meterworkcarmetertime.model.MeterWorkCarMeterTime;
+import com.steerinfo.meterwork.meterworkcarmetertime.model.PointDetailsBo;
+import com.steerinfo.meterwork.meterworkcarmetertime.model.PointDetailsVo;
 import com.steerinfo.meterwork.meterworkcarmetertime.service.IMeterWorkCarMeterTimeService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -39,8 +44,10 @@ import java.math.BigDecimal;
 @RequestMapping("/${api.version}/meterworkcarmetertimes")
 public class MeterWorkCarMeterTimeController extends BaseRESTfulController {
 
-    @Autowired
+   @Autowired
     IMeterWorkCarMeterTimeService meterWorkCarMeterTimeService;
+    @Autowired
+    IMeterWorkCarActualFirstService meterWorkCarActualFirstService;
 
 
 
@@ -58,6 +65,31 @@ public class MeterWorkCarMeterTimeController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value="获取称点详情")
+    @ApiImplicitParam(name = "meterWorkCarMeterTime", value = "详细实体meterWorkCarMeterTime", required = true, dataType = "MeterWorkCarMeterTime")
+    @PostMapping(value = "/getPointDetails")
+    @Transactional
+    public RESTfulResult getPointDetails(@RequestBody(required = false) PointDetailsBo pointDetailsBo){
+        try {
+
+            if(pointDetailsBo==null||
+                    (pointDetailsBo.getBaseSpotName()==null||
+                    "".equals(pointDetailsBo.getBaseSpotName()))&&
+                            (pointDetailsBo.getBaseSpotNo()==null||
+                    "".equals(pointDetailsBo.getBaseSpotNo()))){
+                return failed("参数错误：请传入计量点参数");
+            }
+            //分页功能
+            PageHelper.startPage(pointDetailsBo.getPageNum(),pointDetailsBo.getPageSize());
+            List<PointDetailsVo> pointDetails = meterWorkCarMeterTimeService.getPointDetails(pointDetailsBo);
+            PageList<PointDetailsVo> pageList=new PageList<>(pointDetails);
+            return success(pageList);
+        }catch (Exception e){
+            e.printStackTrace();
+            return success(null,"操作失败");
+        }
+    }
+
     @ApiOperation(value="新增汽车衡计量时间")
     @ApiImplicitParam(name = "meterWorkCarMeterTime", value = "详细实体meterWorkCarMeterTime", required = true, dataType = "MeterWorkCarMeterTime")
     @PostMapping(value = "/insert")

src/main/java/com/steerinfo/meterwork/meterworkcarmetertime/mapper/MeterWorkCarMeterTimeMapper.java

@@ -1,16 +1,21 @@
 package com.steerinfo.meterwork.meterworkcarmetertime.mapper;
 
 import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
 import com.steerinfo.meterwork.meterworkcarmetertime.model.GroupTimeVo;
 import com.steerinfo.meterwork.meterworkcarmetertime.model.MeterWorkCarMeterTime;
 import java.math.*;
 import java.util.HashMap;
 import java.util.List;
 
+import com.steerinfo.meterwork.meterworkcarmetertime.model.PointDetailsBo;
+import com.steerinfo.meterwork.meterworkcarmetertime.model.PointDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.shiro.crypto.hash.Hash;
 
 @Mapper
 public interface MeterWorkCarMeterTimeMapper extends IBaseMapper<MeterWorkCarMeterTime, String> {
     List<GroupTimeVo> selectGroupByTime(HashMap meterWorkCarMeterTime);
+
+    List<PointDetailsVo> selectPointDetails(PointDetailsBo pointDetailsBo);
 }

src/main/java/com/steerinfo/meterwork/meterworkcarmetertime/mapper/MeterWorkCarMeterTimeMapper.xml

@@ -431,7 +431,50 @@
       <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
         and t.create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and t.create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
       </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        and t1.BASE_SPOT_NAME like '%${baseSpotName}%'
+      </if>
     </where>
     group by t1.BASE_SPOT_NO,t1.BASE_SPOT_NAME
   </select>
+
+  <resultMap id="PointDetailsResultMap" type="com.steerinfo.meterwork.meterworkcarmetertime.model.PointDetailsVo">
+    <id column="ACTUAL_FIRST_NO" jdbcType="VARCHAR" property="actualFirstNo" />
+    <result column="BASE_SPOT_NO" jdbcType="VARCHAR" property="baseSpotNo" />
+    <result column="BASE_SPOT_NAME" jdbcType="VARCHAR" property="baseSpotName" />
+    <result column="START_TIME" jdbcType="TIMESTAMP" property="startTime" />
+    <result column="METER_START_TIME" jdbcType="TIMESTAMP" property="meterStartTime" />
+    <result column="METER_END_TIME" jdbcType="TIMESTAMP" property="meterEndTime" />
+    <result column="END_TIME" jdbcType="TIMESTAMP" property="endTime" />
+    <result column="TOTAL_NUM" jdbcType="DECIMAL" property="totalNum" />
+    <result column="UP_NUM" jdbcType="DECIMAL" property="upNum" />
+    <result column="METER_NUM" jdbcType="DECIMAL" property="meterNum" />
+    <result column="DOWN_NUM" jdbcType="DECIMAL" property="downNum" />
+    <result column="VALUE_FLAG" jdbcType="VARCHAR" property="valueFlag" />
+    <result column="CREATE_MAN_NO" jdbcType="VARCHAR" property="createManNo" />
+    <result column="CREATE_MAN_NAME" jdbcType="VARCHAR" property="createManName" />
+    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
+  </resultMap>
+
+  <select id="selectPointDetails"
+          resultMap="PointDetailsResultMap">
+    select
+    t1.BASE_SPOT_NO baseSpotNo,
+    t1.BASE_SPOT_NAME baseSpotName,
+    <include refid="columns_alias"></include>
+    from METER_WORK_CAR_METER_TIME t
+    left join meter_work_car_actual_first t1
+    on t.actual_first_no =t1.actual_first_no
+    <where>
+      <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+        and t.create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and t.create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        and t1.BASE_SPOT_NAME = #{baseSpotName}
+      </if>
+      <if test="baseSpotNo != null and baseSpotNo != ''">
+        and t1.BASE_SPOT_NO = #{baseSpotNo}
+      </if>
+    </where>
+  </select>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkcarmetertime/model/PointDetailsBo.java

@@ -0,0 +1,63 @@
+package com.steerinfo.meterwork.meterworkcarmetertime.model;
+
+/**
+ * @Author zhangnan
+ * @Date 2022-10-26 10:53
+ * @Version 1.0
+ */
+public class PointDetailsBo {
+    private String baseSpotNo;
+    private String baseSpotName;
+    private String startTime;
+    private String endTime;
+    private Integer pageNum;
+    private Integer pageSize;
+
+    public String getBaseSpotNo() {
+        return baseSpotNo;
+    }
+
+    public void setBaseSpotNo(String baseSpotNo) {
+        this.baseSpotNo = baseSpotNo;
+    }
+
+    public String getBaseSpotName() {
+        return baseSpotName;
+    }
+
+    public void setBaseSpotName(String baseSpotName) {
+        this.baseSpotName = baseSpotName;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public Integer getPageNum() {
+        return pageNum;
+    }
+
+    public void setPageNum(Integer pageNum) {
+        this.pageNum = pageNum;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkcarmetertime/model/PointDetailsVo.java

@@ -0,0 +1,215 @@
+package com.steerinfo.meterwork.meterworkcarmetertime.model;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+/**
+ * @Author zhangnan
+ * @Date 2022-10-26 10:53
+ * @Version 1.0
+ */
+public class PointDetailsVo {
+
+    @ApiModelProperty(value="计量点编号",required=true)
+    String baseSpotNo;
+    @ApiModelProperty(value="计量点名称",required=true)
+    String baseSpotName;
+    /**
+     * 汽车一次计量编号(ACTUAL_FIRST_NO,VARCHAR,55)
+     */
+    @ApiModelProperty(value="汽车一次计量编号",required=true)
+    private String actualFirstNo;
+
+    /**
+     * 上秤时间(START_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="上秤时间",required=false)
+    private Date startTime;
+
+    /**
+     * 计量开始时间(METER_START_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="计量开始时间",required=false)
+    private Date meterStartTime;
+
+    /**
+     * 计量结束时间(METER_END_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="计量结束时间",required=false)
+    private Date meterEndTime;
+
+    /**
+     * 下秤时间(END_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="下秤时间",required=false)
+    private Date endTime;
+
+    /**
+     * 总计量时间(TOTAL_NUM,DECIMAL,0)
+     */
+    @ApiModelProperty(value="总计量时间",required=false)
+    private Short totalNum;
+
+    /**
+     * 上秤到判稳计量时间(UP_NUM,DECIMAL,0)
+     */
+    @ApiModelProperty(value="上秤到判稳计量时间",required=false)
+    private Short upNum;
+
+    /**
+     * 判稳后程序计量时间(METER_NUM,DECIMAL,0)
+     */
+    @ApiModelProperty(value="判稳后程序计量时间",required=false)
+    private Short meterNum;
+
+    /**
+     * 判稳计量到下秤计量时间(DOWN_NUM,DECIMAL,0)
+     */
+    @ApiModelProperty(value="判稳计量到下秤计量时间",required=false)
+    private Short downNum;
+
+    /**
+     * 状态（1：有效；0：无效）(VALUE_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="状态（1：有效；0：无效）",required=false)
+    private String valueFlag;
+
+    /**
+     * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="创建人编号",required=false)
+    private String createManNo;
+
+    /**
+     * 创建人(CREATE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="创建人",required=false)
+    private String createManName;
+
+    /**
+     * 创建时间(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="创建时间",required=false)
+    private Date createTime;
+
+    public String getBaseSpotNo() {
+        return baseSpotNo;
+    }
+
+    public void setBaseSpotNo(String baseSpotNo) {
+        this.baseSpotNo = baseSpotNo;
+    }
+
+    public String getBaseSpotName() {
+        return baseSpotName;
+    }
+
+    public void setBaseSpotName(String baseSpotName) {
+        this.baseSpotName = baseSpotName;
+    }
+
+    public String getActualFirstNo() {
+        return actualFirstNo;
+    }
+
+    public void setActualFirstNo(String actualFirstNo) {
+        this.actualFirstNo = actualFirstNo;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getMeterStartTime() {
+        return meterStartTime;
+    }
+
+    public void setMeterStartTime(Date meterStartTime) {
+        this.meterStartTime = meterStartTime;
+    }
+
+    public Date getMeterEndTime() {
+        return meterEndTime;
+    }
+
+    public void setMeterEndTime(Date meterEndTime) {
+        this.meterEndTime = meterEndTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public Short getTotalNum() {
+        return totalNum;
+    }
+
+    public void setTotalNum(Short totalNum) {
+        this.totalNum = totalNum;
+    }
+
+    public Short getUpNum() {
+        return upNum;
+    }
+
+    public void setUpNum(Short upNum) {
+        this.upNum = upNum;
+    }
+
+    public Short getMeterNum() {
+        return meterNum;
+    }
+
+    public void setMeterNum(Short meterNum) {
+        this.meterNum = meterNum;
+    }
+
+    public Short getDownNum() {
+        return downNum;
+    }
+
+    public void setDownNum(Short downNum) {
+        this.downNum = downNum;
+    }
+
+    public String getValueFlag() {
+        return valueFlag;
+    }
+
+    public void setValueFlag(String valueFlag) {
+        this.valueFlag = valueFlag;
+    }
+
+    public String getCreateManNo() {
+        return createManNo;
+    }
+
+    public void setCreateManNo(String createManNo) {
+        this.createManNo = createManNo;
+    }
+
+    public String getCreateManName() {
+        return createManName;
+    }
+
+    public void setCreateManName(String createManName) {
+        this.createManName = createManName;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkcarmetertime/service/IMeterWorkCarMeterTimeService.java

@@ -1,8 +1,12 @@
 package com.steerinfo.meterwork.meterworkcarmetertime.service;
 
 import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
 import com.steerinfo.meterwork.meterworkcarmetertime.model.GroupTimeVo;
 import com.steerinfo.meterwork.meterworkcarmetertime.model.MeterWorkCarMeterTime;
+import com.steerinfo.meterwork.meterworkcarmetertime.model.PointDetailsBo;
+import com.steerinfo.meterwork.meterworkcarmetertime.model.PointDetailsVo;
+
 import java.util.Date;
 import java.math.BigDecimal;
 import java.util.HashMap;
@@ -24,4 +28,7 @@ import java.util.List;
 public interface IMeterWorkCarMeterTimeService extends IBaseService<MeterWorkCarMeterTime, String>{
 
     List<GroupTimeVo> getGroupByTime(HashMap meterWorkCarMeterTime);
+
+
+    List<PointDetailsVo> getPointDetails(PointDetailsBo pointDetailsBo);
 }

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

@@ -2,9 +2,12 @@ package com.steerinfo.meterwork.meterworkcarmetertime.service.impl;
 
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
 import com.steerinfo.meterwork.meterworkcarmetertime.model.GroupTimeVo;
 import com.steerinfo.meterwork.meterworkcarmetertime.model.MeterWorkCarMeterTime;
 import com.steerinfo.meterwork.meterworkcarmetertime.mapper.MeterWorkCarMeterTimeMapper;
+import com.steerinfo.meterwork.meterworkcarmetertime.model.PointDetailsBo;
+import com.steerinfo.meterwork.meterworkcarmetertime.model.PointDetailsVo;
 import com.steerinfo.meterwork.meterworkcarmetertime.service.IMeterWorkCarMeterTimeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -41,4 +44,11 @@ public class MeterWorkCarMeterTimeServiceImpl extends BaseServiceImpl<MeterWorkC
     public List<GroupTimeVo> getGroupByTime(HashMap meterWorkCarMeterTime) {
         return meterWorkCarMeterTimeMapper.selectGroupByTime(meterWorkCarMeterTime);
     }
+
+    @Override
+    public List<PointDetailsVo> getPointDetails(PointDetailsBo pointDetailsBo) {
+
+        return meterWorkCarMeterTimeMapper.selectPointDetails(pointDetailsBo);
+    }
+
 }

src/main/java/com/steerinfo/meterwork/meterworkcarnoidentify/controller/MeterWorkCarnoIdentifyController.java

@@ -2,9 +2,14 @@ package com.steerinfo.meterwork.meterworkcarnoidentify.controller;
 
 import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
 import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.framework.utils.collection.ListUtils;
+import com.steerinfo.meterwork.meterworkcarmetertime.model.GroupTimeVo;
+import com.steerinfo.meterwork.meterworkcarmetertime.model.PointDetailsBo;
+import com.steerinfo.meterwork.meterworkcarnoidentify.model.GroupByNumVo;
 import com.steerinfo.meterwork.meterworkcarnoidentify.model.MeterWorkCarnoIdentify;
+import com.steerinfo.meterwork.meterworkcarnoidentify.model.PointDetailsVo;
 import com.steerinfo.meterwork.meterworkcarnoidentify.service.IMeterWorkCarnoIdentifyService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -40,6 +45,41 @@ public class MeterWorkCarnoIdentifyController extends BaseRESTfulController {
     @Autowired
     IMeterWorkCarnoIdentifyService meterWorkCarnoIdentifyService;
 
+
+    @PostMapping(value = "/getGroupByNum")
+    public RESTfulResult getGroupByNum(@RequestBody(required = false) HashMap meterWorkCarnoIdentify){
+        try {
+            List<GroupByNumVo> groupByNum = meterWorkCarnoIdentifyService.getGroupByNum(meterWorkCarnoIdentify);
+            return success(groupByNum);
+        }catch (Exception e){
+            e.printStackTrace();
+            return success(null,"操作失败");
+        }
+
+    }
+
+    @PostMapping(value = "/getPointDetails")
+    public RESTfulResult getPointDetails(@RequestBody(required = false) PointDetailsBo pointDetailsBo){
+        try {
+            if(pointDetailsBo==null||
+                    (pointDetailsBo.getBaseSpotName()==null||
+                            "".equals(pointDetailsBo.getBaseSpotName()))&&
+                            (pointDetailsBo.getBaseSpotNo()==null||
+                                    "".equals(pointDetailsBo.getBaseSpotNo()))){
+                return failed("参数错误：请传入计量点参数");
+            }
+            //分页功能
+            PageHelper.startPage(pointDetailsBo.getPageNum(),pointDetailsBo.getPageSize());
+            List<PointDetailsVo> pointDetails = meterWorkCarnoIdentifyService.getPointDetails(pointDetailsBo);
+            PageList<PointDetailsVo> pageList=new PageList<>(pointDetails);
+            return success(pageList);
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed("操作失败");
+        }
+
+    }
+
     @ApiOperation(value="获取列表", notes="分页查询")
     @ApiImplicitParams({
         @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
@@ -63,7 +103,7 @@ public class MeterWorkCarnoIdentifyController extends BaseRESTfulController {
         PageList<MeterWorkCarnoIdentify> list = meterWorkCarnoIdentifyService.queryLikeForPage(parmas, pageNum, pageSize);
         return success(list);
     }
-    
+
     @ApiOperation(value="创建", notes="根据MeterWorkCarnoIdentify对象创建")
     @ApiImplicitParam(name = "meterWorkCarnoIdentify", value = "详细实体meterWorkCarnoIdentify", required = true, dataType = "MeterWorkCarnoIdentify")
     //@RequiresPermissions("meterworkcarnoidentify:create")

src/main/java/com/steerinfo/meterwork/meterworkcarnoidentify/mapper/MeterWorkCarnoIdentifyMapper.java

@@ -1,10 +1,19 @@
 package com.steerinfo.meterwork.meterworkcarnoidentify.mapper;
 
 import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.meterwork.meterworkcarmetertime.model.PointDetailsBo;
+import com.steerinfo.meterwork.meterworkcarnoidentify.model.GroupByNumVo;
 import com.steerinfo.meterwork.meterworkcarnoidentify.model.MeterWorkCarnoIdentify;
 import java.math.*;
+import java.util.HashMap;
+import java.util.List;
+
+import com.steerinfo.meterwork.meterworkcarnoidentify.model.PointDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface MeterWorkCarnoIdentifyMapper extends IBaseMapper<MeterWorkCarnoIdentify, String> {
-}
+    List<GroupByNumVo> selectGroupByNum(HashMap meterWorkCarnoIdentify);
+
+    List<PointDetailsVo> selectPointDetails(PointDetailsBo pointDetailsBo);
+}

src/main/java/com/steerinfo/meterwork/meterworkcarnoidentify/mapper/MeterWorkCarnoIdentifyMapper.xml

@@ -12,11 +12,11 @@
     <result column="CAR_NO_TYPE" jdbcType="VARCHAR" property="carNoType" />
   </resultMap>
   <sql id="columns">
-    ID, ACTUAL_FIRST_NO, CAR_NO, VIDEO_CAR_NO1, VIDEO_CAR_NO2, RFID_CAR_NO, SCAN_CAR_NO, 
+    ID, ACTUAL_FIRST_NO, CAR_NO, VIDEO_CAR_NO1, VIDEO_CAR_NO2, RFID_CAR_NO, SCAN_CAR_NO,
     CAR_NO_TYPE
   </sql>
   <sql id="columns_alias">
-    t.ID, t.ACTUAL_FIRST_NO, t.CAR_NO, t.VIDEO_CAR_NO1, t.VIDEO_CAR_NO2, t.RFID_CAR_NO, 
+    t.ID, t.ACTUAL_FIRST_NO, t.CAR_NO, t.VIDEO_CAR_NO1, t.VIDEO_CAR_NO2, t.RFID_CAR_NO,
     t.SCAN_CAR_NO, t.CAR_NO_TYPE
   </sql>
   <sql id="select">
@@ -26,7 +26,7 @@
     SELECT <include refid="columns_alias" /> FROM METER_WORK_CARNO_IDENTIFY t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="id != null and id != ''">
         and ID = #{id}
       </if>
@@ -54,7 +54,7 @@
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="id != null and id != ''">
         and ID LIKE '%${id}%'
       </if>
@@ -87,7 +87,7 @@
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from METER_WORK_CARNO_IDENTIFY
-    where 1!=1 
+    where 1!=1
       <if test="actualFirstNo != null and actualFirstNo != ''">
         or ACTUAL_FIRST_NO = #{actualFirstNo}
       </if>
@@ -111,11 +111,11 @@
       </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkcarnoidentify.model.MeterWorkCarnoIdentify">
-    insert into METER_WORK_CARNO_IDENTIFY (ID, ACTUAL_FIRST_NO, CAR_NO, 
-      VIDEO_CAR_NO1, VIDEO_CAR_NO2, RFID_CAR_NO, 
+    insert into METER_WORK_CARNO_IDENTIFY (ID, ACTUAL_FIRST_NO, CAR_NO,
+      VIDEO_CAR_NO1, VIDEO_CAR_NO2, RFID_CAR_NO,
       SCAN_CAR_NO, CAR_NO_TYPE)
-    values (#{id,jdbcType=VARCHAR}, #{actualFirstNo,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR}, 
-      #{videoCarNo1,jdbcType=VARCHAR}, #{videoCarNo2,jdbcType=VARCHAR}, #{rfidCarNo,jdbcType=VARCHAR}, 
+    values (#{id,jdbcType=VARCHAR}, #{actualFirstNo,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR},
+      #{videoCarNo1,jdbcType=VARCHAR}, #{videoCarNo2,jdbcType=VARCHAR}, #{rfidCarNo,jdbcType=VARCHAR},
       #{scanCarNo,jdbcType=VARCHAR}, #{carNoType,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkcarnoidentify.model.MeterWorkCarnoIdentify">
@@ -224,17 +224,17 @@
     <include refid="whereLike" />
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into METER_WORK_CARNO_IDENTIFY 
-      (ID, 
-      ACTUAL_FIRST_NO, CAR_NO, VIDEO_CAR_NO1, 
-      VIDEO_CAR_NO2, RFID_CAR_NO, SCAN_CAR_NO, 
+    insert into METER_WORK_CARNO_IDENTIFY
+      (ID,
+      ACTUAL_FIRST_NO, CAR_NO, VIDEO_CAR_NO1,
+      VIDEO_CAR_NO2, RFID_CAR_NO, SCAN_CAR_NO,
       CAR_NO_TYPE)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.id,jdbcType=VARCHAR}, 
-      #{item.actualFirstNo,jdbcType=VARCHAR}, #{item.carNo,jdbcType=VARCHAR}, #{item.videoCarNo1,jdbcType=VARCHAR}, 
-      #{item.videoCarNo2,jdbcType=VARCHAR}, #{item.rfidCarNo,jdbcType=VARCHAR}, #{item.scanCarNo,jdbcType=VARCHAR}, 
-      #{item.carNoType,jdbcType=VARCHAR} from dual  
+    ( <foreach collection="list" item="item" separator="union all">
+   select
+      #{item.id,jdbcType=VARCHAR},
+      #{item.actualFirstNo,jdbcType=VARCHAR}, #{item.carNo,jdbcType=VARCHAR}, #{item.videoCarNo1,jdbcType=VARCHAR},
+      #{item.videoCarNo2,jdbcType=VARCHAR}, #{item.rfidCarNo,jdbcType=VARCHAR}, #{item.scanCarNo,jdbcType=VARCHAR},
+      #{item.carNoType,jdbcType=VARCHAR} from dual
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -272,19 +272,134 @@
        <foreach close="end" collection="list" index="index" item="item" open="case ID" separator=" ">
           when #{item.id,jdbcType=VARCHAR} then #{item.carNoType,jdbcType=VARCHAR}
        </foreach>
-     where ID in 
+     where ID in
      <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
     #{item.id,jdbcType=VARCHAR}
-     </foreach> 
+     </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from METER_WORK_CARNO_IDENTIFY
-    where ID in 
+    where ID in
     <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
     </foreach>
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  
-</mapper>
+  <select id="selectGroupByNum" parameterType="java.util.HashMap" resultType="com.steerinfo.meterwork.meterworkcarnoidentify.model.GroupByNumVo">
+    select
+    t1.BASE_SPOT_NO baseSpotNo,
+    t1.BASE_SPOT_NAME baseSpotName,
+    (
+      select count(*) from
+      METER_WORK_CARNO_IDENTIFY t2
+      left join meter_work_car_actual_first t3
+      on t3.actual_first_no =t2.actual_first_no
+      where t3.base_spot_no = t1.BASE_SPOT_NO
+      and t2.video_car_no1=t2.video_car_no2
+      and t2.video_car_no1 is not null and t2.video_car_no2 is not null
+      <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+        and t3.create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and t3.create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        and t3.BASE_SPOT_NAME like '%${baseSpotName}%'
+      </if>
+    ) videoCarNo1EqVideoCarNo2,
+    (
+      select count(*) from
+      METER_WORK_CARNO_IDENTIFY t2
+      left join meter_work_car_actual_first t3
+      on t3.actual_first_no =t2.actual_first_no
+      where t3.base_spot_no = t1.BASE_SPOT_NO
+      and t2.video_car_no1 !=t2.video_car_no2
+      and t2.video_car_no1 is not null and t2.video_car_no2 is not null
+      <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+        and t3.create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and t3.create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        and t3.BASE_SPOT_NAME like '%${baseSpotName}%'
+      </if>
+    ) videoCarNo1NoEqVideoCarNo2,
+    (
+      select count(*) from
+      METER_WORK_CARNO_IDENTIFY t2
+      left join meter_work_car_actual_first t3
+      on t3.actual_first_no =t2.actual_first_no
+      where t3.base_spot_no = t1.BASE_SPOT_NO
+      and (t2.video_car_no1 is null and t2.video_car_no2 is not null)
+      or(t2.video_car_no1 is not null and t2.video_car_no2 is null)
+      <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+        and t3.create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and t3.create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        and t3.BASE_SPOT_NAME like '%${baseSpotName}%'
+      </if>
+    ) onlyOne,
+    (
+      select count(*) from
+      METER_WORK_CARNO_IDENTIFY t2
+      left join meter_work_car_actual_first t3
+      on t3.actual_first_no =t2.actual_first_no
+      where t3.base_spot_no = t1.BASE_SPOT_NO
+      and t2.video_car_no1 is null and t2.video_car_no2 is null
+      <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+        and t3.create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and t3.create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        and t3.BASE_SPOT_NAME like '%${baseSpotName}%'
+      </if>
+    ) neither
+    from
+    METER_WORK_CARNO_IDENTIFY t
+    left join meter_work_car_actual_first t1
+    on t1.actual_first_no =t.actual_first_no
+    <where>
+      <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+        and t1.create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and t1.create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        and t1.BASE_SPOT_NAME like '%${baseSpotName}%'
+      </if>
+    </where>
+    group by t1.BASE_SPOT_NO,t1.BASE_SPOT_NAME
+  </select>
+  <resultMap id="PointDetailsResultMap" type="com.steerinfo.meterwork.meterworkcarnoidentify.model.PointDetailsVo">
+    <id column="ID" jdbcType="VARCHAR" property="id" />
+    <result column="BASE_SPOT_NO" jdbcType="VARCHAR" property="baseSpotNo" />
+    <result column="BASE_SPOT_NAME" jdbcType="VARCHAR" property="baseSpotName" />
+    <result column="ACTUAL_FIRST_NO" jdbcType="VARCHAR" property="actualFirstNo" />
+    <result column="CAR_NO" jdbcType="VARCHAR" property="carNo" />
+    <result column="VIDEO_CAR_NO1" jdbcType="VARCHAR" property="videoCarNo1" />
+    <result column="VIDEO_CAR_NO2" jdbcType="VARCHAR" property="videoCarNo2" />
+    <result column="RFID_CAR_NO" jdbcType="VARCHAR" property="rfidCarNo" />
+    <result column="SCAN_CAR_NO" jdbcType="VARCHAR" property="scanCarNo" />
+    <result column="CAR_NO_TYPE" jdbcType="VARCHAR" property="carNoType" />
+  </resultMap>
+  <select id="selectPointDetails"
+          resultMap="PointDetailsResultMap">
+    select
+    t1.BASE_SPOT_NO baseSpotNo,
+    t1.BASE_SPOT_NAME baseSpotName,
+    t.id,
+    t.actual_first_no,
+    t.car_no,
+    t.video_car_no1,
+    t.video_car_no2,
+    t.rfid_car_no,
+    t.scan_car_no,
+    t.car_no_type
+    from
+    METER_WORK_CARNO_IDENTIFY t
+    left join meter_work_car_actual_first t1
+    on t1.actual_first_no =t.actual_first_no
+    <where>
+      <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+        and t1.create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and t1.create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        and t1.BASE_SPOT_NAME like '%${baseSpotName}%'
+      </if>
+    </where>
+  </select>
+
+</mapper>

src/main/java/com/steerinfo/meterwork/meterworkcarnoidentify/model/GroupByNumVo.java

@@ -0,0 +1,69 @@
+package com.steerinfo.meterwork.meterworkcarnoidentify.model;
+
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Author zhangnan
+ * @Date 2022-10-26 11:40
+ * @Version 1.0
+ */
+public class GroupByNumVo {
+
+    @ApiModelProperty(value="计量点编号",required=true)
+    String baseSpotNo;
+    @ApiModelProperty(value="计量点名称",required=true)
+    String baseSpotName;
+
+    private Integer videoCarNo1EqVideoCarNo2;
+    private Integer videoCarNo1NoEqVideoCarNo2;
+    private Integer onlyOne;
+    private Integer neither;
+
+    public String getBaseSpotNo() {
+        return baseSpotNo;
+    }
+
+    public void setBaseSpotNo(String baseSpotNo) {
+        this.baseSpotNo = baseSpotNo;
+    }
+
+    public String getBaseSpotName() {
+        return baseSpotName;
+    }
+
+    public void setBaseSpotName(String baseSpotName) {
+        this.baseSpotName = baseSpotName;
+    }
+
+    public Integer getVideoCarNo1EqVideoCarNo2() {
+        return videoCarNo1EqVideoCarNo2;
+    }
+
+    public void setVideoCarNo1EqVideoCarNo2(Integer videoCarNo1EqVideoCarNo2) {
+        this.videoCarNo1EqVideoCarNo2 = videoCarNo1EqVideoCarNo2;
+    }
+
+    public Integer getVideoCarNo1NoEqVideoCarNo2() {
+        return videoCarNo1NoEqVideoCarNo2;
+    }
+
+    public void setVideoCarNo1NoEqVideoCarNo2(Integer videoCarNo1NoEqVideoCarNo2) {
+        this.videoCarNo1NoEqVideoCarNo2 = videoCarNo1NoEqVideoCarNo2;
+    }
+
+    public Integer getOnlyOne() {
+        return onlyOne;
+    }
+
+    public void setOnlyOne(Integer onlyOne) {
+        this.onlyOne = onlyOne;
+    }
+
+    public Integer getNeither() {
+        return neither;
+    }
+
+    public void setNeither(Integer neither) {
+        this.neither = neither;
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkcarnoidentify/model/PointDetailsVo.java

@@ -0,0 +1,142 @@
+package com.steerinfo.meterwork.meterworkcarnoidentify.model;
+
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Author zhangnan
+ * @Date 2022-10-26 15:33
+ * @Version 1.0
+ */
+public class PointDetailsVo {
+    @ApiModelProperty(value="计量点编号",required=true)
+    String baseSpotNo;
+    @ApiModelProperty(value="计量点名称",required=true)
+    String baseSpotName;
+    /**
+     * 主键(ID,VARCHAR,50)
+     */
+    @ApiModelProperty(value="主键",required=true)
+    private String id;
+
+    /**
+     * 一次数据编号(ACTUAL_FIRST_NO,VARCHAR,50)
+     */
+    @ApiModelProperty(value="一次数据编号",required=true)
+    private String actualFirstNo;
+
+    /**
+     * 最终车号(CAR_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="最终车号",required=false)
+    private String carNo;
+
+    /**
+     * 视觉识别车号1(VIDEO_CAR_NO1,VARCHAR,20)
+     */
+    @ApiModelProperty(value="视觉识别车号1",required=false)
+    private String videoCarNo1;
+
+    /**
+     * 视觉识别车号2(VIDEO_CAR_NO2,VARCHAR,20)
+     */
+    @ApiModelProperty(value="视觉识别车号2",required=false)
+    private String videoCarNo2;
+
+    /**
+     * RFID车号(RFID_CAR_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="RFID车号",required=false)
+    private String rfidCarNo;
+
+    /**
+     * 扫码识别车号(SCAN_CAR_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="扫码识别车号",required=false)
+    private String scanCarNo;
+
+    /**
+     * 识别方式(CAR_NO_TYPE,VARCHAR,1)
+     */
+    @ApiModelProperty(value="识别方式",required=false)
+    private String carNoType;
+
+    public String getBaseSpotNo() {
+        return baseSpotNo;
+    }
+
+    public void setBaseSpotNo(String baseSpotNo) {
+        this.baseSpotNo = baseSpotNo;
+    }
+
+    public String getBaseSpotName() {
+        return baseSpotName;
+    }
+
+    public void setBaseSpotName(String baseSpotName) {
+        this.baseSpotName = baseSpotName;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getActualFirstNo() {
+        return actualFirstNo;
+    }
+
+    public void setActualFirstNo(String actualFirstNo) {
+        this.actualFirstNo = actualFirstNo;
+    }
+
+    public String getCarNo() {
+        return carNo;
+    }
+
+    public void setCarNo(String carNo) {
+        this.carNo = carNo;
+    }
+
+    public String getVideoCarNo1() {
+        return videoCarNo1;
+    }
+
+    public void setVideoCarNo1(String videoCarNo1) {
+        this.videoCarNo1 = videoCarNo1;
+    }
+
+    public String getVideoCarNo2() {
+        return videoCarNo2;
+    }
+
+    public void setVideoCarNo2(String videoCarNo2) {
+        this.videoCarNo2 = videoCarNo2;
+    }
+
+    public String getRfidCarNo() {
+        return rfidCarNo;
+    }
+
+    public void setRfidCarNo(String rfidCarNo) {
+        this.rfidCarNo = rfidCarNo;
+    }
+
+    public String getScanCarNo() {
+        return scanCarNo;
+    }
+
+    public void setScanCarNo(String scanCarNo) {
+        this.scanCarNo = scanCarNo;
+    }
+
+    public String getCarNoType() {
+        return carNoType;
+    }
+
+    public void setCarNoType(String carNoType) {
+        this.carNoType = carNoType;
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkcarnoidentify/service/IMeterWorkCarnoIdentifyService.java

@@ -1,9 +1,15 @@
 package com.steerinfo.meterwork.meterworkcarnoidentify.service;
 
 import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.meterwork.meterworkcarmetertime.model.PointDetailsBo;
+import com.steerinfo.meterwork.meterworkcarnoidentify.model.GroupByNumVo;
 import com.steerinfo.meterwork.meterworkcarnoidentify.model.MeterWorkCarnoIdentify;
+import com.steerinfo.meterwork.meterworkcarnoidentify.model.PointDetailsVo;
+
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * MeterWorkCarnoIdentify服务接口：
@@ -20,4 +26,7 @@ import java.math.BigDecimal;
  */
 public interface IMeterWorkCarnoIdentifyService extends IBaseService<MeterWorkCarnoIdentify, String>{
 
-}
+    List<GroupByNumVo> getGroupByNum(HashMap meterWorkCarnoIdentify);
+
+    List<PointDetailsVo> getPointDetails(PointDetailsBo pointDetailsBo);
+}

src/main/java/com/steerinfo/meterwork/meterworkcarnoidentify/service/impl/MeterWorkCarnoIdentifyServiceImpl.java

@@ -2,13 +2,18 @@ package com.steerinfo.meterwork.meterworkcarnoidentify.service.impl;
 
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.meterwork.meterworkcarmetertime.model.PointDetailsBo;
+import com.steerinfo.meterwork.meterworkcarnoidentify.model.GroupByNumVo;
 import com.steerinfo.meterwork.meterworkcarnoidentify.model.MeterWorkCarnoIdentify;
 import com.steerinfo.meterwork.meterworkcarnoidentify.mapper.MeterWorkCarnoIdentifyMapper;
+import com.steerinfo.meterwork.meterworkcarnoidentify.model.PointDetailsVo;
 import com.steerinfo.meterwork.meterworkcarnoidentify.service.IMeterWorkCarnoIdentifyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * MeterWorkCarnoIdentify服务实现：
@@ -33,4 +38,15 @@ public class MeterWorkCarnoIdentifyServiceImpl extends BaseServiceImpl<MeterWork
     protected IBaseMapper<MeterWorkCarnoIdentify, String> getMapper() {
         return meterWorkCarnoIdentifyMapper;
     }
+
+    @Override
+    public List<GroupByNumVo> getGroupByNum(HashMap meterWorkCarnoIdentify) {
+        return meterWorkCarnoIdentifyMapper.selectGroupByNum(meterWorkCarnoIdentify);
+
+    }
+
+    @Override
+    public List<PointDetailsVo> getPointDetails(PointDetailsBo pointDetailsBo) {
+        return meterWorkCarnoIdentifyMapper.selectPointDetails(pointDetailsBo);
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkmonitor/model/MeterWorkMonitor.java

@@ -392,6 +392,12 @@ public class MeterWorkMonitor implements IBasePO<String> {
     @ApiModelProperty(value="是否播放声音（0：不播放；1：播放）",required=false)
     private String isEnableSound;
 
+    /**
+     * 抓拍车号2(PHOTO_CAR2,VARCHAR,20)
+     */
+    @ApiModelProperty(value="抓拍车号2",required=false)
+    private String photoCar2;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -916,6 +922,14 @@ public class MeterWorkMonitor implements IBasePO<String> {
         this.isEnableSound = isEnableSound == null ? null : isEnableSound.trim();
     }
 
+    public String getPhotoCar2() {
+        return photoCar2;
+    }
+
+    public void setPhotoCar2(String photoCar2) {
+        this.photoCar2 = photoCar2 == null ? null : photoCar2.trim();
+    }
+
     public MeterWorkMonitor() {
 
     }
@@ -1122,8 +1136,9 @@ public class MeterWorkMonitor implements IBasePO<String> {
         sb.append(", isZeroState=").append(isZeroState);
         sb.append(", isValidScan=").append(isValidScan);
         sb.append(", isEnableSound=").append(isEnableSound);
+        sb.append(", photoCar2=").append(photoCar2);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();
     }
-}
+}

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/service/impl/MeterWorkRailwayReceivedServiceImpl.java

@@ -317,7 +317,7 @@ public class MeterWorkRailwayReceivedServiceImpl extends BaseServiceImpl<MeterWo
                         recMainTemp.get(0).setCarriageNum((short)(receiveds.size() + 1));
                         meterWorkRailwayRecMainMapper.updateByPrimaryKeySelective(recMainTemp.get(0));
 
-                        if(receivedTemp.getMemo() != null && StringUtils.isNotEmpty(receivedTemp.getMemo())) {
+//                        if(receivedTemp.getMemo() != null && StringUtils.isNotEmpty(receivedTemp.getMemo())) {
                             MeterBaseOperationLog note = new MeterBaseOperationLog();
                             note.setId(PublicMethod.IdCreate(3));
                             note.setCreateManNo(receivedTemp.getCreateManNo());
@@ -327,7 +327,7 @@ public class MeterWorkRailwayReceivedServiceImpl extends BaseServiceImpl<MeterWo
                             note.setOperationFunction("新增");
                             note.setOperationCarnNo(receivedTemp.getRailwayNo());
                             meterBaseOperationLogMapper.insertSelective(note);
-                        }
+//                        }
                         receivedTemp.setRailwayWorkNo(recMainTemp.get(0).getActualNo());
                         receivedTemp.setActualFirstNo(PublicMethod.IdCreate(3));
                         receivedTemp.setValueFlag("1");
@@ -361,7 +361,7 @@ public class MeterWorkRailwayReceivedServiceImpl extends BaseServiceImpl<MeterWo
                     meterWorkRailwayRecMainMapper.insertSelective(recMain);
 
                     for(MeterWorkRailwayReceived received: receiveds){
-                        if(received.getMemo() != null && StringUtils.isNotEmpty(received.getMemo())) {
+//                        if(received.getMemo() != null && StringUtils.isNotEmpty(received.getMemo())) {
                             MeterBaseOperationLog note = new MeterBaseOperationLog();
                             note.setId(PublicMethod.IdCreate(3));
                             note.setCreateManNo(received.getCreateManNo());
@@ -371,7 +371,7 @@ public class MeterWorkRailwayReceivedServiceImpl extends BaseServiceImpl<MeterWo
                             note.setOperationFunction("新增");
                             note.setOperationCarnNo(received.getRailwayNo());
                             meterBaseOperationLogMapper.insertSelective(note);
-                        }
+//                        }
                         received.setRailwayWorkNo(recMain.getActualNo());
                         received.setActualFirstNo(PublicMethod.IdCreate(3));
                         received.setValueFlag("1");