'提交'

src/main/java/com/steerinfo/baseinfo/meterbasecar/controller/MeterBaseCarController.java

@@ -1,6 +1,7 @@
 package com.steerinfo.baseinfo.meterbasecar.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.jisco.dynamicweight.util.UserUtil;
 import com.steerinfo.baseinfo.appverificationcode.mapper.AppVerificationCodeMapper;
 import com.steerinfo.baseinfo.appverificationcode.model.AppVerificationCode;
 import com.steerinfo.baseinfo.meterbasecar.mapper.MeterBaseCarMapper;
@@ -25,13 +26,11 @@ import com.steerinfo.baseinfo.meterbasecar.service.IMeterBaseCarService;
 import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.util.CommonPage;
 import com.steerinfo.util.SSOUtil;
-import io.micrometer.core.instrument.Meter;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.crypto.hash.Hash;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -39,7 +38,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.math.BigDecimal;
 
@@ -1124,8 +1122,8 @@ public class MeterBaseCarController extends BaseRESTfulController {
             for(MeterBaseCar models : model){
                 list.add(models.getCarNo());
             }
-            meterBaseDriverMapper.deleteCarById(list);
-            meterBaseCarMapper.deleteCarById(list);
+            meterBaseDriverMapper.deleteCarById(list, UserUtil.getCurrentUserId(), UserUtil.getCurrentUserName());
+            meterBaseCarMapper.deleteCarById(list, UserUtil.getCurrentUserId(), UserUtil.getCurrentUserName());
             return success();
         }
         catch (Exception e){
@@ -1142,8 +1140,10 @@ public class MeterBaseCarController extends BaseRESTfulController {
         try {
             List<String> list = new ArrayList<>();
             list.add(carNo.get("carNo").toString());
-            meterBaseDriverMapper.deleteCarById(list);
-            meterBaseCarMapper.deleteCarById(list);
+
+            UserUtil.getCurrentUserId();
+            meterBaseDriverMapper.deleteCarById(list,UserUtil.getCurrentUserId(),UserUtil.getCurrentUserName());
+            meterBaseCarMapper.deleteCarById(list,UserUtil.getCurrentUserId(),UserUtil.getCurrentUserName());
             return success();
         }
         catch (Exception e){

src/main/java/com/steerinfo/baseinfo/meterbasecar/mapper/MeterBaseCarMapper.java

@@ -1,16 +1,12 @@
 package com.steerinfo.baseinfo.meterbasecar.mapper;
 
 import com.steerinfo.baseinfo.meterbasecar.model.MeterBaseCar;
-import com.steerinfo.baseinfo.meterbasedriver.model.MeterBaseDriver;
 import com.steerinfo.framework.mapper.IBaseMapper;
-import java.math.*;
-import java.util.HashMap;
+
 import java.util.List;
 import java.util.Map;
 
-import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
 import feign.Param;
-import io.micrometer.core.instrument.Meter;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
@@ -19,7 +15,7 @@ public interface MeterBaseCarMapper extends IBaseMapper<MeterBaseCar, String> {
 
     List<MeterBaseCar> selectForUpdate(Map<String, Object> parameters);
 
-    void deleteCarById(@Param("list") List<String> driverNos);
+    void deleteCarById(@Param("list") List<String> list, String currentUserId, String currentUserName);
     void enableCarById(@Param("list") List<String> driverNos);
 
     List<MeterBaseCar> selectByMap(Map<String, Object> parameters);
@@ -31,4 +27,4 @@ public interface MeterBaseCarMapper extends IBaseMapper<MeterBaseCar, String> {
     int reNewID(MeterBaseCar map);
 
     String ssoIdBySysUser(Map<String, Object> parmas);
-}
+}

src/main/java/com/steerinfo/baseinfo/meterbasecar/mapper/MeterBaseCarMapper.xml

@@ -36,20 +36,20 @@
     <result column="USET_DEPARTMENT_NO" jdbcType="VARCHAR" property="usetDepartmentNo" />
   </resultMap>
   <sql id="columns">
-    PK_NO, CAR_NO, MNEMONIC_CODE, CUSTOMER_SUPPLIER_NO, CUSTOMER_SUPPLIER_NAME, CAR_TYPE_NO, 
-    CAR_TYPE_NAME, CAR_CARRIER_WEIGHT, CAR_SELF_WEIGHT, MEMO, VALID_FLAG, CREATE_MAN_NO, 
-    CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, DELETE_MAN_NO, 
-    DELETE_MAN_NAME, DELETE_TIME, SSO_ID, VEHICLE_TYPE, BELONG_UNIT_TYPE_NO, BELONG_UNIT_TYPE_NAME, 
-    USET_DEPARTMENT, VEHICLE_IDENTIFY_NO, FILLING_DEPARTMENT, FILLING_USER, IS_INSURANCE, 
+    PK_NO, CAR_NO, MNEMONIC_CODE, CUSTOMER_SUPPLIER_NO, CUSTOMER_SUPPLIER_NAME, CAR_TYPE_NO,
+    CAR_TYPE_NAME, CAR_CARRIER_WEIGHT, CAR_SELF_WEIGHT, MEMO, VALID_FLAG, CREATE_MAN_NO,
+    CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, DELETE_MAN_NO,
+    DELETE_MAN_NAME, DELETE_TIME, SSO_ID, VEHICLE_TYPE, BELONG_UNIT_TYPE_NO, BELONG_UNIT_TYPE_NAME,
+    USET_DEPARTMENT, VEHICLE_IDENTIFY_NO, FILLING_DEPARTMENT, FILLING_USER, IS_INSURANCE,
     OTHER_INSURANCE, IS_SPECIALUNIT, USET_DEPARTMENT_NO
   </sql>
   <sql id="columns_alias">
-    t.PK_NO, t.CAR_NO, t.MNEMONIC_CODE, t.CUSTOMER_SUPPLIER_NO, t.CUSTOMER_SUPPLIER_NAME, 
-    t.CAR_TYPE_NO, t.CAR_TYPE_NAME, t.CAR_CARRIER_WEIGHT, t.CAR_SELF_WEIGHT, t.MEMO, 
-    t.VALID_FLAG, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO, 
-    t.UPDATE_MAN_NAME, t.UPDATE_TIME, t.DELETE_MAN_NO, t.DELETE_MAN_NAME, t.DELETE_TIME, 
-    t.SSO_ID, t.VEHICLE_TYPE, t.BELONG_UNIT_TYPE_NO, t.BELONG_UNIT_TYPE_NAME, t.USET_DEPARTMENT, 
-    t.VEHICLE_IDENTIFY_NO, t.FILLING_DEPARTMENT, t.FILLING_USER, t.IS_INSURANCE, t.OTHER_INSURANCE, 
+    t.PK_NO, t.CAR_NO, t.MNEMONIC_CODE, t.CUSTOMER_SUPPLIER_NO, t.CUSTOMER_SUPPLIER_NAME,
+    t.CAR_TYPE_NO, t.CAR_TYPE_NAME, t.CAR_CARRIER_WEIGHT, t.CAR_SELF_WEIGHT, t.MEMO,
+    t.VALID_FLAG, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO,
+    t.UPDATE_MAN_NAME, t.UPDATE_TIME, t.DELETE_MAN_NO, t.DELETE_MAN_NAME, t.DELETE_TIME,
+    t.SSO_ID, t.VEHICLE_TYPE, t.BELONG_UNIT_TYPE_NO, t.BELONG_UNIT_TYPE_NAME, t.USET_DEPARTMENT,
+    t.VEHICLE_IDENTIFY_NO, t.FILLING_DEPARTMENT, t.FILLING_USER, t.IS_INSURANCE, t.OTHER_INSURANCE,
     t.IS_SPECIALUNIT, t.USET_DEPARTMENT_NO
   </sql>
   <sql id="select">
@@ -59,7 +59,7 @@
     SELECT <include refid="columns_alias"/> FROM METER_BASE_CAR t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="pkNo != null and pkNo != ''">
         and PK_NO = #{pkNo}
       </if>
@@ -159,7 +159,7 @@
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="pkNo != null and pkNo != ''">
         and PK_NO LIKE '%${pkNo}%'
       </if>
@@ -264,7 +264,7 @@
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from METER_BASE_CAR
-    where 1!=1 
+    where 1!=1
       <if test="carNo != null and carNo != ''">
         or CAR_NO = #{carNo}
       </if>
@@ -360,28 +360,28 @@
       </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbasecar.model.MeterBaseCar">
-    insert into METER_BASE_CAR (PK_NO, CAR_NO, MNEMONIC_CODE, 
-      CUSTOMER_SUPPLIER_NO, CUSTOMER_SUPPLIER_NAME, 
-      CAR_TYPE_NO, CAR_TYPE_NAME, CAR_CARRIER_WEIGHT, 
-      CAR_SELF_WEIGHT, MEMO, VALID_FLAG, 
-      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
-      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
-      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, 
-      SSO_ID, VEHICLE_TYPE, BELONG_UNIT_TYPE_NO, 
-      BELONG_UNIT_TYPE_NAME, USET_DEPARTMENT, VEHICLE_IDENTIFY_NO, 
-      FILLING_DEPARTMENT, FILLING_USER, IS_INSURANCE, 
+    insert into METER_BASE_CAR (PK_NO, CAR_NO, MNEMONIC_CODE,
+      CUSTOMER_SUPPLIER_NO, CUSTOMER_SUPPLIER_NAME,
+      CAR_TYPE_NO, CAR_TYPE_NAME, CAR_CARRIER_WEIGHT,
+      CAR_SELF_WEIGHT, MEMO, VALID_FLAG,
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME,
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME,
+      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME,
+      SSO_ID, VEHICLE_TYPE, BELONG_UNIT_TYPE_NO,
+      BELONG_UNIT_TYPE_NAME, USET_DEPARTMENT, VEHICLE_IDENTIFY_NO,
+      FILLING_DEPARTMENT, FILLING_USER, IS_INSURANCE,
       OTHER_INSURANCE, IS_SPECIALUNIT, USET_DEPARTMENT_NO
       )
-    values (#{pkNo,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR}, #{mnemonicCode,jdbcType=VARCHAR}, 
-      #{customerSupplierNo,jdbcType=VARCHAR}, #{customerSupplierName,jdbcType=VARCHAR}, 
-      #{carTypeNo,jdbcType=VARCHAR}, #{carTypeName,jdbcType=VARCHAR}, #{carCarrierWeight,jdbcType=DECIMAL}, 
-      #{carSelfWeight,jdbcType=DECIMAL}, #{memo,jdbcType=VARCHAR}, #{validFlag,jdbcType=VARCHAR}, 
-      #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{deleteManNo,jdbcType=VARCHAR}, #{deleteManName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP}, 
-      #{ssoId,jdbcType=VARCHAR}, #{vehicleType,jdbcType=VARCHAR}, #{belongUnitTypeNo,jdbcType=VARCHAR}, 
-      #{belongUnitTypeName,jdbcType=VARCHAR}, #{usetDepartment,jdbcType=VARCHAR}, #{vehicleIdentifyNo,jdbcType=VARCHAR}, 
-      #{fillingDepartment,jdbcType=VARCHAR}, #{fillingUser,jdbcType=VARCHAR}, #{isInsurance,jdbcType=VARCHAR}, 
+    values (#{pkNo,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR}, #{mnemonicCode,jdbcType=VARCHAR},
+      #{customerSupplierNo,jdbcType=VARCHAR}, #{customerSupplierName,jdbcType=VARCHAR},
+      #{carTypeNo,jdbcType=VARCHAR}, #{carTypeName,jdbcType=VARCHAR}, #{carCarrierWeight,jdbcType=DECIMAL},
+      #{carSelfWeight,jdbcType=DECIMAL}, #{memo,jdbcType=VARCHAR}, #{validFlag,jdbcType=VARCHAR},
+      #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
+      #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
+      #{deleteManNo,jdbcType=VARCHAR}, #{deleteManName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP},
+      #{ssoId,jdbcType=VARCHAR}, #{vehicleType,jdbcType=VARCHAR}, #{belongUnitTypeNo,jdbcType=VARCHAR},
+      #{belongUnitTypeName,jdbcType=VARCHAR}, #{usetDepartment,jdbcType=VARCHAR}, #{vehicleIdentifyNo,jdbcType=VARCHAR},
+      #{fillingDepartment,jdbcType=VARCHAR}, #{fillingUser,jdbcType=VARCHAR}, #{isInsurance,jdbcType=VARCHAR},
       #{otherInsurance,jdbcType=VARCHAR}, #{isSpecialunit,jdbcType=VARCHAR}, #{usetDepartmentNo,jdbcType=VARCHAR}
       )
   </insert>
@@ -731,37 +731,37 @@
     <include refid="whereLike"/>
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into METER_BASE_CAR 
-      (PK_NO, 
-      CAR_NO, MNEMONIC_CODE, CUSTOMER_SUPPLIER_NO, 
-      CUSTOMER_SUPPLIER_NAME, CAR_TYPE_NO, 
-      CAR_TYPE_NAME, CAR_CARRIER_WEIGHT, 
-      CAR_SELF_WEIGHT, MEMO, VALID_FLAG, 
-      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
-      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
-      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, 
-      SSO_ID, VEHICLE_TYPE, BELONG_UNIT_TYPE_NO, 
-      BELONG_UNIT_TYPE_NAME, USET_DEPARTMENT, 
-      VEHICLE_IDENTIFY_NO, FILLING_DEPARTMENT, 
-      FILLING_USER, IS_INSURANCE, OTHER_INSURANCE, 
+    insert into METER_BASE_CAR
+      (PK_NO,
+      CAR_NO, MNEMONIC_CODE, CUSTOMER_SUPPLIER_NO,
+      CUSTOMER_SUPPLIER_NAME, CAR_TYPE_NO,
+      CAR_TYPE_NAME, CAR_CARRIER_WEIGHT,
+      CAR_SELF_WEIGHT, MEMO, VALID_FLAG,
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME,
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME,
+      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME,
+      SSO_ID, VEHICLE_TYPE, BELONG_UNIT_TYPE_NO,
+      BELONG_UNIT_TYPE_NAME, USET_DEPARTMENT,
+      VEHICLE_IDENTIFY_NO, FILLING_DEPARTMENT,
+      FILLING_USER, IS_INSURANCE, OTHER_INSURANCE,
       IS_SPECIALUNIT, USET_DEPARTMENT_NO
       )
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.pkNo,jdbcType=VARCHAR}, 
-      #{item.carNo,jdbcType=VARCHAR}, #{item.mnemonicCode,jdbcType=VARCHAR}, #{item.customerSupplierNo,jdbcType=VARCHAR}, 
-      #{item.customerSupplierName,jdbcType=VARCHAR}, #{item.carTypeNo,jdbcType=VARCHAR}, 
-      #{item.carTypeName,jdbcType=VARCHAR}, #{item.carCarrierWeight,jdbcType=DECIMAL}, 
-      #{item.carSelfWeight,jdbcType=DECIMAL}, #{item.memo,jdbcType=VARCHAR}, #{item.validFlag,jdbcType=VARCHAR}, 
-      #{item.createManNo,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
-      #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
-      #{item.deleteManNo,jdbcType=VARCHAR}, #{item.deleteManName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=TIMESTAMP}, 
-      #{item.ssoId,jdbcType=VARCHAR}, #{item.vehicleType,jdbcType=VARCHAR}, #{item.belongUnitTypeNo,jdbcType=VARCHAR}, 
-      #{item.belongUnitTypeName,jdbcType=VARCHAR}, #{item.usetDepartment,jdbcType=VARCHAR}, 
-      #{item.vehicleIdentifyNo,jdbcType=VARCHAR}, #{item.fillingDepartment,jdbcType=VARCHAR}, 
-      #{item.fillingUser,jdbcType=VARCHAR}, #{item.isInsurance,jdbcType=VARCHAR}, #{item.otherInsurance,jdbcType=VARCHAR}, 
+    ( <foreach collection="list" item="item" separator="union all">
+   select
+      #{item.pkNo,jdbcType=VARCHAR},
+      #{item.carNo,jdbcType=VARCHAR}, #{item.mnemonicCode,jdbcType=VARCHAR}, #{item.customerSupplierNo,jdbcType=VARCHAR},
+      #{item.customerSupplierName,jdbcType=VARCHAR}, #{item.carTypeNo,jdbcType=VARCHAR},
+      #{item.carTypeName,jdbcType=VARCHAR}, #{item.carCarrierWeight,jdbcType=DECIMAL},
+      #{item.carSelfWeight,jdbcType=DECIMAL}, #{item.memo,jdbcType=VARCHAR}, #{item.validFlag,jdbcType=VARCHAR},
+      #{item.createManNo,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP},
+      #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
+      #{item.deleteManNo,jdbcType=VARCHAR}, #{item.deleteManName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=TIMESTAMP},
+      #{item.ssoId,jdbcType=VARCHAR}, #{item.vehicleType,jdbcType=VARCHAR}, #{item.belongUnitTypeNo,jdbcType=VARCHAR},
+      #{item.belongUnitTypeName,jdbcType=VARCHAR}, #{item.usetDepartment,jdbcType=VARCHAR},
+      #{item.vehicleIdentifyNo,jdbcType=VARCHAR}, #{item.fillingDepartment,jdbcType=VARCHAR},
+      #{item.fillingUser,jdbcType=VARCHAR}, #{item.isInsurance,jdbcType=VARCHAR}, #{item.otherInsurance,jdbcType=VARCHAR},
       #{item.isSpecialunit,jdbcType=VARCHAR}, #{item.usetDepartmentNo,jdbcType=VARCHAR}
-       from dual  
+       from dual
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -895,14 +895,14 @@
        <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
           when #{item.pkNo,jdbcType=VARCHAR} then #{item.usetDepartmentNo,jdbcType=VARCHAR}
        </foreach>
-     where PK_NO in 
+     where PK_NO in
      <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
     #{item.pkNo,jdbcType=VARCHAR}
-     </foreach> 
+     </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from METER_BASE_CAR
-    where PK_NO in 
+    where PK_NO in
     <foreach collection="list" item="id" open="(" close=")" separator=",">
       #{id}
     </foreach>
@@ -930,7 +930,10 @@
 
   <!--  批量删除车辆-->
   <update id="deleteCarById" parameterType="java.util.List">
-    update METER_BASE_CAR set VALID_FLAG = '1' where CAR_NO in
+    update METER_BASE_CAR set VALID_FLAG = '1',
+    DELETE_MAN_NO = #{currentUserId},
+    DELETE_MAN_NAME=#{currentUserName},
+    DELETE_TIME=sysdate where CAR_NO in
     <foreach item="carNos" collection="list" open="(" separator="," close=")">
       #{carNos}
     </foreach>
@@ -1075,4 +1078,4 @@
      select user_Id as pk_no from sso.sys_user
      where user_code = #{userCode}
   </select>
-</mapper>
+</mapper>

src/main/java/com/steerinfo/baseinfo/meterbasedriver/mapper/MeterBaseDriverMapper.java

@@ -2,11 +2,10 @@ package com.steerinfo.baseinfo.meterbasedriver.mapper;
 
 import com.steerinfo.baseinfo.meterbasedriver.model.MeterBaseDriver;
 import com.steerinfo.framework.mapper.IBaseMapper;
-import java.math.*;
+
 import java.util.List;
 import java.util.Map;
 
-import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
 import feign.Param;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -21,7 +20,7 @@ public interface MeterBaseDriverMapper extends IBaseMapper<MeterBaseDriver, Stri
 //    void deleteDriverById(List<MeterBaseDriver> deleteList);
     void deleteDriverById(@Param("list") List<String> driverNos);
 
-    void deleteCarById(@Param("list") List<String> carNos);
+    void deleteCarById(@Param("list") List<String> list, @Param("currentUserId")String currentUserId,@Param("currentUserName") String currentUserName);
     void enableCarById(@Param("list") List<String> carNos);
     void deleteCarById01(@Param("list") List<String> carNos);
     void enableCarById01(@Param("list") List<String> carNos);
@@ -29,4 +28,4 @@ public interface MeterBaseDriverMapper extends IBaseMapper<MeterBaseDriver, Stri
     List<MeterBaseDriver> getDirverBySup(String customerSupplierNo);
 
     int updateValidFlagByCarId(Map<String, Object> parameters);
-}
+}

src/main/java/com/steerinfo/baseinfo/meterbasedriver/mapper/MeterBaseDriverMapper.xml

@@ -20,13 +20,13 @@
     <result column="CAR_ID" jdbcType="VARCHAR" property="carId" />
   </resultMap>
   <sql id="columns">
-    DRIVER_NO, DRIVER_NAME, ID_NUM, TEL_NUM, MEMO, VALID_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, 
-    CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME, 
+    DRIVER_NO, DRIVER_NAME, ID_NUM, TEL_NUM, MEMO, VALID_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME,
+    CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME,
     DELETE_TIME, CAR_ID
   </sql>
   <sql id="columns_alias">
-    t.DRIVER_NO, t.DRIVER_NAME, t.ID_NUM, t.TEL_NUM, t.MEMO, t.VALID_FLAG, t.CREATE_MAN_NO, 
-    t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME, 
+    t.DRIVER_NO, t.DRIVER_NAME, t.ID_NUM, t.TEL_NUM, t.MEMO, t.VALID_FLAG, t.CREATE_MAN_NO,
+    t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME,
     t.DELETE_MAN_NO, t.DELETE_MAN_NAME, t.DELETE_TIME, t.CAR_ID
   </sql>
   <sql id="select">
@@ -36,7 +36,7 @@
     SELECT <include refid="columns_alias"/> FROM METER_BASE_DRIVER t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="driverNo != null and driverNo != ''">
         and DRIVER_NO = #{driverNo}
       </if>
@@ -88,7 +88,7 @@
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="driverNo != null and driverNo != ''">
         and DRIVER_NO LIKE '%${driverNo}%'
       </if>
@@ -148,7 +148,7 @@
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from METER_BASE_DRIVER
-    where 1!=1 
+    where 1!=1
       <if test="driverName != null and driverName != ''">
         or DRIVER_NAME = #{driverName}
       </if>
@@ -196,17 +196,17 @@
       </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbasedriver.model.MeterBaseDriver">
-    insert into METER_BASE_DRIVER (DRIVER_NO, DRIVER_NAME, ID_NUM, 
-      TEL_NUM, MEMO, VALID_FLAG, 
-      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
-      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
-      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, 
+    insert into METER_BASE_DRIVER (DRIVER_NO, DRIVER_NAME, ID_NUM,
+      TEL_NUM, MEMO, VALID_FLAG,
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME,
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME,
+      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME,
       CAR_ID)
-    values (#{driverNo,jdbcType=VARCHAR}, #{driverName,jdbcType=VARCHAR}, #{idNum,jdbcType=VARCHAR}, 
-      #{telNum,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, #{validFlag,jdbcType=VARCHAR}, 
-      #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{deleteManNo,jdbcType=VARCHAR}, #{deleteManName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP}, 
+    values (#{driverNo,jdbcType=VARCHAR}, #{driverName,jdbcType=VARCHAR}, #{idNum,jdbcType=VARCHAR},
+      #{telNum,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, #{validFlag,jdbcType=VARCHAR},
+      #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
+      #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
+      #{deleteManNo,jdbcType=VARCHAR}, #{deleteManName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP},
       #{carId,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbasedriver.model.MeterBaseDriver">
@@ -395,23 +395,23 @@
     <include refid="whereLike"/>
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into METER_BASE_DRIVER 
-      (DRIVER_NO, 
-      DRIVER_NAME, ID_NUM, TEL_NUM, 
-      MEMO, VALID_FLAG, CREATE_MAN_NO, 
-      CREATE_MAN_NAME, CREATE_TIME, 
-      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
-      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, 
+    insert into METER_BASE_DRIVER
+      (DRIVER_NO,
+      DRIVER_NAME, ID_NUM, TEL_NUM,
+      MEMO, VALID_FLAG, CREATE_MAN_NO,
+      CREATE_MAN_NAME, CREATE_TIME,
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME,
+      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME,
       CAR_ID)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.driverNo,jdbcType=VARCHAR}, 
-      #{item.driverName,jdbcType=VARCHAR}, #{item.idNum,jdbcType=VARCHAR}, #{item.telNum,jdbcType=VARCHAR}, 
-      #{item.memo,jdbcType=VARCHAR}, #{item.validFlag,jdbcType=VARCHAR}, #{item.createManNo,jdbcType=VARCHAR}, 
-      #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
-      #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
-      #{item.deleteManNo,jdbcType=VARCHAR}, #{item.deleteManName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=TIMESTAMP}, 
-      #{item.carId,jdbcType=VARCHAR} from dual  
+    ( <foreach collection="list" item="item" separator="union all">
+   select
+      #{item.driverNo,jdbcType=VARCHAR},
+      #{item.driverName,jdbcType=VARCHAR}, #{item.idNum,jdbcType=VARCHAR}, #{item.telNum,jdbcType=VARCHAR},
+      #{item.memo,jdbcType=VARCHAR}, #{item.validFlag,jdbcType=VARCHAR}, #{item.createManNo,jdbcType=VARCHAR},
+      #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP},
+      #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
+      #{item.deleteManNo,jdbcType=VARCHAR}, #{item.deleteManName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=TIMESTAMP},
+      #{item.carId,jdbcType=VARCHAR} from dual
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -481,14 +481,14 @@
        <foreach collection="list" item="item" index="index" separator=" " open="case DRIVER_NO" close="end">
           when #{item.driverNo,jdbcType=VARCHAR} then #{item.carId,jdbcType=VARCHAR}
        </foreach>
-     where DRIVER_NO in 
+     where DRIVER_NO in
      <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
     #{item.driverNo,jdbcType=VARCHAR}
-     </foreach> 
+     </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from METER_BASE_DRIVER
-    where DRIVER_NO in 
+    where DRIVER_NO in
     <foreach collection="list" item="id" open="(" close=")" separator=",">
       #{id}
     </foreach>
@@ -529,7 +529,10 @@
   </update>
 
   <update id="deleteCarById" parameterType="java.util.List">
-    update METER_BASE_DRIVER set VALID_FLAG = '1' where CAR_ID in
+    update METER_BASE_DRIVER set VALID_FLAG = '1',
+    DELETE_MAN_NO = #{currentUserId},
+    DELETE_MAN_NAME=#{currentUserName},
+    DELETE_TIME=sysdate where CAR_ID in
     <foreach item="carNos" collection="list" open="(" separator="," close=")">
       #{carNos}
     </foreach>
@@ -567,4 +570,4 @@
         and car_id = #{carId}
       </if>
   </update>
-</mapper>
+</mapper>

src/main/java/com/steerinfo/meterwork/constants/DjPbModel.java

@@ -0,0 +1,23 @@
+package com.steerinfo.meterwork.constants;
+
+public class DjPbModel {
+    //存储老的计量编号值
+    public String key;
+
+    //存储新的计量编号值
+    public String value;
+
+    public String getKey() {
+        return key;
+    }
+    public void setKey(String key) {
+        this.key = key == null ? null : key.trim();
+    }
+
+    public String getValue() {
+        return value;
+    }
+    public void setValue(String value) {
+        this.value = value == null ? null : value.trim();
+    }
+}

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

@@ -442,7 +442,9 @@
 
     <select id="truckHisTareComparison" parameterType="java.util.HashMap"
             resultType="com.steerinfo.meterwork.meterworkdatacount.model.TruckHisTareComparison">
-    select A.car_no carNo,
+    select
+    A.base_spot_name baseSpotName,
+            A.car_no carNo,
            case when abs(round((A.meter_weight - B.avg_weight)/1000, 2)) >= 0.5 then '皮重超过偏差'
                 else '正常皮重' end alarmType,
            round(A.meter_weight/1000, 2) meterWeight,
@@ -1228,7 +1230,11 @@
 
     <select id="scaleOrCarComparison" parameterType="java.util.HashMap"
             resultType="com.steerinfo.meterwork.meterworkdatacount.model.ScaleOrCarComparison">
-    select typeTemp,
+    select
+           grossManName,
+           tareManName,
+           netManName,
+           typeTemp,
            actualNo,
            actualPredictionNo,
            first1PredictionNo,
@@ -1255,6 +1261,9 @@
      from
     (
       (select '一个委托对应多个净重数据' typeTemp,
+             B.gross_man_name grossManName,
+             B.tare_man_name tareManName,
+             B.net_man_name netManName,
              B.actual_no actualNo,
              B.prediction_no actualPredictionNo,
              C.prediction_no first1PredictionNo,
@@ -1323,6 +1332,9 @@
         </if>)
     union
       (select '净重数据毛皮委托不同' typeTemp,
+             A.gross_man_name grossManName,
+             A.tare_man_name tareManName,
+             A.net_man_name netManName,
              A.actual_no actualNo,
              A.prediction_no actualPredictionNo,
              B.prediction_no first1PredictionNo,

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

@@ -5,6 +5,9 @@ import java.util.Date;
 
 public class ScaleOrCarComparison {
     private String typeTemp;
+    private String grossManName;
+    private String tareManName;
+    private String netManName;
     private String actualNo;
     private String actualPredictionNo;
     private String first1PredictionNo;
@@ -29,6 +32,30 @@ public class ScaleOrCarComparison {
     private String valueFlag;
     private String uploadFlag;
 
+    public String getGrossManName() {
+        return grossManName;
+    }
+
+    public void setGrossManName(String grossManName) {
+        this.grossManName = grossManName;
+    }
+
+    public String getTareManName() {
+        return tareManName;
+    }
+
+    public void setTareManName(String tareManName) {
+        this.tareManName = tareManName;
+    }
+
+    public String getNetManName() {
+        return netManName;
+    }
+
+    public void setNetManName(String netManName) {
+        this.netManName = netManName;
+    }
+
     public String getTypeTemp() {
         return typeTemp;
     }

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

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 public class TruckHisTareComparison {
+    private String baseSpotName;
     private String carNo;
     private String alarmType;
     private double meterWeight;
@@ -21,6 +22,14 @@ public class TruckHisTareComparison {
     private String meterTypeName;
     private String note;
 
+    public String getBaseSpotName() {
+        return baseSpotName;
+    }
+
+    public void setBaseSpotName(String baseSpotName) {
+        this.baseSpotName = baseSpotName;
+    }
+
     public String getCarNo() {
         return carNo;
     }

src/main/java/com/steerinfo/meterwork/meterworkrailwayactualbak/controller/MeterWorkRailwayActualBakController.java

@@ -841,6 +841,9 @@ public class MeterWorkRailwayActualBakController extends BaseRESTfulController {
 //            model.setGrossManNo(meterWorkRailwayActualBakService.subStr(map.get("grossManNo").toString(), "0"));
 //            model.setGrossManName(meterWorkRailwayActualBakService.subStr(map.get("grossManNo").toString(), "1"));
             model.setGrossTime(grossTime);
+
+            model.setTareManNo(map.get("tareManNo").toString());
+            model.setTareManName(map.get("tareManName").toString());
             model.setTareTime(tareTime);
             model.setNetTime(netTime);
             model.setBaseSpot2No(map.get("baseSpot2No").toString());