修改了后端接口

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

@@ -15,6 +15,9 @@ import com.steerinfo.framework.user.UserPayload;
 import com.steerinfo.framework.utils.collection.ListUtils;
 import com.steerinfo.baseinfo.meterbasecar.model.MeterBaseCar;
 import com.steerinfo.baseinfo.meterbasecar.service.IMeterBaseCarService;
+import com.steerinfo.meterwork.except.MarkerMetException;
+import com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual;
+import com.steerinfo.util.CommonPage;
 import com.steerinfo.util.SSOUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -322,9 +325,11 @@ public class MeterBaseCarController extends BaseRESTfulController {
     @PostMapping(value = "/notApplogin")
     public RESTfulResult notApplogin(@RequestBody HashMap params) {
 
+        RESTfulResult rm = new RESTfulResult();
         String msg = "";
         Object ssodata = "";
-        int userType = 1;
+        String userType = "1";
+        HashMap returnObj = new HashMap();
         try {
             SSOUtil ssoUtil = new SSOUtil();
             HashMap map = ssoUtil.ssoLogin(params, "");
@@ -339,20 +344,22 @@ public class MeterBaseCarController extends BaseRESTfulController {
             trave.put("travellingMerchantPossword",params.get("password"));
             List<MeterBaseTravellingMerchant> meterBaseTravellingMerchant = meterBaseTravellingMerchantMapper.selectByParameters(trave);
             if (meterBaseTravellingMerchant.size()>0){
-                userType = 2;
+                userType = "2";
+                ssodata = meterBaseTravellingMerchant;
             }
 
-            if (com.steerinfo.util.StringUtils.isNotEmpty(msg)) {
+            returnObj.put("ssodata",ssodata);
+            returnObj.put("userType",userType);
+
+            if (com.steerinfo.util.StringUtils.isNotEmpty(msg) && meterBaseTravellingMerchant.size()<0) {
                 return failed(null, msg);
             }
-
         } catch (Exception e) {
             e.printStackTrace();
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return failed(null, "操作异常，请确认！");
         }
-
-        return success(ssodata);
+        return success(returnObj);
     }
 
     @ApiOperation(value = "app修改密码", notes = "app修改密码")
@@ -631,4 +638,17 @@ public class MeterBaseCarController extends BaseRESTfulController {
             return failed(null, "操作异常，请确认！");
         }
     }
+
+    @ApiOperation(value = "获取计量结果", notes = "客商来获取详细计量信息")
+    //@RequiresPermissions("meterbasecar:view")
+    @PostMapping(value = "/getCarActual")
+    public RESTfulResult getCarActual(@RequestBody CommonPage<MeterBaseCar> oci) {
+        try {
+            RESTfulResult rm = meterBaseCarService.getCarActual(oci);
+            return rm;
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
 }

src/main/java/com/steerinfo/baseinfo/meterbasecar/service/IMeterBaseCarService.java

@@ -1,8 +1,12 @@
 package com.steerinfo.baseinfo.meterbasecar.service;
 
 import com.steerinfo.baseinfo.meterbasedriver.model.MeterBaseDriver;
+import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.baseinfo.meterbasecar.model.MeterBaseCar;
+import com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual;
+import com.steerinfo.util.CommonPage;
+
 import java.util.Date;
 import java.math.BigDecimal;
 import java.util.HashMap;
@@ -26,6 +30,8 @@ public interface IMeterBaseCarService extends IBaseService<MeterBaseCar, String>
 
     String Recovery(List<MeterBaseCar> models);
 
+    RESTfulResult getCarActual(CommonPage<MeterBaseCar> oci);
+    
     String abolish(List<MeterBaseCar> models);
 
     String checkandupdate(String id,MeterBaseCar model);

src/main/java/com/steerinfo/baseinfo/meterbasecar/service/impl/MeterBaseCarServiceImpl.java

@@ -3,11 +3,19 @@ package com.steerinfo.baseinfo.meterbasecar.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.steerinfo.baseinfo.meterbasecussupcar.model.MeterBaseCusSupCar;
 import com.steerinfo.baseinfo.meterbasedriver.model.MeterBaseDriver;
+import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import com.steerinfo.baseinfo.meterbasecar.model.MeterBaseCar;
 import com.steerinfo.baseinfo.meterbasecar.mapper.MeterBaseCarMapper;
 import com.steerinfo.baseinfo.meterbasecar.service.IMeterBaseCarService;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.meterwork.meterworkcaractual.mapper.MeterWorkCarActualMapper;
+import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
+import com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual;
+import com.steerinfo.util.CommonPage;
+import com.steerinfo.util.FieldsCollector;
 import com.steerinfo.util.SSOUtil;
 import com.steerinfo.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +28,7 @@ import java.util.Date;
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * MeterBaseCar服务实现：
@@ -40,6 +49,9 @@ public class MeterBaseCarServiceImpl extends BaseServiceImpl<MeterBaseCar, Strin
     @Autowired
     private MeterBaseCarMapper meterBaseCarMapper;
 
+    @Autowired
+    private MeterWorkCarActualMapper meterWorkCarActualMapper;
+
     @Override
     protected IBaseMapper<MeterBaseCar, String> getMapper() {
         return meterBaseCarMapper;
@@ -215,4 +227,24 @@ public class MeterBaseCarServiceImpl extends BaseServiceImpl<MeterBaseCar, Strin
         }
         return "";
     }
+
+    @Override
+    public RESTfulResult getCarActual(CommonPage<MeterBaseCar> oci) {
+        RESTfulResult rm = new RESTfulResult();
+        try {
+            rm.setCode("200");
+            if (oci.getParam() != null) {
+                int iStart = oci.getPageSize() > 0 ? oci.getPageSize() : 9999;
+                Map<String, Object> map = FieldsCollector.beanToMap(oci.getParam());
+                PageHelper.startPage(oci.getPageNum(), iStart);
+                List<MeterWorkCarActual> rows = meterWorkCarActualMapper.getCarActual(map);
+                PageList pageInfo = new PageList(rows);
+                rm.setData(pageInfo);
+            }
+        } catch (Exception ex) {
+            rm.setCode("500");
+            rm.setMessage("查询失败：" + ex.getMessage());
+        }
+        return rm;
+    }
 }

src/main/java/com/steerinfo/baseinfo/meterbasedriver/controller/MeterBaseDriverController.java

@@ -13,6 +13,7 @@ import com.steerinfo.framework.user.UserPayload;
 import com.steerinfo.framework.utils.collection.ListUtils;
 import com.steerinfo.baseinfo.meterbasedriver.model.MeterBaseDriver;
 import com.steerinfo.baseinfo.meterbasedriver.service.IMeterBaseDriverService;
+import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.util.StringUtils;
 import feign.Param;
 import io.swagger.annotations.Api;
@@ -163,4 +164,20 @@ public class MeterBaseDriverController extends BaseRESTfulController {
             return failed(null,"操作异常，请确认");
         }
     }
+
+    @ApiOperation(value = "获取该客商对应司机新信息", notes = "获取该客商对应车辆")
+    //@RequiresPermissions("meterbasecar:view")
+    @PostMapping(value = "/getCarBySup")
+    public RESTfulResult getCarBySup(@RequestBody String customerSupplierNo) {
+        try {
+            RESTfulResult rm = new RESTfulResult();
+            rm.setCode("200");
+            List<MeterBaseDriver> list = meterBaseDriverMapper.getDirverBySup(customerSupplierNo);
+            rm.setData(list);
+            return rm;
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
 }

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

@@ -5,6 +5,7 @@ import com.steerinfo.framework.mapper.IBaseMapper;
 import java.math.*;
 import java.util.List;
 
+import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
 import feign.Param;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -20,4 +21,6 @@ public interface MeterBaseDriverMapper extends IBaseMapper<MeterBaseDriver, Stri
     void deleteDriverById(@Param("list") List<String> driverNos);
 
     void deleteCarById(@Param("list") List<String> carNos);
+
+    List<MeterBaseDriver> getDirverBySup(String customerSupplierNo);
 }

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

@@ -534,4 +534,8 @@
       #{carNos}
     </foreach>
   </update>
+
+  <select id="getDirverBySup" parameterType="java.lang.String">
+    select * from METER_BASE_DRIVER where CAR_ID in (select CAR_NO from METER_BASE_CAR WHERE CUSTOMER_SUPPLIER_NO = #{customerSupplierNo})
+  </select>
 </mapper>

src/main/java/com/steerinfo/baseinfo/meterbasetravellingmerchant/controller/MeterBaseTravellingMerchantController.java

@@ -6,6 +6,7 @@ import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.framework.utils.collection.ListUtils;
 import com.steerinfo.baseinfo.meterbasetravellingmerchant.model.MeterBaseTravellingMerchant;
 import com.steerinfo.baseinfo.meterbasetravellingmerchant.service.IMeterBaseTravellingMerchantService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -35,6 +36,7 @@ import java.math.BigDecimal;
  */
 @RestController
 @RequestMapping("/${api.version}/meterbasetravellingmerchants")
+@Api(value = "/${api.version}/meterbasetravellingmerchants", tags = "客商信息 - MeterBaseTravellingMerchantController")
 public class MeterBaseTravellingMerchantController extends BaseRESTfulController {
 
     @Autowired
@@ -63,6 +65,20 @@ public class MeterBaseTravellingMerchantController extends BaseRESTfulController
         PageList<MeterBaseTravellingMerchant> list = meterBaseTravellingMerchantService.queryLikeForPage(parmas, pageNum, pageSize);
         return success(list);
     }
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterbasetravellingmerchant:view")
+    @PostMapping(value = "/like/")
+    public RESTfulResult listLikePost(@RequestBody HashMap parmas){
+        Integer pageNum = parmas.get("pageNum") == null ? 1 : Integer.parseInt(parmas.get("pageNum").toString());
+        Integer pageSize =parmas.get("pageSize") == null ? 20 : Integer.parseInt(parmas.get("pageSize").toString());
+        PageList<MeterBaseTravellingMerchant> list = meterBaseTravellingMerchantService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
     
     @ApiOperation(value="创建", notes="根据MeterBaseTravellingMerchant对象创建")
     @ApiImplicitParam(name = "meterBaseTravellingMerchant", value = "详细实体meterBaseTravellingMerchant", required = true, dataType = "MeterBaseTravellingMerchant")

src/main/java/com/steerinfo/baseinfo/meterbasetravellingmerchant/mapper/MeterBaseTravellingMerchantMapper.java

@@ -7,4 +7,5 @@ import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface MeterBaseTravellingMerchantMapper extends IBaseMapper<MeterBaseTravellingMerchant, String> {
+    String getNewID();
 }

src/main/java/com/steerinfo/baseinfo/meterbasetravellingmerchant/mapper/MeterBaseTravellingMerchantMapper.xml

@@ -444,5 +444,8 @@
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  
+  <select id="getNewID" parameterType="java.lang.String" resultType="java.lang.String">
+    SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(TRAVELLING_MERCHANT_NO, LENGTH(TRAVELLING_MERCHANT_NO) - 3))),0) + 1,4,'0') TRAVELLING_MERCHANT_NO
+    FROM METER_BASE_TRAVELLING_MERCHANT
+  </select>
 </mapper>

src/main/java/com/steerinfo/baseinfo/meterbaseunloadtimecontrol/controller/MeterBaseUnloadTimecontrolController.java

@@ -6,6 +6,7 @@ import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.framework.utils.collection.ListUtils;
 import com.steerinfo.baseinfo.meterbaseunloadtimecontrol.model.MeterBaseUnloadTimecontrol;
 import com.steerinfo.baseinfo.meterbaseunloadtimecontrol.service.IMeterBaseUnloadTimecontrolService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -31,6 +32,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/${api.version}/meterbaseunloadtimecontrols")
+@Api(value = "/${api.version}/meterbaseunloadtimecontrols", tags = "计量信息 - MeterBaseUnloadTimecontrolController")
 public class MeterBaseUnloadTimecontrolController extends BaseRESTfulController {
 
     @Autowired

src/main/java/com/steerinfo/baseinfo/meterbaseversions/controller/MeterBaseVersionsController.java

@@ -0,0 +1,118 @@
+package com.steerinfo.baseinfo.meterbaseversions.controller;
+
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+import com.steerinfo.baseinfo.meterbaseversions.model.MeterBaseVersions;
+import com.steerinfo.baseinfo.meterbaseversions.service.IMeterBaseVersionsService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ArrayList;
+import java.math.BigDecimal;
+
+/**
+ * MeterBaseVersions RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-03-08 03:59
+ * 类描述
+ * 修订历史：
+ * 日期：2022-03-08
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseVersions RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/meterbaseversionss")
+public class MeterBaseVersionsController extends BaseRESTfulController {
+
+    @Autowired
+    IMeterBaseVersionsService meterBaseVersionsService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterbaseversions:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseVersions> list = meterBaseVersionsService.queryForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterbaseversions:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseVersions> list = meterBaseVersionsService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据MeterBaseVersions对象创建")
+    @ApiImplicitParam(name = "meterBaseVersions", value = "详细实体meterBaseVersions", required = true, dataType = "MeterBaseVersions")
+    //@RequiresPermissions("meterbaseversions:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@RequestBody MeterBaseVersions model){
+        try{
+            String msg = meterBaseVersionsService.checkandadd(model);
+            if (msg != "" && !msg.equals("")) {
+                return  failed(null,msg);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(null,"操作异常，请确认！");
+        }
+        return success();
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbaseversions:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        MeterBaseVersions meterBaseVersions = meterBaseVersionsService.getById(id);
+        return success(meterBaseVersions);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的meterBaseVersions信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "meterBaseVersions", value = "详细实体meterBaseVersions", required = true, dataType = "MeterBaseVersions")
+    })
+    //@RequiresPermissions("meterbaseversions:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody MeterBaseVersions model){
+        model.setId(id);
+        MeterBaseVersions meterBaseVersions = meterBaseVersionsService.modify(model);
+        return success(meterBaseVersions);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbaseversions:delete")
+    @DeleteMapping(value = "/{id}")//String
+    public RESTfulResult delete(@PathVariable String id){
+    	List<String> list = Arrays.asList(id.split(","));
+    	if(ListUtils.isNotEmpty(list)) {
+	    	List<String> ids = ListUtils.convertList(list);
+			  meterBaseVersionsService.delete(ids);
+    	}
+      return success();
+    }
+}

src/main/java/com/steerinfo/baseinfo/meterbaseversions/mapper/MeterBaseVersionsMapper.java

@@ -0,0 +1,11 @@
+package com.steerinfo.baseinfo.meterbaseversions.mapper;
+
+import com.steerinfo.baseinfo.meterbaseversions.model.MeterBaseVersions;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MeterBaseVersionsMapper extends IBaseMapper<MeterBaseVersions, String> {
+    String GetNewID();
+}

src/main/java/com/steerinfo/baseinfo/meterbaseversions/mapper/MeterBaseVersionsMapper.xml

@@ -0,0 +1,475 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.baseinfo.meterbaseversions.mapper.MeterBaseVersionsMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.baseinfo.meterbaseversions.model.MeterBaseVersions">
+    <id column="VERSIONS_NO" jdbcType="VARCHAR" property="versionsNo" />
+    <result column="VERSIONS_NUMBER" jdbcType="VARCHAR" property="versionsNumber" />
+    <result column="VERSIONS_INFO" jdbcType="VARCHAR" property="versionsInfo" />
+    <result column="DOWNLOAD_URL" jdbcType="VARCHAR" property="downloadUrl" />
+    <result column="MEMO" jdbcType="VARCHAR" property="memo" />
+    <result column="VALID_FLAG" jdbcType="VARCHAR" property="validFlag" />
+    <result column="CREATE_MAN_NO" jdbcType="VARCHAR" property="createManNo" />
+    <result column="CREATE_MAN_NAME" jdbcType="VARCHAR" property="createManName" />
+    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="UPDATE_MAN_NO" jdbcType="VARCHAR" property="updateManNo" />
+    <result column="UPDATE_MAN_NAME" jdbcType="VARCHAR" property="updateManName" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="DELETE_MAN_NO" jdbcType="VARCHAR" property="deleteManNo" />
+    <result column="DELETE_MAN_NAME" jdbcType="VARCHAR" property="deleteManName" />
+    <result column="DELETE_TIME" jdbcType="TIMESTAMP" property="deleteTime" />
+  </resultMap>
+  <sql id="columns">
+    VERSIONS_NO, VERSIONS_NUMBER, VERSIONS_INFO, DOWNLOAD_URL, 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
+  </sql>
+  <sql id="columns_alias">
+    t.VERSIONS_NO, t.VERSIONS_NUMBER, t.VERSIONS_INFO, t.DOWNLOAD_URL, 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
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_BASE_VERSIONS
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_BASE_VERSIONS t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="versionsNo != null and versionsNo != ''">
+        and VERSIONS_NO = #{versionsNo}
+      </if>
+      <if test="versionsNumber != null and versionsNumber != ''">
+        and VERSIONS_NUMBER = #{versionsNumber}
+      </if>
+      <if test="versionsInfo != null and versionsInfo != ''">
+        and VERSIONS_INFO = #{versionsInfo}
+      </if>
+      <if test="downloadUrl != null and downloadUrl != ''">
+        and DOWNLOAD_URL = #{downloadUrl}
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO = #{memo}
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        and VALID_FLAG = #{validFlag}
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO = #{createManNo}
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME = #{createManName}
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        and UPDATE_MAN_NO = #{updateManNo}
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        and UPDATE_MAN_NAME = #{updateManName}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="deleteManNo != null and deleteManNo != ''">
+        and DELETE_MAN_NO = #{deleteManNo}
+      </if>
+      <if test="deleteManName != null and deleteManName != ''">
+        and DELETE_MAN_NAME = #{deleteManName}
+      </if>
+      <if test="deleteTime != null">
+        and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="versionsNo != null and versionsNo != ''">
+        and VERSIONS_NO LIKE '%${versionsNo}%'
+      </if>
+      <if test="versionsNumber != null and versionsNumber != ''">
+        and VERSIONS_NUMBER LIKE '%${versionsNumber}%'
+      </if>
+      <if test="versionsInfo != null and versionsInfo != ''">
+        and VERSIONS_INFO LIKE '%${versionsInfo}%'
+      </if>
+      <if test="downloadUrl != null and downloadUrl != ''">
+        and DOWNLOAD_URL LIKE '%${downloadUrl}%'
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO LIKE '%${memo}%'
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        and VALID_FLAG LIKE '%${validFlag}%'
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO LIKE '%${createManNo}%'
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME LIKE '%${createManName}%'
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        and UPDATE_MAN_NO LIKE '%${updateManNo}%'
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        and UPDATE_MAN_NAME LIKE '%${updateManName}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="deleteManNo != null and deleteManNo != ''">
+        and DELETE_MAN_NO LIKE '%${deleteManNo}%'
+      </if>
+      <if test="deleteManName != null and deleteManName != ''">
+        and DELETE_MAN_NAME LIKE '%${deleteManName}%'
+      </if>
+      <if test="deleteTime != null">
+        and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_BASE_VERSIONS
+    where VERSIONS_NO = #{versionsNo,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_BASE_VERSIONS
+    where 1!=1 
+      <if test="versionsNumber != null and versionsNumber != ''">
+        or VERSIONS_NUMBER = #{versionsNumber}
+      </if>
+      <if test="versionsInfo != null and versionsInfo != ''">
+        or VERSIONS_INFO = #{versionsInfo}
+      </if>
+      <if test="downloadUrl != null and downloadUrl != ''">
+        or DOWNLOAD_URL = #{downloadUrl}
+      </if>
+      <if test="memo != null and memo != ''">
+        or MEMO = #{memo}
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        or VALID_FLAG = #{validFlag}
+      </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>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbaseversions.model.MeterBaseVersions">
+    insert into METER_BASE_VERSIONS (VERSIONS_NO, VERSIONS_NUMBER, VERSIONS_INFO, 
+      DOWNLOAD_URL, 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
+      )
+    values (#{versionsNo,jdbcType=VARCHAR}, #{versionsNumber,jdbcType=VARCHAR}, #{versionsInfo,jdbcType=VARCHAR}, 
+      #{downloadUrl,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, #{validFlag,jdbcType=VARCHAR}, 
+      #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{deleteManNo,jdbcType=VARCHAR}, #{deleteManName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbaseversions.model.MeterBaseVersions">
+    insert into METER_BASE_VERSIONS
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="versionsNo != null">
+        VERSIONS_NO,
+      </if>
+      <if test="versionsNumber != null">
+        VERSIONS_NUMBER,
+      </if>
+      <if test="versionsInfo != null">
+        VERSIONS_INFO,
+      </if>
+      <if test="downloadUrl != null">
+        DOWNLOAD_URL,
+      </if>
+      <if test="memo != null">
+        MEMO,
+      </if>
+      <if test="validFlag != null">
+        VALID_FLAG,
+      </if>
+      <if test="createManNo != null">
+        CREATE_MAN_NO,
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME,
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME,
+      </if>
+      <if test="updateManNo != null">
+        UPDATE_MAN_NO,
+      </if>
+      <if test="updateManName != null">
+        UPDATE_MAN_NAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="deleteManNo != null">
+        DELETE_MAN_NO,
+      </if>
+      <if test="deleteManName != null">
+        DELETE_MAN_NAME,
+      </if>
+      <if test="deleteTime != null">
+        DELETE_TIME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="versionsNo != null">
+        #{versionsNo,jdbcType=VARCHAR},
+      </if>
+      <if test="versionsNumber != null">
+        #{versionsNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="versionsInfo != null">
+        #{versionsInfo,jdbcType=VARCHAR},
+      </if>
+      <if test="downloadUrl != null">
+        #{downloadUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="validFlag != null">
+        #{validFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="createManNo != null">
+        #{createManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateManNo != null">
+        #{updateManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManName != null">
+        #{updateManName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deleteManNo != null">
+        #{deleteManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteManName != null">
+        #{deleteManName,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteTime != null">
+        #{deleteTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbaseversions.model.MeterBaseVersions">
+    update METER_BASE_VERSIONS
+    set VERSIONS_NUMBER = #{versionsNumber,jdbcType=VARCHAR},
+      VERSIONS_INFO = #{versionsInfo,jdbcType=VARCHAR},
+      DOWNLOAD_URL = #{downloadUrl,jdbcType=VARCHAR},
+      MEMO = #{memo,jdbcType=VARCHAR},
+      VALID_FLAG = #{validFlag,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}
+    where VERSIONS_NO = #{versionsNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbaseversions.model.MeterBaseVersions">
+    update METER_BASE_VERSIONS
+    <set>
+      <if test="versionsNumber != null">
+        VERSIONS_NUMBER = #{versionsNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="versionsInfo != null">
+        VERSIONS_INFO = #{versionsInfo,jdbcType=VARCHAR},
+      </if>
+      <if test="downloadUrl != null">
+        DOWNLOAD_URL = #{downloadUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        MEMO = #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="validFlag != null">
+        VALID_FLAG = #{validFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="createManNo != null">
+        CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateManNo != null">
+        UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManName != null">
+        UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deleteManNo != null">
+        DELETE_MAN_NO = #{deleteManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteManName != null">
+        DELETE_MAN_NAME = #{deleteManName,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteTime != null">
+        DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where VERSIONS_NO = #{versionsNo,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where VERSIONS_NO = #{versionsNo,jdbcType=VARCHAR}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into METER_BASE_VERSIONS 
+      (VERSIONS_NO, 
+      VERSIONS_NUMBER, VERSIONS_INFO, 
+      DOWNLOAD_URL, 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
+      )
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.versionsNo,jdbcType=VARCHAR}, 
+      #{item.versionsNumber,jdbcType=VARCHAR}, #{item.versionsInfo,jdbcType=VARCHAR}, 
+      #{item.downloadUrl,jdbcType=VARCHAR}, #{item.memo,jdbcType=VARCHAR}, #{item.validFlag,jdbcType=VARCHAR}, 
+      #{item.createManNo,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
+      #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
+      #{item.deleteManNo,jdbcType=VARCHAR}, #{item.deleteManName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=TIMESTAMP}
+       from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_BASE_VERSIONS
+     set
+       VERSIONS_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERSIONS_NO" close="end">
+          when #{item.versionsNo,jdbcType=VARCHAR} then #{item.versionsNo,jdbcType=VARCHAR}
+       </foreach>
+       ,VERSIONS_NUMBER=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERSIONS_NO" close="end">
+          when #{item.versionsNo,jdbcType=VARCHAR} then #{item.versionsNumber,jdbcType=VARCHAR}
+       </foreach>
+       ,VERSIONS_INFO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERSIONS_NO" close="end">
+          when #{item.versionsNo,jdbcType=VARCHAR} then #{item.versionsInfo,jdbcType=VARCHAR}
+       </foreach>
+       ,DOWNLOAD_URL=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERSIONS_NO" close="end">
+          when #{item.versionsNo,jdbcType=VARCHAR} then #{item.downloadUrl,jdbcType=VARCHAR}
+       </foreach>
+       ,MEMO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERSIONS_NO" close="end">
+          when #{item.versionsNo,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
+       </foreach>
+       ,VALID_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERSIONS_NO" close="end">
+          when #{item.versionsNo,jdbcType=VARCHAR} then #{item.validFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERSIONS_NO" close="end">
+          when #{item.versionsNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERSIONS_NO" close="end">
+          when #{item.versionsNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERSIONS_NO" close="end">
+          when #{item.versionsNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERSIONS_NO" close="end">
+          when #{item.versionsNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERSIONS_NO" close="end">
+          when #{item.versionsNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERSIONS_NO" close="end">
+          when #{item.versionsNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,DELETE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERSIONS_NO" close="end">
+          when #{item.versionsNo,jdbcType=VARCHAR} then #{item.deleteManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERSIONS_NO" close="end">
+          when #{item.versionsNo,jdbcType=VARCHAR} then #{item.deleteManName,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERSIONS_NO" close="end">
+          when #{item.versionsNo,jdbcType=VARCHAR} then #{item.deleteTime,jdbcType=TIMESTAMP}
+       </foreach>
+     where VERSIONS_NO in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.versionsNo,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_BASE_VERSIONS
+    where VERSIONS_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(VERSIONS_NO, LENGTH(VERSIONS_NO) - 4))),0) + 1,5,'0') VERSIONS_NO
+    FROM METER_BASE_VERSIONS
+  </select>
+</mapper>

src/main/java/com/steerinfo/baseinfo/meterbaseversions/model/MeterBaseVersions.java

@@ -0,0 +1,257 @@
+package com.steerinfo.baseinfo.meterbaseversions.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+
+@ApiModel(value="null")
+public class MeterBaseVersions implements IBasePO<String> {
+    /**
+     * 主键编号(VERSIONS_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="主键编号",required=true)
+    private String versionsNo;
+
+    /**
+     * 版本编号(VERSIONS_NUMBER,VARCHAR,255)
+     */
+    @ApiModelProperty(value="版本编号",required=false)
+    private String versionsNumber;
+
+    /**
+     * 版本信息(VERSIONS_INFO,VARCHAR,255)
+     */
+    @ApiModelProperty(value="版本信息",required=false)
+    private String versionsInfo;
+
+    /**
+     * 下载地址(DOWNLOAD_URL,VARCHAR,255)
+     */
+    @ApiModelProperty(value="下载地址",required=false)
+    private String downloadUrl;
+
+    /**
+     * 备注(MEMO,VARCHAR,200)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String memo;
+
+    /**
+     * 状态（0:无效;1:有效）(VALID_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="状态（0:无效;1:有效）",required=true)
+    private String validFlag;
+
+    /**
+     * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="创建人编号",required=true)
+    private String createManNo;
+
+    /**
+     * 创建人姓名(CREATE_MAN_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="创建人姓名",required=true)
+    private String createManName;
+
+    /**
+     * 创建时间（YYYY-MM-DD HH:mm:SS）(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="创建时间（YYYY-MM-DD HH:mm:SS）",required=true)
+    private Date createTime;
+
+    /**
+     * 修改人编号(UPDATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="修改人编号",required=false)
+    private String updateManNo;
+
+    /**
+     * 修改人姓名(UPDATE_MAN_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="修改人姓名",required=false)
+    private String updateManName;
+
+    /**
+     * 修改时间（YYYY-MM-DD HH:mm:SS）(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间（YYYY-MM-DD HH:mm:SS）",required=false)
+    private Date updateTime;
+
+    /**
+     * 删除人编号(DELETE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="删除人编号",required=false)
+    private String deleteManNo;
+
+    /**
+     * 删除人姓名(DELETE_MAN_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="删除人姓名",required=false)
+    private String deleteManName;
+
+    /**
+     * 删除时间（YYYY-MM-DD HH:mm:SS）(DELETE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="删除时间（YYYY-MM-DD HH:mm:SS）",required=false)
+    private Date deleteTime;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.versionsNo;
+    }
+
+    @Override
+    public void setId(String versionsNo) {
+        this.versionsNo = versionsNo == null ? null : versionsNo.trim();
+    }
+
+    public String getVersionsNo() {
+        return versionsNo;
+    }
+
+    public void setVersionsNo(String versionsNo) {
+        this.versionsNo = versionsNo == null ? null : versionsNo.trim();
+    }
+
+    public String getVersionsNumber() {
+        return versionsNumber;
+    }
+
+    public void setVersionsNumber(String versionsNumber) {
+        this.versionsNumber = versionsNumber == null ? null : versionsNumber.trim();
+    }
+
+    public String getVersionsInfo() {
+        return versionsInfo;
+    }
+
+    public void setVersionsInfo(String versionsInfo) {
+        this.versionsInfo = versionsInfo == null ? null : versionsInfo.trim();
+    }
+
+    public String getDownloadUrl() {
+        return downloadUrl;
+    }
+
+    public void setDownloadUrl(String downloadUrl) {
+        this.downloadUrl = downloadUrl == null ? null : downloadUrl.trim();
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo == null ? null : memo.trim();
+    }
+
+    public String getValidFlag() {
+        return validFlag;
+    }
+
+    public void setValidFlag(String validFlag) {
+        this.validFlag = validFlag == null ? null : validFlag.trim();
+    }
+
+    public String getCreateManNo() {
+        return createManNo;
+    }
+
+    public void setCreateManNo(String createManNo) {
+        this.createManNo = createManNo == null ? null : createManNo.trim();
+    }
+
+    public String getCreateManName() {
+        return createManName;
+    }
+
+    public void setCreateManName(String createManName) {
+        this.createManName = createManName == null ? null : createManName.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateManNo() {
+        return updateManNo;
+    }
+
+    public void setUpdateManNo(String updateManNo) {
+        this.updateManNo = updateManNo == null ? null : updateManNo.trim();
+    }
+
+    public String getUpdateManName() {
+        return updateManName;
+    }
+
+    public void setUpdateManName(String updateManName) {
+        this.updateManName = updateManName == null ? null : updateManName.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getDeleteManNo() {
+        return deleteManNo;
+    }
+
+    public void setDeleteManNo(String deleteManNo) {
+        this.deleteManNo = deleteManNo == null ? null : deleteManNo.trim();
+    }
+
+    public String getDeleteManName() {
+        return deleteManName;
+    }
+
+    public void setDeleteManName(String deleteManName) {
+        this.deleteManName = deleteManName == null ? null : deleteManName.trim();
+    }
+
+    public Date getDeleteTime() {
+        return deleteTime;
+    }
+
+    public void setDeleteTime(Date deleteTime) {
+        this.deleteTime = deleteTime;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", versionsNo=").append(versionsNo);
+        sb.append(", versionsNumber=").append(versionsNumber);
+        sb.append(", versionsInfo=").append(versionsInfo);
+        sb.append(", downloadUrl=").append(downloadUrl);
+        sb.append(", memo=").append(memo);
+        sb.append(", validFlag=").append(validFlag);
+        sb.append(", createManNo=").append(createManNo);
+        sb.append(", createManName=").append(createManName);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateManNo=").append(updateManNo);
+        sb.append(", updateManName=").append(updateManName);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", deleteManNo=").append(deleteManNo);
+        sb.append(", deleteManName=").append(deleteManName);
+        sb.append(", deleteTime=").append(deleteTime);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/baseinfo/meterbaseversions/service/IMeterBaseVersionsService.java

@@ -0,0 +1,24 @@
+package com.steerinfo.baseinfo.meterbaseversions.service;
+
+import com.steerinfo.baseinfo.meterbaseunitdirect.model.MeterBaseUnitDirect;
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.baseinfo.meterbaseversions.model.MeterBaseVersions;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * MeterBaseVersions服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-03-08 03:59
+ * 类描述
+ * 修订历史：
+ * 日期：2022-03-08
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseVersions服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IMeterBaseVersionsService extends IBaseService<MeterBaseVersions, String>{
+    String checkandadd(MeterBaseVersions model);
+}

src/main/java/com/steerinfo/baseinfo/meterbaseversions/service/impl/MeterBaseVersionsServiceImpl.java

@@ -0,0 +1,58 @@
+package com.steerinfo.baseinfo.meterbaseversions.service.impl;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.baseinfo.meterbaseversions.model.MeterBaseVersions;
+import com.steerinfo.baseinfo.meterbaseversions.mapper.MeterBaseVersionsMapper;
+import com.steerinfo.baseinfo.meterbaseversions.service.IMeterBaseVersionsService;
+import com.steerinfo.util.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * MeterBaseVersions服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-03-08 03:59
+ * 类描述
+ * 修订历史：
+ * 日期：2022-03-08
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseVersions服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "meterBaseVersionsService")
+public class MeterBaseVersionsServiceImpl extends BaseServiceImpl<MeterBaseVersions, String> implements IMeterBaseVersionsService {
+
+    @Autowired
+    private MeterBaseVersionsMapper meterBaseVersionsMapper;
+
+    @Override
+    protected IBaseMapper<MeterBaseVersions, String> getMapper() {
+        return meterBaseVersionsMapper;
+    }
+
+    @Override
+    public String checkandadd(MeterBaseVersions model) {
+        if (StringUtils.isEmpty(model.getVersionsInfo())) {
+            return "版本信息不能为空";
+        }
+        if (StringUtils.isEmpty(model.getDownloadUrl())) {
+            return "下载地址不能为空";
+        }
+        if (StringUtils.isEmpty(model.getVersionsNumber())){
+            return "版本号不能为空";
+        }
+        String no = meterBaseVersionsMapper.GetNewID();
+        model.setVersionsNo(no);
+        model.setCreateTime(new Date());
+        model.setValidFlag("1");//有效
+        meterBaseVersionsMapper.insert(model);
+        return "";
+    }
+}

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

@@ -50,5 +50,7 @@ public interface MeterWorkCarActualMapper extends IBaseMapper<MeterWorkCarActual
      */
     List<MeterWorkCarActual> distinctCarNo(HashMap<String, Object> obj);
 
+    List<MeterWorkCarActual> getCarActual(Map<String, Object> obj);
+
     MeterWorkCarActual selectActual(String actualFirstNo);
 }

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

@@ -3417,4 +3417,8 @@
       from METER_WORK_CAR_ACTUAL
       where ACTUAL_FIRST1_NO = #{actualFirstNo} or ACTUAL_FIRST2_NO = #{actualFirstNo}
     </select>
+
+  <select id="getCarActual" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    select * from METER_WORK_CAR_ACTUAL WHERE CAR_NO IN (select CAR_NO from METER_BASE_CAR where CUSTOMER_SUPPLIER_NO = #{customerSupplierNo} and CUSTOMER_SUPPLIER_NAME = #{customerSupplierName})
+  </select>
 </mapper>

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

@@ -15,6 +15,7 @@ import com.steerinfo.framework.utils.collection.ListUtils;
 import com.steerinfo.meterwork.constants.DbConstants;
 import com.steerinfo.meterwork.dto.StaffPerformanceAnalysis;
 import com.steerinfo.meterwork.except.MarkerMetException;
+import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
 import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
 import com.steerinfo.meterwork.meterworkimage.mapper.MeterWorkImageMapper;
 import com.steerinfo.meterwork.meterworkimage.model.MeterWorkImage;
@@ -579,6 +580,30 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             prs.setUpdateTime(new Date());
             prs.setUpdateManNo("system");
             prs.setUpdateManName("火车一次计量匹配操作");
+
+            //当一次计量数据是已结净的状态时，同时将该结净数据的另一条一次计量数据自动匹配该委托，并将该结净记录也进行委托匹配
+            if (model.getValueFlag() == "2" || "2".equals(model.getValueFlag())){
+                MeterWorkRailwayActual meterWorkRailwayActual = meterWorkRailwayActualMapper.selectActual(actualFirstNo);
+                String getActualFirstNo = "";
+                //判断传入的是哪条一次记录
+                if (meterWorkRailwayActual.getActualFirst1No().equals(actualFirstNo)){
+                    getActualFirstNo = meterWorkRailwayActual.getActualFirst2No();
+                }
+                if (meterWorkRailwayActual.getActualFirst2No().equals(actualFirstNo)){
+                    getActualFirstNo = meterWorkRailwayActual.getActualFirst1No();
+                }
+                //另一条一次数据进行委托解除
+                MeterWorkRailwayActFirst meterWorkCarActualFirst1 = meterWorkRailwayActFirstMapper.selectAndMatch(getActualFirstNo,predictionNo);
+                meterWorkCarActualFirst1.setIsPreSacale("1");
+                meterWorkRailwayActFirstMapper.updateByPrimaryKey(meterWorkCarActualFirst1);
+                //将该一次记录的结净数据委托解除
+                MeterWorkRailwayActual mwca = meterWorkRailwayActualMapper.mathPredcition(meterWorkRailwayActual.getActualNo(),predictionNo);
+                mwca.setIsPreSacale("1");
+                mwca.setUploadFlag("1");
+                meterWorkRailwayActualMapper.updateByPrimaryKey(mwca);
+            }
+
+
 //            prs.setNote(); 需要添加修改原因写入
             preRailwayScaleMapper.updateByPrimaryKeySelective(prs);
             meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model);

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

@@ -47,4 +47,6 @@ public interface MeterWorkRailwayActualMapper extends IBaseMapper<MeterWorkRailw
     List<MeterWorkRailwayActual> distinctCarNo(HashMap<String, Object> obj);
 
     double getGrossAvg(HashMap actual);
+
+    MeterWorkRailwayActual selectActual(String actualFirstNo);
 }

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

@@ -3565,4 +3565,10 @@ select nvl(round(avg(gross_weight / 1000), 2),0)
       and  data_source = '${dataSource}'
     </if>
   </select>
+
+  <select id="selectActual" parameterType="java.lang.String" resultMap="BaseResultMap">
+      SELECT *
+      from METER_WORK_RAILWAY_ACTUAL
+      where ACTUAL_FIRST1_NO = #{actualFirstNo} or ACTUAL_FIRST2_NO = #{actualFirstNo}
+    </select>
 </mapper>