修改

src/main/java/com/jisco/dynamicweight/dynamicworkupdata/controller/DynamicWorkUpdataController.java

@@ -305,7 +305,7 @@ public class DynamicWorkUpdataController extends BaseRESTfulController {
         if (ListUtils.isNotEmpty(list)) {
             for (DynamicWorkUpdata updata : list) {
                 boolean flag = dynamicWorkUpdataService.enable(updata.getId());
-                Assert.isTrue(flag,"操作失败");
+                Assert.isTrue(flag, "操作失败");
             }
         }
         return success();
@@ -318,7 +318,7 @@ public class DynamicWorkUpdataController extends BaseRESTfulController {
         if (ListUtils.isNotEmpty(list)) {
             for (DynamicWorkUpdata updata : list) {
                 boolean flag = dynamicWorkUpdataService.disable(updata.getId());
-                Assert.isTrue(flag,"操作失败");
+                Assert.isTrue(flag, "操作失败");
             }
         }
         return success();
@@ -355,11 +355,13 @@ public class DynamicWorkUpdataController extends BaseRESTfulController {
     @ApiOperation(value = "新焦炭计算", notes = "新焦炭计算")
     @PostMapping(value = "/calNewCoke")
     public RESTfulResult calNewCoke(@RequestBody CalNewCokeDto calNewCokeDto) throws IOException {
-        try{
+        try {
             dynamicWorkUpdataService.calNewCoke(calNewCokeDto);
+//            Integer a = null;
+//            int i = 1 / a;
             return success(null, "操作成功");
-        }catch (Exception e){
-            return failed(null, e.getMessage());
+        } catch (Exception e) {
+            return failed(null, "操作失败：" + e.getMessage());
         }
     }
 }

src/main/java/com/jisco/dynamicweight/dynamicworkupdata/dto/CalNewCokeDto.java

@@ -1,5 +1,6 @@
 package com.jisco.dynamicweight.dynamicworkupdata.dto;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -70,4 +71,44 @@ public class CalNewCokeDto {
                 ", stationNums=" + stationNums +
                 '}';
     }
+
+    public static class InbatchDto {
+
+        private String materialCode;
+        private String materialName;
+        private BigDecimal weight;
+
+        public String getMaterialCode() {
+            return materialCode;
+        }
+
+        public void setMaterialCode(String materialCode) {
+            this.materialCode = materialCode;
+        }
+
+        public String getMaterialName() {
+            return materialName;
+        }
+
+        public void setMaterialName(String materialName) {
+            this.materialName = materialName;
+        }
+
+        public BigDecimal getWeight() {
+            return weight;
+        }
+
+        public void setWeight(BigDecimal weight) {
+            this.weight = weight;
+        }
+
+        @Override
+        public String toString() {
+            return "InbatchDto{" +
+                    "materialCode='" + materialCode + '\'' +
+                    ", materialName='" + materialName + '\'' +
+                    ", weight=" + weight +
+                    '}';
+        }
+    }
 }

src/main/java/com/jisco/dynamicweight/dynamicworkupdata/service/impl/DynamicWorkUpdataServiceImpl.java

@@ -464,7 +464,6 @@ public class DynamicWorkUpdataServiceImpl extends BaseServiceImpl<DynamicWorkUpd
 //        2、查询“动态秤日报”内返焦4皮带总量；假设结果为B
         calNewCokeDto.setStationNums(Arrays.asList("001336"));
         BigDecimal b = dtcrbMapper.getTotalWeight(calNewCokeDto);
-        ;
 //        3、统计“物资量系统”内，汽车衡，物料品名包含“焦”，发货库房为“2548”的数据；并求和；假设结果为C
         calNewCokeDto.setReceiverCode(null);
         calNewCokeDto.setSenderCode("2548");
@@ -476,8 +475,9 @@ public class DynamicWorkUpdataServiceImpl extends BaseServiceImpl<DynamicWorkUpd
         List<String> stationNums = dtcrbMapper.getMJEStationNums();
         calNewCokeDto.setStationNums(stationNums);
         BigDecimal e = dtcrbMapper.getTotalWeight(calNewCokeDto);
-        ;
 //        6、计算系数K=（C+D+B）/ (A+E)
+        if (a == null || b == null || c == null || d == null || e == null || a.add(e).compareTo(BigDecimal.ZERO) == 0)
+            return;
         BigDecimal k = c.add(d).add(b).divide(a.add(e), 5, RoundingMode.HALF_UP);
 //        7、分别用“动态秤称重数据维护”内，综1A、综1B、综1C、综1D皮带秤，物料品名包含“焦”，收货库房为“2546”的数据，和煤焦E皮带秤，物料品名包含“焦”的数据乘以计算系数K，并将结果汇总存放“动态称数据审核”
         calNewCokeDto.setReceiverCode("2546");
@@ -505,6 +505,8 @@ public class DynamicWorkUpdataServiceImpl extends BaseServiceImpl<DynamicWorkUpd
 //        5、统计“动态秤称重数据维护”内，36B1计量焦炭数据（不包含粉焦），并求和；假设结果为E，并作废原始数据
         BigDecimal e = getCokeByStation("PD0039", calNewCokeDto.getStartTime(), calNewCokeDto.getEndTime());
 //        6、计算系数K=（C+D-E-B）/ A
+        if (a == null || b == null || c == null || d == null || e == null || a.compareTo(BigDecimal.ZERO) == 0)
+            return;
         BigDecimal k = c.add(d).subtract(b).subtract(e).divide(a, 5, RoundingMode.HALF_UP);
 //        7、用“动态秤称重数据维护”内，综1A、综1B、综1C、综1D皮带秤，物料品名包含“焦”，收货库房为“2531”的数据，每条数据乘以系数K，并将结果汇总存放“动态称数据审核”
         calNewCokeDto.setReceiverCode("2531");

src/main/java/com/steerinfo/baseinfo/meterbasesystemmessage/service/impl/MeterBaseSystemMessageServiceImpl.java

@@ -8,6 +8,7 @@ import com.steerinfo.baseinfo.meterbasesystemmessage.mapper.MeterBaseSystemMessa
 import com.steerinfo.baseinfo.meterbasesystemmessage.service.IMeterBaseSystemMessageService;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
 import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.user.UserPayload;
 import com.steerinfo.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -54,6 +55,18 @@ public class MeterBaseSystemMessageServiceImpl extends BaseServiceImpl<MeterBase
         }
         String no = meterBaseSystemMessageMapper.GetNewID();
         model.setSystemMessageNo(new SimpleDateFormat("yyyyMMdd").format(new Date()) + no);
+        String userId;
+        String userName;
+        try{
+            UserPayload payload = UserPayload.getCurrUser();
+            userId = payload.getUserCode();
+            userName = payload.getUserName();
+        }catch(Exception e) {
+            userId = "admin";
+            userName = "admins";
+        }
+        model.setCreateManNo(userId);
+        model.setCreateManName(userName);
         model.setCreateTime(new Date());
         model.setVaildFlag("1");//有效
         meterBaseSystemMessageMapper.insert(model);

src/main/java/com/steerinfo/baseinfo/meterbasevehiclerangeconfig/controller/MeterBaseVehicleRangeConfigController.java

@@ -0,0 +1,132 @@
+package com.steerinfo.baseinfo.meterbasevehiclerangeconfig.controller;
+
+import com.steerinfo.baseinfo.meterbasevehiclerangeconfig.model.MeterBaseVehicleRangeConfig;
+import com.steerinfo.baseinfo.meterbasevehiclerangeconfig.service.IMeterBaseVehicleRangeConfigService;
+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 io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+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;
+
+/**
+ * MeterBaseVehicleRangeConfig RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-12-05 01:44
+ * 类描述
+ * 修订历史：
+ * 日期：2022-12-05
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseVehicleRangeConfig RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/meterbasevehiclerangeconfigs")
+public class MeterBaseVehicleRangeConfigController extends BaseRESTfulController {
+
+    @Autowired
+    IMeterBaseVehicleRangeConfigService meterBaseVehicleRangeConfigService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterbasevehiclerangeconfig:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseVehicleRangeConfig> list = meterBaseVehicleRangeConfigService.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("meterbasevehiclerangeconfig:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseVehicleRangeConfig> list = meterBaseVehicleRangeConfigService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据MeterBaseVehicleRangeConfig对象创建")
+    @ApiImplicitParam(name = "meterBaseVehicleRangeConfig", value = "详细实体meterBaseVehicleRangeConfig", required = true, dataType = "MeterBaseVehicleRangeConfig")
+    //@RequiresPermissions("meterbasevehiclerangeconfig:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute MeterBaseVehicleRangeConfig model){
+        MeterBaseVehicleRangeConfig meterBaseVehicleRangeConfig = meterBaseVehicleRangeConfigService.add(model);
+        return success(meterBaseVehicleRangeConfig);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbasevehiclerangeconfig:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        MeterBaseVehicleRangeConfig meterBaseVehicleRangeConfig = meterBaseVehicleRangeConfigService.getById(id);
+        return success(meterBaseVehicleRangeConfig);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的meterBaseVehicleRangeConfig信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "meterBaseVehicleRangeConfig", value = "详细实体meterBaseVehicleRangeConfig", required = true, dataType = "MeterBaseVehicleRangeConfig")
+    })
+    //@RequiresPermissions("meterbasevehiclerangeconfig:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody MeterBaseVehicleRangeConfig model){
+        model.setId(id);
+        MeterBaseVehicleRangeConfig meterBaseVehicleRangeConfig = meterBaseVehicleRangeConfigService.modify(model);
+        return success(meterBaseVehicleRangeConfig);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbasevehiclerangeconfig: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);
+			  meterBaseVehicleRangeConfigService.delete(ids);
+    	}
+      return success();
+    }
+
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    @PostMapping(value = "/likeByDesc")
+    public RESTfulResult likeByDesc(@RequestBody HashMap parmas){
+        PageList<MeterBaseVehicleRangeConfig> list = meterBaseVehicleRangeConfigService.likeByDesc(parmas, Integer.parseInt(parmas.get("pageNum").toString()), Integer.parseInt(parmas.get("pageSize").toString()));
+        return success(list);
+    }
+
+    @ApiOperation(value="修改数据配置", notes="修改数据配置")
+    @PostMapping(value = "/updateModel")
+    public RESTfulResult updateModel(@RequestBody MeterBaseVehicleRangeConfig model){
+        MeterBaseVehicleRangeConfig meterBaseVehicleRangeConfig = meterBaseVehicleRangeConfigService.updateModel(model);
+        return success(meterBaseVehicleRangeConfig);
+    }
+
+    @ApiOperation(value="新增数据配置", notes="新增数据配置")
+    @PostMapping(value = "/addModel")
+    public RESTfulResult addModel(@RequestBody MeterBaseVehicleRangeConfig model){
+        MeterBaseVehicleRangeConfig meterBaseVehicleRangeConfig = meterBaseVehicleRangeConfigService.addModel(model);
+        return success(meterBaseVehicleRangeConfig);
+    }
+}

src/main/java/com/steerinfo/baseinfo/meterbasevehiclerangeconfig/mapper/MeterBaseVehicleRangeConfigMapper.java

@@ -0,0 +1,13 @@
+package com.steerinfo.baseinfo.meterbasevehiclerangeconfig.mapper;
+
+import com.steerinfo.baseinfo.meterbasevehiclerangeconfig.model.MeterBaseVehicleRangeConfig;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.HashMap;
+import java.util.List;
+
+@Mapper
+public interface MeterBaseVehicleRangeConfigMapper extends IBaseMapper<MeterBaseVehicleRangeConfig, String> {
+    List<MeterBaseVehicleRangeConfig> likeByDesc(HashMap params);
+}

src/main/java/com/steerinfo/baseinfo/meterbasevehiclerangeconfig/mapper/MeterBaseVehicleRangeConfigMapper.xml

@@ -0,0 +1,776 @@
+<?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.meterbasevehiclerangeconfig.mapper.MeterBaseVehicleRangeConfigMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.baseinfo.meterbasevehiclerangeconfig.model.MeterBaseVehicleRangeConfig">
+    <id column="VEHICLE_RANGE_ID" jdbcType="VARCHAR" property="vehicleRangeId" />
+    <result column="RAILWAY_NO" jdbcType="VARCHAR" property="railwayNo" />
+    <result column="MATTER_NO" jdbcType="VARCHAR" property="matterNo" />
+    <result column="MATTER_NAME" jdbcType="VARCHAR" property="matterName" />
+    <result column="FORWARDING_UNIT_NO" jdbcType="VARCHAR" property="forwardingUnitNo" />
+    <result column="FORWARDING_UNIT_NAME" jdbcType="VARCHAR" property="forwardingUnitName" />
+    <result column="RECEIVING_UINT_NO" jdbcType="VARCHAR" property="receivingUintNo" />
+    <result column="RECEIVING_UINT_NAME" jdbcType="VARCHAR" property="receivingUintName" />
+    <result column="BASE_SPOT_NO" jdbcType="VARCHAR" property="baseSpotNo" />
+    <result column="BASE_SPOT_NAME" jdbcType="VARCHAR" property="baseSpotName" />
+    <result column="CARRIGE_NO" jdbcType="VARCHAR" property="carrigeNo" />
+    <result column="LOAD_WEIGHT" jdbcType="DECIMAL" property="loadWeight" />
+    <result column="GROSS_WEIGHT_UPPER" jdbcType="DECIMAL" property="grossWeightUpper" />
+    <result column="GROSS_WEIGHT_LOWER" jdbcType="DECIMAL" property="grossWeightLower" />
+    <result column="NET_WEIGHT_UPPER" jdbcType="DECIMAL" property="netWeightUpper" />
+    <result column="NET_WEIGHT_LOWER" jdbcType="DECIMAL" property="netWeightLower" />
+    <result column="RAILWAY_TYPE_NO" jdbcType="VARCHAR" property="railwayTypeNo" />
+    <result column="RAILWAY_TYPE_NAME" jdbcType="VARCHAR" property="railwayTypeName" />
+    <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="VALUE_FLAG" jdbcType="VARCHAR" property="valueFlag" />
+  </resultMap>
+  <sql id="columns">
+    VEHICLE_RANGE_ID, RAILWAY_NO, MATTER_NO, MATTER_NAME, FORWARDING_UNIT_NO, FORWARDING_UNIT_NAME, 
+    RECEIVING_UINT_NO, RECEIVING_UINT_NAME, BASE_SPOT_NO, BASE_SPOT_NAME, CARRIGE_NO, 
+    LOAD_WEIGHT, GROSS_WEIGHT_UPPER, GROSS_WEIGHT_LOWER, NET_WEIGHT_UPPER, NET_WEIGHT_LOWER, 
+    RAILWAY_TYPE_NO, RAILWAY_TYPE_NAME, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+    UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, VALUE_FLAG
+  </sql>
+  <sql id="columns_alias">
+    t.VEHICLE_RANGE_ID, t.RAILWAY_NO, t.MATTER_NO, t.MATTER_NAME, t.FORWARDING_UNIT_NO, 
+    t.FORWARDING_UNIT_NAME, t.RECEIVING_UINT_NO, t.RECEIVING_UINT_NAME, t.BASE_SPOT_NO, 
+    t.BASE_SPOT_NAME, t.CARRIGE_NO, t.LOAD_WEIGHT, t.GROSS_WEIGHT_UPPER, t.GROSS_WEIGHT_LOWER, 
+    t.NET_WEIGHT_UPPER, t.NET_WEIGHT_LOWER, t.RAILWAY_TYPE_NO, t.RAILWAY_TYPE_NAME, t.CREATE_MAN_NO, 
+    t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME, 
+    t.VALUE_FLAG
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_BASE_VEHICLE_RANGE_CONFIG
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_BASE_VEHICLE_RANGE_CONFIG t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="vehicleRangeId != null and vehicleRangeId != ''">
+        and VEHICLE_RANGE_ID = #{vehicleRangeId}
+      </if>
+      <if test="railwayNo != null and railwayNo != ''">
+        and RAILWAY_NO = #{railwayNo}
+      </if>
+      <if test="matterNo != null and matterNo != ''">
+        and MATTER_NO = #{matterNo}
+      </if>
+      <if test="matterName != null and matterName != ''">
+        and MATTER_NAME = #{matterName}
+      </if>
+      <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+        and FORWARDING_UNIT_NO = #{forwardingUnitNo}
+      </if>
+      <if test="forwardingUnitName != null and forwardingUnitName != ''">
+        and FORWARDING_UNIT_NAME = #{forwardingUnitName}
+      </if>
+      <if test="receivingUintNo != null and receivingUintNo != ''">
+        and RECEIVING_UINT_NO = #{receivingUintNo}
+      </if>
+      <if test="receivingUintName != null and receivingUintName != ''">
+        and RECEIVING_UINT_NAME = #{receivingUintName}
+      </if>
+      <if test="baseSpotNo != null and baseSpotNo != ''">
+        and BASE_SPOT_NO = #{baseSpotNo}
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        and BASE_SPOT_NAME = #{baseSpotName}
+      </if>
+      <if test="carrigeNo != null and carrigeNo != ''">
+        and CARRIGE_NO = #{carrigeNo}
+      </if>
+      <if test="loadWeight != null">
+        and LOAD_WEIGHT = #{loadWeight}
+      </if>
+      <if test="grossWeightUpper != null">
+        and GROSS_WEIGHT_UPPER = #{grossWeightUpper}
+      </if>
+      <if test="grossWeightLower != null">
+        and GROSS_WEIGHT_LOWER = #{grossWeightLower}
+      </if>
+      <if test="netWeightUpper != null">
+        and NET_WEIGHT_UPPER = #{netWeightUpper}
+      </if>
+      <if test="netWeightLower != null">
+        and NET_WEIGHT_LOWER = #{netWeightLower}
+      </if>
+      <if test="railwayTypeNo != null and railwayTypeNo != ''">
+        and RAILWAY_TYPE_NO = #{railwayTypeNo}
+      </if>
+      <if test="railwayTypeName != null and railwayTypeName != ''">
+        and RAILWAY_TYPE_NAME = #{railwayTypeName}
+      </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="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG = #{valueFlag}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="vehicleRangeId != null and vehicleRangeId != ''">
+        and VEHICLE_RANGE_ID LIKE '%${vehicleRangeId}%'
+      </if>
+      <if test="railwayNo != null and railwayNo != ''">
+        and RAILWAY_NO LIKE '%${railwayNo}%'
+      </if>
+      <if test="matterNo != null and matterNo != ''">
+        and MATTER_NO LIKE '%${matterNo}%'
+      </if>
+      <if test="matterName != null and matterName != ''">
+        and MATTER_NAME LIKE '%${matterName}%'
+      </if>
+      <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+        and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+      </if>
+      <if test="forwardingUnitName != null and forwardingUnitName != ''">
+        and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+      </if>
+      <if test="receivingUintNo != null and receivingUintNo != ''">
+        and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+      </if>
+      <if test="receivingUintName != null and receivingUintName != ''">
+        and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+      </if>
+      <if test="baseSpotNo != null and baseSpotNo != ''">
+        and BASE_SPOT_NO LIKE '%${baseSpotNo}%'
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        and BASE_SPOT_NAME LIKE '%${baseSpotName}%'
+      </if>
+      <if test="carrigeNo != null and carrigeNo != ''">
+        and CARRIGE_NO LIKE '%${carrigeNo}%'
+      </if>
+      <if test="loadWeight != null">
+        and LOAD_WEIGHT = #{loadWeight}
+      </if>
+      <if test="grossWeightUpper != null">
+        and GROSS_WEIGHT_UPPER = #{grossWeightUpper}
+      </if>
+      <if test="grossWeightLower != null">
+        and GROSS_WEIGHT_LOWER = #{grossWeightLower}
+      </if>
+      <if test="netWeightUpper != null">
+        and NET_WEIGHT_UPPER = #{netWeightUpper}
+      </if>
+      <if test="netWeightLower != null">
+        and NET_WEIGHT_LOWER = #{netWeightLower}
+      </if>
+      <if test="railwayTypeNo != null and railwayTypeNo != ''">
+        and RAILWAY_TYPE_NO LIKE '%${railwayTypeNo}%'
+      </if>
+      <if test="railwayTypeName != null and railwayTypeName != ''">
+        and RAILWAY_TYPE_NAME LIKE '%${railwayTypeName}%'
+      </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="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG LIKE '%${valueFlag}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_BASE_VEHICLE_RANGE_CONFIG
+    where VEHICLE_RANGE_ID = #{vehicleRangeId,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_BASE_VEHICLE_RANGE_CONFIG
+    where 1!=1 
+      <if test="railwayNo != null and railwayNo != ''">
+        or RAILWAY_NO = #{railwayNo}
+      </if>
+      <if test="matterNo != null and matterNo != ''">
+        or MATTER_NO = #{matterNo}
+      </if>
+      <if test="matterName != null and matterName != ''">
+        or MATTER_NAME = #{matterName}
+      </if>
+      <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+        or FORWARDING_UNIT_NO = #{forwardingUnitNo}
+      </if>
+      <if test="forwardingUnitName != null and forwardingUnitName != ''">
+        or FORWARDING_UNIT_NAME = #{forwardingUnitName}
+      </if>
+      <if test="receivingUintNo != null and receivingUintNo != ''">
+        or RECEIVING_UINT_NO = #{receivingUintNo}
+      </if>
+      <if test="receivingUintName != null and receivingUintName != ''">
+        or RECEIVING_UINT_NAME = #{receivingUintName}
+      </if>
+      <if test="baseSpotNo != null and baseSpotNo != ''">
+        or BASE_SPOT_NO = #{baseSpotNo}
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        or BASE_SPOT_NAME = #{baseSpotName}
+      </if>
+      <if test="carrigeNo != null and carrigeNo != ''">
+        or CARRIGE_NO = #{carrigeNo}
+      </if>
+      <if test="loadWeight != null">
+        or LOAD_WEIGHT = #{loadWeight}
+      </if>
+      <if test="grossWeightUpper != null">
+        or GROSS_WEIGHT_UPPER = #{grossWeightUpper}
+      </if>
+      <if test="grossWeightLower != null">
+        or GROSS_WEIGHT_LOWER = #{grossWeightLower}
+      </if>
+      <if test="netWeightUpper != null">
+        or NET_WEIGHT_UPPER = #{netWeightUpper}
+      </if>
+      <if test="netWeightLower != null">
+        or NET_WEIGHT_LOWER = #{netWeightLower}
+      </if>
+      <if test="railwayTypeNo != null and railwayTypeNo != ''">
+        or RAILWAY_TYPE_NO = #{railwayTypeNo}
+      </if>
+      <if test="railwayTypeName != null and railwayTypeName != ''">
+        or RAILWAY_TYPE_NAME = #{railwayTypeName}
+      </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="valueFlag != null and valueFlag != ''">
+        or VALUE_FLAG = #{valueFlag}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbasevehiclerangeconfig.model.MeterBaseVehicleRangeConfig">
+    insert into METER_BASE_VEHICLE_RANGE_CONFIG (VEHICLE_RANGE_ID, RAILWAY_NO, MATTER_NO, 
+      MATTER_NAME, FORWARDING_UNIT_NO, FORWARDING_UNIT_NAME, 
+      RECEIVING_UINT_NO, RECEIVING_UINT_NAME, BASE_SPOT_NO, 
+      BASE_SPOT_NAME, CARRIGE_NO, LOAD_WEIGHT, 
+      GROSS_WEIGHT_UPPER, GROSS_WEIGHT_LOWER, NET_WEIGHT_UPPER, 
+      NET_WEIGHT_LOWER, RAILWAY_TYPE_NO, RAILWAY_TYPE_NAME, 
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
+      VALUE_FLAG)
+    values (#{vehicleRangeId,jdbcType=VARCHAR}, #{railwayNo,jdbcType=VARCHAR}, #{matterNo,jdbcType=VARCHAR}, 
+      #{matterName,jdbcType=VARCHAR}, #{forwardingUnitNo,jdbcType=VARCHAR}, #{forwardingUnitName,jdbcType=VARCHAR}, 
+      #{receivingUintNo,jdbcType=VARCHAR}, #{receivingUintName,jdbcType=VARCHAR}, #{baseSpotNo,jdbcType=VARCHAR}, 
+      #{baseSpotName,jdbcType=VARCHAR}, #{carrigeNo,jdbcType=VARCHAR}, #{loadWeight,jdbcType=DECIMAL}, 
+      #{grossWeightUpper,jdbcType=DECIMAL}, #{grossWeightLower,jdbcType=DECIMAL}, #{netWeightUpper,jdbcType=DECIMAL}, 
+      #{netWeightLower,jdbcType=DECIMAL}, #{railwayTypeNo,jdbcType=VARCHAR}, #{railwayTypeName,jdbcType=VARCHAR}, 
+      #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{valueFlag,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbasevehiclerangeconfig.model.MeterBaseVehicleRangeConfig">
+    insert into METER_BASE_VEHICLE_RANGE_CONFIG
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="vehicleRangeId != null">
+        VEHICLE_RANGE_ID,
+      </if>
+      <if test="railwayNo != null">
+        RAILWAY_NO,
+      </if>
+      <if test="matterNo != null">
+        MATTER_NO,
+      </if>
+      <if test="matterName != null">
+        MATTER_NAME,
+      </if>
+      <if test="forwardingUnitNo != null">
+        FORWARDING_UNIT_NO,
+      </if>
+      <if test="forwardingUnitName != null">
+        FORWARDING_UNIT_NAME,
+      </if>
+      <if test="receivingUintNo != null">
+        RECEIVING_UINT_NO,
+      </if>
+      <if test="receivingUintName != null">
+        RECEIVING_UINT_NAME,
+      </if>
+      <if test="baseSpotNo != null">
+        BASE_SPOT_NO,
+      </if>
+      <if test="baseSpotName != null">
+        BASE_SPOT_NAME,
+      </if>
+      <if test="carrigeNo != null">
+        CARRIGE_NO,
+      </if>
+      <if test="loadWeight != null">
+        LOAD_WEIGHT,
+      </if>
+      <if test="grossWeightUpper != null">
+        GROSS_WEIGHT_UPPER,
+      </if>
+      <if test="grossWeightLower != null">
+        GROSS_WEIGHT_LOWER,
+      </if>
+      <if test="netWeightUpper != null">
+        NET_WEIGHT_UPPER,
+      </if>
+      <if test="netWeightLower != null">
+        NET_WEIGHT_LOWER,
+      </if>
+      <if test="railwayTypeNo != null">
+        RAILWAY_TYPE_NO,
+      </if>
+      <if test="railwayTypeName != null">
+        RAILWAY_TYPE_NAME,
+      </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="valueFlag != null">
+        VALUE_FLAG,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="vehicleRangeId != null">
+        #{vehicleRangeId,jdbcType=VARCHAR},
+      </if>
+      <if test="railwayNo != null">
+        #{railwayNo,jdbcType=VARCHAR},
+      </if>
+      <if test="matterNo != null">
+        #{matterNo,jdbcType=VARCHAR},
+      </if>
+      <if test="matterName != null">
+        #{matterName,jdbcType=VARCHAR},
+      </if>
+      <if test="forwardingUnitNo != null">
+        #{forwardingUnitNo,jdbcType=VARCHAR},
+      </if>
+      <if test="forwardingUnitName != null">
+        #{forwardingUnitName,jdbcType=VARCHAR},
+      </if>
+      <if test="receivingUintNo != null">
+        #{receivingUintNo,jdbcType=VARCHAR},
+      </if>
+      <if test="receivingUintName != null">
+        #{receivingUintName,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotNo != null">
+        #{baseSpotNo,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotName != null">
+        #{baseSpotName,jdbcType=VARCHAR},
+      </if>
+      <if test="carrigeNo != null">
+        #{carrigeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="loadWeight != null">
+        #{loadWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="grossWeightUpper != null">
+        #{grossWeightUpper,jdbcType=DECIMAL},
+      </if>
+      <if test="grossWeightLower != null">
+        #{grossWeightLower,jdbcType=DECIMAL},
+      </if>
+      <if test="netWeightUpper != null">
+        #{netWeightUpper,jdbcType=DECIMAL},
+      </if>
+      <if test="netWeightLower != null">
+        #{netWeightLower,jdbcType=DECIMAL},
+      </if>
+      <if test="railwayTypeNo != null">
+        #{railwayTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="railwayTypeName != null">
+        #{railwayTypeName,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="valueFlag != null">
+        #{valueFlag,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbasevehiclerangeconfig.model.MeterBaseVehicleRangeConfig">
+    update METER_BASE_VEHICLE_RANGE_CONFIG
+    set RAILWAY_NO = #{railwayNo,jdbcType=VARCHAR},
+      MATTER_NO = #{matterNo,jdbcType=VARCHAR},
+      MATTER_NAME = #{matterName,jdbcType=VARCHAR},
+      FORWARDING_UNIT_NO = #{forwardingUnitNo,jdbcType=VARCHAR},
+      FORWARDING_UNIT_NAME = #{forwardingUnitName,jdbcType=VARCHAR},
+      RECEIVING_UINT_NO = #{receivingUintNo,jdbcType=VARCHAR},
+      RECEIVING_UINT_NAME = #{receivingUintName,jdbcType=VARCHAR},
+      BASE_SPOT_NO = #{baseSpotNo,jdbcType=VARCHAR},
+      BASE_SPOT_NAME = #{baseSpotName,jdbcType=VARCHAR},
+      CARRIGE_NO = #{carrigeNo,jdbcType=VARCHAR},
+      LOAD_WEIGHT = #{loadWeight,jdbcType=DECIMAL},
+      GROSS_WEIGHT_UPPER = #{grossWeightUpper,jdbcType=DECIMAL},
+      GROSS_WEIGHT_LOWER = #{grossWeightLower,jdbcType=DECIMAL},
+      NET_WEIGHT_UPPER = #{netWeightUpper,jdbcType=DECIMAL},
+      NET_WEIGHT_LOWER = #{netWeightLower,jdbcType=DECIMAL},
+      RAILWAY_TYPE_NO = #{railwayTypeNo,jdbcType=VARCHAR},
+      RAILWAY_TYPE_NAME = #{railwayTypeName,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},
+      VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR}
+    where VEHICLE_RANGE_ID = #{vehicleRangeId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbasevehiclerangeconfig.model.MeterBaseVehicleRangeConfig">
+    update METER_BASE_VEHICLE_RANGE_CONFIG
+    <set>
+      <if test="railwayNo != null">
+        RAILWAY_NO = #{railwayNo,jdbcType=VARCHAR},
+      </if>
+      <if test="matterNo != null">
+        MATTER_NO = #{matterNo,jdbcType=VARCHAR},
+      </if>
+      <if test="matterName != null">
+        MATTER_NAME = #{matterName,jdbcType=VARCHAR},
+      </if>
+      <if test="forwardingUnitNo != null">
+        FORWARDING_UNIT_NO = #{forwardingUnitNo,jdbcType=VARCHAR},
+      </if>
+      <if test="forwardingUnitName != null">
+        FORWARDING_UNIT_NAME = #{forwardingUnitName,jdbcType=VARCHAR},
+      </if>
+      <if test="receivingUintNo != null">
+        RECEIVING_UINT_NO = #{receivingUintNo,jdbcType=VARCHAR},
+      </if>
+      <if test="receivingUintName != null">
+        RECEIVING_UINT_NAME = #{receivingUintName,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotNo != null">
+        BASE_SPOT_NO = #{baseSpotNo,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotName != null">
+        BASE_SPOT_NAME = #{baseSpotName,jdbcType=VARCHAR},
+      </if>
+      <if test="carrigeNo != null">
+        CARRIGE_NO = #{carrigeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="loadWeight != null">
+        LOAD_WEIGHT = #{loadWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="grossWeightUpper != null">
+        GROSS_WEIGHT_UPPER = #{grossWeightUpper,jdbcType=DECIMAL},
+      </if>
+      <if test="grossWeightLower != null">
+        GROSS_WEIGHT_LOWER = #{grossWeightLower,jdbcType=DECIMAL},
+      </if>
+      <if test="netWeightUpper != null">
+        NET_WEIGHT_UPPER = #{netWeightUpper,jdbcType=DECIMAL},
+      </if>
+      <if test="netWeightLower != null">
+        NET_WEIGHT_LOWER = #{netWeightLower,jdbcType=DECIMAL},
+      </if>
+      <if test="railwayTypeNo != null">
+        RAILWAY_TYPE_NO = #{railwayTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="railwayTypeName != null">
+        RAILWAY_TYPE_NAME = #{railwayTypeName,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="valueFlag != null">
+        VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where VEHICLE_RANGE_ID = #{vehicleRangeId,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where VEHICLE_RANGE_ID = #{vehicleRangeId,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_VEHICLE_RANGE_CONFIG 
+      (VEHICLE_RANGE_ID, 
+      RAILWAY_NO, MATTER_NO, MATTER_NAME, 
+      FORWARDING_UNIT_NO, FORWARDING_UNIT_NAME, 
+      RECEIVING_UINT_NO, RECEIVING_UINT_NAME, 
+      BASE_SPOT_NO, BASE_SPOT_NAME, CARRIGE_NO, 
+      LOAD_WEIGHT, GROSS_WEIGHT_UPPER, 
+      GROSS_WEIGHT_LOWER, NET_WEIGHT_UPPER, 
+      NET_WEIGHT_LOWER, RAILWAY_TYPE_NO, 
+      RAILWAY_TYPE_NAME, CREATE_MAN_NO, 
+      CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
+      VALUE_FLAG)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.vehicleRangeId,jdbcType=VARCHAR}, 
+      #{item.railwayNo,jdbcType=VARCHAR}, #{item.matterNo,jdbcType=VARCHAR}, #{item.matterName,jdbcType=VARCHAR}, 
+      #{item.forwardingUnitNo,jdbcType=VARCHAR}, #{item.forwardingUnitName,jdbcType=VARCHAR}, 
+      #{item.receivingUintNo,jdbcType=VARCHAR}, #{item.receivingUintName,jdbcType=VARCHAR}, 
+      #{item.baseSpotNo,jdbcType=VARCHAR}, #{item.baseSpotName,jdbcType=VARCHAR}, #{item.carrigeNo,jdbcType=VARCHAR}, 
+      #{item.loadWeight,jdbcType=DECIMAL}, #{item.grossWeightUpper,jdbcType=DECIMAL}, 
+      #{item.grossWeightLower,jdbcType=DECIMAL}, #{item.netWeightUpper,jdbcType=DECIMAL}, 
+      #{item.netWeightLower,jdbcType=DECIMAL}, #{item.railwayTypeNo,jdbcType=VARCHAR}, 
+      #{item.railwayTypeName,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.valueFlag,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_BASE_VEHICLE_RANGE_CONFIG
+     set
+       VEHICLE_RANGE_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.vehicleRangeId,jdbcType=VARCHAR}
+       </foreach>
+       ,RAILWAY_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.railwayNo,jdbcType=VARCHAR}
+       </foreach>
+       ,MATTER_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.matterNo,jdbcType=VARCHAR}
+       </foreach>
+       ,MATTER_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.matterName,jdbcType=VARCHAR}
+       </foreach>
+       ,FORWARDING_UNIT_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.forwardingUnitNo,jdbcType=VARCHAR}
+       </foreach>
+       ,FORWARDING_UNIT_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.forwardingUnitName,jdbcType=VARCHAR}
+       </foreach>
+       ,RECEIVING_UINT_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.receivingUintNo,jdbcType=VARCHAR}
+       </foreach>
+       ,RECEIVING_UINT_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.receivingUintName,jdbcType=VARCHAR}
+       </foreach>
+       ,BASE_SPOT_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.baseSpotNo,jdbcType=VARCHAR}
+       </foreach>
+       ,BASE_SPOT_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.baseSpotName,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIGE_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.carrigeNo,jdbcType=VARCHAR}
+       </foreach>
+       ,LOAD_WEIGHT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.loadWeight,jdbcType=DECIMAL}
+       </foreach>
+       ,GROSS_WEIGHT_UPPER=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.grossWeightUpper,jdbcType=DECIMAL}
+       </foreach>
+       ,GROSS_WEIGHT_LOWER=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.grossWeightLower,jdbcType=DECIMAL}
+       </foreach>
+       ,NET_WEIGHT_UPPER=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.netWeightUpper,jdbcType=DECIMAL}
+       </foreach>
+       ,NET_WEIGHT_LOWER=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.netWeightLower,jdbcType=DECIMAL}
+       </foreach>
+       ,RAILWAY_TYPE_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.railwayTypeNo,jdbcType=VARCHAR}
+       </foreach>
+       ,RAILWAY_TYPE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.railwayTypeName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,VALUE_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VEHICLE_RANGE_ID" close="end">
+          when #{item.vehicleRangeId,jdbcType=VARCHAR} then #{item.valueFlag,jdbcType=VARCHAR}
+       </foreach>
+     where VEHICLE_RANGE_ID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.vehicleRangeId,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_BASE_VEHICLE_RANGE_CONFIG
+    where VEHICLE_RANGE_ID in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <select id="likeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    where 1 = 1
+      <if test="railwayNo != null and railwayNo != ''">
+        and RAILWAY_NO LIKE '%${railwayNo}%'
+      </if>
+      <if test="matterNo != null and matterNo != ''">
+        and MATTER_NO LIKE '%${matterNo}%'
+      </if>
+      <if test="matterName != null and matterName != ''">
+        and MATTER_NAME LIKE '%${matterName}%'
+      </if>
+      <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+        and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+      </if>
+      <if test="forwardingUnitName != null and forwardingUnitName != ''">
+        and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+      </if>
+      <if test="receivingUintNo != null and receivingUintNo != ''">
+        and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+      </if>
+      <if test="receivingUintName != null and receivingUintName != ''">
+        and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+      </if>
+      <if test="baseSpotNo != null and baseSpotNo != ''">
+        and BASE_SPOT_NO LIKE '%${baseSpotNo}%'
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        and BASE_SPOT_NAME LIKE '%${baseSpotName}%'
+      </if>
+      <if test="carrigeNo != null and carrigeNo != ''">
+        and CARRIGE_NO LIKE '%${carrigeNo}%'
+      </if>
+      <if test="loadWeight != null">
+        and LOAD_WEIGHT = #{loadWeight}
+      </if>
+      <if test="railwayTypeNo != null and railwayTypeNo != ''">
+        and RAILWAY_TYPE_NO LIKE '%${railwayTypeNo}%'
+      </if>
+      <if test="railwayTypeName != null and railwayTypeName != ''">
+        and RAILWAY_TYPE_NAME LIKE '%${railwayTypeName}%'
+      </if>
+    order by BASE_SPOT_NAME,create_time desc
+  </select>
+</mapper>

src/main/java/com/steerinfo/baseinfo/meterbasevehiclerangeconfig/model/MeterBaseVehicleRangeConfig.java

@@ -0,0 +1,408 @@
+package com.steerinfo.baseinfo.meterbasevehiclerangeconfig.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 MeterBaseVehicleRangeConfig implements IBasePO<String> {
+    /**
+     * 车型范围ID(VEHICLE_RANGE_ID,VARCHAR,50)
+     */
+    @ApiModelProperty(value="车型范围ID",required=true)
+    private String vehicleRangeId;
+
+    /**
+     * 车号(RAILWAY_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="车号",required=false)
+    private String railwayNo;
+
+    /**
+     * 物料编号(MATTER_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="物料编号",required=false)
+    private String matterNo;
+
+    /**
+     * 物料名称(MATTER_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="物料名称",required=false)
+    private String matterName;
+
+    /**
+     * 发货单位编号(FORWARDING_UNIT_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="发货单位编号",required=false)
+    private String forwardingUnitNo;
+
+    /**
+     * 发货单位名称(FORWARDING_UNIT_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="发货单位名称",required=false)
+    private String forwardingUnitName;
+
+    /**
+     * 收货单位编号(RECEIVING_UINT_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="收货单位编号",required=false)
+    private String receivingUintNo;
+
+    /**
+     * 收货单位名称(RECEIVING_UINT_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="收货单位名称",required=false)
+    private String receivingUintName;
+
+    /**
+     * 计量点编号(BASE_SPOT_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="计量点编号",required=false)
+    private String baseSpotNo;
+
+    /**
+     * 计量点名称(BASE_SPOT_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="计量点名称",required=false)
+    private String baseSpotName;
+
+    /**
+     * 车型(CARRIGE_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="车型",required=false)
+    private String carrigeNo;
+
+    /**
+     * 载重(LOAD_WEIGHT,DECIMAL,10)
+     */
+    @ApiModelProperty(value="载重",required=false)
+    private Long loadWeight;
+
+    /**
+     * 毛重上限(GROSS_WEIGHT_UPPER,DECIMAL,10)
+     */
+    @ApiModelProperty(value="毛重上限",required=false)
+    private Long grossWeightUpper;
+
+    /**
+     * 毛重下限(GROSS_WEIGHT_LOWER,DECIMAL,10)
+     */
+    @ApiModelProperty(value="毛重下限",required=false)
+    private Long grossWeightLower;
+
+    /**
+     * 净重上限(NET_WEIGHT_UPPER,DECIMAL,10)
+     */
+    @ApiModelProperty(value="净重上限",required=false)
+    private Long netWeightUpper;
+
+    /**
+     * 净重下限(NET_WEIGHT_LOWER,DECIMAL,10)
+     */
+    @ApiModelProperty(value="净重下限",required=false)
+    private Long netWeightLower;
+
+    /**
+     * 轨道衡类型编号(RAILWAY_TYPE_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="轨道衡类型编号",required=false)
+    private String railwayTypeNo;
+
+    /**
+     * 轨道衡类型名称(RAILWAY_TYPE_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="轨道衡类型名称",required=false)
+    private String railwayTypeName;
+
+    /**
+     * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="创建人编号",required=false)
+    private String createManNo;
+
+    /**
+     * 创建人名称(CREATE_MAN_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="创建人名称",required=false)
+    private String createManName;
+
+    /**
+     * 创建时间(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="创建时间",required=false)
+    private Date createTime;
+
+    /**
+     * 修改人编号(UPDATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="修改人编号",required=false)
+    private String updateManNo;
+
+    /**
+     * 修改人名称(UPDATE_MAN_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="修改人名称",required=false)
+    private String updateManName;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 状态（0：无效、1：有效）(VALUE_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="状态（0：无效、1：有效）",required=true)
+    private String valueFlag;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.vehicleRangeId;
+    }
+
+    @Override
+    public void setId(String vehicleRangeId) {
+        this.vehicleRangeId = vehicleRangeId == null ? null : vehicleRangeId.trim();
+    }
+
+    public String getVehicleRangeId() {
+        return vehicleRangeId;
+    }
+
+    public void setVehicleRangeId(String vehicleRangeId) {
+        this.vehicleRangeId = vehicleRangeId == null ? null : vehicleRangeId.trim();
+    }
+
+    public String getRailwayNo() {
+        return railwayNo;
+    }
+
+    public void setRailwayNo(String railwayNo) {
+        this.railwayNo = railwayNo == null ? null : railwayNo.trim();
+    }
+
+    public String getMatterNo() {
+        return matterNo;
+    }
+
+    public void setMatterNo(String matterNo) {
+        this.matterNo = matterNo == null ? null : matterNo.trim();
+    }
+
+    public String getMatterName() {
+        return matterName;
+    }
+
+    public void setMatterName(String matterName) {
+        this.matterName = matterName == null ? null : matterName.trim();
+    }
+
+    public String getForwardingUnitNo() {
+        return forwardingUnitNo;
+    }
+
+    public void setForwardingUnitNo(String forwardingUnitNo) {
+        this.forwardingUnitNo = forwardingUnitNo == null ? null : forwardingUnitNo.trim();
+    }
+
+    public String getForwardingUnitName() {
+        return forwardingUnitName;
+    }
+
+    public void setForwardingUnitName(String forwardingUnitName) {
+        this.forwardingUnitName = forwardingUnitName == null ? null : forwardingUnitName.trim();
+    }
+
+    public String getReceivingUintNo() {
+        return receivingUintNo;
+    }
+
+    public void setReceivingUintNo(String receivingUintNo) {
+        this.receivingUintNo = receivingUintNo == null ? null : receivingUintNo.trim();
+    }
+
+    public String getReceivingUintName() {
+        return receivingUintName;
+    }
+
+    public void setReceivingUintName(String receivingUintName) {
+        this.receivingUintName = receivingUintName == null ? null : receivingUintName.trim();
+    }
+
+    public String getBaseSpotNo() {
+        return baseSpotNo;
+    }
+
+    public void setBaseSpotNo(String baseSpotNo) {
+        this.baseSpotNo = baseSpotNo == null ? null : baseSpotNo.trim();
+    }
+
+    public String getBaseSpotName() {
+        return baseSpotName;
+    }
+
+    public void setBaseSpotName(String baseSpotName) {
+        this.baseSpotName = baseSpotName == null ? null : baseSpotName.trim();
+    }
+
+    public String getCarrigeNo() {
+        return carrigeNo;
+    }
+
+    public void setCarrigeNo(String carrigeNo) {
+        this.carrigeNo = carrigeNo == null ? null : carrigeNo.trim();
+    }
+
+    public Long getLoadWeight() {
+        return loadWeight;
+    }
+
+    public void setLoadWeight(Long loadWeight) {
+        this.loadWeight = loadWeight;
+    }
+
+    public Long getGrossWeightUpper() {
+        return grossWeightUpper;
+    }
+
+    public void setGrossWeightUpper(Long grossWeightUpper) {
+        this.grossWeightUpper = grossWeightUpper;
+    }
+
+    public Long getGrossWeightLower() {
+        return grossWeightLower;
+    }
+
+    public void setGrossWeightLower(Long grossWeightLower) {
+        this.grossWeightLower = grossWeightLower;
+    }
+
+    public Long getNetWeightUpper() {
+        return netWeightUpper;
+    }
+
+    public void setNetWeightUpper(Long netWeightUpper) {
+        this.netWeightUpper = netWeightUpper;
+    }
+
+    public Long getNetWeightLower() {
+        return netWeightLower;
+    }
+
+    public void setNetWeightLower(Long netWeightLower) {
+        this.netWeightLower = netWeightLower;
+    }
+
+    public String getRailwayTypeNo() {
+        return railwayTypeNo;
+    }
+
+    public void setRailwayTypeNo(String railwayTypeNo) {
+        this.railwayTypeNo = railwayTypeNo == null ? null : railwayTypeNo.trim();
+    }
+
+    public String getRailwayTypeName() {
+        return railwayTypeName;
+    }
+
+    public void setRailwayTypeName(String railwayTypeName) {
+        this.railwayTypeName = railwayTypeName == null ? null : railwayTypeName.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 getValueFlag() {
+        return valueFlag;
+    }
+
+    public void setValueFlag(String valueFlag) {
+        this.valueFlag = valueFlag == null ? null : valueFlag.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", vehicleRangeId=").append(vehicleRangeId);
+        sb.append(", railwayNo=").append(railwayNo);
+        sb.append(", matterNo=").append(matterNo);
+        sb.append(", matterName=").append(matterName);
+        sb.append(", forwardingUnitNo=").append(forwardingUnitNo);
+        sb.append(", forwardingUnitName=").append(forwardingUnitName);
+        sb.append(", receivingUintNo=").append(receivingUintNo);
+        sb.append(", receivingUintName=").append(receivingUintName);
+        sb.append(", baseSpotNo=").append(baseSpotNo);
+        sb.append(", baseSpotName=").append(baseSpotName);
+        sb.append(", carrigeNo=").append(carrigeNo);
+        sb.append(", loadWeight=").append(loadWeight);
+        sb.append(", grossWeightUpper=").append(grossWeightUpper);
+        sb.append(", grossWeightLower=").append(grossWeightLower);
+        sb.append(", netWeightUpper=").append(netWeightUpper);
+        sb.append(", netWeightLower=").append(netWeightLower);
+        sb.append(", railwayTypeNo=").append(railwayTypeNo);
+        sb.append(", railwayTypeName=").append(railwayTypeName);
+        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(", valueFlag=").append(valueFlag);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/baseinfo/meterbasevehiclerangeconfig/service/IMeterBaseVehicleRangeConfigService.java

@@ -0,0 +1,26 @@
+package com.steerinfo.baseinfo.meterbasevehiclerangeconfig.service;
+
+import com.steerinfo.baseinfo.meterbasevehiclerangeconfig.model.MeterBaseVehicleRangeConfig;
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.framework.service.pagehelper.PageList;
+
+import java.util.HashMap;
+
+/**
+ * MeterBaseVehicleRangeConfig服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-12-05 01:44
+ * 类描述
+ * 修订历史：
+ * 日期：2022-12-05
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseVehicleRangeConfig服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IMeterBaseVehicleRangeConfigService extends IBaseService<MeterBaseVehicleRangeConfig, String>{
+    PageList<MeterBaseVehicleRangeConfig> likeByDesc(HashMap<String, Object> params, Integer pageNum, Integer pageSize);
+    MeterBaseVehicleRangeConfig updateModel(MeterBaseVehicleRangeConfig model);
+    MeterBaseVehicleRangeConfig addModel(MeterBaseVehicleRangeConfig model);
+}

src/main/java/com/steerinfo/baseinfo/meterbasevehiclerangeconfig/service/impl/MeterBaseVehicleRangeConfigServiceImpl.java

@@ -0,0 +1,90 @@
+package com.steerinfo.baseinfo.meterbasevehiclerangeconfig.service.impl;
+
+import com.steerinfo.baseinfo.meterbasevehiclerangeconfig.mapper.MeterBaseVehicleRangeConfigMapper;
+import com.steerinfo.baseinfo.meterbasevehiclerangeconfig.model.MeterBaseVehicleRangeConfig;
+import com.steerinfo.baseinfo.meterbasevehiclerangeconfig.service.IMeterBaseVehicleRangeConfigService;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.user.UserPayload;
+import com.steerinfo.util.PublicMethod;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * MeterBaseVehicleRangeConfig服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-12-05 01:44
+ * 类描述
+ * 修订历史：
+ * 日期：2022-12-05
+ * 作者：generator
+ * 参考：
+ * 描述：MeterBaseVehicleRangeConfig服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "meterBaseVehicleRangeConfigService")
+public class MeterBaseVehicleRangeConfigServiceImpl extends BaseServiceImpl<MeterBaseVehicleRangeConfig, String> implements IMeterBaseVehicleRangeConfigService {
+
+    @Resource
+    private MeterBaseVehicleRangeConfigMapper meterBaseVehicleRangeConfigMapper;
+
+    @Override
+    protected IBaseMapper<MeterBaseVehicleRangeConfig, String> getMapper() {
+        return meterBaseVehicleRangeConfigMapper;
+    }
+
+    @Override
+    public PageList<MeterBaseVehicleRangeConfig> likeByDesc(HashMap<String, Object> params, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<MeterBaseVehicleRangeConfig> rows = meterBaseVehicleRangeConfigMapper.likeByDesc(params);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
+    @Override
+    public MeterBaseVehicleRangeConfig updateModel(MeterBaseVehicleRangeConfig model) {
+        String userId;
+        String userName;
+        try{
+            UserPayload payload = UserPayload.getCurrUser();
+            userId = payload.getUserCode();
+            userName = payload.getUserName();
+        }catch(Exception e) {
+            userId = "admin";
+            userName = "admins";
+        }
+        model.setUpdateManNo(userId);
+        model.setUpdateManName(userName);
+        model.setUpdateTime(new Date());
+        meterBaseVehicleRangeConfigMapper.updateByPrimaryKeySelective(model);
+        return meterBaseVehicleRangeConfigMapper.selectByPrimaryKey(model.getVehicleRangeId());
+    }
+
+    @Override
+    public MeterBaseVehicleRangeConfig addModel(MeterBaseVehicleRangeConfig model) {
+        model.setVehicleRangeId(PublicMethod.IdCreate(3));
+        String userId;
+        String userName;
+        try{
+            UserPayload payload = UserPayload.getCurrUser();
+            userId = payload.getUserCode();
+            userName = payload.getUserName();
+        }catch(Exception e) {
+            userId = "admin";
+            userName = "admins";
+        }
+        model.setCreateManNo(userId);
+        model.setCreateManName(userName);
+        model.setCreateTime(new Date());
+        model.setValueFlag("1");
+        meterBaseVehicleRangeConfigMapper.insert(model);
+        return model;
+    }
+}

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

@@ -2,16 +2,27 @@ package com.steerinfo.meterwork.meterworkdatacount.controller;
 
 import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.meterwork.meterworkcaractual.mapper.MeterWorkCarActualMapper;
+import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
 import com.steerinfo.meterwork.meterworkdatacount.service.IMeterWorkDataCountService;
 import com.steerinfo.meterwork.meterworkdatacount.service.impl.MeterWorkDataCountServiceImpl;
+import com.steerinfo.meterwork.meterworkrailwayactual.mapper.MeterWorkRailwayActualMapper;
+import com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual;
+import com.steerinfo.util.StringUtils;
 import io.swagger.annotations.ApiOperation;
+import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.ss.usermodel.FillPatternType;
+import org.apache.poi.ss.usermodel.IndexedColors;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.math.BigDecimal;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
@@ -22,6 +33,12 @@ public class MeterWorkDataCountController extends BaseRESTfulController {
     @Autowired
     MeterWorkDataCountServiceImpl meterWorkDataCountService;
 
+    @Resource
+    MeterWorkCarActualMapper meterWorkCarActualMapper;
+
+    @Resource
+    MeterWorkRailwayActualMapper meterWorkRailwayActualMapper;
+
     @ApiOperation(value="统计汽车衡、静态衡、动态衡、铁水衡、吊钩秤的有效一次、未洁净一次、有效净重、未匹配委托净重数据", notes="返回List<HashMap>对象")
     @PostMapping(value = "/countFirstAndActual")
     public RESTfulResult countFirstAndActual(@RequestBody HashMap params) {
@@ -45,4 +62,230 @@ public class MeterWorkDataCountController extends BaseRESTfulController {
         RESTfulResult rm = meterWorkDataCountService.carRegularComparison(params);
         return rm;
     }
+
+    @ApiOperation(value="汽车衡净重数据导出", notes="返回List<HashMap>对象")
+    @RequestMapping("/ExcelCarDownload")
+    public void ExcelCarDownload(HttpServletResponse response, @RequestParam HashMap param) throws IOException {
+        //表头数据
+        String[] header = {"序号","车号", "物料名称", "数据状态", "匹配委托", "委托单号", "上传状态","预报组合编号","预报类型",
+                "发货单位","收货单位","毛重(t)","皮重(t)","净重(t)","净重时间","净重计量点名称",
+                "毛重时间","毛重计量点名称","皮重时间","皮重计量点名称","处理人编号","处理人", "处理时间", "操作日志"};
+        //声明一个工作簿
+        HSSFWorkbook workbook = new HSSFWorkbook();
+        //生成一个表格，设置表格名称为"学生表"
+        HSSFSheet sheet = workbook.createSheet("汽车衡净重明细表");
+        //设置表格列宽度为10个字节
+        sheet.setDefaultColumnWidth(10);
+        //创建标题的显示样式
+        HSSFCellStyle headerStyle = workbook.createCellStyle();
+        headerStyle.setFillForegroundColor(IndexedColors.YELLOW.index);
+        headerStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+        //创建第一行表头
+        HSSFRow headrow = sheet.createRow(0);
+        //遍历添加表头(下面模拟遍历学生，也是同样的操作过程)
+        for (int i = 0; i < header.length; i++) {
+            //创建一个单元格
+            HSSFCell cell = headrow.createCell(i);
+            //创建一个内容对象
+            HSSFRichTextString text = new HSSFRichTextString(header[i]);
+            //将内容对象的文字内容写入到单元格中
+            cell.setCellValue(text);
+            cell.setCellStyle(headerStyle);
+        }
+
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        //获取所有的employee
+//        HashMap<String, Object> map = new HashMap<>();
+//        map.put("validFlag", "1");
+//        map.put("startTime", "2022-12-05 00:00:00");
+//        map.put("endTime", "2022-12-05 23:59:59");
+
+        List<MeterWorkCarActual> emps= meterWorkCarActualMapper.carActualDataDetail(param);
+        for(int i=0;i<emps.size();i++){
+            //创建一行
+            HSSFRow row1 = sheet.createRow(i+1);
+            //第一列创建并赋值
+            row1.createCell(0).setCellValue(new HSSFRichTextString(String.valueOf(i)));
+            //第二列创建并赋值
+            row1.createCell(1).setCellValue(new HSSFRichTextString(emps.get(i).getCarNo()));
+            //第三列创建并赋值
+            row1.createCell(2).setCellValue(new HSSFRichTextString(emps.get(i).getMatterName()));
+            //第5列创建并赋值
+            row1.createCell(3).setCellValue(new HSSFRichTextString(emps.get(i).getValueFlag().equals("1")?"有效":"作废"));
+            //第6列创建并赋值
+            row1.createCell(4).setCellValue(new HSSFRichTextString(emps.get(i).getIsPreScale().equals("1")?"已匹配":"未匹配"));
+            //第7列创建并赋值
+            row1.createCell(5).setCellValue(new HSSFRichTextString(emps.get(i).getPredictionNo()));
+            //籍贯
+            row1.createCell(6).setCellValue(new HSSFRichTextString(emps.get(i).getUploadFlag().equals("1")?"待上传":"已上传"));
+            //第8列创建并赋值
+            row1.createCell(7).setCellValue(new HSSFRichTextString(emps.get(i).getPredictionCombination()));
+            //第9列创建并赋值
+            row1.createCell(8).setCellValue(new HSSFRichTextString(emps.get(i).getPredictionType()));
+            //第10列创建并赋值
+            row1.createCell(9).setCellValue(new HSSFRichTextString(emps.get(i).getForwardingUnitName()));
+            //第11列创建并赋值
+            row1.createCell(10).setCellValue(new HSSFRichTextString(emps.get(i).getReceivingUintName()));
+            //第12列创建并赋值
+            row1.createCell(11).setCellValue(new HSSFRichTextString((emps.get(i).getGrossWeight().divide(new BigDecimal(1000))).toString()));
+            //第13列创建并赋值
+            row1.createCell(12).setCellValue(new HSSFRichTextString((emps.get(i).getTareWeight().divide(new BigDecimal(1000))).toString()));
+            //第14列创建并赋值
+            row1.createCell(13).setCellValue(new HSSFRichTextString((emps.get(i).getNetWeight().divide(new BigDecimal(1000))).toString()));
+            //第15列创建并赋值
+            if(emps.get(i).getNetTime() != null){
+                row1.createCell(14).setCellValue(new HSSFRichTextString(dateFormat.format(emps.get(i).getNetTime())));
+            }
+            //第16列创建并赋值-入职日期
+            row1.createCell(15).setCellValue(new HSSFRichTextString(emps.get(i).getNetSpot3Name()));
+            if(emps.get(i).getGrossTime() != null){
+                row1.createCell(16).setCellValue(new HSSFRichTextString(dateFormat.format(emps.get(i).getGrossTime())));
+            }
+            //第16列创建并赋值-入职日期
+            row1.createCell(17).setCellValue(new HSSFRichTextString(emps.get(i).getBaseSpot1Name()));
+            if(emps.get(i).getTareTime() != null){
+                row1.createCell(18).setCellValue(new HSSFRichTextString(dateFormat.format(emps.get(i).getTareTime())));
+            }
+            //第16列创建并赋值-入职日期
+            row1.createCell(19).setCellValue(new HSSFRichTextString(emps.get(i).getBaseSpot2Name()));
+            //转正日期
+            row1.createCell(20).setCellValue(new HSSFRichTextString(emps.get(i).getUpdateManNo()));
+            row1.createCell(21).setCellValue(new HSSFRichTextString(emps.get(i).getUpdateManName()));
+            if(emps.get(i).getUpdateTime() != null) {
+                row1.createCell(22).setCellValue(new HSSFRichTextString(dateFormat.format(emps.get(i).getUpdateTime())));
+            }
+            row1.createCell(23).setCellValue(new HSSFRichTextString(emps.get(i).getNote()));
+        }
+        //准备将Excel的输出流通过response输出到页面下载
+        //八进制输出流
+        response.setContentType("application/octet-stream");
+        //这后面可以设置导出Excel的名称，此例中名为student.xls
+        response.setHeader("Content-disposition", "attachment;filename=carActualDetail.xls");
+        //刷新缓冲
+        response.flushBuffer();
+        //workbook将Excel写入到response的输出流中，供页面下载
+        workbook.write(response.getOutputStream());
+    }
+
+    @ApiOperation(value="轨道衡净重数据导出", notes="返回List<HashMap>对象")
+    @RequestMapping("/ExcelRailwayDownload")
+    public void ExcelStaticDownload(HttpServletResponse response, @RequestParam HashMap param) throws IOException {
+        //表头数据
+        String[] header = {"序号","车号", "物料名称", "数据状态", "匹配委托", "委托单号", "上传状态","预报组合编号","预报类型",
+                "发货单位","收货单位","毛重(t)","皮重(t)","净重(t)","净重时间","净重计量点名称",
+                "毛重时间","毛重计量点名称","皮重时间","皮重计量点名称","处理人编号","处理人", "处理时间", "操作日志"};
+        //声明一个工作簿
+        HSSFWorkbook workbook = new HSSFWorkbook();
+        //生成一个表格，设置表格名称为"学生表"
+        HSSFSheet sheet;
+        if(param.get("railwayTypeNoStr") == null || StringUtils.isEmpty(param.get("railwayTypeNoStr").toString())) {
+            if(param.get("railwayTypeNo").equals("001019001")){
+                sheet = workbook.createSheet("静轨净重明细表");
+            }else if(param.get("railwayTypeNo").equals("001019002")){
+                sheet = workbook.createSheet("动轨衡净重明细表");
+            }else{
+                //param.get("railwayTypeNo").equals("001019005")
+                sheet = workbook.createSheet("吊钩秤净重明细表");
+            }
+        }else {
+            if(param.get("railwayTypeNoStr") != null) {
+                String[] typeNoStr = param.get("railwayTypeNoStr").toString().split(",");
+                param.put("typeNoStr", typeNoStr);
+            }
+            //param.get("railwayTypeNoStr").equals("001019003,001019004")
+            sheet = workbook.createSheet("铁水衡净重明细表");
+        }
+
+        //设置表格列宽度为10个字节
+        sheet.setDefaultColumnWidth(10);
+        //创建标题的显示样式
+        HSSFCellStyle headerStyle = workbook.createCellStyle();
+        headerStyle.setFillForegroundColor(IndexedColors.YELLOW.index);
+        headerStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+        //创建第一行表头
+        HSSFRow headrow = sheet.createRow(0);
+        //遍历添加表头(下面模拟遍历学生，也是同样的操作过程)
+        for (int i = 0; i < header.length; i++) {
+            //创建一个单元格
+            HSSFCell cell = headrow.createCell(i);
+            //创建一个内容对象
+            HSSFRichTextString text = new HSSFRichTextString(header[i]);
+            //将内容对象的文字内容写入到单元格中
+            cell.setCellValue(text);
+            cell.setCellStyle(headerStyle);
+        }
+
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        //获取所有的employee
+//        HashMap<String, Object> map = new HashMap<>();
+//        map.put("validFlag", "1");
+//        map.put("startTime", "2022-12-05 00:00:00");
+//        map.put("endTime", "2022-12-05 23:59:59");
+
+        List<MeterWorkRailwayActual> emps= meterWorkRailwayActualMapper.carActualDataDetail(param);
+        for(int i=0;i<emps.size();i++){
+            //创建一行
+            HSSFRow row1 = sheet.createRow(i+1);
+            //第一列创建并赋值
+            row1.createCell(0).setCellValue(new HSSFRichTextString(String.valueOf(i)));
+            //第二列创建并赋值
+            row1.createCell(1).setCellValue(new HSSFRichTextString(emps.get(i).getRailwayNo()));
+            //第三列创建并赋值
+            row1.createCell(2).setCellValue(new HSSFRichTextString(emps.get(i).getMatterName()));
+            //第5列创建并赋值
+            row1.createCell(3).setCellValue(new HSSFRichTextString(emps.get(i).getValueFlag().equals("1")?"有效":"作废"));
+            //第6列创建并赋值
+            row1.createCell(4).setCellValue(new HSSFRichTextString(emps.get(i).getIsPreSacale().equals("1")?"已匹配":"未匹配"));
+            //第7列创建并赋值
+            row1.createCell(5).setCellValue(new HSSFRichTextString(emps.get(i).getPredictionNo()));
+            //籍贯
+            row1.createCell(6).setCellValue(new HSSFRichTextString(emps.get(i).getUploadFlag().equals("1")?"待上传":"已上传"));
+            //第8列创建并赋值
+            row1.createCell(7).setCellValue(new HSSFRichTextString(emps.get(i).getPredictionCombination()));
+            //第9列创建并赋值
+            row1.createCell(8).setCellValue(new HSSFRichTextString(emps.get(i).getPredictionType()));
+            //第10列创建并赋值
+            row1.createCell(9).setCellValue(new HSSFRichTextString(emps.get(i).getForwardingUnitName()));
+            //第11列创建并赋值
+            row1.createCell(10).setCellValue(new HSSFRichTextString(emps.get(i).getReceivingUintName()));
+            //第12列创建并赋值
+            row1.createCell(11).setCellValue(new HSSFRichTextString((emps.get(i).getGrossWeight().divide(new BigDecimal(1000))).toString()));
+            //第13列创建并赋值
+            row1.createCell(12).setCellValue(new HSSFRichTextString((emps.get(i).getTareWeight().divide(new BigDecimal(1000))).toString()));
+            //第14列创建并赋值
+            row1.createCell(13).setCellValue(new HSSFRichTextString((emps.get(i).getNetWeight().divide(new BigDecimal(1000))).toString()));
+            //第15列创建并赋值
+            if(emps.get(i).getNetTime() != null){
+                row1.createCell(14).setCellValue(new HSSFRichTextString(dateFormat.format(emps.get(i).getNetTime())));
+            }
+            //第16列创建并赋值-入职日期
+            row1.createCell(15).setCellValue(new HSSFRichTextString(emps.get(i).getNetSpot3Name()));
+            if(emps.get(i).getGrossTime() != null){
+                row1.createCell(16).setCellValue(new HSSFRichTextString(dateFormat.format(emps.get(i).getGrossTime())));
+            }
+            //第16列创建并赋值-入职日期
+            row1.createCell(17).setCellValue(new HSSFRichTextString(emps.get(i).getBaseSpot1Name()));
+            if(emps.get(i).getTareTime() != null){
+                row1.createCell(18).setCellValue(new HSSFRichTextString(dateFormat.format(emps.get(i).getTareTime())));
+            }
+            //第16列创建并赋值-入职日期
+            row1.createCell(19).setCellValue(new HSSFRichTextString(emps.get(i).getBaseSpot2Name()));
+            //转正日期
+            row1.createCell(20).setCellValue(new HSSFRichTextString(emps.get(i).getUpdateManNo()));
+            row1.createCell(21).setCellValue(new HSSFRichTextString(emps.get(i).getUpdateManName()));
+            if(emps.get(i).getUpdateTime() != null) {
+                row1.createCell(22).setCellValue(new HSSFRichTextString(dateFormat.format(emps.get(i).getUpdateTime())));
+            }
+            row1.createCell(23).setCellValue(new HSSFRichTextString(emps.get(i).getNote()));
+        }
+        //准备将Excel的输出流通过response输出到页面下载
+        //八进制输出流
+        response.setContentType("application/octet-stream");
+        //这后面可以设置导出Excel的名称，此例中名为student.xls
+        response.setHeader("Content-disposition", "attachment;filename=railwayActualDetail.xls");
+        //刷新缓冲
+        response.flushBuffer();
+        //workbook将Excel写入到response的输出流中，供页面下载
+        workbook.write(response.getOutputStream());
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkhookmetertime/controller/MeterWorkHookMeterTimeController.java

@@ -70,7 +70,7 @@ public class MeterWorkHookMeterTimeController extends BaseRESTfulController {
     @ApiImplicitParam(name = "meterWorkHookMeterTime", value = "详细实体meterWorkHookMeterTime", required = true, dataType = "MeterWorkHookMeterTime")
     //@RequiresPermissions("meterworkhookmetertime:create")
     @PostMapping(value = "/")
-    public RESTfulResult add(@ModelAttribute MeterWorkHookMeterTime model){
+    public RESTfulResult add(@RequestBody MeterWorkHookMeterTime model){
         MeterWorkHookMeterTime meterWorkHookMeterTime = meterWorkHookMeterTimeService.add(model);
         return success(meterWorkHookMeterTime);
     }

src/main/java/com/steerinfo/meterwork/meterworkrailwaymetertime/controller/MeterWorkRailwayMeterTimeController.java

@@ -68,9 +68,13 @@ public class MeterWorkRailwayMeterTimeController extends BaseRESTfulController {
     @ApiImplicitParam(name = "meterWorkRailwayMeterTime", value = "详细实体meterWorkRailwayMeterTime", required = true, dataType = "MeterWorkRailwayMeterTime")
     //@RequiresPermissions("meterworkrailwaymetertime:create")
     @PostMapping(value = "/")
-    public RESTfulResult add(@ModelAttribute MeterWorkRailwayMeterTime model){
-        MeterWorkRailwayMeterTime meterWorkRailwayMeterTime = meterWorkRailwayMeterTimeService.add(model);
-        return success(meterWorkRailwayMeterTime);
+    public RESTfulResult add(@RequestBody MeterWorkRailwayMeterTime model){
+        try {
+            MeterWorkRailwayMeterTime meterWorkRailwayMeterTime = meterWorkRailwayMeterTimeService.add(model);
+            return success();
+        }catch (Exception e){
+            return failed();
+        }
     }
 
     @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")

src/main/java/com/steerinfo/meterwork/meterworkshiftreport/controller/MeterWorkShiftReportController.java

@@ -0,0 +1,127 @@
+package com.steerinfo.meterwork.meterworkshiftreport.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.meterwork.meterworkshiftreport.model.MeterWorkShiftReport;
+import com.steerinfo.meterwork.meterworkshiftreport.service.IMeterWorkShiftReportService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+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;
+
+/**
+ * MeterWorkShiftReport RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-12-06 02:18
+ * 类描述
+ * 修订历史：
+ * 日期：2022-12-06
+ * 作者：generator
+ * 参考：
+ * 描述：MeterWorkShiftReport RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/meterworkshiftreports")
+public class MeterWorkShiftReportController extends BaseRESTfulController {
+
+    @Autowired
+    IMeterWorkShiftReportService meterWorkShiftReportService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkshiftreport:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkShiftReport> list = meterWorkShiftReportService.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("meterworkshiftreport:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkShiftReport> list = meterWorkShiftReportService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据MeterWorkShiftReport对象创建")
+    @ApiImplicitParam(name = "meterWorkShiftReport", value = "详细实体meterWorkShiftReport", required = true, dataType = "MeterWorkShiftReport")
+    //@RequiresPermissions("meterworkshiftreport:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute MeterWorkShiftReport model){
+        MeterWorkShiftReport meterWorkShiftReport = meterWorkShiftReportService.add(model);
+        return success(meterWorkShiftReport);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterworkshiftreport:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        MeterWorkShiftReport meterWorkShiftReport = meterWorkShiftReportService.getById(id);
+        return success(meterWorkShiftReport);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的meterWorkShiftReport信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "meterWorkShiftReport", value = "详细实体meterWorkShiftReport", required = true, dataType = "MeterWorkShiftReport")
+    })
+    //@RequiresPermissions("meterworkshiftreport:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody MeterWorkShiftReport model){
+        model.setId(id);
+        MeterWorkShiftReport meterWorkShiftReport = meterWorkShiftReportService.modify(model);
+        return success(meterWorkShiftReport);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterworkshiftreport: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);
+			  meterWorkShiftReportService.delete(ids);
+    	}
+      return success();
+    }
+
+    @ApiOperation(value="根据日期查询", notes="只能查询一条数据")
+    @PostMapping(value = "/likeByCreateTime")
+    public RESTfulResult likeByCreateTime(@RequestBody HashMap parmas){
+        MeterWorkShiftReport list = meterWorkShiftReportService.likeByCreateTime(parmas);
+        return success(list);
+    }
+
+    @ApiOperation(value="修改数据配置", notes="修改数据配置")
+    @PostMapping(value = "/updateModel")
+    public RESTfulResult updateModel(@RequestBody MeterWorkShiftReport model){
+        MeterWorkShiftReport meterWorkShiftReport = meterWorkShiftReportService.updateModel(model);
+        return success(meterWorkShiftReport);
+    }
+
+    @ApiOperation(value="新增数据配置", notes="新增数据配置")
+    @PostMapping(value = "/addModel")
+    public RESTfulResult addModel(@RequestBody MeterWorkShiftReport model){
+        MeterWorkShiftReport meterWorkShiftReport = meterWorkShiftReportService.addModel(model);
+        return success(meterWorkShiftReport);
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkshiftreport/mapper/MeterWorkShiftReportMapper.java

@@ -0,0 +1,12 @@
+package com.steerinfo.meterwork.meterworkshiftreport.mapper;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.meterwork.meterworkshiftreport.model.MeterWorkShiftReport;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.HashMap;
+
+@Mapper
+public interface MeterWorkShiftReportMapper extends IBaseMapper<MeterWorkShiftReport, String> {
+    MeterWorkShiftReport likeByCreateTime(HashMap<String, Object> params);
+}

src/main/java/com/steerinfo/meterwork/meterworkshiftreport/mapper/MeterWorkShiftReportMapper.xml

@@ -0,0 +1,619 @@
+<?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.meterwork.meterworkshiftreport.mapper.MeterWorkShiftReportMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.meterwork.meterworkshiftreport.model.MeterWorkShiftReport">
+    <id column="SHIFT_REPORT_ID" jdbcType="VARCHAR" property="shiftReportId" />
+    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="METER_CLASS" jdbcType="VARCHAR" property="meterClass" />
+    <result column="METER_GROUP" jdbcType="VARCHAR" property="meterGroup" />
+    <result column="SHIFT_MAN_NO" jdbcType="VARCHAR" property="shiftManNo" />
+    <result column="SHIFT_MAN_NAME" jdbcType="VARCHAR" property="shiftManName" />
+    <result column="WORK_START_TIME" jdbcType="TIMESTAMP" property="workStartTime" />
+    <result column="WORK_END_TIME" jdbcType="TIMESTAMP" property="workEndTime" />
+    <result column="WORK_MATTERS" jdbcType="VARCHAR" property="workMatters" />
+    <result column="WORK_PROCESSING_RESULT" jdbcType="VARCHAR" property="workProcessingResult" />
+    <result column="WORK_REPORTER_NO" jdbcType="VARCHAR" property="workReporterNo" />
+    <result column="WORK_REPORTER_NAME" jdbcType="VARCHAR" property="workReporterName" />
+    <result column="WORK_HANDLER_NO" jdbcType="VARCHAR" property="workHandlerNo" />
+    <result column="WORK_HANDLER_NAME" jdbcType="VARCHAR" property="workHandlerName" />
+    <result column="WORK_RECORDER_NO" jdbcType="VARCHAR" property="workRecorderNo" />
+    <result column="WORK_RECORDER_NAME" jdbcType="VARCHAR" property="workRecorderName" />
+    <result column="SHIFT_WORK_LOG" jdbcType="VARCHAR" property="shiftWorkLog" />
+    <result column="COMPARE_RECORDS" jdbcType="VARCHAR" property="compareRecords" />
+    <result column="DEVICE_PROBLEM" jdbcType="VARCHAR" property="deviceProblem" />
+    <result column="WORK_LOG" jdbcType="VARCHAR" property="workLog" />
+  </resultMap>
+  <sql id="columns">
+    SHIFT_REPORT_ID, CREATE_TIME, METER_CLASS, METER_GROUP, SHIFT_MAN_NO, SHIFT_MAN_NAME, 
+    WORK_START_TIME, WORK_END_TIME, WORK_MATTERS, WORK_PROCESSING_RESULT, WORK_REPORTER_NO, 
+    WORK_REPORTER_NAME, WORK_HANDLER_NO, WORK_HANDLER_NAME, WORK_RECORDER_NO, WORK_RECORDER_NAME, 
+    SHIFT_WORK_LOG, COMPARE_RECORDS, DEVICE_PROBLEM, WORK_LOG
+  </sql>
+  <sql id="columns_alias">
+    t.SHIFT_REPORT_ID, t.CREATE_TIME, t.METER_CLASS, t.METER_GROUP, t.SHIFT_MAN_NO, t.SHIFT_MAN_NAME, 
+    t.WORK_START_TIME, t.WORK_END_TIME, t.WORK_MATTERS, t.WORK_PROCESSING_RESULT, t.WORK_REPORTER_NO, 
+    t.WORK_REPORTER_NAME, t.WORK_HANDLER_NO, t.WORK_HANDLER_NAME, t.WORK_RECORDER_NO, 
+    t.WORK_RECORDER_NAME, t.SHIFT_WORK_LOG, t.COMPARE_RECORDS, t.DEVICE_PROBLEM, t.WORK_LOG
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_WORK_SHIFT_REPORT
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_WORK_SHIFT_REPORT t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="shiftReportId != null and shiftReportId != ''">
+        and SHIFT_REPORT_ID = #{shiftReportId}
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="meterClass != null and meterClass != ''">
+        and METER_CLASS = #{meterClass}
+      </if>
+      <if test="meterGroup != null and meterGroup != ''">
+        and METER_GROUP = #{meterGroup}
+      </if>
+      <if test="shiftManNo != null and shiftManNo != ''">
+        and SHIFT_MAN_NO = #{shiftManNo}
+      </if>
+      <if test="shiftManName != null and shiftManName != ''">
+        and SHIFT_MAN_NAME = #{shiftManName}
+      </if>
+      <if test="workStartTime != null">
+        and TO_CHAR(WORK_START_TIME,'yyyy-MM-dd') = #{workStartTime}
+      </if>
+      <if test="workEndTime != null">
+        and TO_CHAR(WORK_END_TIME,'yyyy-MM-dd') = #{workEndTime}
+      </if>
+      <if test="workMatters != null and workMatters != ''">
+        and WORK_MATTERS = #{workMatters}
+      </if>
+      <if test="workProcessingResult != null and workProcessingResult != ''">
+        and WORK_PROCESSING_RESULT = #{workProcessingResult}
+      </if>
+      <if test="workReporterNo != null and workReporterNo != ''">
+        and WORK_REPORTER_NO = #{workReporterNo}
+      </if>
+      <if test="workReporterName != null and workReporterName != ''">
+        and WORK_REPORTER_NAME = #{workReporterName}
+      </if>
+      <if test="workHandlerNo != null and workHandlerNo != ''">
+        and WORK_HANDLER_NO = #{workHandlerNo}
+      </if>
+      <if test="workHandlerName != null and workHandlerName != ''">
+        and WORK_HANDLER_NAME = #{workHandlerName}
+      </if>
+      <if test="workRecorderNo != null and workRecorderNo != ''">
+        and WORK_RECORDER_NO = #{workRecorderNo}
+      </if>
+      <if test="workRecorderName != null and workRecorderName != ''">
+        and WORK_RECORDER_NAME = #{workRecorderName}
+      </if>
+      <if test="shiftWorkLog != null and shiftWorkLog != ''">
+        and SHIFT_WORK_LOG = #{shiftWorkLog}
+      </if>
+      <if test="compareRecords != null and compareRecords != ''">
+        and COMPARE_RECORDS = #{compareRecords}
+      </if>
+      <if test="deviceProblem != null and deviceProblem != ''">
+        and DEVICE_PROBLEM = #{deviceProblem}
+      </if>
+      <if test="workLog != null and workLog != ''">
+        and WORK_LOG = #{workLog}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="shiftReportId != null and shiftReportId != ''">
+        and SHIFT_REPORT_ID LIKE '%${shiftReportId}%'
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="meterClass != null and meterClass != ''">
+        and METER_CLASS LIKE '%${meterClass}%'
+      </if>
+      <if test="meterGroup != null and meterGroup != ''">
+        and METER_GROUP LIKE '%${meterGroup}%'
+      </if>
+      <if test="shiftManNo != null and shiftManNo != ''">
+        and SHIFT_MAN_NO LIKE '%${shiftManNo}%'
+      </if>
+      <if test="shiftManName != null and shiftManName != ''">
+        and SHIFT_MAN_NAME LIKE '%${shiftManName}%'
+      </if>
+      <if test="workStartTime != null">
+        and TO_CHAR(WORK_START_TIME,'yyyy-MM-dd') = #{workStartTime}
+      </if>
+      <if test="workEndTime != null">
+        and TO_CHAR(WORK_END_TIME,'yyyy-MM-dd') = #{workEndTime}
+      </if>
+      <if test="workMatters != null and workMatters != ''">
+        and WORK_MATTERS LIKE '%${workMatters}%'
+      </if>
+      <if test="workProcessingResult != null and workProcessingResult != ''">
+        and WORK_PROCESSING_RESULT LIKE '%${workProcessingResult}%'
+      </if>
+      <if test="workReporterNo != null and workReporterNo != ''">
+        and WORK_REPORTER_NO LIKE '%${workReporterNo}%'
+      </if>
+      <if test="workReporterName != null and workReporterName != ''">
+        and WORK_REPORTER_NAME LIKE '%${workReporterName}%'
+      </if>
+      <if test="workHandlerNo != null and workHandlerNo != ''">
+        and WORK_HANDLER_NO LIKE '%${workHandlerNo}%'
+      </if>
+      <if test="workHandlerName != null and workHandlerName != ''">
+        and WORK_HANDLER_NAME LIKE '%${workHandlerName}%'
+      </if>
+      <if test="workRecorderNo != null and workRecorderNo != ''">
+        and WORK_RECORDER_NO LIKE '%${workRecorderNo}%'
+      </if>
+      <if test="workRecorderName != null and workRecorderName != ''">
+        and WORK_RECORDER_NAME LIKE '%${workRecorderName}%'
+      </if>
+      <if test="shiftWorkLog != null and shiftWorkLog != ''">
+        and SHIFT_WORK_LOG LIKE '%${shiftWorkLog}%'
+      </if>
+      <if test="compareRecords != null and compareRecords != ''">
+        and COMPARE_RECORDS LIKE '%${compareRecords}%'
+      </if>
+      <if test="deviceProblem != null and deviceProblem != ''">
+        and DEVICE_PROBLEM LIKE '%${deviceProblem}%'
+      </if>
+      <if test="workLog != null and workLog != ''">
+        and WORK_LOG LIKE '%${workLog}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_WORK_SHIFT_REPORT
+    where SHIFT_REPORT_ID = #{shiftReportId,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_WORK_SHIFT_REPORT
+    where 1!=1 
+      <if test="createTime != null">
+        or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
+      </if>
+      <if test="meterClass != null and meterClass != ''">
+        or METER_CLASS = #{meterClass}
+      </if>
+      <if test="meterGroup != null and meterGroup != ''">
+        or METER_GROUP = #{meterGroup}
+      </if>
+      <if test="shiftManNo != null and shiftManNo != ''">
+        or SHIFT_MAN_NO = #{shiftManNo}
+      </if>
+      <if test="shiftManName != null and shiftManName != ''">
+        or SHIFT_MAN_NAME = #{shiftManName}
+      </if>
+      <if test="workStartTime != null">
+        or TO_CHAR(WORK_START_TIME,'yyyy-MM-dd') = '#{workStartTime}'
+      </if>
+      <if test="workEndTime != null">
+        or TO_CHAR(WORK_END_TIME,'yyyy-MM-dd') = '#{workEndTime}'
+      </if>
+      <if test="workMatters != null and workMatters != ''">
+        or WORK_MATTERS = #{workMatters}
+      </if>
+      <if test="workProcessingResult != null and workProcessingResult != ''">
+        or WORK_PROCESSING_RESULT = #{workProcessingResult}
+      </if>
+      <if test="workReporterNo != null and workReporterNo != ''">
+        or WORK_REPORTER_NO = #{workReporterNo}
+      </if>
+      <if test="workReporterName != null and workReporterName != ''">
+        or WORK_REPORTER_NAME = #{workReporterName}
+      </if>
+      <if test="workHandlerNo != null and workHandlerNo != ''">
+        or WORK_HANDLER_NO = #{workHandlerNo}
+      </if>
+      <if test="workHandlerName != null and workHandlerName != ''">
+        or WORK_HANDLER_NAME = #{workHandlerName}
+      </if>
+      <if test="workRecorderNo != null and workRecorderNo != ''">
+        or WORK_RECORDER_NO = #{workRecorderNo}
+      </if>
+      <if test="workRecorderName != null and workRecorderName != ''">
+        or WORK_RECORDER_NAME = #{workRecorderName}
+      </if>
+      <if test="shiftWorkLog != null and shiftWorkLog != ''">
+        or SHIFT_WORK_LOG = #{shiftWorkLog}
+      </if>
+      <if test="compareRecords != null and compareRecords != ''">
+        or COMPARE_RECORDS = #{compareRecords}
+      </if>
+      <if test="deviceProblem != null and deviceProblem != ''">
+        or DEVICE_PROBLEM = #{deviceProblem}
+      </if>
+      <if test="workLog != null and workLog != ''">
+        or WORK_LOG = #{workLog}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkshiftreport.model.MeterWorkShiftReport">
+    insert into METER_WORK_SHIFT_REPORT (SHIFT_REPORT_ID, CREATE_TIME, METER_CLASS, 
+      METER_GROUP, SHIFT_MAN_NO, SHIFT_MAN_NAME, 
+      WORK_START_TIME, WORK_END_TIME, WORK_MATTERS, 
+      WORK_PROCESSING_RESULT, WORK_REPORTER_NO, WORK_REPORTER_NAME, 
+      WORK_HANDLER_NO, WORK_HANDLER_NAME, WORK_RECORDER_NO, 
+      WORK_RECORDER_NAME, SHIFT_WORK_LOG, COMPARE_RECORDS, 
+      DEVICE_PROBLEM, WORK_LOG)
+    values (#{shiftReportId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{meterClass,jdbcType=VARCHAR}, 
+      #{meterGroup,jdbcType=VARCHAR}, #{shiftManNo,jdbcType=VARCHAR}, #{shiftManName,jdbcType=VARCHAR}, 
+      #{workStartTime,jdbcType=TIMESTAMP}, #{workEndTime,jdbcType=TIMESTAMP}, #{workMatters,jdbcType=VARCHAR}, 
+      #{workProcessingResult,jdbcType=VARCHAR}, #{workReporterNo,jdbcType=VARCHAR}, #{workReporterName,jdbcType=VARCHAR}, 
+      #{workHandlerNo,jdbcType=VARCHAR}, #{workHandlerName,jdbcType=VARCHAR}, #{workRecorderNo,jdbcType=VARCHAR}, 
+      #{workRecorderName,jdbcType=VARCHAR}, #{shiftWorkLog,jdbcType=VARCHAR}, #{compareRecords,jdbcType=VARCHAR}, 
+      #{deviceProblem,jdbcType=VARCHAR}, #{workLog,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkshiftreport.model.MeterWorkShiftReport">
+    insert into METER_WORK_SHIFT_REPORT
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="shiftReportId != null">
+        SHIFT_REPORT_ID,
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME,
+      </if>
+      <if test="meterClass != null">
+        METER_CLASS,
+      </if>
+      <if test="meterGroup != null">
+        METER_GROUP,
+      </if>
+      <if test="shiftManNo != null">
+        SHIFT_MAN_NO,
+      </if>
+      <if test="shiftManName != null">
+        SHIFT_MAN_NAME,
+      </if>
+      <if test="workStartTime != null">
+        WORK_START_TIME,
+      </if>
+      <if test="workEndTime != null">
+        WORK_END_TIME,
+      </if>
+      <if test="workMatters != null">
+        WORK_MATTERS,
+      </if>
+      <if test="workProcessingResult != null">
+        WORK_PROCESSING_RESULT,
+      </if>
+      <if test="workReporterNo != null">
+        WORK_REPORTER_NO,
+      </if>
+      <if test="workReporterName != null">
+        WORK_REPORTER_NAME,
+      </if>
+      <if test="workHandlerNo != null">
+        WORK_HANDLER_NO,
+      </if>
+      <if test="workHandlerName != null">
+        WORK_HANDLER_NAME,
+      </if>
+      <if test="workRecorderNo != null">
+        WORK_RECORDER_NO,
+      </if>
+      <if test="workRecorderName != null">
+        WORK_RECORDER_NAME,
+      </if>
+      <if test="shiftWorkLog != null">
+        SHIFT_WORK_LOG,
+      </if>
+      <if test="compareRecords != null">
+        COMPARE_RECORDS,
+      </if>
+      <if test="deviceProblem != null">
+        DEVICE_PROBLEM,
+      </if>
+      <if test="workLog != null">
+        WORK_LOG,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="shiftReportId != null">
+        #{shiftReportId,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="meterClass != null">
+        #{meterClass,jdbcType=VARCHAR},
+      </if>
+      <if test="meterGroup != null">
+        #{meterGroup,jdbcType=VARCHAR},
+      </if>
+      <if test="shiftManNo != null">
+        #{shiftManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="shiftManName != null">
+        #{shiftManName,jdbcType=VARCHAR},
+      </if>
+      <if test="workStartTime != null">
+        #{workStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="workEndTime != null">
+        #{workEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="workMatters != null">
+        #{workMatters,jdbcType=VARCHAR},
+      </if>
+      <if test="workProcessingResult != null">
+        #{workProcessingResult,jdbcType=VARCHAR},
+      </if>
+      <if test="workReporterNo != null">
+        #{workReporterNo,jdbcType=VARCHAR},
+      </if>
+      <if test="workReporterName != null">
+        #{workReporterName,jdbcType=VARCHAR},
+      </if>
+      <if test="workHandlerNo != null">
+        #{workHandlerNo,jdbcType=VARCHAR},
+      </if>
+      <if test="workHandlerName != null">
+        #{workHandlerName,jdbcType=VARCHAR},
+      </if>
+      <if test="workRecorderNo != null">
+        #{workRecorderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="workRecorderName != null">
+        #{workRecorderName,jdbcType=VARCHAR},
+      </if>
+      <if test="shiftWorkLog != null">
+        #{shiftWorkLog,jdbcType=VARCHAR},
+      </if>
+      <if test="compareRecords != null">
+        #{compareRecords,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceProblem != null">
+        #{deviceProblem,jdbcType=VARCHAR},
+      </if>
+      <if test="workLog != null">
+        #{workLog,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkshiftreport.model.MeterWorkShiftReport">
+    update METER_WORK_SHIFT_REPORT
+    set CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      METER_CLASS = #{meterClass,jdbcType=VARCHAR},
+      METER_GROUP = #{meterGroup,jdbcType=VARCHAR},
+      SHIFT_MAN_NO = #{shiftManNo,jdbcType=VARCHAR},
+      SHIFT_MAN_NAME = #{shiftManName,jdbcType=VARCHAR},
+      WORK_START_TIME = #{workStartTime,jdbcType=TIMESTAMP},
+      WORK_END_TIME = #{workEndTime,jdbcType=TIMESTAMP},
+      WORK_MATTERS = #{workMatters,jdbcType=VARCHAR},
+      WORK_PROCESSING_RESULT = #{workProcessingResult,jdbcType=VARCHAR},
+      WORK_REPORTER_NO = #{workReporterNo,jdbcType=VARCHAR},
+      WORK_REPORTER_NAME = #{workReporterName,jdbcType=VARCHAR},
+      WORK_HANDLER_NO = #{workHandlerNo,jdbcType=VARCHAR},
+      WORK_HANDLER_NAME = #{workHandlerName,jdbcType=VARCHAR},
+      WORK_RECORDER_NO = #{workRecorderNo,jdbcType=VARCHAR},
+      WORK_RECORDER_NAME = #{workRecorderName,jdbcType=VARCHAR},
+      SHIFT_WORK_LOG = #{shiftWorkLog,jdbcType=VARCHAR},
+      COMPARE_RECORDS = #{compareRecords,jdbcType=VARCHAR},
+      DEVICE_PROBLEM = #{deviceProblem,jdbcType=VARCHAR},
+      WORK_LOG = #{workLog,jdbcType=VARCHAR}
+    where SHIFT_REPORT_ID = #{shiftReportId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkshiftreport.model.MeterWorkShiftReport">
+    update METER_WORK_SHIFT_REPORT
+    <set>
+      <if test="createTime != null">
+        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="meterClass != null">
+        METER_CLASS = #{meterClass,jdbcType=VARCHAR},
+      </if>
+      <if test="meterGroup != null">
+        METER_GROUP = #{meterGroup,jdbcType=VARCHAR},
+      </if>
+      <if test="shiftManNo != null">
+        SHIFT_MAN_NO = #{shiftManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="shiftManName != null">
+        SHIFT_MAN_NAME = #{shiftManName,jdbcType=VARCHAR},
+      </if>
+      <if test="workStartTime != null">
+        WORK_START_TIME = #{workStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="workEndTime != null">
+        WORK_END_TIME = #{workEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="workMatters != null">
+        WORK_MATTERS = #{workMatters,jdbcType=VARCHAR},
+      </if>
+      <if test="workProcessingResult != null">
+        WORK_PROCESSING_RESULT = #{workProcessingResult,jdbcType=VARCHAR},
+      </if>
+      <if test="workReporterNo != null">
+        WORK_REPORTER_NO = #{workReporterNo,jdbcType=VARCHAR},
+      </if>
+      <if test="workReporterName != null">
+        WORK_REPORTER_NAME = #{workReporterName,jdbcType=VARCHAR},
+      </if>
+      <if test="workHandlerNo != null">
+        WORK_HANDLER_NO = #{workHandlerNo,jdbcType=VARCHAR},
+      </if>
+      <if test="workHandlerName != null">
+        WORK_HANDLER_NAME = #{workHandlerName,jdbcType=VARCHAR},
+      </if>
+      <if test="workRecorderNo != null">
+        WORK_RECORDER_NO = #{workRecorderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="workRecorderName != null">
+        WORK_RECORDER_NAME = #{workRecorderName,jdbcType=VARCHAR},
+      </if>
+      <if test="shiftWorkLog != null">
+        SHIFT_WORK_LOG = #{shiftWorkLog,jdbcType=VARCHAR},
+      </if>
+      <if test="compareRecords != null">
+        COMPARE_RECORDS = #{compareRecords,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceProblem != null">
+        DEVICE_PROBLEM = #{deviceProblem,jdbcType=VARCHAR},
+      </if>
+      <if test="workLog != null">
+        WORK_LOG = #{workLog,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where SHIFT_REPORT_ID = #{shiftReportId,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where SHIFT_REPORT_ID = #{shiftReportId,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_WORK_SHIFT_REPORT 
+      (SHIFT_REPORT_ID, 
+      CREATE_TIME, METER_CLASS, METER_GROUP, 
+      SHIFT_MAN_NO, SHIFT_MAN_NAME, WORK_START_TIME, 
+      WORK_END_TIME, WORK_MATTERS, WORK_PROCESSING_RESULT, 
+      WORK_REPORTER_NO, WORK_REPORTER_NAME, 
+      WORK_HANDLER_NO, WORK_HANDLER_NAME, 
+      WORK_RECORDER_NO, WORK_RECORDER_NAME, 
+      SHIFT_WORK_LOG, COMPARE_RECORDS, 
+      DEVICE_PROBLEM, WORK_LOG)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.shiftReportId,jdbcType=VARCHAR}, 
+      #{item.createTime,jdbcType=TIMESTAMP}, #{item.meterClass,jdbcType=VARCHAR}, #{item.meterGroup,jdbcType=VARCHAR}, 
+      #{item.shiftManNo,jdbcType=VARCHAR}, #{item.shiftManName,jdbcType=VARCHAR}, #{item.workStartTime,jdbcType=TIMESTAMP}, 
+      #{item.workEndTime,jdbcType=TIMESTAMP}, #{item.workMatters,jdbcType=VARCHAR}, #{item.workProcessingResult,jdbcType=VARCHAR}, 
+      #{item.workReporterNo,jdbcType=VARCHAR}, #{item.workReporterName,jdbcType=VARCHAR}, 
+      #{item.workHandlerNo,jdbcType=VARCHAR}, #{item.workHandlerName,jdbcType=VARCHAR}, 
+      #{item.workRecorderNo,jdbcType=VARCHAR}, #{item.workRecorderName,jdbcType=VARCHAR}, 
+      #{item.shiftWorkLog,jdbcType=VARCHAR}, #{item.compareRecords,jdbcType=VARCHAR}, 
+      #{item.deviceProblem,jdbcType=VARCHAR}, #{item.workLog,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_WORK_SHIFT_REPORT
+     set
+       SHIFT_REPORT_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.shiftReportId,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,METER_CLASS=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.meterClass,jdbcType=VARCHAR}
+       </foreach>
+       ,METER_GROUP=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.meterGroup,jdbcType=VARCHAR}
+       </foreach>
+       ,SHIFT_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.shiftManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,SHIFT_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.shiftManName,jdbcType=VARCHAR}
+       </foreach>
+       ,WORK_START_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.workStartTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,WORK_END_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.workEndTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,WORK_MATTERS=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.workMatters,jdbcType=VARCHAR}
+       </foreach>
+       ,WORK_PROCESSING_RESULT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.workProcessingResult,jdbcType=VARCHAR}
+       </foreach>
+       ,WORK_REPORTER_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.workReporterNo,jdbcType=VARCHAR}
+       </foreach>
+       ,WORK_REPORTER_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.workReporterName,jdbcType=VARCHAR}
+       </foreach>
+       ,WORK_HANDLER_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.workHandlerNo,jdbcType=VARCHAR}
+       </foreach>
+       ,WORK_HANDLER_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.workHandlerName,jdbcType=VARCHAR}
+       </foreach>
+       ,WORK_RECORDER_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.workRecorderNo,jdbcType=VARCHAR}
+       </foreach>
+       ,WORK_RECORDER_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.workRecorderName,jdbcType=VARCHAR}
+       </foreach>
+       ,SHIFT_WORK_LOG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.shiftWorkLog,jdbcType=VARCHAR}
+       </foreach>
+       ,COMPARE_RECORDS=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.compareRecords,jdbcType=VARCHAR}
+       </foreach>
+       ,DEVICE_PROBLEM=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.deviceProblem,jdbcType=VARCHAR}
+       </foreach>
+       ,WORK_LOG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.workLog,jdbcType=VARCHAR}
+       </foreach>
+     where SHIFT_REPORT_ID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.shiftReportId,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_WORK_SHIFT_REPORT
+    where SHIFT_REPORT_ID in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <select id="likeByCreateTime" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    where 1 = 1
+        and rownum = 1
+    <if test="createTime != null">
+      and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+    </if>
+    <if test="meterClass != null and meterClass != ''">
+      and METER_CLASS LIKE '%${meterClass}%'
+    </if>
+    <if test="meterGroup != null and meterGroup != ''">
+      and METER_GROUP LIKE '%${meterGroup}%'
+    </if>
+    <if test="shiftManNo != null and shiftManNo != ''">
+      and SHIFT_MAN_NO LIKE '%${shiftManNo}%'
+    </if>
+    <if test="shiftManName != null and shiftManName != ''">
+      and SHIFT_MAN_NAME LIKE '%${shiftManName}%'
+    </if>
+  </select>
+</mapper>

src/main/java/com/steerinfo/meterwork/meterworkshiftreport/model/MeterWorkShiftReport.java

@@ -0,0 +1,333 @@
+package com.steerinfo.meterwork.meterworkshiftreport.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 MeterWorkShiftReport implements IBasePO<String> {
+    /**
+     * 交接班主键(SHIFT_REPORT_ID,VARCHAR,50)
+     */
+    @ApiModelProperty(value="交接班主键",required=true)
+    private String shiftReportId;
+
+    /**
+     * 日期(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="日期",required=false)
+    private Date createTime;
+
+    /**
+     * 班次(METER_CLASS,VARCHAR,20)
+     */
+    @ApiModelProperty(value="班次",required=false)
+    private String meterClass;
+
+    /**
+     * 班组(METER_GROUP,VARCHAR,50)
+     */
+    @ApiModelProperty(value="班组",required=false)
+    private String meterGroup;
+
+    /**
+     * 交班人编号(SHIFT_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="交班人编号",required=false)
+    private String shiftManNo;
+
+    /**
+     * 交班人(SHIFT_MAN_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="交班人",required=false)
+    private String shiftManName;
+
+    /**
+     * 工作日志开始时间(WORK_START_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="工作日志开始时间",required=false)
+    private Date workStartTime;
+
+    /**
+     * 工作日志完成时间(WORK_END_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="工作日志完成时间",required=false)
+    private Date workEndTime;
+
+    /**
+     * 工作事项(WORK_MATTERS,VARCHAR,255)
+     */
+    @ApiModelProperty(value="工作事项",required=false)
+    private String workMatters;
+
+    /**
+     * 工作处理结果(WORK_PROCESSING_RESULT,VARCHAR,500)
+     */
+    @ApiModelProperty(value="工作处理结果",required=false)
+    private String workProcessingResult;
+
+    /**
+     * 工作汇报人编号(WORK_REPORTER_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="工作汇报人编号",required=false)
+    private String workReporterNo;
+
+    /**
+     * 工作汇报人(WORK_REPORTER_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="工作汇报人",required=false)
+    private String workReporterName;
+
+    /**
+     * 工作处理人编号(WORK_HANDLER_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="工作处理人编号",required=false)
+    private String workHandlerNo;
+
+    /**
+     * 工作处理人(WORK_HANDLER_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="工作处理人",required=false)
+    private String workHandlerName;
+
+    /**
+     * 工作记录人编号(WORK_RECORDER_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="工作记录人编号",required=false)
+    private String workRecorderNo;
+
+    /**
+     * 工作记录人(WORK_RECORDER_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="工作记录人",required=false)
+    private String workRecorderName;
+
+    /**
+     * 当班工作日志(SHIFT_WORK_LOG,VARCHAR,500)
+     */
+    @ApiModelProperty(value="当班工作日志",required=false)
+    private String shiftWorkLog;
+
+    /**
+     * 比对记录(COMPARE_RECORDS,VARCHAR,500)
+     */
+    @ApiModelProperty(value="比对记录",required=false)
+    private String compareRecords;
+
+    /**
+     * 设备存在问题(DEVICE_PROBLEM,VARCHAR,500)
+     */
+    @ApiModelProperty(value="设备存在问题",required=false)
+    private String deviceProblem;
+
+    /**
+     * 工作日志(WORK_LOG,VARCHAR,500)
+     */
+    @ApiModelProperty(value="工作日志",required=false)
+    private String workLog;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.shiftReportId;
+    }
+
+    @Override
+    public void setId(String shiftReportId) {
+        this.shiftReportId = shiftReportId == null ? null : shiftReportId.trim();
+    }
+
+    public String getShiftReportId() {
+        return shiftReportId;
+    }
+
+    public void setShiftReportId(String shiftReportId) {
+        this.shiftReportId = shiftReportId == null ? null : shiftReportId.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getMeterClass() {
+        return meterClass;
+    }
+
+    public void setMeterClass(String meterClass) {
+        this.meterClass = meterClass == null ? null : meterClass.trim();
+    }
+
+    public String getMeterGroup() {
+        return meterGroup;
+    }
+
+    public void setMeterGroup(String meterGroup) {
+        this.meterGroup = meterGroup == null ? null : meterGroup.trim();
+    }
+
+    public String getShiftManNo() {
+        return shiftManNo;
+    }
+
+    public void setShiftManNo(String shiftManNo) {
+        this.shiftManNo = shiftManNo == null ? null : shiftManNo.trim();
+    }
+
+    public String getShiftManName() {
+        return shiftManName;
+    }
+
+    public void setShiftManName(String shiftManName) {
+        this.shiftManName = shiftManName == null ? null : shiftManName.trim();
+    }
+
+    public Date getWorkStartTime() {
+        return workStartTime;
+    }
+
+    public void setWorkStartTime(Date workStartTime) {
+        this.workStartTime = workStartTime;
+    }
+
+    public Date getWorkEndTime() {
+        return workEndTime;
+    }
+
+    public void setWorkEndTime(Date workEndTime) {
+        this.workEndTime = workEndTime;
+    }
+
+    public String getWorkMatters() {
+        return workMatters;
+    }
+
+    public void setWorkMatters(String workMatters) {
+        this.workMatters = workMatters == null ? null : workMatters.trim();
+    }
+
+    public String getWorkProcessingResult() {
+        return workProcessingResult;
+    }
+
+    public void setWorkProcessingResult(String workProcessingResult) {
+        this.workProcessingResult = workProcessingResult == null ? null : workProcessingResult.trim();
+    }
+
+    public String getWorkReporterNo() {
+        return workReporterNo;
+    }
+
+    public void setWorkReporterNo(String workReporterNo) {
+        this.workReporterNo = workReporterNo == null ? null : workReporterNo.trim();
+    }
+
+    public String getWorkReporterName() {
+        return workReporterName;
+    }
+
+    public void setWorkReporterName(String workReporterName) {
+        this.workReporterName = workReporterName == null ? null : workReporterName.trim();
+    }
+
+    public String getWorkHandlerNo() {
+        return workHandlerNo;
+    }
+
+    public void setWorkHandlerNo(String workHandlerNo) {
+        this.workHandlerNo = workHandlerNo == null ? null : workHandlerNo.trim();
+    }
+
+    public String getWorkHandlerName() {
+        return workHandlerName;
+    }
+
+    public void setWorkHandlerName(String workHandlerName) {
+        this.workHandlerName = workHandlerName == null ? null : workHandlerName.trim();
+    }
+
+    public String getWorkRecorderNo() {
+        return workRecorderNo;
+    }
+
+    public void setWorkRecorderNo(String workRecorderNo) {
+        this.workRecorderNo = workRecorderNo == null ? null : workRecorderNo.trim();
+    }
+
+    public String getWorkRecorderName() {
+        return workRecorderName;
+    }
+
+    public void setWorkRecorderName(String workRecorderName) {
+        this.workRecorderName = workRecorderName == null ? null : workRecorderName.trim();
+    }
+
+    public String getShiftWorkLog() {
+        return shiftWorkLog;
+    }
+
+    public void setShiftWorkLog(String shiftWorkLog) {
+        this.shiftWorkLog = shiftWorkLog == null ? null : shiftWorkLog.trim();
+    }
+
+    public String getCompareRecords() {
+        return compareRecords;
+    }
+
+    public void setCompareRecords(String compareRecords) {
+        this.compareRecords = compareRecords == null ? null : compareRecords.trim();
+    }
+
+    public String getDeviceProblem() {
+        return deviceProblem;
+    }
+
+    public void setDeviceProblem(String deviceProblem) {
+        this.deviceProblem = deviceProblem == null ? null : deviceProblem.trim();
+    }
+
+    public String getWorkLog() {
+        return workLog;
+    }
+
+    public void setWorkLog(String workLog) {
+        this.workLog = workLog == null ? null : workLog.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", shiftReportId=").append(shiftReportId);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", meterClass=").append(meterClass);
+        sb.append(", meterGroup=").append(meterGroup);
+        sb.append(", shiftManNo=").append(shiftManNo);
+        sb.append(", shiftManName=").append(shiftManName);
+        sb.append(", workStartTime=").append(workStartTime);
+        sb.append(", workEndTime=").append(workEndTime);
+        sb.append(", workMatters=").append(workMatters);
+        sb.append(", workProcessingResult=").append(workProcessingResult);
+        sb.append(", workReporterNo=").append(workReporterNo);
+        sb.append(", workReporterName=").append(workReporterName);
+        sb.append(", workHandlerNo=").append(workHandlerNo);
+        sb.append(", workHandlerName=").append(workHandlerName);
+        sb.append(", workRecorderNo=").append(workRecorderNo);
+        sb.append(", workRecorderName=").append(workRecorderName);
+        sb.append(", shiftWorkLog=").append(shiftWorkLog);
+        sb.append(", compareRecords=").append(compareRecords);
+        sb.append(", deviceProblem=").append(deviceProblem);
+        sb.append(", workLog=").append(workLog);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkshiftreport/service/IMeterWorkShiftReportService.java

@@ -0,0 +1,25 @@
+package com.steerinfo.meterwork.meterworkshiftreport.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.meterwork.meterworkshiftreport.model.MeterWorkShiftReport;
+
+import java.util.HashMap;
+
+/**
+ * MeterWorkShiftReport服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-12-06 02:18
+ * 类描述
+ * 修订历史：
+ * 日期：2022-12-06
+ * 作者：generator
+ * 参考：
+ * 描述：MeterWorkShiftReport服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IMeterWorkShiftReportService extends IBaseService<MeterWorkShiftReport, String>{
+    MeterWorkShiftReport likeByCreateTime(HashMap<String, Object> params);
+    MeterWorkShiftReport updateModel(MeterWorkShiftReport model);
+    MeterWorkShiftReport addModel(MeterWorkShiftReport model);
+}

src/main/java/com/steerinfo/meterwork/meterworkshiftreport/service/impl/MeterWorkShiftReportServiceImpl.java

@@ -0,0 +1,88 @@
+package com.steerinfo.meterwork.meterworkshiftreport.service.impl;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.framework.user.UserPayload;
+import com.steerinfo.meterwork.meterworkshiftreport.mapper.MeterWorkShiftReportMapper;
+import com.steerinfo.meterwork.meterworkshiftreport.model.MeterWorkShiftReport;
+import com.steerinfo.meterwork.meterworkshiftreport.service.IMeterWorkShiftReportService;
+import com.steerinfo.util.PublicMethod;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * MeterWorkShiftReport服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-12-06 02:18
+ * 类描述
+ * 修订历史：
+ * 日期：2022-12-06
+ * 作者：generator
+ * 参考：
+ * 描述：MeterWorkShiftReport服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "meterWorkShiftReportService")
+public class MeterWorkShiftReportServiceImpl extends BaseServiceImpl<MeterWorkShiftReport, String> implements IMeterWorkShiftReportService {
+
+    @Resource
+    private MeterWorkShiftReportMapper meterWorkShiftReportMapper;
+
+    @Override
+    protected IBaseMapper<MeterWorkShiftReport, String> getMapper() {
+        return meterWorkShiftReportMapper;
+    }
+
+    @Override
+    public MeterWorkShiftReport likeByCreateTime(HashMap<String, Object> params) {
+        MeterWorkShiftReport rows = meterWorkShiftReportMapper.likeByCreateTime(params);
+        return rows;
+    }
+
+    @Override
+    public MeterWorkShiftReport updateModel(MeterWorkShiftReport model) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        sdf.format(model.getCreateTime());
+        String userId;
+        String userName;
+        try{
+            UserPayload payload = UserPayload.getCurrUser();
+            userId = payload.getUserCode();
+            userName = payload.getUserName();
+        }catch(Exception e) {
+            userId = "admin";
+            userName = "admins";
+        }
+        model.setWorkRecorderNo(userId);
+        model.setWorkRecorderName(userName);
+        meterWorkShiftReportMapper.updateByPrimaryKeySelective(model);
+        return meterWorkShiftReportMapper.selectByPrimaryKey(model.getShiftReportId());
+    }
+
+    @Override
+    public MeterWorkShiftReport addModel(MeterWorkShiftReport model) {
+        model.setShiftReportId(PublicMethod.IdCreate(3));
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        sdf.format(model.getCreateTime());
+        String userId;
+        String userName;
+        try{
+            UserPayload payload = UserPayload.getCurrUser();
+            userId = payload.getUserCode();
+            userName = payload.getUserName();
+        }catch(Exception e) {
+            userId = "admin";
+            userName = "admins";
+        }
+        model.setWorkRecorderNo(userId);
+        model.setWorkRecorderName(userName);
+        meterWorkShiftReportMapper.insert(model);
+        return model;
+    }
+}