修改了后端接口

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

@@ -312,6 +312,37 @@ public class MeterBaseCarController extends BaseRESTfulController {
         return success(ssodata);
     }
 
+    @ApiOperation(value = "app非司机登录", notes = "app非司机登录")
+    @Transactional
+    @PostMapping(value = "/notApplogin")
+    public RESTfulResult notApplogin(@RequestBody HashMap params) {
+
+        String msg = "";
+        Object ssodata = "";
+
+        try {
+            SSOUtil ssoUtil = new SSOUtil();
+            HashMap map = ssoUtil.ssoLogin(params, "");
+
+            if (map.get("code").toString().equals("0")) {
+                ssodata = map.get("data").toString();
+            } else {
+                msg = map.get("msg").toString();
+            }
+
+            if (com.steerinfo.util.StringUtils.isNotEmpty(msg)) {
+                return failed(null, msg);
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return failed(null, "操作异常，请确认！");
+        }
+
+        return success(ssodata);
+    }
+
     @ApiOperation(value = "app修改密码", notes = "app修改密码")
     @Transactional
     @PostMapping(value = "/appchangepwd")
@@ -406,6 +437,41 @@ public class MeterBaseCarController extends BaseRESTfulController {
         return success();
     }
 
+
+    @ApiOperation(value = "web重置密码", notes = "web重置密码")
+    @Transactional
+    @PostMapping(value = "/webresetpwd")
+    public RESTfulResult webresetpwd(@RequestBody HashMap params) {
+
+        String msg = "";
+
+        try {
+            // 获取车辆SSO ID
+            HashMap queryMap = new HashMap();
+            queryMap.put("carNo", params.get("carNo").toString());
+
+            MeterBaseCar car = meterBaseCarService.getByParams(queryMap);
+
+            // 通过车辆SSO ID重置密码
+            if (car != null) {
+                // SSO重置密码
+                SSOUtil ssoUtil = new SSOUtil();
+                msg = ssoUtil.ssoResetPwd(car.getSsoId(), params.get("newpassword").toString(), "");
+            }
+
+            if (com.steerinfo.util.StringUtils.isNotEmpty(msg)) {
+                return failed(null, msg);
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return failed(null, "操作异常，请确认！");
+        }
+
+        return success();
+    }
+
     @ApiOperation(value = "PC新增车辆", notes = "PC新增车辆")
     @Transactional
     @PostMapping(value = "/addcar")

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

@@ -23,25 +23,30 @@
     <result column="DELETE_MAN_NAME" jdbcType="VARCHAR" property="deleteManName" />
     <result column="DELETE_TIME" jdbcType="TIMESTAMP" property="deleteTime" />
     <result column="SSO_ID" jdbcType="VARCHAR" property="ssoId" />
+    <result column="VEHICLE_TYPE" jdbcType="VARCHAR" property="vehicleType" />
+    <result column="BELONG_UNIT_TYPE_NO" jdbcType="VARCHAR" property="belongUnitTypeNo" />
+    <result column="BELONG_UNIT_TYPE_NAME" jdbcType="VARCHAR" property="belongUnitTypeName" />
+    <result column="USET_DEPARTMENT" jdbcType="VARCHAR" property="usetDepartment" />
   </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
+    DELETE_MAN_NAME, DELETE_TIME, SSO_ID, VEHICLE_TYPE, BELONG_UNIT_TYPE_NO, BELONG_UNIT_TYPE_NAME, 
+    USET_DEPARTMENT
   </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.SSO_ID, t.VEHICLE_TYPE, t.BELONG_UNIT_TYPE_NO, t.BELONG_UNIT_TYPE_NAME, t.USET_DEPARTMENT
   </sql>
   <sql id="select">
-    SELECT <include refid="columns"/> FROM METER_BASE_CAR
+    SELECT <include refid="columns" /> FROM METER_BASE_CAR
   </sql>
   <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM METER_BASE_CAR t
+    SELECT <include refid="columns_alias" /> FROM METER_BASE_CAR t
   </sql>
   <sql id="where">
     <where> 
@@ -108,6 +113,18 @@
       <if test="ssoId != null and ssoId != ''">
         and SSO_ID = #{ssoId}
       </if>
+      <if test="vehicleType != null and vehicleType != ''">
+        and VEHICLE_TYPE = #{vehicleType}
+      </if>
+      <if test="belongUnitTypeNo != null and belongUnitTypeNo != ''">
+        and BELONG_UNIT_TYPE_NO = #{belongUnitTypeNo}
+      </if>
+      <if test="belongUnitTypeName != null and belongUnitTypeName != ''">
+        and BELONG_UNIT_TYPE_NAME = #{belongUnitTypeName}
+      </if>
+      <if test="usetDepartment != null and usetDepartment != ''">
+        and USET_DEPARTMENT = #{usetDepartment}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -175,6 +192,18 @@
       <if test="ssoId != null and ssoId != ''">
         and SSO_ID LIKE '%${ssoId}%'
       </if>
+      <if test="vehicleType != null and vehicleType != ''">
+        and VEHICLE_TYPE LIKE '%${vehicleType}%'
+      </if>
+      <if test="belongUnitTypeNo != null and belongUnitTypeNo != ''">
+        and BELONG_UNIT_TYPE_NO LIKE '%${belongUnitTypeNo}%'
+      </if>
+      <if test="belongUnitTypeName != null and belongUnitTypeName != ''">
+        and BELONG_UNIT_TYPE_NAME LIKE '%${belongUnitTypeName}%'
+      </if>
+      <if test="usetDepartment != null and usetDepartment != ''">
+        and USET_DEPARTMENT LIKE '%${usetDepartment}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -244,6 +273,18 @@
       <if test="ssoId != null and ssoId != ''">
         or SSO_ID = #{ssoId}
       </if>
+      <if test="vehicleType != null and vehicleType != ''">
+        or VEHICLE_TYPE = #{vehicleType}
+      </if>
+      <if test="belongUnitTypeNo != null and belongUnitTypeNo != ''">
+        or BELONG_UNIT_TYPE_NO = #{belongUnitTypeNo}
+      </if>
+      <if test="belongUnitTypeName != null and belongUnitTypeName != ''">
+        or BELONG_UNIT_TYPE_NAME = #{belongUnitTypeName}
+      </if>
+      <if test="usetDepartment != null and usetDepartment != ''">
+        or USET_DEPARTMENT = #{usetDepartment}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbasecar.model.MeterBaseCar">
     insert into METER_BASE_CAR (PK_NO, CAR_NO, MNEMONIC_CODE, 
@@ -253,7 +294,8 @@
       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)
+      SSO_ID, VEHICLE_TYPE, BELONG_UNIT_TYPE_NO, 
+      BELONG_UNIT_TYPE_NAME, USET_DEPARTMENT)
     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}, 
@@ -261,7 +303,8 @@
       #{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})
+      #{ssoId,jdbcType=VARCHAR}, #{vehicleType,jdbcType=VARCHAR}, #{belongUnitTypeNo,jdbcType=VARCHAR}, 
+      #{belongUnitTypeName,jdbcType=VARCHAR}, #{usetDepartment,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbasecar.model.MeterBaseCar">
     insert into METER_BASE_CAR
@@ -329,6 +372,18 @@
       <if test="ssoId != null">
         SSO_ID,
       </if>
+      <if test="vehicleType != null">
+        VEHICLE_TYPE,
+      </if>
+      <if test="belongUnitTypeNo != null">
+        BELONG_UNIT_TYPE_NO,
+      </if>
+      <if test="belongUnitTypeName != null">
+        BELONG_UNIT_TYPE_NAME,
+      </if>
+      <if test="usetDepartment != null">
+        USET_DEPARTMENT,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="pkNo != null">
@@ -394,6 +449,18 @@
       <if test="ssoId != null">
         #{ssoId,jdbcType=VARCHAR},
       </if>
+      <if test="vehicleType != null">
+        #{vehicleType,jdbcType=VARCHAR},
+      </if>
+      <if test="belongUnitTypeNo != null">
+        #{belongUnitTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="belongUnitTypeName != null">
+        #{belongUnitTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="usetDepartment != null">
+        #{usetDepartment,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbasecar.model.MeterBaseCar">
@@ -417,7 +484,11 @@
       DELETE_MAN_NO = #{deleteManNo,jdbcType=VARCHAR},
       DELETE_MAN_NAME = #{deleteManName,jdbcType=VARCHAR},
       DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
-      SSO_ID = #{ssoId,jdbcType=VARCHAR}
+      SSO_ID = #{ssoId,jdbcType=VARCHAR},
+      VEHICLE_TYPE = #{vehicleType,jdbcType=VARCHAR},
+      BELONG_UNIT_TYPE_NO = #{belongUnitTypeNo,jdbcType=VARCHAR},
+      BELONG_UNIT_TYPE_NAME = #{belongUnitTypeName,jdbcType=VARCHAR},
+      USET_DEPARTMENT = #{usetDepartment,jdbcType=VARCHAR}
     where PK_NO = #{pkNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbasecar.model.MeterBaseCar">
@@ -483,20 +554,32 @@
       <if test="ssoId != null">
         SSO_ID = #{ssoId,jdbcType=VARCHAR},
       </if>
+      <if test="vehicleType != null">
+        VEHICLE_TYPE = #{vehicleType,jdbcType=VARCHAR},
+      </if>
+      <if test="belongUnitTypeNo != null">
+        BELONG_UNIT_TYPE_NO = #{belongUnitTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="belongUnitTypeName != null">
+        BELONG_UNIT_TYPE_NAME = #{belongUnitTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="usetDepartment != null">
+        USET_DEPARTMENT = #{usetDepartment,jdbcType=VARCHAR},
+      </if>
     </set>
     where PK_NO = #{pkNo,jdbcType=VARCHAR}
   </update>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    <include refid="select"/>
+    <include refid="select" />
     where PK_NO = #{pkNo,jdbcType=VARCHAR}
   </select>
   <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="where"/>
+    <include refid="select" />
+    <include refid="where" />
   </select>
   <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="whereLike"/>
+    <include refid="select" />
+    <include refid="whereLike" />
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
     insert into METER_BASE_CAR 
@@ -508,7 +591,9 @@
       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)
+      SSO_ID, VEHICLE_TYPE, BELONG_UNIT_TYPE_NO, 
+      BELONG_UNIT_TYPE_NAME, USET_DEPARTMENT
+      )
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.pkNo,jdbcType=VARCHAR}, 
@@ -519,110 +604,130 @@
       #{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} from dual  
+      #{item.ssoId,jdbcType=VARCHAR}, #{item.vehicleType,jdbcType=VARCHAR}, #{item.belongUnitTypeNo,jdbcType=VARCHAR}, 
+      #{item.belongUnitTypeName,jdbcType=VARCHAR}, #{item.usetDepartment,jdbcType=VARCHAR}
+       from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
      update METER_BASE_CAR
      set
        PK_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case PK_NO" separator=" ">
           when #{item.pkNo,jdbcType=VARCHAR} then #{item.pkNo,jdbcType=VARCHAR}
        </foreach>
        ,CAR_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case PK_NO" separator=" ">
           when #{item.pkNo,jdbcType=VARCHAR} then #{item.carNo,jdbcType=VARCHAR}
        </foreach>
        ,MNEMONIC_CODE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case PK_NO" separator=" ">
           when #{item.pkNo,jdbcType=VARCHAR} then #{item.mnemonicCode,jdbcType=VARCHAR}
        </foreach>
        ,CUSTOMER_SUPPLIER_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case PK_NO" separator=" ">
           when #{item.pkNo,jdbcType=VARCHAR} then #{item.customerSupplierNo,jdbcType=VARCHAR}
        </foreach>
        ,CUSTOMER_SUPPLIER_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case PK_NO" separator=" ">
           when #{item.pkNo,jdbcType=VARCHAR} then #{item.customerSupplierName,jdbcType=VARCHAR}
        </foreach>
        ,CAR_TYPE_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case PK_NO" separator=" ">
           when #{item.pkNo,jdbcType=VARCHAR} then #{item.carTypeNo,jdbcType=VARCHAR}
        </foreach>
        ,CAR_TYPE_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case PK_NO" separator=" ">
           when #{item.pkNo,jdbcType=VARCHAR} then #{item.carTypeName,jdbcType=VARCHAR}
        </foreach>
        ,CAR_CARRIER_WEIGHT=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case PK_NO" separator=" ">
           when #{item.pkNo,jdbcType=VARCHAR} then #{item.carCarrierWeight,jdbcType=DECIMAL}
        </foreach>
        ,CAR_SELF_WEIGHT=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case PK_NO" separator=" ">
           when #{item.pkNo,jdbcType=VARCHAR} then #{item.carSelfWeight,jdbcType=DECIMAL}
        </foreach>
        ,MEMO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case PK_NO" separator=" ">
           when #{item.pkNo,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
        </foreach>
        ,VALID_FLAG=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case PK_NO" separator=" ">
           when #{item.pkNo,jdbcType=VARCHAR} then #{item.validFlag,jdbcType=VARCHAR}
        </foreach>
        ,CREATE_MAN_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case PK_NO" separator=" ">
           when #{item.pkNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
        </foreach>
        ,CREATE_MAN_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case PK_NO" separator=" ">
           when #{item.pkNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
        </foreach>
        ,CREATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case PK_NO" separator=" ">
           when #{item.pkNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
        </foreach>
        ,UPDATE_MAN_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case PK_NO" separator=" ">
           when #{item.pkNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
        </foreach>
        ,UPDATE_MAN_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case PK_NO" separator=" ">
           when #{item.pkNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
        </foreach>
        ,UPDATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case PK_NO" separator=" ">
           when #{item.pkNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
        </foreach>
        ,DELETE_MAN_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case PK_NO" separator=" ">
           when #{item.pkNo,jdbcType=VARCHAR} then #{item.deleteManNo,jdbcType=VARCHAR}
        </foreach>
        ,DELETE_MAN_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case PK_NO" separator=" ">
           when #{item.pkNo,jdbcType=VARCHAR} then #{item.deleteManName,jdbcType=VARCHAR}
        </foreach>
        ,DELETE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case PK_NO" separator=" ">
           when #{item.pkNo,jdbcType=VARCHAR} then #{item.deleteTime,jdbcType=TIMESTAMP}
        </foreach>
        ,SSO_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case PK_NO" separator=" ">
           when #{item.pkNo,jdbcType=VARCHAR} then #{item.ssoId,jdbcType=VARCHAR}
        </foreach>
+       ,VEHICLE_TYPE=
+       <foreach close="end" collection="list" index="index" item="item" open="case PK_NO" separator=" ">
+          when #{item.pkNo,jdbcType=VARCHAR} then #{item.vehicleType,jdbcType=VARCHAR}
+       </foreach>
+       ,BELONG_UNIT_TYPE_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case PK_NO" separator=" ">
+          when #{item.pkNo,jdbcType=VARCHAR} then #{item.belongUnitTypeNo,jdbcType=VARCHAR}
+       </foreach>
+       ,BELONG_UNIT_TYPE_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case PK_NO" separator=" ">
+          when #{item.pkNo,jdbcType=VARCHAR} then #{item.belongUnitTypeName,jdbcType=VARCHAR}
+       </foreach>
+       ,USET_DEPARTMENT=
+       <foreach close="end" collection="list" index="index" item="item" open="case PK_NO" separator=" ">
+          when #{item.pkNo,jdbcType=VARCHAR} then #{item.usetDepartment,jdbcType=VARCHAR}
+       </foreach>
      where PK_NO in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
     #{item.pkNo,jdbcType=VARCHAR}
      </foreach> 
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from METER_BASE_CAR
     where PK_NO in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
     </foreach>
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
   <select id="GetNewID" parameterType="java.lang.String" resultType="java.lang.String">
     SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(PK_NO, LENGTH(PK_NO) -3))),0) + 1,4,'0') PK_NO
     FROM METER_BASE_CAR
@@ -640,7 +745,7 @@
     </where>
   </select>
 
-<!--  批量删除车辆-->
+  <!--  批量删除车辆-->
   <update id="deleteCarById" parameterType="java.util.List">
     update METER_BASE_CAR set VALID_FLAG = '2' where CAR_NO in
     <foreach item="carNos" collection="list" open="(" separator="," close=")">
@@ -648,5 +753,4 @@
     </foreach>
   </update>
 
-
 </mapper>

src/main/java/com/steerinfo/baseinfo/meterbasecar/model/MeterBaseCar.java

@@ -134,6 +134,30 @@ public class MeterBaseCar implements IBasePO<String> {
     @ApiModelProperty(value="SSO用户ID",required=false)
     private String ssoId;
 
+    /**
+     * 车型(VEHICLE_TYPE,VARCHAR,30)
+     */
+    @ApiModelProperty(value="车型",required=false)
+    private String vehicleType;
+
+    /**
+     * 归属单位类型编码(BELONG_UNIT_TYPE_NO,VARCHAR,30)
+     */
+    @ApiModelProperty(value="归属单位类型编码",required=false)
+    private String belongUnitTypeNo;
+
+    /**
+     * 归属单位类型名称(BELONG_UNIT_TYPE_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="归属单位类型名称",required=false)
+    private String belongUnitTypeName;
+
+    /**
+     * 使用部门(USET_DEPARTMENT,VARCHAR,255)
+     */
+    @ApiModelProperty(value="使用部门",required=false)
+    private String usetDepartment;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -314,6 +338,38 @@ public class MeterBaseCar implements IBasePO<String> {
         this.ssoId = ssoId == null ? null : ssoId.trim();
     }
 
+    public String getVehicleType() {
+        return vehicleType;
+    }
+
+    public void setVehicleType(String vehicleType) {
+        this.vehicleType = vehicleType == null ? null : vehicleType.trim();
+    }
+
+    public String getBelongUnitTypeNo() {
+        return belongUnitTypeNo;
+    }
+
+    public void setBelongUnitTypeNo(String belongUnitTypeNo) {
+        this.belongUnitTypeNo = belongUnitTypeNo == null ? null : belongUnitTypeNo.trim();
+    }
+
+    public String getBelongUnitTypeName() {
+        return belongUnitTypeName;
+    }
+
+    public void setBelongUnitTypeName(String belongUnitTypeName) {
+        this.belongUnitTypeName = belongUnitTypeName == null ? null : belongUnitTypeName.trim();
+    }
+
+    public String getUsetDepartment() {
+        return usetDepartment;
+    }
+
+    public void setUsetDepartment(String usetDepartment) {
+        this.usetDepartment = usetDepartment == null ? null : usetDepartment.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -341,6 +397,10 @@ public class MeterBaseCar implements IBasePO<String> {
         sb.append(", deleteManName=").append(deleteManName);
         sb.append(", deleteTime=").append(deleteTime);
         sb.append(", ssoId=").append(ssoId);
+        sb.append(", vehicleType=").append(vehicleType);
+        sb.append(", belongUnitTypeNo=").append(belongUnitTypeNo);
+        sb.append(", belongUnitTypeName=").append(belongUnitTypeName);
+        sb.append(", usetDepartment=").append(usetDepartment);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/baseinfo/meterbasecarblacelist/mapper/MeterBaseCarBlacelistMapper.xml

@@ -26,19 +26,21 @@
     <result column="OPERATION_UNIT" jdbcType="VARCHAR" property="operationUnit" />
     <result column="CHANGE_MEMO" jdbcType="VARCHAR" property="changeMemo" />
     <result column="BLACK_LEVEL_NAME" jdbcType="VARCHAR" property="blackLevelName" />
+    <result column="SUPPLLIER" jdbcType="VARCHAR" property="suppllier" />
   </resultMap>
   <sql id="columns">
-    BLACELIST_NO, CAR_NO, CAR_OWNER_NAME, CAR_DRIVER_NAME, CAR_UNDER_UNIT, PUNISH_REASON,
-    PUNISH_RESULT, VALUE_FLAG, MEMO, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO,
-    UPDATE_MAN_NAME, UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, PUNISH_TYPE_NO,
-    PUNISH_TYPE_NAME, BLACK_LEVEL_NO, OPERATION_UNIT, CHANGE_MEMO, BLACK_LEVEL_NAME
+    BLACELIST_NO, CAR_NO, CAR_OWNER_NAME, CAR_DRIVER_NAME, CAR_UNDER_UNIT, PUNISH_REASON, 
+    PUNISH_RESULT, VALUE_FLAG, MEMO, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, 
+    UPDATE_MAN_NAME, UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, PUNISH_TYPE_NO, 
+    PUNISH_TYPE_NAME, BLACK_LEVEL_NO, OPERATION_UNIT, CHANGE_MEMO, BLACK_LEVEL_NAME, 
+    SUPPLLIER
   </sql>
   <sql id="columns_alias">
-    t.BLACELIST_NO, t.CAR_NO, t.CAR_OWNER_NAME, t.CAR_DRIVER_NAME, t.CAR_UNDER_UNIT,
-    t.PUNISH_REASON, t.PUNISH_RESULT, t.VALUE_FLAG, t.MEMO, 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.PUNISH_TYPE_NO, t.PUNISH_TYPE_NAME, t.BLACK_LEVEL_NO,
-    t.OPERATION_UNIT, t.CHANGE_MEMO, t.BLACK_LEVEL_NAME
+    t.BLACELIST_NO, t.CAR_NO, t.CAR_OWNER_NAME, t.CAR_DRIVER_NAME, t.CAR_UNDER_UNIT, 
+    t.PUNISH_REASON, t.PUNISH_RESULT, t.VALUE_FLAG, t.MEMO, 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.PUNISH_TYPE_NO, t.PUNISH_TYPE_NAME, t.BLACK_LEVEL_NO, 
+    t.OPERATION_UNIT, t.CHANGE_MEMO, t.BLACK_LEVEL_NAME, t.SUPPLLIER
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM METER_BASE_CAR_BLACELIST
@@ -47,7 +49,7 @@
     SELECT <include refid="columns_alias"/> FROM METER_BASE_CAR_BLACELIST t
   </sql>
   <sql id="where">
-    <where>
+    <where> 
       <if test="blacelistNo != null and blacelistNo != ''">
         and BLACELIST_NO = #{blacelistNo}
       </if>
@@ -120,10 +122,13 @@
       <if test="blackLevelName != null and blackLevelName != ''">
         and BLACK_LEVEL_NAME = #{blackLevelName}
       </if>
+      <if test="suppllier != null and suppllier != ''">
+        and SUPPLLIER = #{suppllier}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
-    <where>
+    <where> 
       <if test="blacelistNo != null and blacelistNo != ''">
         and BLACELIST_NO LIKE '%${blacelistNo}%'
       </if>
@@ -196,6 +201,9 @@
       <if test="blackLevelName != null and blackLevelName != ''">
         and BLACK_LEVEL_NAME LIKE '%${blackLevelName}%'
       </if>
+      <if test="suppllier != null and suppllier != ''">
+        and SUPPLLIER LIKE '%${suppllier}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -204,96 +212,99 @@
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from METER_BASE_CAR_BLACELIST
-    where 1!=1
-    <if test="carNo != null and carNo != ''">
-      or CAR_NO = #{carNo}
-    </if>
-    <if test="carOwnerName != null and carOwnerName != ''">
-      or CAR_OWNER_NAME = #{carOwnerName}
-    </if>
-    <if test="carDriverName != null and carDriverName != ''">
-      or CAR_DRIVER_NAME = #{carDriverName}
-    </if>
-    <if test="carUnderUnit != null and carUnderUnit != ''">
-      or CAR_UNDER_UNIT = #{carUnderUnit}
-    </if>
-    <if test="punishReason != null and punishReason != ''">
-      or PUNISH_REASON = #{punishReason}
-    </if>
-    <if test="punishResult != null and punishResult != ''">
-      or PUNISH_RESULT = #{punishResult}
-    </if>
-    <if test="valueFlag != null and valueFlag != ''">
-      or VALUE_FLAG = #{valueFlag}
-    </if>
-    <if test="memo != null and memo != ''">
-      or MEMO = #{memo}
-    </if>
-    <if test="createManNo != null and createManNo != ''">
-      or CREATE_MAN_NO = #{createManNo}
-    </if>
-    <if test="createManName != null and createManName != ''">
-      or CREATE_MAN_NAME = #{createManName}
-    </if>
-    <if test="createTime != null">
-      or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
-    </if>
-    <if test="updateManNo != null and updateManNo != ''">
-      or UPDATE_MAN_NO = #{updateManNo}
-    </if>
-    <if test="updateManName != null and updateManName != ''">
-      or UPDATE_MAN_NAME = #{updateManName}
-    </if>
-    <if test="updateTime != null">
-      or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-    </if>
-    <if test="deleteManNo != null and deleteManNo != ''">
-      or DELETE_MAN_NO = #{deleteManNo}
-    </if>
-    <if test="deleteManName != null and deleteManName != ''">
-      or DELETE_MAN_NAME = #{deleteManName}
-    </if>
-    <if test="deleteTime != null">
-      or TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = '#{deleteTime}'
-    </if>
-    <if test="punishTypeNo != null and punishTypeNo != ''">
-      or PUNISH_TYPE_NO = #{punishTypeNo}
-    </if>
-    <if test="punishTypeName != null and punishTypeName != ''">
-      or PUNISH_TYPE_NAME = #{punishTypeName}
-    </if>
-    <if test="blackLevelNo != null and blackLevelNo != ''">
-      or BLACK_LEVEL_NO = #{blackLevelNo}
-    </if>
-    <if test="operationUnit != null and operationUnit != ''">
-      or OPERATION_UNIT = #{operationUnit}
-    </if>
-    <if test="changeMemo != null and changeMemo != ''">
-      or CHANGE_MEMO = #{changeMemo}
-    </if>
-    <if test="blackLevelName != null and blackLevelName != ''">
-      or BLACK_LEVEL_NAME = #{blackLevelName}
-    </if>
+    where 1!=1 
+      <if test="carNo != null and carNo != ''">
+        or CAR_NO = #{carNo}
+      </if>
+      <if test="carOwnerName != null and carOwnerName != ''">
+        or CAR_OWNER_NAME = #{carOwnerName}
+      </if>
+      <if test="carDriverName != null and carDriverName != ''">
+        or CAR_DRIVER_NAME = #{carDriverName}
+      </if>
+      <if test="carUnderUnit != null and carUnderUnit != ''">
+        or CAR_UNDER_UNIT = #{carUnderUnit}
+      </if>
+      <if test="punishReason != null and punishReason != ''">
+        or PUNISH_REASON = #{punishReason}
+      </if>
+      <if test="punishResult != null and punishResult != ''">
+        or PUNISH_RESULT = #{punishResult}
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        or VALUE_FLAG = #{valueFlag}
+      </if>
+      <if test="memo != null and memo != ''">
+        or MEMO = #{memo}
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        or CREATE_MAN_NO = #{createManNo}
+      </if>
+      <if test="createManName != null and createManName != ''">
+        or CREATE_MAN_NAME = #{createManName}
+      </if>
+      <if test="createTime != null">
+        or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        or UPDATE_MAN_NO = #{updateManNo}
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        or UPDATE_MAN_NAME = #{updateManName}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+      <if test="deleteManNo != null and deleteManNo != ''">
+        or DELETE_MAN_NO = #{deleteManNo}
+      </if>
+      <if test="deleteManName != null and deleteManName != ''">
+        or DELETE_MAN_NAME = #{deleteManName}
+      </if>
+      <if test="deleteTime != null">
+        or TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = '#{deleteTime}'
+      </if>
+      <if test="punishTypeNo != null and punishTypeNo != ''">
+        or PUNISH_TYPE_NO = #{punishTypeNo}
+      </if>
+      <if test="punishTypeName != null and punishTypeName != ''">
+        or PUNISH_TYPE_NAME = #{punishTypeName}
+      </if>
+      <if test="blackLevelNo != null and blackLevelNo != ''">
+        or BLACK_LEVEL_NO = #{blackLevelNo}
+      </if>
+      <if test="operationUnit != null and operationUnit != ''">
+        or OPERATION_UNIT = #{operationUnit}
+      </if>
+      <if test="changeMemo != null and changeMemo != ''">
+        or CHANGE_MEMO = #{changeMemo}
+      </if>
+      <if test="blackLevelName != null and blackLevelName != ''">
+        or BLACK_LEVEL_NAME = #{blackLevelName}
+      </if>
+      <if test="suppllier != null and suppllier != ''">
+        or SUPPLLIER = #{suppllier}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbasecarblacelist.model.MeterBaseCarBlacelist">
-    insert into METER_BASE_CAR_BLACELIST (BLACELIST_NO, CAR_NO, CAR_OWNER_NAME,
-                                          CAR_DRIVER_NAME, CAR_UNDER_UNIT, PUNISH_REASON,
-                                          PUNISH_RESULT, VALUE_FLAG, MEMO,
-                                          CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME,
-                                          UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME,
-                                          DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME,
-                                          PUNISH_TYPE_NO, PUNISH_TYPE_NAME, BLACK_LEVEL_NO,
-                                          OPERATION_UNIT, CHANGE_MEMO, BLACK_LEVEL_NAME
-    )
-    values (#{blacelistNo,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR}, #{carOwnerName,jdbcType=VARCHAR},
-            #{carDriverName,jdbcType=VARCHAR}, #{carUnderUnit,jdbcType=VARCHAR}, #{punishReason,jdbcType=VARCHAR},
-            #{punishResult,jdbcType=VARCHAR}, #{valueFlag,jdbcType=VARCHAR}, #{memo,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},
-            #{punishTypeNo,jdbcType=VARCHAR}, #{punishTypeName,jdbcType=VARCHAR}, #{blackLevelNo,jdbcType=VARCHAR},
-            #{operationUnit,jdbcType=VARCHAR}, #{changeMemo,jdbcType=VARCHAR}, #{blackLevelName,jdbcType=VARCHAR}
-           )
+    insert into METER_BASE_CAR_BLACELIST (BLACELIST_NO, CAR_NO, CAR_OWNER_NAME, 
+      CAR_DRIVER_NAME, CAR_UNDER_UNIT, PUNISH_REASON, 
+      PUNISH_RESULT, VALUE_FLAG, MEMO, 
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
+      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, 
+      PUNISH_TYPE_NO, PUNISH_TYPE_NAME, BLACK_LEVEL_NO, 
+      OPERATION_UNIT, CHANGE_MEMO, BLACK_LEVEL_NAME, 
+      SUPPLLIER)
+    values (#{blacelistNo,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR}, #{carOwnerName,jdbcType=VARCHAR}, 
+      #{carDriverName,jdbcType=VARCHAR}, #{carUnderUnit,jdbcType=VARCHAR}, #{punishReason,jdbcType=VARCHAR}, 
+      #{punishResult,jdbcType=VARCHAR}, #{valueFlag,jdbcType=VARCHAR}, #{memo,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}, 
+      #{punishTypeNo,jdbcType=VARCHAR}, #{punishTypeName,jdbcType=VARCHAR}, #{blackLevelNo,jdbcType=VARCHAR}, 
+      #{operationUnit,jdbcType=VARCHAR}, #{changeMemo,jdbcType=VARCHAR}, #{blackLevelName,jdbcType=VARCHAR}, 
+      #{suppllier,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbasecarblacelist.model.MeterBaseCarBlacelist">
     insert into METER_BASE_CAR_BLACELIST
@@ -370,6 +381,9 @@
       <if test="blackLevelName != null">
         BLACK_LEVEL_NAME,
       </if>
+      <if test="suppllier != null">
+        SUPPLLIER,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="blacelistNo != null">
@@ -444,33 +458,37 @@
       <if test="blackLevelName != null">
         #{blackLevelName,jdbcType=VARCHAR},
       </if>
+      <if test="suppllier != null">
+        #{suppllier,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbasecarblacelist.model.MeterBaseCarBlacelist">
     update METER_BASE_CAR_BLACELIST
     set CAR_NO = #{carNo,jdbcType=VARCHAR},
-        CAR_OWNER_NAME = #{carOwnerName,jdbcType=VARCHAR},
-        CAR_DRIVER_NAME = #{carDriverName,jdbcType=VARCHAR},
-        CAR_UNDER_UNIT = #{carUnderUnit,jdbcType=VARCHAR},
-        PUNISH_REASON = #{punishReason,jdbcType=VARCHAR},
-        PUNISH_RESULT = #{punishResult,jdbcType=VARCHAR},
-        VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
-        MEMO = #{memo,jdbcType=VARCHAR},
-        CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
-        CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
-        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
-        UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
-        UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
-        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-        DELETE_MAN_NO = #{deleteManNo,jdbcType=VARCHAR},
-        DELETE_MAN_NAME = #{deleteManName,jdbcType=VARCHAR},
-        DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
-        PUNISH_TYPE_NO = #{punishTypeNo,jdbcType=VARCHAR},
-        PUNISH_TYPE_NAME = #{punishTypeName,jdbcType=VARCHAR},
-        BLACK_LEVEL_NO = #{blackLevelNo,jdbcType=VARCHAR},
-        OPERATION_UNIT = #{operationUnit,jdbcType=VARCHAR},
-        CHANGE_MEMO = #{changeMemo,jdbcType=VARCHAR},
-        BLACK_LEVEL_NAME = #{blackLevelName,jdbcType=VARCHAR}
+      CAR_OWNER_NAME = #{carOwnerName,jdbcType=VARCHAR},
+      CAR_DRIVER_NAME = #{carDriverName,jdbcType=VARCHAR},
+      CAR_UNDER_UNIT = #{carUnderUnit,jdbcType=VARCHAR},
+      PUNISH_REASON = #{punishReason,jdbcType=VARCHAR},
+      PUNISH_RESULT = #{punishResult,jdbcType=VARCHAR},
+      VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
+      MEMO = #{memo,jdbcType=VARCHAR},
+      CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
+      CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
+      UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      DELETE_MAN_NO = #{deleteManNo,jdbcType=VARCHAR},
+      DELETE_MAN_NAME = #{deleteManName,jdbcType=VARCHAR},
+      DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
+      PUNISH_TYPE_NO = #{punishTypeNo,jdbcType=VARCHAR},
+      PUNISH_TYPE_NAME = #{punishTypeName,jdbcType=VARCHAR},
+      BLACK_LEVEL_NO = #{blackLevelNo,jdbcType=VARCHAR},
+      OPERATION_UNIT = #{operationUnit,jdbcType=VARCHAR},
+      CHANGE_MEMO = #{changeMemo,jdbcType=VARCHAR},
+      BLACK_LEVEL_NAME = #{blackLevelName,jdbcType=VARCHAR},
+      SUPPLLIER = #{suppllier,jdbcType=VARCHAR}
     where BLACELIST_NO = #{blacelistNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbasecarblacelist.model.MeterBaseCarBlacelist">
@@ -545,6 +563,9 @@
       <if test="blackLevelName != null">
         BLACK_LEVEL_NAME = #{blackLevelName,jdbcType=VARCHAR},
       </if>
+      <if test="suppllier != null">
+        SUPPLLIER = #{suppllier,jdbcType=VARCHAR},
+      </if>
     </set>
     where BLACELIST_NO = #{blacelistNo,jdbcType=VARCHAR}
   </update>
@@ -561,144 +582,151 @@
     <include refid="whereLike"/>
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into METER_BASE_CAR_BLACELIST
-    (BLACELIST_NO,
-    CAR_NO, CAR_OWNER_NAME, CAR_DRIVER_NAME,
-    CAR_UNDER_UNIT, PUNISH_REASON, PUNISH_RESULT,
-    VALUE_FLAG, MEMO, CREATE_MAN_NO,
-    CREATE_MAN_NAME, CREATE_TIME,
-    UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME,
-    DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME,
-    PUNISH_TYPE_NO, PUNISH_TYPE_NAME,
-    BLACK_LEVEL_NO, OPERATION_UNIT,
-    CHANGE_MEMO, BLACK_LEVEL_NAME)
-    ( <foreach collection="list" item="item" separator="union all">
-    select
-    #{item.blacelistNo,jdbcType=VARCHAR},
-    #{item.carNo,jdbcType=VARCHAR}, #{item.carOwnerName,jdbcType=VARCHAR}, #{item.carDriverName,jdbcType=VARCHAR},
-    #{item.carUnderUnit,jdbcType=VARCHAR}, #{item.punishReason,jdbcType=VARCHAR}, #{item.punishResult,jdbcType=VARCHAR},
-    #{item.valueFlag,jdbcType=VARCHAR}, #{item.memo,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.punishTypeNo,jdbcType=VARCHAR}, #{item.punishTypeName,jdbcType=VARCHAR},
-    #{item.blackLevelNo,jdbcType=VARCHAR}, #{item.operationUnit,jdbcType=VARCHAR},
-    #{item.changeMemo,jdbcType=VARCHAR}, #{item.blackLevelName,jdbcType=VARCHAR} from dual
-  </foreach> )
+    insert into METER_BASE_CAR_BLACELIST 
+      (BLACELIST_NO, 
+      CAR_NO, CAR_OWNER_NAME, CAR_DRIVER_NAME, 
+      CAR_UNDER_UNIT, PUNISH_REASON, PUNISH_RESULT, 
+      VALUE_FLAG, MEMO, CREATE_MAN_NO, 
+      CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
+      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, 
+      PUNISH_TYPE_NO, PUNISH_TYPE_NAME, 
+      BLACK_LEVEL_NO, OPERATION_UNIT, 
+      CHANGE_MEMO, BLACK_LEVEL_NAME, SUPPLLIER
+      )
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.blacelistNo,jdbcType=VARCHAR}, 
+      #{item.carNo,jdbcType=VARCHAR}, #{item.carOwnerName,jdbcType=VARCHAR}, #{item.carDriverName,jdbcType=VARCHAR}, 
+      #{item.carUnderUnit,jdbcType=VARCHAR}, #{item.punishReason,jdbcType=VARCHAR}, #{item.punishResult,jdbcType=VARCHAR}, 
+      #{item.valueFlag,jdbcType=VARCHAR}, #{item.memo,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.punishTypeNo,jdbcType=VARCHAR}, #{item.punishTypeName,jdbcType=VARCHAR}, 
+      #{item.blackLevelNo,jdbcType=VARCHAR}, #{item.operationUnit,jdbcType=VARCHAR}, 
+      #{item.changeMemo,jdbcType=VARCHAR}, #{item.blackLevelName,jdbcType=VARCHAR}, #{item.suppllier,jdbcType=VARCHAR}
+       from dual  
+   </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
-    update METER_BASE_CAR_BLACELIST
-    set
-    BLACELIST_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.blacelistNo,jdbcType=VARCHAR}
-    </foreach>
-    ,CAR_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.carNo,jdbcType=VARCHAR}
-    </foreach>
-    ,CAR_OWNER_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.carOwnerName,jdbcType=VARCHAR}
-    </foreach>
-    ,CAR_DRIVER_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.carDriverName,jdbcType=VARCHAR}
-    </foreach>
-    ,CAR_UNDER_UNIT=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.carUnderUnit,jdbcType=VARCHAR}
-    </foreach>
-    ,PUNISH_REASON=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.punishReason,jdbcType=VARCHAR}
-    </foreach>
-    ,PUNISH_RESULT=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.punishResult,jdbcType=VARCHAR}
-    </foreach>
-    ,VALUE_FLAG=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.valueFlag,jdbcType=VARCHAR}
-    </foreach>
-    ,MEMO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
-    </foreach>
-    ,CREATE_MAN_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
-    </foreach>
-    ,CREATE_MAN_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
-    </foreach>
-    ,CREATE_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,UPDATE_MAN_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
-    </foreach>
-    ,UPDATE_MAN_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
-    </foreach>
-    ,UPDATE_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,DELETE_MAN_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.deleteManNo,jdbcType=VARCHAR}
-    </foreach>
-    ,DELETE_MAN_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.deleteManName,jdbcType=VARCHAR}
-    </foreach>
-    ,DELETE_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.deleteTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,PUNISH_TYPE_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.punishTypeNo,jdbcType=VARCHAR}
-    </foreach>
-    ,PUNISH_TYPE_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.punishTypeName,jdbcType=VARCHAR}
-    </foreach>
-    ,BLACK_LEVEL_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.blackLevelNo,jdbcType=VARCHAR}
-    </foreach>
-    ,OPERATION_UNIT=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.operationUnit,jdbcType=VARCHAR}
-    </foreach>
-    ,CHANGE_MEMO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.changeMemo,jdbcType=VARCHAR}
-    </foreach>
-    ,BLACK_LEVEL_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
-      when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.blackLevelName,jdbcType=VARCHAR}
-    </foreach>
-    where BLACELIST_NO in
-    <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-      #{item.blacelistNo,jdbcType=VARCHAR}
-    </foreach>
+     update METER_BASE_CAR_BLACELIST
+     set
+       BLACELIST_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
+          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.blacelistNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CAR_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
+          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.carNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CAR_OWNER_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
+          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.carOwnerName,jdbcType=VARCHAR}
+       </foreach>
+       ,CAR_DRIVER_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
+          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.carDriverName,jdbcType=VARCHAR}
+       </foreach>
+       ,CAR_UNDER_UNIT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
+          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.carUnderUnit,jdbcType=VARCHAR}
+       </foreach>
+       ,PUNISH_REASON=
+       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
+          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.punishReason,jdbcType=VARCHAR}
+       </foreach>
+       ,PUNISH_RESULT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
+          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.punishResult,jdbcType=VARCHAR}
+       </foreach>
+       ,VALUE_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
+          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.valueFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,MEMO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
+          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
+          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
+          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
+          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
+          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
+          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
+          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,DELETE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
+          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.deleteManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
+          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.deleteManName,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
+          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.deleteTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,PUNISH_TYPE_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
+          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.punishTypeNo,jdbcType=VARCHAR}
+       </foreach>
+       ,PUNISH_TYPE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
+          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.punishTypeName,jdbcType=VARCHAR}
+       </foreach>
+       ,BLACK_LEVEL_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
+          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.blackLevelNo,jdbcType=VARCHAR}
+       </foreach>
+       ,OPERATION_UNIT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
+          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.operationUnit,jdbcType=VARCHAR}
+       </foreach>
+       ,CHANGE_MEMO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
+          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.changeMemo,jdbcType=VARCHAR}
+       </foreach>
+       ,BLACK_LEVEL_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
+          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.blackLevelName,jdbcType=VARCHAR}
+       </foreach>
+       ,SUPPLLIER=
+       <foreach collection="list" item="item" index="index" separator=" " open="case BLACELIST_NO" close="end">
+          when #{item.blacelistNo,jdbcType=VARCHAR} then #{item.suppllier,jdbcType=VARCHAR}
+       </foreach>
+     where BLACELIST_NO in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.blacelistNo,jdbcType=VARCHAR}
+     </foreach> 
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from METER_BASE_CAR_BLACELIST
-    where BLACELIST_NO in
+    where BLACELIST_NO in 
     <foreach collection="list" item="id" open="(" close=")" separator=",">
       #{id}
     </foreach>
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+
   <select id="GetNewID" parameterType="java.lang.String" resultType="java.lang.String">
     SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(BLACELIST_NO, LENGTH(BLACELIST_NO) -3))),0) + 1,4,'0') BLACELIST_NO
     FROM METER_BASE_CAR_BLACELIST

src/main/java/com/steerinfo/baseinfo/meterbasecarblacelist/model/MeterBaseCarBlacelist.java

@@ -1,14 +1,16 @@
 package com.steerinfo.baseinfo.meterbasecarblacelist.model;
 
 import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
 
+@ApiModel(value="车辆黑名单配置表")
 public class MeterBaseCarBlacelist implements IBasePO<String> {
     /**
-     * 黑名单编号(BLACELIST_NO,VARCHAR,20)
+     * 黑名单编号（YYYYMMDD+4位流水）(BLACELIST_NO,VARCHAR,20)
      */
-    @ApiModelProperty(value="黑名单编号",required=true)
+    @ApiModelProperty(value="黑名单编号（YYYYMMDD+4位流水）",required=true)
     private String blacelistNo;
 
     /**
@@ -48,9 +50,9 @@ public class MeterBaseCarBlacelist implements IBasePO<String> {
     private String punishResult;
 
     /**
-     * 状态(VALUE_FLAG,VARCHAR,1)
+     * 状态（0：无效；1：有效，2：已撤销）(VALUE_FLAG,VARCHAR,1)
      */
-    @ApiModelProperty(value="状态",required=true)
+    @ApiModelProperty(value="状态（0：无效；1：有效，2：已撤销）",required=true)
     private String valueFlag;
 
     /**
@@ -72,9 +74,9 @@ public class MeterBaseCarBlacelist implements IBasePO<String> {
     private String createManName;
 
     /**
-     * 创建时间(CREATE_TIME,TIMESTAMP,7)
+     * 创建时间（YYYY-MM-DD HH:mm:SS）(CREATE_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="创建时间",required=true)
+    @ApiModelProperty(value="创建时间（YYYY-MM-DD HH:mm:SS）",required=true)
     private Date createTime;
 
     /**
@@ -90,9 +92,9 @@ public class MeterBaseCarBlacelist implements IBasePO<String> {
     private String updateManName;
 
     /**
-     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     * 修改时间（YYYY-MM-DD HH:mm:SS）(UPDATE_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="修改时间",required=false)
+    @ApiModelProperty(value="修改时间（YYYY-MM-DD HH:mm:SS）",required=false)
     private Date updateTime;
 
     /**
@@ -108,9 +110,9 @@ public class MeterBaseCarBlacelist implements IBasePO<String> {
     private String deleteManName;
 
     /**
-     * 删除时间(DELETE_TIME,TIMESTAMP,7)
+     * 删除时间（YYYY-MM-DD HH:mm:SS）(DELETE_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="删除时间",required=false)
+    @ApiModelProperty(value="删除时间（YYYY-MM-DD HH:mm:SS）",required=false)
     private Date deleteTime;
 
     /**
@@ -149,6 +151,12 @@ public class MeterBaseCarBlacelist implements IBasePO<String> {
     @ApiModelProperty(value="黑名单级别名称",required=false)
     private String blackLevelName;
 
+    /**
+     * 供应商(SUPPLLIER,VARCHAR,255)
+     */
+    @ApiModelProperty(value="供应商",required=false)
+    private String suppllier;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -353,6 +361,14 @@ public class MeterBaseCarBlacelist implements IBasePO<String> {
         this.blackLevelName = blackLevelName == null ? null : blackLevelName.trim();
     }
 
+    public String getSuppllier() {
+        return suppllier;
+    }
+
+    public void setSuppllier(String suppllier) {
+        this.suppllier = suppllier == null ? null : suppllier.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -383,6 +399,7 @@ public class MeterBaseCarBlacelist implements IBasePO<String> {
         sb.append(", operationUnit=").append(operationUnit);
         sb.append(", changeMemo=").append(changeMemo);
         sb.append(", blackLevelName=").append(blackLevelName);
+        sb.append(", suppllier=").append(suppllier);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/baseinfo/meterbasecarblacelist/service/impl/MeterBaseCarBlacelistServiceImpl.java

@@ -155,23 +155,23 @@ public class MeterBaseCarBlacelistServiceImpl extends BaseServiceImpl<MeterBaseC
         if (StringUtils.isEmpty(model.getCarNo())){
             return "车号不能为空！！";
         }
-        if (StringUtils.isEmpty(model.getCarDriverName())){
-            return "驾驶员不能为空！！";
+        if (StringUtils.isEmpty(model.getSuppllier())){
+            return "供应商不能为空！！";
         }
         if (StringUtils.isEmpty(model.getCarOwnerName())){
             return "车主不能为空！！";
         }
-        if (StringUtils.isEmpty(model.getCarUnderUnit())){
-            return "隶属单位不能为空！！";
+        if (StringUtils.isEmpty(model.getPunishTypeNo())){
+            return "违规类型编号不能为空！！";
         }
-        if (StringUtils.isEmpty(model.getCreateManNo())){
-            return "创建人标号不能为空！！";
+        if (StringUtils.isEmpty(model.getPunishTypeName())){
+            return "违规类型名称不能为空！！";
         }
-        if (StringUtils.isEmpty(model.getPunishReason())){
-            return "处罚原因不能为空！！";
+        if (StringUtils.isEmpty(model.getBlackLevelNo())){
+            return "黑名单级别编码不能为空！！";
         }
-        if (StringUtils.isEmpty(model.getPunishResult())){
-            return "处罚结果不能为空！！";
+        if (StringUtils.isEmpty(model.getBlackLevelName())){
+            return "黑名单级别名称不能为空！！";
         }
         if(StringUtils.isEmpty(model.getBlacelistNo())){
             model.setCreateTime(new Date());

src/main/java/com/steerinfo/baseinfo/meterbasescalepoint/mapper/MeterBaseScalePointMapper.xml

@@ -37,6 +37,16 @@
     <result column="PHOTO_CAR" jdbcType="VARCHAR" property="photoCar" />
     <result column="WGT_ERR" jdbcType="VARCHAR" property="wgtErr" />
     <result column="USER_IP" jdbcType="VARCHAR" property="userIp" />
+    <result column="AI_WEIGHT" jdbcType="VARCHAR" property="aiWeight" />
+    <result column="CAR_ERR" jdbcType="VARCHAR" property="carErr" />
+    <result column="POWER_STATE" jdbcType="VARCHAR" property="powerState" />
+    <result column="DVR_STATE" jdbcType="VARCHAR" property="dvrState" />
+    <result column="MOXA_STATE" jdbcType="VARCHAR" property="moxaState" />
+    <result column="PLC_STATE" jdbcType="VARCHAR" property="plcState" />
+    <result column="LEFT_INFRARED_RAY_STATE" jdbcType="VARCHAR" property="leftInfraredRayState" />
+    <result column="RIGHT_INFRARED_RAY_STATE" jdbcType="VARCHAR" property="rightInfraredRayState" />
+    <result column="AMPLIFIER_STATE" jdbcType="VARCHAR" property="amplifierState" />
+    <result column="LAMP_STATE" jdbcType="VARCHAR" property="lampState" />
   </resultMap>
   <sql id="columns">
     SCALE_POINT_NO, SCALE_POINT_NAME, BASE_SPOT_NO, BASE_SPOT_NAME, WEIGH_INSTRUMENT_MODEL, 
@@ -44,7 +54,9 @@
     MONITOR_USER_NO, WEIGHT, COLLECTION_CODE, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
     UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, 
     SPOT_TYPE_NO, SPOT_TYPE_NAME, WEIGHT_ZERO, MONITOR_USER_IP, IS_HELP, IS_TAKE_OVER, 
-    LED_WRITER, RFID_CAR, PHOTO_CAR, WGT_ERR, USER_IP
+    LED_WRITER, RFID_CAR, PHOTO_CAR, WGT_ERR, USER_IP, AI_WEIGHT, CAR_ERR, POWER_STATE, 
+    DVR_STATE, MOXA_STATE, PLC_STATE, LEFT_INFRARED_RAY_STATE, RIGHT_INFRARED_RAY_STATE, 
+    AMPLIFIER_STATE, LAMP_STATE
   </sql>
   <sql id="columns_alias">
     t.SCALE_POINT_NO, t.SCALE_POINT_NAME, t.BASE_SPOT_NO, t.BASE_SPOT_NAME, t.WEIGH_INSTRUMENT_MODEL, 
@@ -53,7 +65,9 @@
     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.SPOT_TYPE_NO, t.SPOT_TYPE_NAME, t.WEIGHT_ZERO, 
     t.MONITOR_USER_IP, t.IS_HELP, t.IS_TAKE_OVER, t.LED_WRITER, t.RFID_CAR, t.PHOTO_CAR, 
-    t.WGT_ERR, t.USER_IP
+    t.WGT_ERR, t.USER_IP, t.AI_WEIGHT, t.CAR_ERR, t.POWER_STATE, t.DVR_STATE, t.MOXA_STATE, 
+    t.PLC_STATE, t.LEFT_INFRARED_RAY_STATE, t.RIGHT_INFRARED_RAY_STATE, t.AMPLIFIER_STATE, 
+    t.LAMP_STATE
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM METER_BASE_SCALE_POINT
@@ -168,6 +182,36 @@
       <if test="userIp != null and userIp != ''">
         and USER_IP = #{userIp}
       </if>
+      <if test="aiWeight != null and aiWeight != ''">
+        and AI_WEIGHT = #{aiWeight}
+      </if>
+      <if test="carErr != null and carErr != ''">
+        and CAR_ERR = #{carErr}
+      </if>
+      <if test="powerState != null and powerState != ''">
+        and POWER_STATE = #{powerState}
+      </if>
+      <if test="dvrState != null and dvrState != ''">
+        and DVR_STATE = #{dvrState}
+      </if>
+      <if test="moxaState != null and moxaState != ''">
+        and MOXA_STATE = #{moxaState}
+      </if>
+      <if test="plcState != null and plcState != ''">
+        and PLC_STATE = #{plcState}
+      </if>
+      <if test="leftInfraredRayState != null and leftInfraredRayState != ''">
+        and LEFT_INFRARED_RAY_STATE = #{leftInfraredRayState}
+      </if>
+      <if test="rightInfraredRayState != null and rightInfraredRayState != ''">
+        and RIGHT_INFRARED_RAY_STATE = #{rightInfraredRayState}
+      </if>
+      <if test="amplifierState != null and amplifierState != ''">
+        and AMPLIFIER_STATE = #{amplifierState}
+      </if>
+      <if test="lampState != null and lampState != ''">
+        and LAMP_STATE = #{lampState}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -277,6 +321,36 @@
       <if test="userIp != null and userIp != ''">
         and USER_IP LIKE '%${userIp}%'
       </if>
+      <if test="aiWeight != null and aiWeight != ''">
+        and AI_WEIGHT LIKE '%${aiWeight}%'
+      </if>
+      <if test="carErr != null and carErr != ''">
+        and CAR_ERR LIKE '%${carErr}%'
+      </if>
+      <if test="powerState != null and powerState != ''">
+        and POWER_STATE LIKE '%${powerState}%'
+      </if>
+      <if test="dvrState != null and dvrState != ''">
+        and DVR_STATE LIKE '%${dvrState}%'
+      </if>
+      <if test="moxaState != null and moxaState != ''">
+        and MOXA_STATE LIKE '%${moxaState}%'
+      </if>
+      <if test="plcState != null and plcState != ''">
+        and PLC_STATE LIKE '%${plcState}%'
+      </if>
+      <if test="leftInfraredRayState != null and leftInfraredRayState != ''">
+        and LEFT_INFRARED_RAY_STATE LIKE '%${leftInfraredRayState}%'
+      </if>
+      <if test="rightInfraredRayState != null and rightInfraredRayState != ''">
+        and RIGHT_INFRARED_RAY_STATE LIKE '%${rightInfraredRayState}%'
+      </if>
+      <if test="amplifierState != null and amplifierState != ''">
+        and AMPLIFIER_STATE LIKE '%${amplifierState}%'
+      </if>
+      <if test="lampState != null and lampState != ''">
+        and LAMP_STATE LIKE '%${lampState}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -388,6 +462,36 @@
       <if test="userIp != null and userIp != ''">
         or USER_IP = #{userIp}
       </if>
+      <if test="aiWeight != null and aiWeight != ''">
+        or AI_WEIGHT = #{aiWeight}
+      </if>
+      <if test="carErr != null and carErr != ''">
+        or CAR_ERR = #{carErr}
+      </if>
+      <if test="powerState != null and powerState != ''">
+        or POWER_STATE = #{powerState}
+      </if>
+      <if test="dvrState != null and dvrState != ''">
+        or DVR_STATE = #{dvrState}
+      </if>
+      <if test="moxaState != null and moxaState != ''">
+        or MOXA_STATE = #{moxaState}
+      </if>
+      <if test="plcState != null and plcState != ''">
+        or PLC_STATE = #{plcState}
+      </if>
+      <if test="leftInfraredRayState != null and leftInfraredRayState != ''">
+        or LEFT_INFRARED_RAY_STATE = #{leftInfraredRayState}
+      </if>
+      <if test="rightInfraredRayState != null and rightInfraredRayState != ''">
+        or RIGHT_INFRARED_RAY_STATE = #{rightInfraredRayState}
+      </if>
+      <if test="amplifierState != null and amplifierState != ''">
+        or AMPLIFIER_STATE = #{amplifierState}
+      </if>
+      <if test="lampState != null and lampState != ''">
+        or LAMP_STATE = #{lampState}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbasescalepoint.model.MeterBaseScalePoint">
     insert into METER_BASE_SCALE_POINT (SCALE_POINT_NO, SCALE_POINT_NAME, BASE_SPOT_NO, 
@@ -401,7 +505,11 @@
       SPOT_TYPE_NO, SPOT_TYPE_NAME, WEIGHT_ZERO, 
       MONITOR_USER_IP, IS_HELP, IS_TAKE_OVER, 
       LED_WRITER, RFID_CAR, PHOTO_CAR, 
-      WGT_ERR, USER_IP)
+      WGT_ERR, USER_IP, AI_WEIGHT, 
+      CAR_ERR, POWER_STATE, DVR_STATE, 
+      MOXA_STATE, PLC_STATE, LEFT_INFRARED_RAY_STATE, 
+      RIGHT_INFRARED_RAY_STATE, AMPLIFIER_STATE, 
+      LAMP_STATE)
     values (#{scalePointNo,jdbcType=VARCHAR}, #{scalePointName,jdbcType=VARCHAR}, #{baseSpotNo,jdbcType=VARCHAR}, 
       #{baseSpotName,jdbcType=VARCHAR}, #{weighInstrumentModel,jdbcType=VARCHAR}, #{weighInstrumentParam,jdbcType=VARCHAR}, 
       #{moxaIp,jdbcType=VARCHAR}, #{moxaPort,jdbcType=VARCHAR}, #{validFlag,jdbcType=VARCHAR}, 
@@ -413,7 +521,11 @@
       #{spotTypeNo,jdbcType=VARCHAR}, #{spotTypeName,jdbcType=VARCHAR}, #{weightZero,jdbcType=DECIMAL}, 
       #{monitorUserIp,jdbcType=VARCHAR}, #{isHelp,jdbcType=VARCHAR}, #{isTakeOver,jdbcType=VARCHAR}, 
       #{ledWriter,jdbcType=VARCHAR}, #{rfidCar,jdbcType=VARCHAR}, #{photoCar,jdbcType=VARCHAR}, 
-      #{wgtErr,jdbcType=VARCHAR}, #{userIp,jdbcType=VARCHAR})
+      #{wgtErr,jdbcType=VARCHAR}, #{userIp,jdbcType=VARCHAR}, #{aiWeight,jdbcType=VARCHAR}, 
+      #{carErr,jdbcType=VARCHAR}, #{powerState,jdbcType=VARCHAR}, #{dvrState,jdbcType=VARCHAR}, 
+      #{moxaState,jdbcType=VARCHAR}, #{plcState,jdbcType=VARCHAR}, #{leftInfraredRayState,jdbcType=VARCHAR}, 
+      #{rightInfraredRayState,jdbcType=VARCHAR}, #{amplifierState,jdbcType=VARCHAR}, 
+      #{lampState,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbasescalepoint.model.MeterBaseScalePoint">
     insert into METER_BASE_SCALE_POINT
@@ -523,6 +635,36 @@
       <if test="userIp != null">
         USER_IP,
       </if>
+      <if test="aiWeight != null">
+        AI_WEIGHT,
+      </if>
+      <if test="carErr != null">
+        CAR_ERR,
+      </if>
+      <if test="powerState != null">
+        POWER_STATE,
+      </if>
+      <if test="dvrState != null">
+        DVR_STATE,
+      </if>
+      <if test="moxaState != null">
+        MOXA_STATE,
+      </if>
+      <if test="plcState != null">
+        PLC_STATE,
+      </if>
+      <if test="leftInfraredRayState != null">
+        LEFT_INFRARED_RAY_STATE,
+      </if>
+      <if test="rightInfraredRayState != null">
+        RIGHT_INFRARED_RAY_STATE,
+      </if>
+      <if test="amplifierState != null">
+        AMPLIFIER_STATE,
+      </if>
+      <if test="lampState != null">
+        LAMP_STATE,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="scalePointNo != null">
@@ -630,6 +772,36 @@
       <if test="userIp != null">
         #{userIp,jdbcType=VARCHAR},
       </if>
+      <if test="aiWeight != null">
+        #{aiWeight,jdbcType=VARCHAR},
+      </if>
+      <if test="carErr != null">
+        #{carErr,jdbcType=VARCHAR},
+      </if>
+      <if test="powerState != null">
+        #{powerState,jdbcType=VARCHAR},
+      </if>
+      <if test="dvrState != null">
+        #{dvrState,jdbcType=VARCHAR},
+      </if>
+      <if test="moxaState != null">
+        #{moxaState,jdbcType=VARCHAR},
+      </if>
+      <if test="plcState != null">
+        #{plcState,jdbcType=VARCHAR},
+      </if>
+      <if test="leftInfraredRayState != null">
+        #{leftInfraredRayState,jdbcType=VARCHAR},
+      </if>
+      <if test="rightInfraredRayState != null">
+        #{rightInfraredRayState,jdbcType=VARCHAR},
+      </if>
+      <if test="amplifierState != null">
+        #{amplifierState,jdbcType=VARCHAR},
+      </if>
+      <if test="lampState != null">
+        #{lampState,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbasescalepoint.model.MeterBaseScalePoint">
@@ -667,7 +839,17 @@
       RFID_CAR = #{rfidCar,jdbcType=VARCHAR},
       PHOTO_CAR = #{photoCar,jdbcType=VARCHAR},
       WGT_ERR = #{wgtErr,jdbcType=VARCHAR},
-      USER_IP = #{userIp,jdbcType=VARCHAR}
+      USER_IP = #{userIp,jdbcType=VARCHAR},
+      AI_WEIGHT = #{aiWeight,jdbcType=VARCHAR},
+      CAR_ERR = #{carErr,jdbcType=VARCHAR},
+      POWER_STATE = #{powerState,jdbcType=VARCHAR},
+      DVR_STATE = #{dvrState,jdbcType=VARCHAR},
+      MOXA_STATE = #{moxaState,jdbcType=VARCHAR},
+      PLC_STATE = #{plcState,jdbcType=VARCHAR},
+      LEFT_INFRARED_RAY_STATE = #{leftInfraredRayState,jdbcType=VARCHAR},
+      RIGHT_INFRARED_RAY_STATE = #{rightInfraredRayState,jdbcType=VARCHAR},
+      AMPLIFIER_STATE = #{amplifierState,jdbcType=VARCHAR},
+      LAMP_STATE = #{lampState,jdbcType=VARCHAR}
     where SCALE_POINT_NO = #{scalePointNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbasescalepoint.model.MeterBaseScalePoint">
@@ -775,6 +957,36 @@
       <if test="userIp != null">
         USER_IP = #{userIp,jdbcType=VARCHAR},
       </if>
+      <if test="aiWeight != null">
+        AI_WEIGHT = #{aiWeight,jdbcType=VARCHAR},
+      </if>
+      <if test="carErr != null">
+        CAR_ERR = #{carErr,jdbcType=VARCHAR},
+      </if>
+      <if test="powerState != null">
+        POWER_STATE = #{powerState,jdbcType=VARCHAR},
+      </if>
+      <if test="dvrState != null">
+        DVR_STATE = #{dvrState,jdbcType=VARCHAR},
+      </if>
+      <if test="moxaState != null">
+        MOXA_STATE = #{moxaState,jdbcType=VARCHAR},
+      </if>
+      <if test="plcState != null">
+        PLC_STATE = #{plcState,jdbcType=VARCHAR},
+      </if>
+      <if test="leftInfraredRayState != null">
+        LEFT_INFRARED_RAY_STATE = #{leftInfraredRayState,jdbcType=VARCHAR},
+      </if>
+      <if test="rightInfraredRayState != null">
+        RIGHT_INFRARED_RAY_STATE = #{rightInfraredRayState,jdbcType=VARCHAR},
+      </if>
+      <if test="amplifierState != null">
+        AMPLIFIER_STATE = #{amplifierState,jdbcType=VARCHAR},
+      </if>
+      <if test="lampState != null">
+        LAMP_STATE = #{lampState,jdbcType=VARCHAR},
+      </if>
     </set>
     where SCALE_POINT_NO = #{scalePointNo,jdbcType=VARCHAR}
   </update>
@@ -804,7 +1016,11 @@
       SPOT_TYPE_NO, SPOT_TYPE_NAME, WEIGHT_ZERO, 
       MONITOR_USER_IP, IS_HELP, IS_TAKE_OVER, 
       LED_WRITER, RFID_CAR, PHOTO_CAR, 
-      WGT_ERR, USER_IP)
+      WGT_ERR, USER_IP, AI_WEIGHT, 
+      CAR_ERR, POWER_STATE, DVR_STATE, 
+      MOXA_STATE, PLC_STATE, LEFT_INFRARED_RAY_STATE, 
+      RIGHT_INFRARED_RAY_STATE, AMPLIFIER_STATE, 
+      LAMP_STATE)
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.scalePointNo,jdbcType=VARCHAR}, 
@@ -819,7 +1035,11 @@
       #{item.spotTypeNo,jdbcType=VARCHAR}, #{item.spotTypeName,jdbcType=VARCHAR}, #{item.weightZero,jdbcType=DECIMAL}, 
       #{item.monitorUserIp,jdbcType=VARCHAR}, #{item.isHelp,jdbcType=VARCHAR}, #{item.isTakeOver,jdbcType=VARCHAR}, 
       #{item.ledWriter,jdbcType=VARCHAR}, #{item.rfidCar,jdbcType=VARCHAR}, #{item.photoCar,jdbcType=VARCHAR}, 
-      #{item.wgtErr,jdbcType=VARCHAR}, #{item.userIp,jdbcType=VARCHAR} from dual  
+      #{item.wgtErr,jdbcType=VARCHAR}, #{item.userIp,jdbcType=VARCHAR}, #{item.aiWeight,jdbcType=VARCHAR}, 
+      #{item.carErr,jdbcType=VARCHAR}, #{item.powerState,jdbcType=VARCHAR}, #{item.dvrState,jdbcType=VARCHAR}, 
+      #{item.moxaState,jdbcType=VARCHAR}, #{item.plcState,jdbcType=VARCHAR}, #{item.leftInfraredRayState,jdbcType=VARCHAR}, 
+      #{item.rightInfraredRayState,jdbcType=VARCHAR}, #{item.amplifierState,jdbcType=VARCHAR}, 
+      #{item.lampState,jdbcType=VARCHAR} from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -965,6 +1185,46 @@
        <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
           when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.userIp,jdbcType=VARCHAR}
        </foreach>
+       ,AI_WEIGHT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.aiWeight,jdbcType=VARCHAR}
+       </foreach>
+       ,CAR_ERR=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.carErr,jdbcType=VARCHAR}
+       </foreach>
+       ,POWER_STATE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.powerState,jdbcType=VARCHAR}
+       </foreach>
+       ,DVR_STATE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.dvrState,jdbcType=VARCHAR}
+       </foreach>
+       ,MOXA_STATE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.moxaState,jdbcType=VARCHAR}
+       </foreach>
+       ,PLC_STATE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.plcState,jdbcType=VARCHAR}
+       </foreach>
+       ,LEFT_INFRARED_RAY_STATE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.leftInfraredRayState,jdbcType=VARCHAR}
+       </foreach>
+       ,RIGHT_INFRARED_RAY_STATE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.rightInfraredRayState,jdbcType=VARCHAR}
+       </foreach>
+       ,AMPLIFIER_STATE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.amplifierState,jdbcType=VARCHAR}
+       </foreach>
+       ,LAMP_STATE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SCALE_POINT_NO" close="end">
+          when #{item.scalePointNo,jdbcType=VARCHAR} then #{item.lampState,jdbcType=VARCHAR}
+       </foreach>
      where SCALE_POINT_NO in 
      <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
     #{item.scalePointNo,jdbcType=VARCHAR}
@@ -979,7 +1239,6 @@
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
   <select id="getNewID" parameterType="java.lang.String" resultType="java.lang.String">

src/main/java/com/steerinfo/baseinfo/meterbasescalepoint/model/MeterBaseScalePoint.java

@@ -218,6 +218,66 @@ public class MeterBaseScalePoint implements IBasePO<String> {
     @ApiModelProperty(value="接管用户ip地址(接管界面用)",required=false)
     private String userIp;
 
+    /**
+     * AI识别自重重量(AI_WEIGHT,VARCHAR,20)
+     */
+    @ApiModelProperty(value="AI识别自重重量",required=false)
+    private String aiWeight;
+
+    /**
+     * 车号异常（0正常 1异常）(CAR_ERR,VARCHAR,1)
+     */
+    @ApiModelProperty(value="车号异常（0正常 1异常）",required=false)
+    private String carErr;
+
+    /**
+     * 衡器电源状态（0正常 1异常）(POWER_STATE,VARCHAR,1)
+     */
+    @ApiModelProperty(value="衡器电源状态（0正常 1异常）",required=false)
+    private String powerState;
+
+    /**
+     * 硬盘录像机状态（0正常 1异常）(DVR_STATE,VARCHAR,1)
+     */
+    @ApiModelProperty(value="硬盘录像机状态（0正常 1异常）",required=false)
+    private String dvrState;
+
+    /**
+     * MOXA状态（0正常 1异常）(MOXA_STATE,VARCHAR,1)
+     */
+    @ApiModelProperty(value="MOXA状态（0正常 1异常）",required=false)
+    private String moxaState;
+
+    /**
+     * PLC状态（0正常 1异常）(PLC_STATE,VARCHAR,1)
+     */
+    @ApiModelProperty(value="PLC状态（0正常 1异常）",required=false)
+    private String plcState;
+
+    /**
+     * 红外对射状态（0正常 1异常）(LEFT_INFRARED_RAY_STATE,VARCHAR,1)
+     */
+    @ApiModelProperty(value="红外对射状态（0正常 1异常）",required=false)
+    private String leftInfraredRayState;
+
+    /**
+     * 红外对射状态（0正常 1异常）(RIGHT_INFRARED_RAY_STATE,VARCHAR,1)
+     */
+    @ApiModelProperty(value="红外对射状态（0正常 1异常）",required=false)
+    private String rightInfraredRayState;
+
+    /**
+     * 功放状态（0正常 1异常）(AMPLIFIER_STATE,VARCHAR,1)
+     */
+    @ApiModelProperty(value="功放状态（0正常 1异常）",required=false)
+    private String amplifierState;
+
+    /**
+     * 照明灯状态（0正常 1异常）(LAMP_STATE,VARCHAR,1)
+     */
+    @ApiModelProperty(value="照明灯状态（0正常 1异常）",required=false)
+    private String lampState;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -510,6 +570,86 @@ public class MeterBaseScalePoint implements IBasePO<String> {
         this.userIp = userIp == null ? null : userIp.trim();
     }
 
+    public String getAiWeight() {
+        return aiWeight;
+    }
+
+    public void setAiWeight(String aiWeight) {
+        this.aiWeight = aiWeight == null ? null : aiWeight.trim();
+    }
+
+    public String getCarErr() {
+        return carErr;
+    }
+
+    public void setCarErr(String carErr) {
+        this.carErr = carErr == null ? null : carErr.trim();
+    }
+
+    public String getPowerState() {
+        return powerState;
+    }
+
+    public void setPowerState(String powerState) {
+        this.powerState = powerState == null ? null : powerState.trim();
+    }
+
+    public String getDvrState() {
+        return dvrState;
+    }
+
+    public void setDvrState(String dvrState) {
+        this.dvrState = dvrState == null ? null : dvrState.trim();
+    }
+
+    public String getMoxaState() {
+        return moxaState;
+    }
+
+    public void setMoxaState(String moxaState) {
+        this.moxaState = moxaState == null ? null : moxaState.trim();
+    }
+
+    public String getPlcState() {
+        return plcState;
+    }
+
+    public void setPlcState(String plcState) {
+        this.plcState = plcState == null ? null : plcState.trim();
+    }
+
+    public String getLeftInfraredRayState() {
+        return leftInfraredRayState;
+    }
+
+    public void setLeftInfraredRayState(String leftInfraredRayState) {
+        this.leftInfraredRayState = leftInfraredRayState == null ? null : leftInfraredRayState.trim();
+    }
+
+    public String getRightInfraredRayState() {
+        return rightInfraredRayState;
+    }
+
+    public void setRightInfraredRayState(String rightInfraredRayState) {
+        this.rightInfraredRayState = rightInfraredRayState == null ? null : rightInfraredRayState.trim();
+    }
+
+    public String getAmplifierState() {
+        return amplifierState;
+    }
+
+    public void setAmplifierState(String amplifierState) {
+        this.amplifierState = amplifierState == null ? null : amplifierState.trim();
+    }
+
+    public String getLampState() {
+        return lampState;
+    }
+
+    public void setLampState(String lampState) {
+        this.lampState = lampState == null ? null : lampState.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -551,6 +691,16 @@ public class MeterBaseScalePoint implements IBasePO<String> {
         sb.append(", photoCar=").append(photoCar);
         sb.append(", wgtErr=").append(wgtErr);
         sb.append(", userIp=").append(userIp);
+        sb.append(", aiWeight=").append(aiWeight);
+        sb.append(", carErr=").append(carErr);
+        sb.append(", powerState=").append(powerState);
+        sb.append(", dvrState=").append(dvrState);
+        sb.append(", moxaState=").append(moxaState);
+        sb.append(", plcState=").append(plcState);
+        sb.append(", leftInfraredRayState=").append(leftInfraredRayState);
+        sb.append(", rightInfraredRayState=").append(rightInfraredRayState);
+        sb.append(", amplifierState=").append(amplifierState);
+        sb.append(", lampState=").append(lampState);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -49,4 +49,6 @@ public interface MeterWorkCarActualMapper extends IBaseMapper<MeterWorkCarActual
      * @return
      */
     List<MeterWorkCarActual> distinctCarNo(HashMap<String, Object> obj);
+
+    MeterWorkCarActual selectActual(String actualFirstNo);
 }

src/main/java/com/steerinfo/meterwork/meterworkcaractual/model/MeterWorkCarActual.java

@@ -21,9 +21,9 @@ public class MeterWorkCarActual implements IBasePO<String> {
     private String predictionNo;
 
     /**
-     * 通知单号(NOTICE_NO,VARCHAR,20)
+     * 通知单号(磅单号)(NOTICE_NO,VARCHAR,20)
      */
-    @ApiModelProperty(value="通知单号",required=false)
+    @ApiModelProperty(value="通知单号(磅单号)",required=false)
     private String noticeNo;
 
     /**
@@ -357,15 +357,15 @@ public class MeterWorkCarActual implements IBasePO<String> {
     private String netMode;
 
     /**
-     * 状态（0=有效，1=作废 ）(VALUE_FLAG,VARCHAR,1)
+     * 状态（0=作废，1=有效-未发布，2=有效-已发布，3=未匹配委托 ）(VALUE_FLAG,VARCHAR,1)
      */
-    @ApiModelProperty(value="状态（0=有效，1=作废 ）",required=false)
+    @ApiModelProperty(value="状态（0=作废，1=有效-未发布，2=有效-已发布，3=未匹配委托 ）",required=false)
     private String valueFlag;
 
     /**
-     * 上传状态（0=待审核；1：待上传；2=已上传 ）(UPLOAD_FLAG,VARCHAR,1)
+     * 上传状态（1=待上传；2=已上传 ）(UPLOAD_FLAG,VARCHAR,1)
      */
-    @ApiModelProperty(value="上传状态（0=待审核；1：待上传；2=已上传 ）",required=false)
+    @ApiModelProperty(value="上传状态（1=待上传；2=已上传 ）",required=false)
     private String uploadFlag;
 
     /**
@@ -657,11 +657,17 @@ public class MeterWorkCarActual implements IBasePO<String> {
     private Date createTime;
 
     /**
-     * 数据来源(1=智能终端，2=本地计量，3=应急计量)(DATA_SOURCE,VARCHAR,2)
+     * 数据来源(1=智能终端，2=本地计量，3=应急计量，4=手动录入(计量票据录入))(DATA_SOURCE,VARCHAR,2)
      */
-    @ApiModelProperty(value="数据来源(1=智能终端，2=本地计量，3=应急计量)",required=false)
+    @ApiModelProperty(value="数据来源(1=智能终端，2=本地计量，3=应急计量，4=手动录入(计量票据录入))",required=false)
     private String dataSource;
 
+    /**
+     * 是否匹配委托（0:未匹配，1:已匹配）(IS_PRE_SCALE,VARCHAR,1)
+     */
+    @ApiModelProperty(value="是否匹配委托（0:未匹配，1:已匹配）",required=false)
+    private String isPreScale;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -1351,7 +1357,7 @@ public class MeterWorkCarActual implements IBasePO<String> {
     }
 
     public void setNote(String note) {
-        this.note = note == null ? this.note : this.note + "；" + note.trim();
+        this.note = note == null ? null : note.trim();
     }
 
     public String getVoucherIdentity() {
@@ -1546,6 +1552,14 @@ public class MeterWorkCarActual implements IBasePO<String> {
         this.dataSource = dataSource == null ? null : dataSource.trim();
     }
 
+    public String getIsPreScale() {
+        return isPreScale;
+    }
+
+    public void setIsPreScale(String isPreScale) {
+        this.isPreScale = isPreScale == null ? null : isPreScale.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -1661,6 +1675,7 @@ public class MeterWorkCarActual implements IBasePO<String> {
         sb.append(", createManName=").append(createManName);
         sb.append(", createTime=").append(createTime);
         sb.append(", dataSource=").append(dataSource);
+        sb.append(", isPreScale=").append(isPreScale);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/impl/MeterWorkCarActualServiceImpl.java

@@ -297,7 +297,28 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 }
             }
 
-            String preNo = (predictionNo == null ? mwcaf1.getPredictionNo() : predictionNo);
+            String preNo = "";
+            Map<String, Object> repair = new HashMap<>();
+            if (predictionNo == null){
+                if (mwcaf1.getPredictionNo() == "" && mwcaf2.getPredictionNo() != ""){
+                    preNo = mwcaf2.getPredictionNo();
+                    repair.put("predictionNo",preNo);
+                    repair.put("actualFirstNo",mwcaf1.getActualFirstNo());
+                    meterWorkCarActualFirstMapper.repairPre(repair);
+                }
+                if (mwcaf2.getPredictionNo() == "" && mwcaf2.getPredictionNo() != ""){
+                    preNo = mwcaf1.getPredictionNo();
+                    repair.put("predictionNo",preNo);
+                    repair.put("actualFirstNo",mwcaf2.getActualFirstNo());
+                    meterWorkCarActualFirstMapper.repairPre(repair);
+                }
+                if(mwcaf2.getPredictionNo() != "" && mwcaf2.getPredictionNo() != ""){
+                    preNo = mwcaf1.getPredictionNo();
+                }
+            }
+            else {
+                preNo = predictionNo;
+            }
 
             //修改预报
             if (preNo != null && !"".equals(preNo)) {
@@ -539,7 +560,8 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         }
 
         MeterWorkCarActual mwca = meterWorkCarActualMapper.mathPredcition(actualNo, predictionNo);
-        mwca.setValueFlag("1");
+        //mwca.setValueFlag("1");
+        mwca.setIsPreScale("1");
         mwca.setNote(note);
         meterWorkCarActualMapper.updateByPrimaryKey(mwca);
         return mwca;
@@ -594,7 +616,8 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         mwca.setUpdateManNo(userId);
         mwca.setUpdateManName(userName);
         mwca.setUpdateTime(new Date());
-        mwca.setValueFlag("3");
+        //mwca.setValueFlag("3");
+        mwca.setIsPreScale("0");
         meterWorkCarActualMapper.updateByPrimaryKey(mwca);
         return mwca;
     }
@@ -714,8 +737,12 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         }
         if (model.getActualNo() == null && model.getValueFlag() == null) {
             model.setValueFlag("1");//有效已匹配
-        } else if (model.getActualNo() == null && model.getPredictionNo() == null){
-            model.setValueFlag("3");//有效已匹配
+        }
+        if (model.getActualNo() == null && model.getPredictionNo() == null){
+            model.setIsPreScale("0");
+        }
+        else {
+            model.setIsPreScale("1");
         }
 
         if (model.getActualNo() == null && model.getUploadFlag() == null)

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

@@ -70,4 +70,6 @@ public interface MeterWorkCarActualFirstMapper extends IBaseMapper<MeterWorkCarA
      * @return
      */
     List<MeterWorkCarActualFirst> distinctCarNo(HashMap<String, Object> obj);
+
+    void repairPre(Map<String, Object> map);
 }

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/model/MeterWorkCarActualFirst.java

@@ -255,15 +255,15 @@ public class MeterWorkCarActualFirst implements IBasePO<String> {
     private String createManNo;
 
     /**
-     * 计量员姓名(CREATE_MAN_NAME,VARCHAR,100)
+     * 创建人(CREATE_MAN_NAME,VARCHAR,40)
      */
-    @ApiModelProperty(value="计量员姓名",required=false)
+    @ApiModelProperty(value="创建人",required=false)
     private String createManName;
 
     /**
-     * 计量时间（YYYY-MM-DD HH:mm:SS）(CREATE_TIME,TIMESTAMP,7)
+     * 创建时间(CREATE_TIME,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="计量时间（YYYY-MM-DD HH:mm:SS）",required=false)
+    @ApiModelProperty(value="创建时间",required=false)
     private Date createTime;
 
     /**
@@ -297,9 +297,9 @@ public class MeterWorkCarActualFirst implements IBasePO<String> {
     private String memo;
 
     /**
-     * 状态（0=作废，1=有效，2=结净）(VALUE_FLAG,VARCHAR,1)
+     * 状态（0=作废，1=有效(已匹配)，2=结净，3=未匹配）(VALUE_FLAG,VARCHAR,1)
      */
-    @ApiModelProperty(value="状态（0=作废，1=有效，2=结净）",required=false)
+    @ApiModelProperty(value="状态（0=作废，1=有效(已匹配)，2=结净，3=未匹配）",required=false)
     private String valueFlag;
 
     /**
@@ -537,11 +537,17 @@ public class MeterWorkCarActualFirst implements IBasePO<String> {
     private String measureTaskNum;
 
     /**
-     * 数据来源(1=智能终端，2=本地计量，3=应急计量)(DATA_SOURCE,VARCHAR,2)
+     * 数据来源(1=智能终端，2=本地计量，3=应急计量，4=手动录入(计量票据录入))(DATA_SOURCE,VARCHAR,2)
      */
-    @ApiModelProperty(value="数据来源(1=智能终端，2=本地计量，3=应急计量)",required=false)
+    @ApiModelProperty(value="数据来源(1=智能终端，2=本地计量，3=应急计量，4=手动录入(计量票据录入))",required=false)
     private String dataSource;
 
+    /**
+     * 是否匹配委托（0:未匹配，1:已匹配）(IS_PRE_SCALE,VARCHAR,1)
+     */
+    @ApiModelProperty(value="是否匹配委托（0:未匹配，1:已匹配）",required=false)
+    private String isPreScale;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -1094,7 +1100,9 @@ public class MeterWorkCarActualFirst implements IBasePO<String> {
         return note;
     }
 
-    public void setNote(String note) { this.note = note == null ? this.note : this.note + "；" + note.trim(); }
+    public void setNote(String note) {
+        this.note = note == null ? null : note.trim();
+    }
 
     public String getVoucherIdentity() {
         return voucherIdentity;
@@ -1264,6 +1272,14 @@ public class MeterWorkCarActualFirst implements IBasePO<String> {
         this.dataSource = dataSource == null ? null : dataSource.trim();
     }
 
+    public String getIsPreScale() {
+        return isPreScale;
+    }
+
+    public void setIsPreScale(String isPreScale) {
+        this.isPreScale = isPreScale == null ? null : isPreScale.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -1359,6 +1375,7 @@ public class MeterWorkCarActualFirst implements IBasePO<String> {
         sb.append(", measureObjectType=").append(measureObjectType);
         sb.append(", measureTaskNum=").append(measureTaskNum);
         sb.append(", dataSource=").append(dataSource);
+        sb.append(", isPreScale=").append(isPreScale);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -464,9 +464,34 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     mwpl.setValueFlag("0");//未使用
                     meterWorkPreLinkMapper.updateByPrimaryKey(mwpl);
                 }
+
                 MeterWorkCarActualFirst mwcaf = meterWorkCarActualFirstMapper.selectAndRemove(model.getActualFirstNo());
+
+                String actualFirstNo = mwcaf.getActualFirstNo();
+                //当一次计量数据是已结净的状态时，同时将该结净数据的另一条一次计量数据自动匹配该委托，并将该结净记录也进行委托匹配
+                if (mwcaf.getValueFlag() == "2" || "2".equals(mwcaf.getValueFlag())){
+                    MeterWorkCarActual meterWorkCarActual = meterWorkCarActualMapper.selectActual(actualFirstNo);
+                    String getActualFirstNo = "";
+                    //判断传入的是哪条一次记录
+                    if (meterWorkCarActual.getActualFirst1No().equals(actualFirstNo)){
+                        getActualFirstNo = meterWorkCarActual.getActualFirst2No();
+                    }
+                    if (meterWorkCarActual.getActualFirst2No().equals(actualFirstNo)){
+                        getActualFirstNo = meterWorkCarActual.getActualFirst1No();
+                    }
+                    //另一条一次数据进行委托解除
+                    MeterWorkCarActualFirst meterWorkCarActualFirst1 = meterWorkCarActualFirstMapper.selectAndRemove(getActualFirstNo);
+                    meterWorkCarActualFirst1.setIsPreScale("0");
+                    meterWorkCarActualFirstMapper.updateByPrimaryKey(meterWorkCarActualFirst1);
+                    //将该一次记录的结净数据委托解除
+                    MeterWorkCarActual mwca = meterWorkCarActualMapper.cleanPredcition(meterWorkCarActual.getActualNo());
+                    mwca.setIsPreScale("0");
+                    meterWorkCarActualMapper.updateByPrimaryKey(mwca);
+                }
+
                 // 将一次计量数据设置为未匹配状态
-                mwcaf.setValueFlag("3");
+                //mwcaf.setValueFlag("2");
+                mwcaf.setIsPreScale("0");
                 meterWorkCarActualFirstMapper.updateByPrimaryKey(mwcaf);
                 num++;
             }
@@ -528,8 +553,29 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             pts.setUpdateManName("一次计量数据匹配操作");
             pts.setValueFlag(DbConstants.IN); //2021年5月24日  预报直接就写成【使用中】
             preTrackScaleMapper.updateByPrimaryKey(pts);
+            //当一次计量数据是已结净的状态时，同时将该结净数据的另一条一次计量数据自动匹配该委托，并将该结净记录也进行委托匹配
+            if (meterWorkCarActualFirst.getValueFlag() == "2" || "2".equals(meterWorkCarActualFirst.getValueFlag())){
+                MeterWorkCarActual meterWorkCarActual = meterWorkCarActualMapper.selectActual(actualFirstNo);
+                String getActualFirstNo = "";
+                //判断传入的是哪条一次记录
+                if (meterWorkCarActual.getActualFirst1No().equals(actualFirstNo)){
+                    getActualFirstNo = meterWorkCarActual.getActualFirst2No();
+                }
+                if (meterWorkCarActual.getActualFirst2No().equals(actualFirstNo)){
+                    getActualFirstNo = meterWorkCarActual.getActualFirst1No();
+                }
+                //另一条一次数据进行委托解除
+                MeterWorkCarActualFirst meterWorkCarActualFirst1 = meterWorkCarActualFirstMapper.selectAndMatch(getActualFirstNo,predictionNo);
+                meterWorkCarActualFirst1.setIsPreScale("1");
+                meterWorkCarActualFirstMapper.updateByPrimaryKey(meterWorkCarActualFirst1);
+                //将该一次记录的结净数据委托解除
+                MeterWorkCarActual mwca = meterWorkCarActualMapper.mathPredcition(meterWorkCarActual.getActualNo(),predictionNo);
+                mwca.setIsPreScale("1");
+                meterWorkCarActualMapper.updateByPrimaryKey(mwca);
+            }
             // 设置为已匹配状态
-            model.setValueFlag("1");
+            //model.setValueFlag("1");
+            model.setIsPreScale("1");
             meterWorkCarActualFirstMapper.updateByPrimaryKey(model);
             return model;
         } catch (MarkerMetException e) {
@@ -878,6 +924,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     }
                 }
             }
+            MeterWorkImage mw= meterWorkImageMapper.selectByPrimaryKey("C" + oci.getActualFirstNo());
             //METER_WORK_IMAGE
             MeterWorkImage mwi = new MeterWorkImage();
             mwi.setActualFirstNo("C" + oci.getActualFirstNo());
@@ -888,7 +935,11 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 fName.setAccessible(true);
                 fName.set(mwi, oci.getBaseSpotNo() + "_" + oci.getActualFirstNo() + "_" + i);
             }
-            meterWorkImageMapper.insertSelective(mwi);
+            if(mw != null){
+                meterWorkImageMapper.updateByPrimaryKeySelective(mwi);
+            }else{
+                meterWorkImageMapper.insertSelective(mwi);
+            }
         }
     }
 
@@ -997,6 +1048,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 MeterWorkCarActualFirst meca1 = meterWorkCarActualFirstMapper.selectAndMatch(gross.getActualFirstNo(), netDb.getPredictionNo());
                 meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(meca1);
                 PreTrackScale preTrackScale = new PreTrackScale();
+                preTrackScale.setPredictionNo(netDb.getPredictionNo());
                 preTrackScale.setValueFlag("2");
                 preTrackScaleMapper.updateByPrimaryKeySelective(preTrackScale);
             }

src/main/java/com/steerinfo/meterwork/meterworkimage/service/impl/MeterWorkImageServiceImpl.java

@@ -95,7 +95,7 @@ public class MeterWorkImageServiceImpl extends BaseServiceImpl<MeterWorkImage, S
         RESTfulResult rm = new RESTfulResult();
         try{
             rm.setCode("200");
-            MeterWorkImage mw= meterWorkImageMapper.selectByPrimaryKey(mwi.getActualFirstNo());
+            MeterWorkImage mw= meterWorkImageMapper.selectByPrimaryKey("C" + mwi.getActualFirstNo());
             if(mw != null){
                 meterWorkImageMapper.updateByPrimaryKeySelective(mwi);
             }else{

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

@@ -46,4 +46,6 @@ public interface MeterWorkRailwayActFirstMapper extends IBaseMapper<MeterWorkRai
     List<MeterWorkRailwayActFirst> distinctCarNo(HashMap<String, Object> obj);
 
     int getDataCount(Map<String, Object> mp);
+
+    void repairPre(Map<String, Object> map);
 }

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

@@ -3140,4 +3140,8 @@
       and  RAILWAY_NO like '%${railwayNo}%'
     </if>
   </select>
+
+  <update id="repairPre" parameterType="java.util.HashMap">
+    update METER_WORK_RAILWAY_ACT_FIRST set PREDICTION_NO = #{predictionNo} where ACTUAL_FIRST_NO = #{actualFirstNo}
+  </update>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/service/impl/MeterWorkRailwayActualServiceImpl.java

@@ -209,7 +209,28 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 }
             }
 
-            String preNo = (predictionNo == null ? mwcaf1.getPredictionNo() : predictionNo);
+            String preNo = "";
+            Map<String, Object> repair = new HashMap<>();
+            if (predictionNo == null){
+                if (mwcaf1.getPredictionNo() == "" && mwcaf2.getPredictionNo() != ""){
+                    preNo = mwcaf2.getPredictionNo();
+                    repair.put("predictionNo",preNo);
+                    repair.put("actualFirstNo",mwcaf1.getActualFirstNo());
+                    meterWorkRailwayActFirstMapper.repairPre(repair);
+                }
+                if (mwcaf2.getPredictionNo() == "" && mwcaf2.getPredictionNo() != ""){
+                    preNo = mwcaf1.getPredictionNo();
+                    repair.put("predictionNo",preNo);
+                    repair.put("actualFirstNo",mwcaf2.getActualFirstNo());
+                    meterWorkRailwayActFirstMapper.repairPre(repair);
+                }
+                if(mwcaf2.getPredictionNo() != "" && mwcaf2.getPredictionNo() != ""){
+                    preNo = mwcaf1.getPredictionNo();
+                }
+            }
+            else {
+                preNo = predictionNo;
+            }
 
             //修改预报
             if (preNo != null && !"".equals(preNo)) {