Sfoglia il codice sorgente

谢波后端代码提交

BourneCao 4 anni fa
parent
commit
8a5d583b01
13 ha cambiato i file con 2329 aggiunte e 0 eliminazioni
  1. 8 0
      src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/mapper/MeterWorkCarActualFirstMapper.xml
  2. 110 0
      src/main/java/com/steerinfo/meterwork/meterworkcompareconfig/controller/MeterWorkCompareConfigController.java
  3. 10 0
      src/main/java/com/steerinfo/meterwork/meterworkcompareconfig/mapper/MeterWorkCompareConfigMapper.java
  4. 608 0
      src/main/java/com/steerinfo/meterwork/meterworkcompareconfig/mapper/MeterWorkCompareConfigMapper.xml
  5. 333 0
      src/main/java/com/steerinfo/meterwork/meterworkcompareconfig/model/MeterWorkCompareConfig.java
  6. 23 0
      src/main/java/com/steerinfo/meterwork/meterworkcompareconfig/service/IMeterWorkCompareConfigService.java
  7. 36 0
      src/main/java/com/steerinfo/meterwork/meterworkcompareconfig/service/impl/MeterWorkCompareConfigServiceImpl.java
  8. 110 0
      src/main/java/com/steerinfo/meterwork/meterworkcompareresult/controller/MeterWorkCompareResultController.java
  9. 10 0
      src/main/java/com/steerinfo/meterwork/meterworkcompareresult/mapper/MeterWorkCompareResultMapper.java
  10. 659 0
      src/main/java/com/steerinfo/meterwork/meterworkcompareresult/mapper/MeterWorkCompareResultMapper.xml
  11. 363 0
      src/main/java/com/steerinfo/meterwork/meterworkcompareresult/model/MeterWorkCompareResult.java
  12. 23 0
      src/main/java/com/steerinfo/meterwork/meterworkcompareresult/service/IMeterWorkCompareResultService.java
  13. 36 0
      src/main/java/com/steerinfo/meterwork/meterworkcompareresult/service/impl/MeterWorkCompareResultServiceImpl.java

+ 8 - 0
src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/mapper/MeterWorkCarActualFirstMapper.xml

@@ -312,6 +312,10 @@
       <if test="note != null and note != ''">
         and NOTE = #{note}
       </if>
+      <if test="createTime1 != null and createTime2 != null and createTime1 != '' and createTime2 != ''">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd HH24:mi:ss') >= #{createTime1} and TO_CHAR(CREATE_TIME,'yyyy-MM-dd
+        HH24:mi:ss') &lt;= #{createTime2}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -520,6 +524,10 @@
       <if test="note != null and note != ''">
         and NOTE LIKE '%${note}%'
       </if>
+      <if test="createTime1 != null and createTime2 != null and createTime1 != '' and createTime2 != ''">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd HH24:mi:ss') >= #{createTime1} and TO_CHAR(CREATE_TIME,'yyyy-MM-dd
+        HH24:mi:ss') &lt;= #{createTime2}
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">

+ 110 - 0
src/main/java/com/steerinfo/meterwork/meterworkcompareconfig/controller/MeterWorkCompareConfigController.java

@@ -0,0 +1,110 @@
+package com.steerinfo.meterwork.meterworkcompareconfig.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.meterworkcompareconfig.model.MeterWorkCompareConfig;
+import com.steerinfo.meterwork.meterworkcompareconfig.service.IMeterWorkCompareConfigService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ArrayList;
+import java.math.BigDecimal;
+
+/**
+ * MeterWorkCompareConfig RESTful接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-19 08:45
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-19
+ * 作者:generator
+ * 参考:
+ * 描述:MeterWorkCompareConfig RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/meterworkcompareconfigs")
+public class MeterWorkCompareConfigController extends BaseRESTfulController {
+
+    @Autowired
+    IMeterWorkCompareConfigService meterWorkCompareConfigService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkcompareconfig:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkCompareConfig> list = meterWorkCompareConfigService.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("meterworkcompareconfig:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkCompareConfig> list = meterWorkCompareConfigService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据MeterWorkCompareConfig对象创建")
+    @ApiImplicitParam(name = "meterWorkCompareConfig", value = "详细实体meterWorkCompareConfig", required = true, dataType = "MeterWorkCompareConfig")
+    //@RequiresPermissions("meterworkcompareconfig:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute MeterWorkCompareConfig model){
+        MeterWorkCompareConfig meterWorkCompareConfig = meterWorkCompareConfigService.add(model);
+        return success(meterWorkCompareConfig);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterworkcompareconfig:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        MeterWorkCompareConfig meterWorkCompareConfig = meterWorkCompareConfigService.getById(id);
+        return success(meterWorkCompareConfig);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象,并根据传过来的meterWorkCompareConfig信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "meterWorkCompareConfig", value = "详细实体meterWorkCompareConfig", required = true, dataType = "MeterWorkCompareConfig")
+    })
+    //@RequiresPermissions("meterworkcompareconfig:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody MeterWorkCompareConfig model){
+        model.setId(id);
+        MeterWorkCompareConfig meterWorkCompareConfig = meterWorkCompareConfigService.modify(model);
+        return success(meterWorkCompareConfig);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterworkcompareconfig: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);
+			  meterWorkCompareConfigService.delete(ids);
+    	}
+      return success();
+    }
+}

+ 10 - 0
src/main/java/com/steerinfo/meterwork/meterworkcompareconfig/mapper/MeterWorkCompareConfigMapper.java

@@ -0,0 +1,10 @@
+package com.steerinfo.meterwork.meterworkcompareconfig.mapper;
+
+import com.steerinfo.meterwork.meterworkcompareconfig.model.MeterWorkCompareConfig;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MeterWorkCompareConfigMapper extends IBaseMapper<MeterWorkCompareConfig, String> {
+}

+ 608 - 0
src/main/java/com/steerinfo/meterwork/meterworkcompareconfig/mapper/MeterWorkCompareConfigMapper.xml

@@ -0,0 +1,608 @@
+<?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.meterworkcompareconfig.mapper.MeterWorkCompareConfigMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.meterwork.meterworkcompareconfig.model.MeterWorkCompareConfig">
+    <id column="COMPARE_ID" jdbcType="VARCHAR" property="compareId" />
+    <result column="BASE_SPOT_NO" jdbcType="VARCHAR" property="baseSpotNo" />
+    <result column="BASE_SPOT_NAME" jdbcType="VARCHAR" property="baseSpotName" />
+    <result column="MATTER_NO" jdbcType="VARCHAR" property="matterNo" />
+    <result column="MATTER_NAME" jdbcType="VARCHAR" property="matterName" />
+    <result column="PLANNING_TIME" jdbcType="VARCHAR" property="planningTime" />
+    <result column="PROPORTIONAL_VALUE" jdbcType="VARCHAR" property="proportionalValue" />
+    <result column="FIXED_VALUE" jdbcType="DECIMAL" property="fixedValue" />
+    <result column="VALUE_FLAG" jdbcType="VARCHAR" property="valueFlag" />
+    <result column="CREATE_MAN_NO" jdbcType="VARCHAR" property="createManNo" />
+    <result column="CREATE_MAN_NAME" jdbcType="VARCHAR" property="createManName" />
+    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
+    <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="MEMO" jdbcType="VARCHAR" property="memo" />
+    <result column="WEIGHT_TYPE_NO" jdbcType="VARCHAR" property="weightTypeNo" />
+    <result column="WEIGHT_TYPE_NAME" jdbcType="VARCHAR" property="weightTypeName" />
+    <result column="COMPARE_TYPE_NO" jdbcType="VARCHAR" property="compareTypeNo" />
+    <result column="COMPARE_TYPE_NAME" jdbcType="VARCHAR" property="compareTypeName" />
+  </resultMap>
+  <sql id="columns">
+    COMPARE_ID, BASE_SPOT_NO, BASE_SPOT_NAME, MATTER_NO, MATTER_NAME, PLANNING_TIME, 
+    PROPORTIONAL_VALUE, FIXED_VALUE, VALUE_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+    UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, MEMO, WEIGHT_TYPE_NO, WEIGHT_TYPE_NAME, 
+    COMPARE_TYPE_NO, COMPARE_TYPE_NAME
+  </sql>
+  <sql id="columns_alias">
+    t.COMPARE_ID, t.BASE_SPOT_NO, t.BASE_SPOT_NAME, t.MATTER_NO, t.MATTER_NAME, t.PLANNING_TIME, 
+    t.PROPORTIONAL_VALUE, t.FIXED_VALUE, t.VALUE_FLAG, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, 
+    t.CREATE_TIME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME, t.MEMO, t.WEIGHT_TYPE_NO, 
+    t.WEIGHT_TYPE_NAME, t.COMPARE_TYPE_NO, t.COMPARE_TYPE_NAME
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_WORK_COMPARE_CONFIG
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_WORK_COMPARE_CONFIG t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="compareId != null and compareId != ''">
+        and COMPARE_ID = #{compareId}
+      </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="matterNo != null and matterNo != ''">
+        and MATTER_NO = #{matterNo}
+      </if>
+      <if test="matterName != null and matterName != ''">
+        and MATTER_NAME = #{matterName}
+      </if>
+      <if test="planningTime != null and planningTime != ''">
+        and PLANNING_TIME = #{planningTime}
+      </if>
+      <if test="proportionalValue != null and proportionalValue != ''">
+        and PROPORTIONAL_VALUE = #{proportionalValue}
+      </if>
+      <if test="fixedValue != null">
+        and FIXED_VALUE = #{fixedValue}
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG = #{valueFlag}
+      </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="memo != null and memo != ''">
+        and MEMO = #{memo}
+      </if>
+      <if test="weightTypeNo != null and weightTypeNo != ''">
+        and WEIGHT_TYPE_NO = #{weightTypeNo}
+      </if>
+      <if test="weightTypeName != null and weightTypeName != ''">
+        and WEIGHT_TYPE_NAME = #{weightTypeName}
+      </if>
+      <if test="compareTypeNo != null and compareTypeNo != ''">
+        and COMPARE_TYPE_NO = #{compareTypeNo}
+      </if>
+      <if test="compareTypeName != null and compareTypeName != ''">
+        and COMPARE_TYPE_NAME = #{compareTypeName}
+      </if>
+      <if test="createTime1 != null and createTime2 != null and createTime1 != '' and createTime2 != ''">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd HH24:mi:ss') >= #{createTime1} and TO_CHAR(CREATE_TIME,'yyyy-MM-dd
+        HH24:mi:ss') &lt;= #{createTime2}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="compareId != null and compareId != ''">
+        and COMPARE_ID LIKE '%${compareId}%'
+      </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="matterNo != null and matterNo != ''">
+        and MATTER_NO LIKE '%${matterNo}%'
+      </if>
+      <if test="matterName != null and matterName != ''">
+        and MATTER_NAME LIKE '%${matterName}%'
+      </if>
+      <if test="planningTime != null and planningTime != ''">
+        and PLANNING_TIME LIKE '%${planningTime}%'
+      </if>
+      <if test="proportionalValue != null and proportionalValue != ''">
+        and PROPORTIONAL_VALUE LIKE '%${proportionalValue}%'
+      </if>
+      <if test="fixedValue != null">
+        and FIXED_VALUE = #{fixedValue}
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG LIKE '%${valueFlag}%'
+      </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="memo != null and memo != ''">
+        and MEMO LIKE '%${memo}%'
+      </if>
+      <if test="weightTypeNo != null and weightTypeNo != ''">
+        and WEIGHT_TYPE_NO LIKE '%${weightTypeNo}%'
+      </if>
+      <if test="weightTypeName != null and weightTypeName != ''">
+        and WEIGHT_TYPE_NAME LIKE '%${weightTypeName}%'
+      </if>
+      <if test="compareTypeNo != null and compareTypeNo != ''">
+        and COMPARE_TYPE_NO LIKE '%${compareTypeNo}%'
+      </if>
+      <if test="compareTypeName != null and compareTypeName != ''">
+        and COMPARE_TYPE_NAME LIKE '%${compareTypeName}%'
+      </if>
+      <if test="createTime1 != null and createTime2 != null and createTime1 != '' and createTime2 != ''">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd HH24:mi:ss') >= #{createTime1} and TO_CHAR(CREATE_TIME,'yyyy-MM-dd
+        HH24:mi:ss') &lt;= #{createTime2}
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_WORK_COMPARE_CONFIG
+    where COMPARE_ID = #{compareId,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_WORK_COMPARE_CONFIG
+    where 1!=1 
+      <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="matterNo != null and matterNo != ''">
+        or MATTER_NO = #{matterNo}
+      </if>
+      <if test="matterName != null and matterName != ''">
+        or MATTER_NAME = #{matterName}
+      </if>
+      <if test="planningTime != null and planningTime != ''">
+        or PLANNING_TIME = #{planningTime}
+      </if>
+      <if test="proportionalValue != null and proportionalValue != ''">
+        or PROPORTIONAL_VALUE = #{proportionalValue}
+      </if>
+      <if test="fixedValue != null">
+        or FIXED_VALUE = #{fixedValue}
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        or VALUE_FLAG = #{valueFlag}
+      </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="memo != null and memo != ''">
+        or MEMO = #{memo}
+      </if>
+      <if test="weightTypeNo != null and weightTypeNo != ''">
+        or WEIGHT_TYPE_NO = #{weightTypeNo}
+      </if>
+      <if test="weightTypeName != null and weightTypeName != ''">
+        or WEIGHT_TYPE_NAME = #{weightTypeName}
+      </if>
+      <if test="compareTypeNo != null and compareTypeNo != ''">
+        or COMPARE_TYPE_NO = #{compareTypeNo}
+      </if>
+      <if test="compareTypeName != null and compareTypeName != ''">
+        or COMPARE_TYPE_NAME = #{compareTypeName}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkcompareconfig.model.MeterWorkCompareConfig">
+    insert into METER_WORK_COMPARE_CONFIG (COMPARE_ID, BASE_SPOT_NO, BASE_SPOT_NAME, 
+      MATTER_NO, MATTER_NAME, PLANNING_TIME, 
+      PROPORTIONAL_VALUE, FIXED_VALUE, VALUE_FLAG, 
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
+      MEMO, WEIGHT_TYPE_NO, WEIGHT_TYPE_NAME, 
+      COMPARE_TYPE_NO, COMPARE_TYPE_NAME)
+    values (#{compareId,jdbcType=VARCHAR}, #{baseSpotNo,jdbcType=VARCHAR}, #{baseSpotName,jdbcType=VARCHAR}, 
+      #{matterNo,jdbcType=VARCHAR}, #{matterName,jdbcType=VARCHAR}, #{planningTime,jdbcType=VARCHAR}, 
+      #{proportionalValue,jdbcType=VARCHAR}, #{fixedValue,jdbcType=DECIMAL}, #{valueFlag,jdbcType=VARCHAR}, 
+      #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{memo,jdbcType=VARCHAR}, #{weightTypeNo,jdbcType=VARCHAR}, #{weightTypeName,jdbcType=VARCHAR}, 
+      #{compareTypeNo,jdbcType=VARCHAR}, #{compareTypeName,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkcompareconfig.model.MeterWorkCompareConfig">
+    insert into METER_WORK_COMPARE_CONFIG
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="compareId != null">
+        COMPARE_ID,
+      </if>
+      <if test="baseSpotNo != null">
+        BASE_SPOT_NO,
+      </if>
+      <if test="baseSpotName != null">
+        BASE_SPOT_NAME,
+      </if>
+      <if test="matterNo != null">
+        MATTER_NO,
+      </if>
+      <if test="matterName != null">
+        MATTER_NAME,
+      </if>
+      <if test="planningTime != null">
+        PLANNING_TIME,
+      </if>
+      <if test="proportionalValue != null">
+        PROPORTIONAL_VALUE,
+      </if>
+      <if test="fixedValue != null">
+        FIXED_VALUE,
+      </if>
+      <if test="valueFlag != null">
+        VALUE_FLAG,
+      </if>
+      <if test="createManNo != null">
+        CREATE_MAN_NO,
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME,
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME,
+      </if>
+      <if test="updateManNo != null">
+        UPDATE_MAN_NO,
+      </if>
+      <if test="updateManName != null">
+        UPDATE_MAN_NAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="memo != null">
+        MEMO,
+      </if>
+      <if test="weightTypeNo != null">
+        WEIGHT_TYPE_NO,
+      </if>
+      <if test="weightTypeName != null">
+        WEIGHT_TYPE_NAME,
+      </if>
+      <if test="compareTypeNo != null">
+        COMPARE_TYPE_NO,
+      </if>
+      <if test="compareTypeName != null">
+        COMPARE_TYPE_NAME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="compareId != null">
+        #{compareId,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotNo != null">
+        #{baseSpotNo,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotName != null">
+        #{baseSpotName,jdbcType=VARCHAR},
+      </if>
+      <if test="matterNo != null">
+        #{matterNo,jdbcType=VARCHAR},
+      </if>
+      <if test="matterName != null">
+        #{matterName,jdbcType=VARCHAR},
+      </if>
+      <if test="planningTime != null">
+        #{planningTime,jdbcType=VARCHAR},
+      </if>
+      <if test="proportionalValue != null">
+        #{proportionalValue,jdbcType=VARCHAR},
+      </if>
+      <if test="fixedValue != null">
+        #{fixedValue,jdbcType=DECIMAL},
+      </if>
+      <if test="valueFlag != null">
+        #{valueFlag,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="memo != null">
+        #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="weightTypeNo != null">
+        #{weightTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="weightTypeName != null">
+        #{weightTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="compareTypeNo != null">
+        #{compareTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="compareTypeName != null">
+        #{compareTypeName,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkcompareconfig.model.MeterWorkCompareConfig">
+    update METER_WORK_COMPARE_CONFIG
+    set BASE_SPOT_NO = #{baseSpotNo,jdbcType=VARCHAR},
+      BASE_SPOT_NAME = #{baseSpotName,jdbcType=VARCHAR},
+      MATTER_NO = #{matterNo,jdbcType=VARCHAR},
+      MATTER_NAME = #{matterName,jdbcType=VARCHAR},
+      PLANNING_TIME = #{planningTime,jdbcType=VARCHAR},
+      PROPORTIONAL_VALUE = #{proportionalValue,jdbcType=VARCHAR},
+      FIXED_VALUE = #{fixedValue,jdbcType=DECIMAL},
+      VALUE_FLAG = #{valueFlag,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},
+      MEMO = #{memo,jdbcType=VARCHAR},
+      WEIGHT_TYPE_NO = #{weightTypeNo,jdbcType=VARCHAR},
+      WEIGHT_TYPE_NAME = #{weightTypeName,jdbcType=VARCHAR},
+      COMPARE_TYPE_NO = #{compareTypeNo,jdbcType=VARCHAR},
+      COMPARE_TYPE_NAME = #{compareTypeName,jdbcType=VARCHAR}
+    where COMPARE_ID = #{compareId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkcompareconfig.model.MeterWorkCompareConfig">
+    update METER_WORK_COMPARE_CONFIG
+    <set>
+      <if test="baseSpotNo != null">
+        BASE_SPOT_NO = #{baseSpotNo,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotName != null">
+        BASE_SPOT_NAME = #{baseSpotName,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="planningTime != null">
+        PLANNING_TIME = #{planningTime,jdbcType=VARCHAR},
+      </if>
+      <if test="proportionalValue != null">
+        PROPORTIONAL_VALUE = #{proportionalValue,jdbcType=VARCHAR},
+      </if>
+      <if test="fixedValue != null">
+        FIXED_VALUE = #{fixedValue,jdbcType=DECIMAL},
+      </if>
+      <if test="valueFlag != null">
+        VALUE_FLAG = #{valueFlag,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="memo != null">
+        MEMO = #{memo,jdbcType=VARCHAR},
+      </if>
+      <if test="weightTypeNo != null">
+        WEIGHT_TYPE_NO = #{weightTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="weightTypeName != null">
+        WEIGHT_TYPE_NAME = #{weightTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="compareTypeNo != null">
+        COMPARE_TYPE_NO = #{compareTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="compareTypeName != null">
+        COMPARE_TYPE_NAME = #{compareTypeName,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where COMPARE_ID = #{compareId,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where COMPARE_ID = #{compareId,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_COMPARE_CONFIG 
+      (COMPARE_ID, 
+      BASE_SPOT_NO, BASE_SPOT_NAME, MATTER_NO, 
+      MATTER_NAME, PLANNING_TIME, PROPORTIONAL_VALUE, 
+      FIXED_VALUE, VALUE_FLAG, CREATE_MAN_NO, 
+      CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
+      MEMO, WEIGHT_TYPE_NO, WEIGHT_TYPE_NAME, 
+      COMPARE_TYPE_NO, COMPARE_TYPE_NAME
+      )
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.compareId,jdbcType=VARCHAR}, 
+      #{item.baseSpotNo,jdbcType=VARCHAR}, #{item.baseSpotName,jdbcType=VARCHAR}, #{item.matterNo,jdbcType=VARCHAR}, 
+      #{item.matterName,jdbcType=VARCHAR}, #{item.planningTime,jdbcType=VARCHAR}, #{item.proportionalValue,jdbcType=VARCHAR}, 
+      #{item.fixedValue,jdbcType=DECIMAL}, #{item.valueFlag,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.memo,jdbcType=VARCHAR}, #{item.weightTypeNo,jdbcType=VARCHAR}, #{item.weightTypeName,jdbcType=VARCHAR}, 
+      #{item.compareTypeNo,jdbcType=VARCHAR}, #{item.compareTypeName,jdbcType=VARCHAR}
+       from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_WORK_COMPARE_CONFIG
+     set
+       COMPARE_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_ID" close="end">
+          when #{item.compareId,jdbcType=VARCHAR} then #{item.compareId,jdbcType=VARCHAR}
+       </foreach>
+       ,BASE_SPOT_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_ID" close="end">
+          when #{item.compareId,jdbcType=VARCHAR} then #{item.baseSpotNo,jdbcType=VARCHAR}
+       </foreach>
+       ,BASE_SPOT_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_ID" close="end">
+          when #{item.compareId,jdbcType=VARCHAR} then #{item.baseSpotName,jdbcType=VARCHAR}
+       </foreach>
+       ,MATTER_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_ID" close="end">
+          when #{item.compareId,jdbcType=VARCHAR} then #{item.matterNo,jdbcType=VARCHAR}
+       </foreach>
+       ,MATTER_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_ID" close="end">
+          when #{item.compareId,jdbcType=VARCHAR} then #{item.matterName,jdbcType=VARCHAR}
+       </foreach>
+       ,PLANNING_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_ID" close="end">
+          when #{item.compareId,jdbcType=VARCHAR} then #{item.planningTime,jdbcType=VARCHAR}
+       </foreach>
+       ,PROPORTIONAL_VALUE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_ID" close="end">
+          when #{item.compareId,jdbcType=VARCHAR} then #{item.proportionalValue,jdbcType=VARCHAR}
+       </foreach>
+       ,FIXED_VALUE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_ID" close="end">
+          when #{item.compareId,jdbcType=VARCHAR} then #{item.fixedValue,jdbcType=DECIMAL}
+       </foreach>
+       ,VALUE_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_ID" close="end">
+          when #{item.compareId,jdbcType=VARCHAR} then #{item.valueFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_ID" close="end">
+          when #{item.compareId,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_ID" close="end">
+          when #{item.compareId,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_ID" close="end">
+          when #{item.compareId,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_ID" close="end">
+          when #{item.compareId,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_ID" close="end">
+          when #{item.compareId,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_ID" close="end">
+          when #{item.compareId,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,MEMO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_ID" close="end">
+          when #{item.compareId,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
+       </foreach>
+       ,WEIGHT_TYPE_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_ID" close="end">
+          when #{item.compareId,jdbcType=VARCHAR} then #{item.weightTypeNo,jdbcType=VARCHAR}
+       </foreach>
+       ,WEIGHT_TYPE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_ID" close="end">
+          when #{item.compareId,jdbcType=VARCHAR} then #{item.weightTypeName,jdbcType=VARCHAR}
+       </foreach>
+       ,COMPARE_TYPE_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_ID" close="end">
+          when #{item.compareId,jdbcType=VARCHAR} then #{item.compareTypeNo,jdbcType=VARCHAR}
+       </foreach>
+       ,COMPARE_TYPE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_ID" close="end">
+          when #{item.compareId,jdbcType=VARCHAR} then #{item.compareTypeName,jdbcType=VARCHAR}
+       </foreach>
+     where COMPARE_ID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.compareId,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_WORK_COMPARE_CONFIG
+    where COMPARE_ID in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示!!!-->
+  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+  
+</mapper>

+ 333 - 0
src/main/java/com/steerinfo/meterwork/meterworkcompareconfig/model/MeterWorkCompareConfig.java

@@ -0,0 +1,333 @@
+package com.steerinfo.meterwork.meterworkcompareconfig.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value="比对管理-数据配置")
+public class MeterWorkCompareConfig implements IBasePO<String> {
+    /**
+     * 表主键(COMPARE_ID,VARCHAR,20)
+     */
+    @ApiModelProperty(value="表主键",required=true)
+    private String compareId;
+
+    /**
+     * 计量点编号(BASE_SPOT_NO,VARCHAR,40)
+     */
+    @ApiModelProperty(value="计量点编号",required=true)
+    private String baseSpotNo;
+
+    /**
+     * 计量点名称(BASE_SPOT_NAME,VARCHAR,80)
+     */
+    @ApiModelProperty(value="计量点名称",required=true)
+    private String baseSpotName;
+
+    /**
+     * 物料编码(MATTER_NO,VARCHAR,30)
+     */
+    @ApiModelProperty(value="物料编码",required=true)
+    private String matterNo;
+
+    /**
+     * 物料名称(MATTER_NAME,VARCHAR,80)
+     */
+    @ApiModelProperty(value="物料名称",required=true)
+    private String matterName;
+
+    /**
+     * 计划时间(天/次)(PLANNING_TIME,VARCHAR,10)
+     */
+    @ApiModelProperty(value="计划时间(天/次)",required=false)
+    private String planningTime;
+
+    /**
+     * 比例值(%)(PROPORTIONAL_VALUE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="比例值(%)",required=false)
+    private String proportionalValue;
+
+    /**
+     * 固重值(kg)(FIXED_VALUE,DECIMAL,15)
+     */
+    @ApiModelProperty(value="固重值(kg)",required=false)
+    private BigDecimal fixedValue;
+
+    /**
+     * 状态(0为无效,1为有效)(VALUE_FLAG,VARCHAR,2)
+     */
+    @ApiModelProperty(value="状态(0为无效,1为有效)",required=false)
+    private String valueFlag;
+
+    /**
+     * 创建人编号(CREATE_MAN_NO,VARCHAR,50)
+     */
+    @ApiModelProperty(value="创建人编号",required=false)
+    private String createManNo;
+
+    /**
+     * 创建人姓名(CREATE_MAN_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="创建人姓名",required=false)
+    private String createManName;
+
+    /**
+     * 创建时间(YYYY-MM-DD HH:mm:SS)(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="创建时间(YYYY-MM-DD HH:mm:SS)",required=false)
+    private Date createTime;
+
+    /**
+     * 修改人编号(UPDATE_MAN_NO,VARCHAR,50)
+     */
+    @ApiModelProperty(value="修改人编号",required=false)
+    private String updateManNo;
+
+    /**
+     * 修改人姓名(UPDATE_MAN_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="修改人姓名",required=false)
+    private String updateManName;
+
+    /**
+     * 修改时间(YYYY-MM-DD HH:mm:SS)(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间(YYYY-MM-DD HH:mm:SS)",required=false)
+    private Date updateTime;
+
+    /**
+     * 备注(MEMO,VARCHAR,100)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String memo;
+
+    /**
+     * 重量类型编码(WEIGHT_TYPE_NO,VARCHAR,30)
+     */
+    @ApiModelProperty(value="重量类型编码",required=false)
+    private String weightTypeNo;
+
+    /**
+     * 重量类型名称(WEIGHT_TYPE_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="重量类型名称",required=false)
+    private String weightTypeName;
+
+    /**
+     * 对比类型编码(COMPARE_TYPE_NO,VARCHAR,30)
+     */
+    @ApiModelProperty(value="对比类型编码",required=false)
+    private String compareTypeNo;
+
+    /**
+     * 对比类型名称(COMPARE_TYPE_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="对比类型名称",required=false)
+    private String compareTypeName;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.compareId;
+    }
+
+    @Override
+    public void setId(String compareId) {
+        this.compareId = compareId == null ? null : compareId.trim();
+    }
+
+    public String getCompareId() {
+        return compareId;
+    }
+
+    public void setCompareId(String compareId) {
+        this.compareId = compareId == null ? null : compareId.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 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 getPlanningTime() {
+        return planningTime;
+    }
+
+    public void setPlanningTime(String planningTime) {
+        this.planningTime = planningTime == null ? null : planningTime.trim();
+    }
+
+    public String getProportionalValue() {
+        return proportionalValue;
+    }
+
+    public void setProportionalValue(String proportionalValue) {
+        this.proportionalValue = proportionalValue == null ? null : proportionalValue.trim();
+    }
+
+    public BigDecimal getFixedValue() {
+        return fixedValue;
+    }
+
+    public void setFixedValue(BigDecimal fixedValue) {
+        this.fixedValue = fixedValue;
+    }
+
+    public String getValueFlag() {
+        return valueFlag;
+    }
+
+    public void setValueFlag(String valueFlag) {
+        this.valueFlag = valueFlag == null ? null : valueFlag.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 getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo == null ? null : memo.trim();
+    }
+
+    public String getWeightTypeNo() {
+        return weightTypeNo;
+    }
+
+    public void setWeightTypeNo(String weightTypeNo) {
+        this.weightTypeNo = weightTypeNo == null ? null : weightTypeNo.trim();
+    }
+
+    public String getWeightTypeName() {
+        return weightTypeName;
+    }
+
+    public void setWeightTypeName(String weightTypeName) {
+        this.weightTypeName = weightTypeName == null ? null : weightTypeName.trim();
+    }
+
+    public String getCompareTypeNo() {
+        return compareTypeNo;
+    }
+
+    public void setCompareTypeNo(String compareTypeNo) {
+        this.compareTypeNo = compareTypeNo == null ? null : compareTypeNo.trim();
+    }
+
+    public String getCompareTypeName() {
+        return compareTypeName;
+    }
+
+    public void setCompareTypeName(String compareTypeName) {
+        this.compareTypeName = compareTypeName == null ? null : compareTypeName.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", compareId=").append(compareId);
+        sb.append(", baseSpotNo=").append(baseSpotNo);
+        sb.append(", baseSpotName=").append(baseSpotName);
+        sb.append(", matterNo=").append(matterNo);
+        sb.append(", matterName=").append(matterName);
+        sb.append(", planningTime=").append(planningTime);
+        sb.append(", proportionalValue=").append(proportionalValue);
+        sb.append(", fixedValue=").append(fixedValue);
+        sb.append(", valueFlag=").append(valueFlag);
+        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(", memo=").append(memo);
+        sb.append(", weightTypeNo=").append(weightTypeNo);
+        sb.append(", weightTypeName=").append(weightTypeName);
+        sb.append(", compareTypeNo=").append(compareTypeNo);
+        sb.append(", compareTypeName=").append(compareTypeName);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 23 - 0
src/main/java/com/steerinfo/meterwork/meterworkcompareconfig/service/IMeterWorkCompareConfigService.java

@@ -0,0 +1,23 @@
+package com.steerinfo.meterwork.meterworkcompareconfig.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.meterwork.meterworkcompareconfig.model.MeterWorkCompareConfig;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * MeterWorkCompareConfig服务接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-19 08:45
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-19
+ * 作者:generator
+ * 参考:
+ * 描述:MeterWorkCompareConfig服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IMeterWorkCompareConfigService extends IBaseService<MeterWorkCompareConfig, String>{
+
+}

+ 36 - 0
src/main/java/com/steerinfo/meterwork/meterworkcompareconfig/service/impl/MeterWorkCompareConfigServiceImpl.java

@@ -0,0 +1,36 @@
+package com.steerinfo.meterwork.meterworkcompareconfig.service.impl;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.meterwork.meterworkcompareconfig.model.MeterWorkCompareConfig;
+import com.steerinfo.meterwork.meterworkcompareconfig.mapper.MeterWorkCompareConfigMapper;
+import com.steerinfo.meterwork.meterworkcompareconfig.service.IMeterWorkCompareConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * MeterWorkCompareConfig服务实现:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-19 08:45
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-19
+ * 作者:generator
+ * 参考:
+ * 描述:MeterWorkCompareConfig服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "meterWorkCompareConfigService")
+public class MeterWorkCompareConfigServiceImpl extends BaseServiceImpl<MeterWorkCompareConfig, String> implements IMeterWorkCompareConfigService {
+
+    @Autowired
+    private MeterWorkCompareConfigMapper meterWorkCompareConfigMapper;
+
+    @Override
+    protected IBaseMapper<MeterWorkCompareConfig, String> getMapper() {
+        return meterWorkCompareConfigMapper;
+    }
+}

+ 110 - 0
src/main/java/com/steerinfo/meterwork/meterworkcompareresult/controller/MeterWorkCompareResultController.java

@@ -0,0 +1,110 @@
+package com.steerinfo.meterwork.meterworkcompareresult.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.meterworkcompareresult.model.MeterWorkCompareResult;
+import com.steerinfo.meterwork.meterworkcompareresult.service.IMeterWorkCompareResultService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ArrayList;
+import java.math.BigDecimal;
+
+/**
+ * MeterWorkCompareResult RESTful接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-18 11:54
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-18
+ * 作者:generator
+ * 参考:
+ * 描述:MeterWorkCompareResult RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/meterworkcompareresults")
+public class MeterWorkCompareResultController extends BaseRESTfulController {
+
+    @Autowired
+    IMeterWorkCompareResultService meterWorkCompareResultService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkcompareresult:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkCompareResult> list = meterWorkCompareResultService.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("meterworkcompareresult:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkCompareResult> list = meterWorkCompareResultService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据MeterWorkCompareResult对象创建")
+    @ApiImplicitParam(name = "meterWorkCompareResult", value = "详细实体meterWorkCompareResult", required = true, dataType = "MeterWorkCompareResult")
+    //@RequiresPermissions("meterworkcompareresult:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute MeterWorkCompareResult model){
+        MeterWorkCompareResult meterWorkCompareResult = meterWorkCompareResultService.add(model);
+        return success(meterWorkCompareResult);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterworkcompareresult:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        MeterWorkCompareResult meterWorkCompareResult = meterWorkCompareResultService.getById(id);
+        return success(meterWorkCompareResult);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象,并根据传过来的meterWorkCompareResult信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "meterWorkCompareResult", value = "详细实体meterWorkCompareResult", required = true, dataType = "MeterWorkCompareResult")
+    })
+    //@RequiresPermissions("meterworkcompareresult:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody MeterWorkCompareResult model){
+        model.setId(id);
+        MeterWorkCompareResult meterWorkCompareResult = meterWorkCompareResultService.modify(model);
+        return success(meterWorkCompareResult);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterworkcompareresult: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);
+			  meterWorkCompareResultService.delete(ids);
+    	}
+      return success();
+    }
+}

+ 10 - 0
src/main/java/com/steerinfo/meterwork/meterworkcompareresult/mapper/MeterWorkCompareResultMapper.java

@@ -0,0 +1,10 @@
+package com.steerinfo.meterwork.meterworkcompareresult.mapper;
+
+import com.steerinfo.meterwork.meterworkcompareresult.model.MeterWorkCompareResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MeterWorkCompareResultMapper extends IBaseMapper<MeterWorkCompareResult, String> {
+}

+ 659 - 0
src/main/java/com/steerinfo/meterwork/meterworkcompareresult/mapper/MeterWorkCompareResultMapper.xml

@@ -0,0 +1,659 @@
+<?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.meterworkcompareresult.mapper.MeterWorkCompareResultMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.meterwork.meterworkcompareresult.model.MeterWorkCompareResult">
+    <id column="COMPARE_RESULT_ID" jdbcType="VARCHAR" property="compareResultId" />
+    <result column="BASE_SPOT_NO" jdbcType="VARCHAR" property="baseSpotNo" />
+    <result column="BASE_SPOT_NAME" jdbcType="VARCHAR" property="baseSpotName" />
+    <result column="MATTER_NO" jdbcType="VARCHAR" property="matterNo" />
+    <result column="MATTER_NAME" jdbcType="VARCHAR" property="matterName" />
+    <result column="METER_TYPE_NO" jdbcType="VARCHAR" property="meterTypeNo" />
+    <result column="METER_TYPE_NAME" jdbcType="VARCHAR" property="meterTypeName" />
+    <result column="CAR_NO" jdbcType="VARCHAR" property="carNo" />
+    <result column="METER_WEIGHT" jdbcType="DECIMAL" property="meterWeight" />
+    <result column="WEIGHT_DIFF_ALLOW" jdbcType="DECIMAL" property="weightDiffAllow" />
+    <result column="COMPARE_WEIGHT" jdbcType="DECIMAL" property="compareWeight" />
+    <result column="WEIGHT_DIFF_ACT" jdbcType="DECIMAL" property="weightDiffAct" />
+    <result column="COMPARE_SPOT_NAME" jdbcType="VARCHAR" property="compareSpotName" />
+    <result column="COMPARE_TIME" jdbcType="TIMESTAMP" property="compareTime" />
+    <result column="COMPARE_RESULT" jdbcType="VARCHAR" property="compareResult" />
+    <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="MEMO" jdbcType="VARCHAR" property="memo" />
+  </resultMap>
+  <sql id="columns">
+    COMPARE_RESULT_ID, BASE_SPOT_NO, BASE_SPOT_NAME, MATTER_NO, MATTER_NAME, METER_TYPE_NO, 
+    METER_TYPE_NAME, CAR_NO, METER_WEIGHT, WEIGHT_DIFF_ALLOW, COMPARE_WEIGHT, WEIGHT_DIFF_ACT, 
+    COMPARE_SPOT_NAME, COMPARE_TIME, COMPARE_RESULT, CREATE_MAN_NO, CREATE_MAN_NAME, 
+    CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, MEMO
+  </sql>
+  <sql id="columns_alias">
+    t.COMPARE_RESULT_ID, t.BASE_SPOT_NO, t.BASE_SPOT_NAME, t.MATTER_NO, t.MATTER_NAME, 
+    t.METER_TYPE_NO, t.METER_TYPE_NAME, t.CAR_NO, t.METER_WEIGHT, t.WEIGHT_DIFF_ALLOW, 
+    t.COMPARE_WEIGHT, t.WEIGHT_DIFF_ACT, t.COMPARE_SPOT_NAME, t.COMPARE_TIME, t.COMPARE_RESULT, 
+    t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, 
+    t.UPDATE_TIME, t.MEMO
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_WORK_COMPARE_RESULT
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_WORK_COMPARE_RESULT t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="compareResultId != null and compareResultId != ''">
+        and COMPARE_RESULT_ID = #{compareResultId}
+      </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="matterNo != null and matterNo != ''">
+        and MATTER_NO = #{matterNo}
+      </if>
+      <if test="matterName != null and matterName != ''">
+        and MATTER_NAME = #{matterName}
+      </if>
+      <if test="meterTypeNo != null and meterTypeNo != ''">
+        and METER_TYPE_NO = #{meterTypeNo}
+      </if>
+      <if test="meterTypeName != null and meterTypeName != ''">
+        and METER_TYPE_NAME = #{meterTypeName}
+      </if>
+      <if test="carNo != null and carNo != ''">
+        and CAR_NO = #{carNo}
+      </if>
+      <if test="meterWeight != null">
+        and METER_WEIGHT = #{meterWeight}
+      </if>
+      <if test="weightDiffAllow != null">
+        and WEIGHT_DIFF_ALLOW = #{weightDiffAllow}
+      </if>
+      <if test="compareWeight != null">
+        and COMPARE_WEIGHT = #{compareWeight}
+      </if>
+      <if test="weightDiffAct != null">
+        and WEIGHT_DIFF_ACT = #{weightDiffAct}
+      </if>
+      <if test="compareSpotName != null and compareSpotName != ''">
+        and COMPARE_SPOT_NAME = #{compareSpotName}
+      </if>
+      <if test="compareTime != null">
+        and TO_CHAR(COMPARE_TIME,'yyyy-MM-dd') = #{compareTime}
+      </if>
+      <if test="compareResult != null and compareResult != ''">
+        and COMPARE_RESULT = #{compareResult}
+      </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="memo != null and memo != ''">
+        and MEMO = #{memo}
+      </if>
+      <if test="createTime1 != null and createTime2 != null and createTime1 != '' and createTime2 != ''">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd HH24:mi:ss') >= #{createTime1} and TO_CHAR(CREATE_TIME,'yyyy-MM-dd
+        HH24:mi:ss') &lt;= #{createTime2}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="compareResultId != null and compareResultId != ''">
+        and COMPARE_RESULT_ID LIKE '%${compareResultId}%'
+      </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="matterNo != null and matterNo != ''">
+        and MATTER_NO LIKE '%${matterNo}%'
+      </if>
+      <if test="matterName != null and matterName != ''">
+        and MATTER_NAME LIKE '%${matterName}%'
+      </if>
+      <if test="meterTypeNo != null and meterTypeNo != ''">
+        and METER_TYPE_NO LIKE '%${meterTypeNo}%'
+      </if>
+      <if test="meterTypeName != null and meterTypeName != ''">
+        and METER_TYPE_NAME LIKE '%${meterTypeName}%'
+      </if>
+      <if test="carNo != null and carNo != ''">
+        and CAR_NO LIKE '%${carNo}%'
+      </if>
+      <if test="meterWeight != null">
+        and METER_WEIGHT = #{meterWeight}
+      </if>
+      <if test="weightDiffAllow != null">
+        and WEIGHT_DIFF_ALLOW = #{weightDiffAllow}
+      </if>
+      <if test="compareWeight != null">
+        and COMPARE_WEIGHT = #{compareWeight}
+      </if>
+      <if test="weightDiffAct != null">
+        and WEIGHT_DIFF_ACT = #{weightDiffAct}
+      </if>
+      <if test="compareSpotName != null and compareSpotName != ''">
+        and COMPARE_SPOT_NAME LIKE '%${compareSpotName}%'
+      </if>
+      <if test="compareTime != null">
+        and TO_CHAR(COMPARE_TIME,'yyyy-MM-dd') = #{compareTime}
+      </if>
+      <if test="compareResult != null and compareResult != ''">
+        and COMPARE_RESULT LIKE '%${compareResult}%'
+      </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="memo != null and memo != ''">
+        and MEMO LIKE '%${memo}%'
+      </if>
+      <if test="createTime1 != null and createTime2 != null and createTime1 != '' and createTime2 != ''">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd HH24:mi:ss') >= #{createTime1} and TO_CHAR(CREATE_TIME,'yyyy-MM-dd
+        HH24:mi:ss') &lt;= #{createTime2}
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_WORK_COMPARE_RESULT
+    where COMPARE_RESULT_ID = #{compareResultId,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_WORK_COMPARE_RESULT
+    where 1!=1 
+      <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="matterNo != null and matterNo != ''">
+        or MATTER_NO = #{matterNo}
+      </if>
+      <if test="matterName != null and matterName != ''">
+        or MATTER_NAME = #{matterName}
+      </if>
+      <if test="meterTypeNo != null and meterTypeNo != ''">
+        or METER_TYPE_NO = #{meterTypeNo}
+      </if>
+      <if test="meterTypeName != null and meterTypeName != ''">
+        or METER_TYPE_NAME = #{meterTypeName}
+      </if>
+      <if test="carNo != null and carNo != ''">
+        or CAR_NO = #{carNo}
+      </if>
+      <if test="meterWeight != null">
+        or METER_WEIGHT = #{meterWeight}
+      </if>
+      <if test="weightDiffAllow != null">
+        or WEIGHT_DIFF_ALLOW = #{weightDiffAllow}
+      </if>
+      <if test="compareWeight != null">
+        or COMPARE_WEIGHT = #{compareWeight}
+      </if>
+      <if test="weightDiffAct != null">
+        or WEIGHT_DIFF_ACT = #{weightDiffAct}
+      </if>
+      <if test="compareSpotName != null and compareSpotName != ''">
+        or COMPARE_SPOT_NAME = #{compareSpotName}
+      </if>
+      <if test="compareTime != null">
+        or TO_CHAR(COMPARE_TIME,'yyyy-MM-dd') = '#{compareTime}'
+      </if>
+      <if test="compareResult != null and compareResult != ''">
+        or COMPARE_RESULT = #{compareResult}
+      </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="memo != null and memo != ''">
+        or MEMO = #{memo}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkcompareresult.model.MeterWorkCompareResult">
+    insert into METER_WORK_COMPARE_RESULT (COMPARE_RESULT_ID, BASE_SPOT_NO, BASE_SPOT_NAME, 
+      MATTER_NO, MATTER_NAME, METER_TYPE_NO, 
+      METER_TYPE_NAME, CAR_NO, METER_WEIGHT, 
+      WEIGHT_DIFF_ALLOW, COMPARE_WEIGHT, WEIGHT_DIFF_ACT, 
+      COMPARE_SPOT_NAME, COMPARE_TIME, COMPARE_RESULT, 
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
+      MEMO)
+    values (#{compareResultId,jdbcType=VARCHAR}, #{baseSpotNo,jdbcType=VARCHAR}, #{baseSpotName,jdbcType=VARCHAR}, 
+      #{matterNo,jdbcType=VARCHAR}, #{matterName,jdbcType=VARCHAR}, #{meterTypeNo,jdbcType=VARCHAR}, 
+      #{meterTypeName,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR}, #{meterWeight,jdbcType=DECIMAL}, 
+      #{weightDiffAllow,jdbcType=DECIMAL}, #{compareWeight,jdbcType=DECIMAL}, #{weightDiffAct,jdbcType=DECIMAL}, 
+      #{compareSpotName,jdbcType=VARCHAR}, #{compareTime,jdbcType=TIMESTAMP}, #{compareResult,jdbcType=VARCHAR}, 
+      #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{memo,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkcompareresult.model.MeterWorkCompareResult">
+    insert into METER_WORK_COMPARE_RESULT
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="compareResultId != null">
+        COMPARE_RESULT_ID,
+      </if>
+      <if test="baseSpotNo != null">
+        BASE_SPOT_NO,
+      </if>
+      <if test="baseSpotName != null">
+        BASE_SPOT_NAME,
+      </if>
+      <if test="matterNo != null">
+        MATTER_NO,
+      </if>
+      <if test="matterName != null">
+        MATTER_NAME,
+      </if>
+      <if test="meterTypeNo != null">
+        METER_TYPE_NO,
+      </if>
+      <if test="meterTypeName != null">
+        METER_TYPE_NAME,
+      </if>
+      <if test="carNo != null">
+        CAR_NO,
+      </if>
+      <if test="meterWeight != null">
+        METER_WEIGHT,
+      </if>
+      <if test="weightDiffAllow != null">
+        WEIGHT_DIFF_ALLOW,
+      </if>
+      <if test="compareWeight != null">
+        COMPARE_WEIGHT,
+      </if>
+      <if test="weightDiffAct != null">
+        WEIGHT_DIFF_ACT,
+      </if>
+      <if test="compareSpotName != null">
+        COMPARE_SPOT_NAME,
+      </if>
+      <if test="compareTime != null">
+        COMPARE_TIME,
+      </if>
+      <if test="compareResult != null">
+        COMPARE_RESULT,
+      </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="memo != null">
+        MEMO,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="compareResultId != null">
+        #{compareResultId,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotNo != null">
+        #{baseSpotNo,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotName != null">
+        #{baseSpotName,jdbcType=VARCHAR},
+      </if>
+      <if test="matterNo != null">
+        #{matterNo,jdbcType=VARCHAR},
+      </if>
+      <if test="matterName != null">
+        #{matterName,jdbcType=VARCHAR},
+      </if>
+      <if test="meterTypeNo != null">
+        #{meterTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="meterTypeName != null">
+        #{meterTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="carNo != null">
+        #{carNo,jdbcType=VARCHAR},
+      </if>
+      <if test="meterWeight != null">
+        #{meterWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="weightDiffAllow != null">
+        #{weightDiffAllow,jdbcType=DECIMAL},
+      </if>
+      <if test="compareWeight != null">
+        #{compareWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="weightDiffAct != null">
+        #{weightDiffAct,jdbcType=DECIMAL},
+      </if>
+      <if test="compareSpotName != null">
+        #{compareSpotName,jdbcType=VARCHAR},
+      </if>
+      <if test="compareTime != null">
+        #{compareTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="compareResult != null">
+        #{compareResult,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="memo != null">
+        #{memo,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkcompareresult.model.MeterWorkCompareResult">
+    update METER_WORK_COMPARE_RESULT
+    set BASE_SPOT_NO = #{baseSpotNo,jdbcType=VARCHAR},
+      BASE_SPOT_NAME = #{baseSpotName,jdbcType=VARCHAR},
+      MATTER_NO = #{matterNo,jdbcType=VARCHAR},
+      MATTER_NAME = #{matterName,jdbcType=VARCHAR},
+      METER_TYPE_NO = #{meterTypeNo,jdbcType=VARCHAR},
+      METER_TYPE_NAME = #{meterTypeName,jdbcType=VARCHAR},
+      CAR_NO = #{carNo,jdbcType=VARCHAR},
+      METER_WEIGHT = #{meterWeight,jdbcType=DECIMAL},
+      WEIGHT_DIFF_ALLOW = #{weightDiffAllow,jdbcType=DECIMAL},
+      COMPARE_WEIGHT = #{compareWeight,jdbcType=DECIMAL},
+      WEIGHT_DIFF_ACT = #{weightDiffAct,jdbcType=DECIMAL},
+      COMPARE_SPOT_NAME = #{compareSpotName,jdbcType=VARCHAR},
+      COMPARE_TIME = #{compareTime,jdbcType=TIMESTAMP},
+      COMPARE_RESULT = #{compareResult,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},
+      MEMO = #{memo,jdbcType=VARCHAR}
+    where COMPARE_RESULT_ID = #{compareResultId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkcompareresult.model.MeterWorkCompareResult">
+    update METER_WORK_COMPARE_RESULT
+    <set>
+      <if test="baseSpotNo != null">
+        BASE_SPOT_NO = #{baseSpotNo,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotName != null">
+        BASE_SPOT_NAME = #{baseSpotName,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="meterTypeNo != null">
+        METER_TYPE_NO = #{meterTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="meterTypeName != null">
+        METER_TYPE_NAME = #{meterTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="carNo != null">
+        CAR_NO = #{carNo,jdbcType=VARCHAR},
+      </if>
+      <if test="meterWeight != null">
+        METER_WEIGHT = #{meterWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="weightDiffAllow != null">
+        WEIGHT_DIFF_ALLOW = #{weightDiffAllow,jdbcType=DECIMAL},
+      </if>
+      <if test="compareWeight != null">
+        COMPARE_WEIGHT = #{compareWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="weightDiffAct != null">
+        WEIGHT_DIFF_ACT = #{weightDiffAct,jdbcType=DECIMAL},
+      </if>
+      <if test="compareSpotName != null">
+        COMPARE_SPOT_NAME = #{compareSpotName,jdbcType=VARCHAR},
+      </if>
+      <if test="compareTime != null">
+        COMPARE_TIME = #{compareTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="compareResult != null">
+        COMPARE_RESULT = #{compareResult,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="memo != null">
+        MEMO = #{memo,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where COMPARE_RESULT_ID = #{compareResultId,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where COMPARE_RESULT_ID = #{compareResultId,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_COMPARE_RESULT 
+      (COMPARE_RESULT_ID, 
+      BASE_SPOT_NO, BASE_SPOT_NAME, MATTER_NO, 
+      MATTER_NAME, METER_TYPE_NO, METER_TYPE_NAME, 
+      CAR_NO, METER_WEIGHT, WEIGHT_DIFF_ALLOW, 
+      COMPARE_WEIGHT, WEIGHT_DIFF_ACT, 
+      COMPARE_SPOT_NAME, COMPARE_TIME, 
+      COMPARE_RESULT, CREATE_MAN_NO, CREATE_MAN_NAME, 
+      CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, 
+      UPDATE_TIME, MEMO)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.compareResultId,jdbcType=VARCHAR}, 
+      #{item.baseSpotNo,jdbcType=VARCHAR}, #{item.baseSpotName,jdbcType=VARCHAR}, #{item.matterNo,jdbcType=VARCHAR}, 
+      #{item.matterName,jdbcType=VARCHAR}, #{item.meterTypeNo,jdbcType=VARCHAR}, #{item.meterTypeName,jdbcType=VARCHAR}, 
+      #{item.carNo,jdbcType=VARCHAR}, #{item.meterWeight,jdbcType=DECIMAL}, #{item.weightDiffAllow,jdbcType=DECIMAL}, 
+      #{item.compareWeight,jdbcType=DECIMAL}, #{item.weightDiffAct,jdbcType=DECIMAL}, 
+      #{item.compareSpotName,jdbcType=VARCHAR}, #{item.compareTime,jdbcType=TIMESTAMP}, 
+      #{item.compareResult,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.memo,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_WORK_COMPARE_RESULT
+     set
+       COMPARE_RESULT_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_RESULT_ID" close="end">
+          when #{item.compareResultId,jdbcType=VARCHAR} then #{item.compareResultId,jdbcType=VARCHAR}
+       </foreach>
+       ,BASE_SPOT_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_RESULT_ID" close="end">
+          when #{item.compareResultId,jdbcType=VARCHAR} then #{item.baseSpotNo,jdbcType=VARCHAR}
+       </foreach>
+       ,BASE_SPOT_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_RESULT_ID" close="end">
+          when #{item.compareResultId,jdbcType=VARCHAR} then #{item.baseSpotName,jdbcType=VARCHAR}
+       </foreach>
+       ,MATTER_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_RESULT_ID" close="end">
+          when #{item.compareResultId,jdbcType=VARCHAR} then #{item.matterNo,jdbcType=VARCHAR}
+       </foreach>
+       ,MATTER_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_RESULT_ID" close="end">
+          when #{item.compareResultId,jdbcType=VARCHAR} then #{item.matterName,jdbcType=VARCHAR}
+       </foreach>
+       ,METER_TYPE_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_RESULT_ID" close="end">
+          when #{item.compareResultId,jdbcType=VARCHAR} then #{item.meterTypeNo,jdbcType=VARCHAR}
+       </foreach>
+       ,METER_TYPE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_RESULT_ID" close="end">
+          when #{item.compareResultId,jdbcType=VARCHAR} then #{item.meterTypeName,jdbcType=VARCHAR}
+       </foreach>
+       ,CAR_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_RESULT_ID" close="end">
+          when #{item.compareResultId,jdbcType=VARCHAR} then #{item.carNo,jdbcType=VARCHAR}
+       </foreach>
+       ,METER_WEIGHT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_RESULT_ID" close="end">
+          when #{item.compareResultId,jdbcType=VARCHAR} then #{item.meterWeight,jdbcType=DECIMAL}
+       </foreach>
+       ,WEIGHT_DIFF_ALLOW=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_RESULT_ID" close="end">
+          when #{item.compareResultId,jdbcType=VARCHAR} then #{item.weightDiffAllow,jdbcType=DECIMAL}
+       </foreach>
+       ,COMPARE_WEIGHT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_RESULT_ID" close="end">
+          when #{item.compareResultId,jdbcType=VARCHAR} then #{item.compareWeight,jdbcType=DECIMAL}
+       </foreach>
+       ,WEIGHT_DIFF_ACT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_RESULT_ID" close="end">
+          when #{item.compareResultId,jdbcType=VARCHAR} then #{item.weightDiffAct,jdbcType=DECIMAL}
+       </foreach>
+       ,COMPARE_SPOT_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_RESULT_ID" close="end">
+          when #{item.compareResultId,jdbcType=VARCHAR} then #{item.compareSpotName,jdbcType=VARCHAR}
+       </foreach>
+       ,COMPARE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_RESULT_ID" close="end">
+          when #{item.compareResultId,jdbcType=VARCHAR} then #{item.compareTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,COMPARE_RESULT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_RESULT_ID" close="end">
+          when #{item.compareResultId,jdbcType=VARCHAR} then #{item.compareResult,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_RESULT_ID" close="end">
+          when #{item.compareResultId,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_RESULT_ID" close="end">
+          when #{item.compareResultId,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_RESULT_ID" close="end">
+          when #{item.compareResultId,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_RESULT_ID" close="end">
+          when #{item.compareResultId,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_RESULT_ID" close="end">
+          when #{item.compareResultId,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_RESULT_ID" close="end">
+          when #{item.compareResultId,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,MEMO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case COMPARE_RESULT_ID" close="end">
+          when #{item.compareResultId,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
+       </foreach>
+     where COMPARE_RESULT_ID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.compareResultId,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_WORK_COMPARE_RESULT
+    where COMPARE_RESULT_ID in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示!!!-->
+  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+  
+</mapper>

+ 363 - 0
src/main/java/com/steerinfo/meterwork/meterworkcompareresult/model/MeterWorkCompareResult.java

@@ -0,0 +1,363 @@
+package com.steerinfo.meterwork.meterworkcompareresult.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value="比对管理-数据维护")
+public class MeterWorkCompareResult implements IBasePO<String> {
+    /**
+     * 比对记录表主键(COMPARE_RESULT_ID,VARCHAR,20)
+     */
+    @ApiModelProperty(value="比对记录表主键",required=true)
+    private String compareResultId;
+
+    /**
+     * 计量点编号(BASE_SPOT_NO,VARCHAR,40)
+     */
+    @ApiModelProperty(value="计量点编号",required=true)
+    private String baseSpotNo;
+
+    /**
+     * 计量点名称(BASE_SPOT_NAME,VARCHAR,80)
+     */
+    @ApiModelProperty(value="计量点名称",required=true)
+    private String baseSpotName;
+
+    /**
+     * 物料编码(MATTER_NO,VARCHAR,30)
+     */
+    @ApiModelProperty(value="物料编码",required=true)
+    private String matterNo;
+
+    /**
+     * 物料名称(MATTER_NAME,VARCHAR,80)
+     */
+    @ApiModelProperty(value="物料名称",required=true)
+    private String matterName;
+
+    /**
+     * 计量类型编码(METER_TYPE_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="计量类型编码",required=false)
+    private String meterTypeNo;
+
+    /**
+     * 计量类型名称(METER_TYPE_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="计量类型名称",required=false)
+    private String meterTypeName;
+
+    /**
+     * 比对车号(CAR_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="比对车号",required=false)
+    private String carNo;
+
+    /**
+     * 计量重量(METER_WEIGHT,DECIMAL,15)
+     */
+    @ApiModelProperty(value="计量重量",required=false)
+    private BigDecimal meterWeight;
+
+    /**
+     * 允许偏差(WEIGHT_DIFF_ALLOW,DECIMAL,15)
+     */
+    @ApiModelProperty(value="允许偏差",required=false)
+    private BigDecimal weightDiffAllow;
+
+    /**
+     * 比对重量(COMPARE_WEIGHT,DECIMAL,15)
+     */
+    @ApiModelProperty(value="比对重量",required=false)
+    private BigDecimal compareWeight;
+
+    /**
+     * 实际偏差(WEIGHT_DIFF_ACT,DECIMAL,15)
+     */
+    @ApiModelProperty(value="实际偏差",required=false)
+    private BigDecimal weightDiffAct;
+
+    /**
+     * 比对秤点(COMPARE_SPOT_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="比对秤点",required=false)
+    private String compareSpotName;
+
+    /**
+     * 比对时间(COMPARE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="比对时间",required=false)
+    private Date compareTime;
+
+    /**
+     * 比对结果(0为比对失败,1为未比对,2为比对成功)(COMPARE_RESULT,VARCHAR,2)
+     */
+    @ApiModelProperty(value="比对结果(0为比对失败,1为未比对,2为比对成功)",required=false)
+    private String compareResult;
+
+    /**
+     * 创建人编号(CREATE_MAN_NO,VARCHAR,50)
+     */
+    @ApiModelProperty(value="创建人编号",required=false)
+    private String createManNo;
+
+    /**
+     * 创建人姓名(CREATE_MAN_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="创建人姓名",required=false)
+    private String createManName;
+
+    /**
+     * 创建时间(YYYY-MM-DD HH:mm:SS)(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="创建时间(YYYY-MM-DD HH:mm:SS)",required=false)
+    private Date createTime;
+
+    /**
+     * 修改人编号(UPDATE_MAN_NO,VARCHAR,50)
+     */
+    @ApiModelProperty(value="修改人编号",required=false)
+    private String updateManNo;
+
+    /**
+     * 修改人姓名(UPDATE_MAN_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="修改人姓名",required=false)
+    private String updateManName;
+
+    /**
+     * 修改时间(YYYY-MM-DD HH:mm:SS)(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间(YYYY-MM-DD HH:mm:SS)",required=false)
+    private Date updateTime;
+
+    /**
+     * 备注(MEMO,VARCHAR,100)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String memo;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.compareResultId;
+    }
+
+    @Override
+    public void setId(String compareResultId) {
+        this.compareResultId = compareResultId == null ? null : compareResultId.trim();
+    }
+
+    public String getCompareResultId() {
+        return compareResultId;
+    }
+
+    public void setCompareResultId(String compareResultId) {
+        this.compareResultId = compareResultId == null ? null : compareResultId.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 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 getMeterTypeNo() {
+        return meterTypeNo;
+    }
+
+    public void setMeterTypeNo(String meterTypeNo) {
+        this.meterTypeNo = meterTypeNo == null ? null : meterTypeNo.trim();
+    }
+
+    public String getMeterTypeName() {
+        return meterTypeName;
+    }
+
+    public void setMeterTypeName(String meterTypeName) {
+        this.meterTypeName = meterTypeName == null ? null : meterTypeName.trim();
+    }
+
+    public String getCarNo() {
+        return carNo;
+    }
+
+    public void setCarNo(String carNo) {
+        this.carNo = carNo == null ? null : carNo.trim();
+    }
+
+    public BigDecimal getMeterWeight() {
+        return meterWeight;
+    }
+
+    public void setMeterWeight(BigDecimal meterWeight) {
+        this.meterWeight = meterWeight;
+    }
+
+    public BigDecimal getWeightDiffAllow() {
+        return weightDiffAllow;
+    }
+
+    public void setWeightDiffAllow(BigDecimal weightDiffAllow) {
+        this.weightDiffAllow = weightDiffAllow;
+    }
+
+    public BigDecimal getCompareWeight() {
+        return compareWeight;
+    }
+
+    public void setCompareWeight(BigDecimal compareWeight) {
+        this.compareWeight = compareWeight;
+    }
+
+    public BigDecimal getWeightDiffAct() {
+        return weightDiffAct;
+    }
+
+    public void setWeightDiffAct(BigDecimal weightDiffAct) {
+        this.weightDiffAct = weightDiffAct;
+    }
+
+    public String getCompareSpotName() {
+        return compareSpotName;
+    }
+
+    public void setCompareSpotName(String compareSpotName) {
+        this.compareSpotName = compareSpotName == null ? null : compareSpotName.trim();
+    }
+
+    public Date getCompareTime() {
+        return compareTime;
+    }
+
+    public void setCompareTime(Date compareTime) {
+        this.compareTime = compareTime;
+    }
+
+    public String getCompareResult() {
+        return compareResult;
+    }
+
+    public void setCompareResult(String compareResult) {
+        this.compareResult = compareResult == null ? null : compareResult.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 getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo == null ? null : memo.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", compareResultId=").append(compareResultId);
+        sb.append(", baseSpotNo=").append(baseSpotNo);
+        sb.append(", baseSpotName=").append(baseSpotName);
+        sb.append(", matterNo=").append(matterNo);
+        sb.append(", matterName=").append(matterName);
+        sb.append(", meterTypeNo=").append(meterTypeNo);
+        sb.append(", meterTypeName=").append(meterTypeName);
+        sb.append(", carNo=").append(carNo);
+        sb.append(", meterWeight=").append(meterWeight);
+        sb.append(", weightDiffAllow=").append(weightDiffAllow);
+        sb.append(", compareWeight=").append(compareWeight);
+        sb.append(", weightDiffAct=").append(weightDiffAct);
+        sb.append(", compareSpotName=").append(compareSpotName);
+        sb.append(", compareTime=").append(compareTime);
+        sb.append(", compareResult=").append(compareResult);
+        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(", memo=").append(memo);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 23 - 0
src/main/java/com/steerinfo/meterwork/meterworkcompareresult/service/IMeterWorkCompareResultService.java

@@ -0,0 +1,23 @@
+package com.steerinfo.meterwork.meterworkcompareresult.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.meterwork.meterworkcompareresult.model.MeterWorkCompareResult;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * MeterWorkCompareResult服务接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-18 11:54
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-18
+ * 作者:generator
+ * 参考:
+ * 描述:MeterWorkCompareResult服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IMeterWorkCompareResultService extends IBaseService<MeterWorkCompareResult, String>{
+
+}

+ 36 - 0
src/main/java/com/steerinfo/meterwork/meterworkcompareresult/service/impl/MeterWorkCompareResultServiceImpl.java

@@ -0,0 +1,36 @@
+package com.steerinfo.meterwork.meterworkcompareresult.service.impl;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.meterwork.meterworkcompareresult.model.MeterWorkCompareResult;
+import com.steerinfo.meterwork.meterworkcompareresult.mapper.MeterWorkCompareResultMapper;
+import com.steerinfo.meterwork.meterworkcompareresult.service.IMeterWorkCompareResultService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * MeterWorkCompareResult服务实现:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-18 11:54
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-18
+ * 作者:generator
+ * 参考:
+ * 描述:MeterWorkCompareResult服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "meterWorkCompareResultService")
+public class MeterWorkCompareResultServiceImpl extends BaseServiceImpl<MeterWorkCompareResult, String> implements IMeterWorkCompareResultService {
+
+    @Autowired
+    private MeterWorkCompareResultMapper meterWorkCompareResultMapper;
+
+    @Override
+    protected IBaseMapper<MeterWorkCompareResult, String> getMapper() {
+        return meterWorkCompareResultMapper;
+    }
+}