BourneCao преди 4 години
родител
ревизия
ed6c0b88c2
променени са 24 файла, в които са добавени 4172 реда и са изтрити 0 реда
  1. 205 0
      src/main/java/com/steerinfo/baseinfo/meterbasecalibrastandard/controller/MeterBaseCalibraStandardController.java
  2. 16 0
      src/main/java/com/steerinfo/baseinfo/meterbasecalibrastandard/mapper/MeterBaseCalibraStandardMapper.java
  3. 479 0
      src/main/java/com/steerinfo/baseinfo/meterbasecalibrastandard/mapper/MeterBaseCalibraStandardMapper.xml
  4. 259 0
      src/main/java/com/steerinfo/baseinfo/meterbasecalibrastandard/model/MeterBaseCalibraStandard.java
  5. 33 0
      src/main/java/com/steerinfo/baseinfo/meterbasecalibrastandard/service/IMeterBaseCalibraStandardService.java
  6. 149 0
      src/main/java/com/steerinfo/baseinfo/meterbasecalibrastandard/service/impl/MeterBaseCalibraStandardServiceImpl.java
  7. 110 0
      src/main/java/com/steerinfo/baseinfo/meterworkcompareconfig/controller/MeterWorkCompareConfigController.java
  8. 10 0
      src/main/java/com/steerinfo/baseinfo/meterworkcompareconfig/mapper/MeterWorkCompareConfigMapper.java
  9. 496 0
      src/main/java/com/steerinfo/baseinfo/meterworkcompareconfig/mapper/MeterWorkCompareConfigMapper.xml
  10. 273 0
      src/main/java/com/steerinfo/baseinfo/meterworkcompareconfig/model/MeterWorkCompareConfig.java
  11. 23 0
      src/main/java/com/steerinfo/baseinfo/meterworkcompareconfig/service/IMeterWorkCompareConfigService.java
  12. 36 0
      src/main/java/com/steerinfo/baseinfo/meterworkcompareconfig/service/impl/MeterWorkCompareConfigServiceImpl.java
  13. 110 0
      src/main/java/com/steerinfo/baseinfo/meterworkcompareresult/controller/MeterWorkCompareResultController.java
  14. 10 0
      src/main/java/com/steerinfo/baseinfo/meterworkcompareresult/mapper/MeterWorkCompareResultMapper.java
  15. 651 0
      src/main/java/com/steerinfo/baseinfo/meterworkcompareresult/mapper/MeterWorkCompareResultMapper.xml
  16. 363 0
      src/main/java/com/steerinfo/baseinfo/meterworkcompareresult/model/MeterWorkCompareResult.java
  17. 23 0
      src/main/java/com/steerinfo/baseinfo/meterworkcompareresult/service/IMeterWorkCompareResultService.java
  18. 36 0
      src/main/java/com/steerinfo/baseinfo/meterworkcompareresult/service/impl/MeterWorkCompareResultServiceImpl.java
  19. 125 0
      src/main/java/com/steerinfo/meterwork/meterworkprewgttype/controller/MeterWorkPreWgttypeController.java
  20. 11 0
      src/main/java/com/steerinfo/meterwork/meterworkprewgttype/mapper/MeterWorkPreWgttypeMapper.java
  21. 398 0
      src/main/java/com/steerinfo/meterwork/meterworkprewgttype/mapper/MeterWorkPreWgttypeMapper.xml
  22. 212 0
      src/main/java/com/steerinfo/meterwork/meterworkprewgttype/model/MeterWorkPreWgttype.java
  23. 26 0
      src/main/java/com/steerinfo/meterwork/meterworkprewgttype/service/IMeterWorkPreWgttypeService.java
  24. 118 0
      src/main/java/com/steerinfo/meterwork/meterworkprewgttype/service/impl/MeterWorkPreWgttypeServiceImpl.java

+ 205 - 0
src/main/java/com/steerinfo/baseinfo/meterbasecalibrastandard/controller/MeterBaseCalibraStandardController.java

@@ -0,0 +1,205 @@
+package com.steerinfo.baseinfo.meterbasecalibrastandard.controller;
+
+import com.steerinfo.baseinfo.meterbasecalibrastandard.model.MeterBaseCalibraStandard;
+import com.steerinfo.baseinfo.meterbasecalibrastandard.service.IMeterBaseCalibraStandardService;
+import com.steerinfo.baseinfo.meterbasecalibrationtime.model.MeterBaseCalibrationTime;
+import com.steerinfo.baseinfo.meterbasespotinfo.model.MeterBaseSpotInfo;
+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.util.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * MeterBaseCalibraStandard RESTful接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-07 09:29
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-07
+ * 作者:generator
+ * 参考:
+ * 描述:MeterBaseCalibraStandard RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/meterbasecalibrastandards")
+@Api(value = "/${api.version}/meterbasecalibrastandards", tags = "校秤标准管理 - MeterBaseCalibraStandardController")
+public class MeterBaseCalibraStandardController extends BaseRESTfulController {
+
+    @Autowired
+    IMeterBaseCalibraStandardService meterBaseCalibraStandardService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterbasecalibrastandard:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseCalibraStandard> list = meterBaseCalibraStandardService.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("meterbasecalibrastandard:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterBaseCalibraStandard> list = meterBaseCalibraStandardService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据MeterBaseCalibraStandard对象创建")
+    @ApiImplicitParam(name = "meterBaseCalibraStandard", value = "详细实体meterBaseCalibraStandard", required = true, dataType = "MeterBaseCalibraStandard")
+    //@RequiresPermissions("meterbasecalibrastandard:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@RequestBody MeterBaseCalibraStandard model){
+        System.out.println("grjtymkyk,uil"+model);
+        MeterBaseCalibraStandard meterBaseCalibraStandard = meterBaseCalibraStandardService.add(model);
+
+        return success(meterBaseCalibraStandard);
+    }
+
+    @ApiOperation(value="创建", notes="根据MeterBaseCalibraStandard对象创建")
+    @ApiImplicitParam(name = "meterBaseCalibraStandard", value = "详细实体meterBaseCalibraStandard", required = true, dataType = "MeterBaseCalibraStandard")
+    //@RequiresPermissions("meterbasecalibrastandard:create")
+    @Transactional
+    @PostMapping(value = "/insert")
+    public RESTfulResult addInsert(@RequestBody MeterBaseCalibraStandard model){
+//        System.out.println("grjtymkyk,uil"+model);
+//        MeterBaseCalibraStandard meterBaseCalibraStandard = meterBaseCalibraStandardService.checkandadd(model);
+//
+//        return success(meterBaseCalibraStandard);
+        try {
+            String msg = meterBaseCalibraStandardService.checkandadd(model);
+            if (msg != null && !msg.equals("")) {
+                return failed(null, msg);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return failed(null, "操作异常,请确认!");
+        }
+        return success();
+    }
+
+    @ApiOperation(value = "更新详细信息", notes = "根据url的id来指定更新对象,并根据传过来的MeterBaseCalibraStandard信息来更新详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "meterBaseCalibraStandard", value = "详细实体meterBaseCalibraStandard", required = true, dataType = "MeterBaseCalibraStandard")
+    })
+    //@RequiresPermissions("meterbasecalibrationtime:update")
+    @Transactional
+    @PutMapping(value = "/update/{id}", produces = "application/json;charset=UTF-8")
+    public RESTfulResult updateBody(@PathVariable String id,@RequestBody MeterBaseCalibraStandard model) {
+        try {
+            String msg = meterBaseCalibraStandardService.checkandupdate(id,model);
+            if (msg != null && !msg.equals("")) {
+                return failed(null, msg);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return failed(null, "操作异常,请确认!");
+        }
+
+        return success();
+    }
+
+    @ApiOperation(value = "启用标识符", notes = "根据传过来的MeterBaseCalibraStandard集合信息来更新详细信息")
+    @Transactional
+    @PostMapping(value = "/Recovery")
+    public RESTfulResult recovery(@RequestBody List<MeterBaseCalibraStandard> models) {
+        try {
+            String msg = meterBaseCalibraStandardService.recovery(models);
+            if (StringUtils.isNotEmpty(msg)) {
+                return failed(null, msg);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return failed(null, "操作异常,请确认!");
+        }
+        return success();
+    }
+
+    @ApiOperation(value = "废除标识符", notes = "根据传过来的MeterBaseCalibraStandard集合信息来更新详细信息")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "MeterBaseCalibraStandard", value = "详细实体MeterBaseCalibraStandard", required = true, dataType = "MeterBaseSpotInfo")
+    })
+    //@RequiresPermissions("combaseinfo:update")
+    @Transactional
+    @PostMapping(value = "/abolish")
+    public RESTfulResult abolish(@RequestBody List<MeterBaseCalibraStandard> models) {
+        try {
+            String msg = meterBaseCalibraStandardService.abolish(models);
+            if (StringUtils.isNotEmpty(msg)) {
+                return failed(null, msg);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return failed(null, "操作异常,请确认!");
+        }
+        return success();
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbasecalibrastandard:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        MeterBaseCalibraStandard meterBaseCalibraStandard = meterBaseCalibraStandardService.getById(id);
+        return success(meterBaseCalibraStandard);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象,并根据传过来的meterBaseCalibraStandard信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "meterBaseCalibraStandard", value = "详细实体meterBaseCalibraStandard", required = true, dataType = "MeterBaseCalibraStandard")
+    })
+    //@RequiresPermissions("meterbasecalibrastandard:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody MeterBaseCalibraStandard model){
+        model.setId(id);
+        MeterBaseCalibraStandard meterBaseCalibraStandard = meterBaseCalibraStandardService.modify(model);
+        return success(meterBaseCalibraStandard);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbasecalibrastandard: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);
+			  meterBaseCalibraStandardService.delete(ids);
+    	}
+      return success();
+    }
+    @GetMapping("/findall")
+    public List<MeterBaseCalibraStandard> findAll(){
+        List<MeterBaseCalibraStandard> list=meterBaseCalibraStandardService.findAll();
+        return list;
+    }
+}

+ 16 - 0
src/main/java/com/steerinfo/baseinfo/meterbasecalibrastandard/mapper/MeterBaseCalibraStandardMapper.java

@@ -0,0 +1,16 @@
+package com.steerinfo.baseinfo.meterbasecalibrastandard.mapper;
+
+import com.steerinfo.baseinfo.meterbasecalibrastandard.model.MeterBaseCalibraStandard;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface MeterBaseCalibraStandardMapper extends IBaseMapper<MeterBaseCalibraStandard, String> {
+//    查询全部
+    List<MeterBaseCalibraStandard>  findAll();
+
+    String GetNewID();
+
+}

+ 479 - 0
src/main/java/com/steerinfo/baseinfo/meterbasecalibrastandard/mapper/MeterBaseCalibraStandardMapper.xml

@@ -0,0 +1,479 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.baseinfo.meterbasecalibrastandard.mapper.MeterBaseCalibraStandardMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.baseinfo.meterbasecalibrastandard.model.MeterBaseCalibraStandard">
+    <id column="STANDARD_NO" jdbcType="VARCHAR" property="standardNo" />
+    <result column="CALIBRATION_TYPE_NO" jdbcType="VARCHAR" property="calibrationTypeNo" />
+    <result column="CALIBRATION_TYPE_NAME" jdbcType="VARCHAR" property="calibrationTypeName" />
+    <result column="UP_WEIGHT" jdbcType="DECIMAL" property="upWeight" />
+    <result column="DOWN_WEIGHT" jdbcType="DECIMAL" property="downWeight" />
+    <result column="DEVIATION_WEIGHT" jdbcType="DECIMAL" property="deviationWeight" />
+    <result column="STANDARD" jdbcType="VARCHAR" property="standard" />
+    <result column="MEMO" jdbcType="VARCHAR" property="memo" />
+    <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" />
+  </resultMap>
+  <sql id="columns">
+    STANDARD_NO, CALIBRATION_TYPE_NO, CALIBRATION_TYPE_NAME, UP_WEIGHT, DOWN_WEIGHT, 
+    DEVIATION_WEIGHT, STANDARD, MEMO, VALUE_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+    UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME
+  </sql>
+  <sql id="columns_alias">
+    t.STANDARD_NO, t.CALIBRATION_TYPE_NO, t.CALIBRATION_TYPE_NAME, t.UP_WEIGHT, t.DOWN_WEIGHT, 
+    t.DEVIATION_WEIGHT, t.STANDARD, t.MEMO, 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
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_BASE_CALIBRA_STANDARD
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_BASE_CALIBRA_STANDARD t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="standardNo != null and standardNo != ''">
+        and STANDARD_NO = #{standardNo}
+      </if>
+      <if test="calibrationTypeNo != null and calibrationTypeNo != ''">
+        and CALIBRATION_TYPE_NO = #{calibrationTypeNo}
+      </if>
+      <if test="calibrationTypeName != null and calibrationTypeName != ''">
+        and CALIBRATION_TYPE_NAME = #{calibrationTypeName}
+      </if>
+      <if test="upWeight != null">
+        and UP_WEIGHT = #{upWeight}
+      </if>
+      <if test="downWeight != null">
+        and DOWN_WEIGHT = #{downWeight}
+      </if>
+      <if test="deviationWeight != null">
+        and DEVIATION_WEIGHT = #{deviationWeight}
+      </if>
+      <if test="standard != null and standard != ''">
+        and STANDARD = #{standard}
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO = #{memo}
+      </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>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="standardNo != null and standardNo != ''">
+        and STANDARD_NO LIKE '%${standardNo}%'
+      </if>
+      <if test="calibrationTypeNo != null and calibrationTypeNo != ''">
+        and CALIBRATION_TYPE_NO LIKE '%${calibrationTypeNo}%'
+      </if>
+      <if test="calibrationTypeName != null and calibrationTypeName != ''">
+        and CALIBRATION_TYPE_NAME LIKE '%${calibrationTypeName}%'
+      </if>
+      <if test="upWeight != null">
+        and UP_WEIGHT = #{upWeight}
+      </if>
+      <if test="downWeight != null">
+        and DOWN_WEIGHT = #{downWeight}
+      </if>
+      <if test="deviationWeight != null">
+        and DEVIATION_WEIGHT = #{deviationWeight}
+      </if>
+      <if test="standard != null and standard != ''">
+        and STANDARD LIKE '%${standard}%'
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO LIKE '%${memo}%'
+      </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>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_BASE_CALIBRA_STANDARD
+    where STANDARD_NO = #{standardNo,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_BASE_CALIBRA_STANDARD
+    where 1!=1 
+      <if test="calibrationTypeNo != null and calibrationTypeNo != ''">
+        or CALIBRATION_TYPE_NO = #{calibrationTypeNo}
+      </if>
+      <if test="calibrationTypeName != null and calibrationTypeName != ''">
+        or CALIBRATION_TYPE_NAME = #{calibrationTypeName}
+      </if>
+      <if test="upWeight != null">
+        or UP_WEIGHT = #{upWeight}
+      </if>
+      <if test="downWeight != null">
+        or DOWN_WEIGHT = #{downWeight}
+      </if>
+      <if test="deviationWeight != null">
+        or DEVIATION_WEIGHT = #{deviationWeight}
+      </if>
+      <if test="standard != null and standard != ''">
+        or STANDARD = #{standard}
+      </if>
+      <if test="memo != null and memo != ''">
+        or MEMO = #{memo}
+      </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>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.baseinfo.meterbasecalibrastandard.model.MeterBaseCalibraStandard">
+    insert into METER_BASE_CALIBRA_STANDARD (STANDARD_NO, CALIBRATION_TYPE_NO, CALIBRATION_TYPE_NAME, 
+      UP_WEIGHT, DOWN_WEIGHT, DEVIATION_WEIGHT, 
+      STANDARD, MEMO, VALUE_FLAG, 
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME
+      )
+    values (#{standardNo,jdbcType=VARCHAR}, #{calibrationTypeNo,jdbcType=VARCHAR}, #{calibrationTypeName,jdbcType=VARCHAR}, 
+      #{upWeight,jdbcType=DECIMAL}, #{downWeight,jdbcType=DECIMAL}, #{deviationWeight,jdbcType=DECIMAL}, 
+      #{standard,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, #{valueFlag,jdbcType=VARCHAR}, 
+      #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.meterbasecalibrastandard.model.MeterBaseCalibraStandard">
+    insert into METER_BASE_CALIBRA_STANDARD
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="standardNo != null">
+        STANDARD_NO,
+      </if>
+      <if test="calibrationTypeNo != null">
+        CALIBRATION_TYPE_NO,
+      </if>
+      <if test="calibrationTypeName != null">
+        CALIBRATION_TYPE_NAME,
+      </if>
+      <if test="upWeight != null">
+        UP_WEIGHT,
+      </if>
+      <if test="downWeight != null">
+        DOWN_WEIGHT,
+      </if>
+      <if test="deviationWeight != null">
+        DEVIATION_WEIGHT,
+      </if>
+      <if test="standard != null">
+        STANDARD,
+      </if>
+      <if test="memo != null">
+        MEMO,
+      </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>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="standardNo != null">
+        #{standardNo,jdbcType=VARCHAR},
+      </if>
+      <if test="calibrationTypeNo != null">
+        #{calibrationTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="calibrationTypeName != null">
+        #{calibrationTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="upWeight != null">
+        #{upWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="downWeight != null">
+        #{downWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="deviationWeight != null">
+        #{deviationWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="standard != null">
+        #{standard,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        #{memo,jdbcType=VARCHAR},
+      </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>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.meterbasecalibrastandard.model.MeterBaseCalibraStandard">
+    update METER_BASE_CALIBRA_STANDARD
+    set CALIBRATION_TYPE_NO = #{calibrationTypeNo,jdbcType=VARCHAR},
+      CALIBRATION_TYPE_NAME = #{calibrationTypeName,jdbcType=VARCHAR},
+      UP_WEIGHT = #{upWeight,jdbcType=DECIMAL},
+      DOWN_WEIGHT = #{downWeight,jdbcType=DECIMAL},
+      DEVIATION_WEIGHT = #{deviationWeight,jdbcType=DECIMAL},
+      STANDARD = #{standard,jdbcType=VARCHAR},
+      MEMO = #{memo,jdbcType=VARCHAR},
+      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}
+    where STANDARD_NO = #{standardNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.meterbasecalibrastandard.model.MeterBaseCalibraStandard">
+    update METER_BASE_CALIBRA_STANDARD
+    <set>
+      <if test="calibrationTypeNo != null">
+        CALIBRATION_TYPE_NO = #{calibrationTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="calibrationTypeName != null">
+        CALIBRATION_TYPE_NAME = #{calibrationTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="upWeight != null">
+        UP_WEIGHT = #{upWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="downWeight != null">
+        DOWN_WEIGHT = #{downWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="deviationWeight != null">
+        DEVIATION_WEIGHT = #{deviationWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="standard != null">
+        STANDARD = #{standard,jdbcType=VARCHAR},
+      </if>
+      <if test="memo != null">
+        MEMO = #{memo,jdbcType=VARCHAR},
+      </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>
+    </set>
+    where STANDARD_NO = #{standardNo,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where STANDARD_NO = #{standardNo,jdbcType=VARCHAR}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into METER_BASE_CALIBRA_STANDARD 
+      (STANDARD_NO, 
+      CALIBRATION_TYPE_NO, CALIBRATION_TYPE_NAME, 
+      UP_WEIGHT, DOWN_WEIGHT, DEVIATION_WEIGHT, 
+      STANDARD, MEMO, VALUE_FLAG, 
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME
+      )
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.standardNo,jdbcType=VARCHAR}, 
+      #{item.calibrationTypeNo,jdbcType=VARCHAR}, #{item.calibrationTypeName,jdbcType=VARCHAR}, 
+      #{item.upWeight,jdbcType=DECIMAL}, #{item.downWeight,jdbcType=DECIMAL}, #{item.deviationWeight,jdbcType=DECIMAL}, 
+      #{item.standard,jdbcType=VARCHAR}, #{item.memo,jdbcType=VARCHAR}, #{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}
+       from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_BASE_CALIBRA_STANDARD
+     set
+       STANDARD_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STANDARD_NO" close="end">
+          when #{item.standardNo,jdbcType=VARCHAR} then #{item.standardNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CALIBRATION_TYPE_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STANDARD_NO" close="end">
+          when #{item.standardNo,jdbcType=VARCHAR} then #{item.calibrationTypeNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CALIBRATION_TYPE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STANDARD_NO" close="end">
+          when #{item.standardNo,jdbcType=VARCHAR} then #{item.calibrationTypeName,jdbcType=VARCHAR}
+       </foreach>
+       ,UP_WEIGHT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STANDARD_NO" close="end">
+          when #{item.standardNo,jdbcType=VARCHAR} then #{item.upWeight,jdbcType=DECIMAL}
+       </foreach>
+       ,DOWN_WEIGHT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STANDARD_NO" close="end">
+          when #{item.standardNo,jdbcType=VARCHAR} then #{item.downWeight,jdbcType=DECIMAL}
+       </foreach>
+       ,DEVIATION_WEIGHT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STANDARD_NO" close="end">
+          when #{item.standardNo,jdbcType=VARCHAR} then #{item.deviationWeight,jdbcType=DECIMAL}
+       </foreach>
+       ,STANDARD=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STANDARD_NO" close="end">
+          when #{item.standardNo,jdbcType=VARCHAR} then #{item.standard,jdbcType=VARCHAR}
+       </foreach>
+       ,MEMO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STANDARD_NO" close="end">
+          when #{item.standardNo,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
+       </foreach>
+       ,VALUE_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STANDARD_NO" close="end">
+          when #{item.standardNo,jdbcType=VARCHAR} then #{item.valueFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STANDARD_NO" close="end">
+          when #{item.standardNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STANDARD_NO" close="end">
+          when #{item.standardNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STANDARD_NO" close="end">
+          when #{item.standardNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STANDARD_NO" close="end">
+          when #{item.standardNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STANDARD_NO" close="end">
+          when #{item.standardNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case STANDARD_NO" close="end">
+          when #{item.standardNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+     where STANDARD_NO in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.standardNo,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_BASE_CALIBRA_STANDARD
+    where STANDARD_NO in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示!!!-->
+  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+  <select id="findAll" resultMap="BaseResultMap">
+      select * from METER_BASE_CALIBRA_STANDARD
+  </select>
+
+  <select id="GetNewID" parameterType="java.lang.String" resultType="java.lang.String">
+    SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(STANDARD_NO, LENGTH(STANDARD_NO) - 4))),0) + 1,5,'0') STANDARD_NO
+    FROM METER_BASE_CALIBRA_STANDARD
+  </select>
+</mapper>

+ 259 - 0
src/main/java/com/steerinfo/baseinfo/meterbasecalibrastandard/model/MeterBaseCalibraStandard.java

@@ -0,0 +1,259 @@
+package com.steerinfo.baseinfo.meterbasecalibrastandard.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 MeterBaseCalibraStandard implements IBasePO<String> {
+    /**
+     * 标准id(STANDARD_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="标准id",required=true)
+    private String standardNo;
+
+    /**
+     * 校秤类型编号(CALIBRATION_TYPE_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="校秤类型编号",required=true)
+    private String calibrationTypeNo;
+
+    /**
+     * 校秤类型名称(CALIBRATION_TYPE_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="校秤类型名称",required=true)
+    private String calibrationTypeName;
+
+    /**
+     * 重量上限(kg)(UP_WEIGHT,DECIMAL,15)
+     */
+    @ApiModelProperty(value="重量上限(kg)",required=false)
+    private BigDecimal upWeight;
+
+    /**
+     * 重量下限(kg)(DOWN_WEIGHT,DECIMAL,15)
+     */
+    @ApiModelProperty(value="重量下限(kg)",required=false)
+    private BigDecimal downWeight;
+
+    /**
+     * 允许误差(kg)(DEVIATION_WEIGHT,DECIMAL,15)
+     */
+    @ApiModelProperty(value="允许误差(kg)",required=false)
+    private BigDecimal deviationWeight;
+
+    /**
+     * 执行标准(STANDARD,VARCHAR,120)
+     */
+    @ApiModelProperty(value="执行标准",required=false)
+    private String standard;
+
+    /**
+     * 备注(MEMO,VARCHAR,100)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String memo;
+
+    /**
+     * 有效标志(0为作废,1为有效)(VALUE_FLAG,VARCHAR,1)
+     */
+    @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=true)
+    private String createManName;
+
+    /**
+     * 创建时间(YYYY-MM-DD HH:mm:SS)(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="创建时间(YYYY-MM-DD HH:mm:SS)",required=true)
+    private Date createTime;
+
+    /**
+     * 修改人编号(UPDATE_MAN_NO,VARCHAR,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;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.standardNo;
+    }
+
+    @Override
+    public void setId(String standardNo) {
+        this.standardNo = standardNo == null ? null : standardNo.trim();
+    }
+
+    public String getStandardNo() {
+        return standardNo;
+    }
+
+    public void setStandardNo(String standardNo) {
+        this.standardNo = standardNo == null ? null : standardNo.trim();
+    }
+
+    public String getCalibrationTypeNo() {
+        return calibrationTypeNo;
+    }
+
+    public void setCalibrationTypeNo(String calibrationTypeNo) {
+        this.calibrationTypeNo = calibrationTypeNo == null ? null : calibrationTypeNo.trim();
+    }
+
+    public String getCalibrationTypeName() {
+        return calibrationTypeName;
+    }
+
+    public void setCalibrationTypeName(String calibrationTypeName) {
+        this.calibrationTypeName = calibrationTypeName == null ? null : calibrationTypeName.trim();
+    }
+
+    public BigDecimal getUpWeight() {
+        return upWeight;
+    }
+
+    public void setUpWeight(BigDecimal upWeight) {
+        this.upWeight = upWeight;
+    }
+
+    public BigDecimal getDownWeight() {
+        return downWeight;
+    }
+
+    public void setDownWeight(BigDecimal downWeight) {
+        this.downWeight = downWeight;
+    }
+
+    public BigDecimal getDeviationWeight() {
+        return deviationWeight;
+    }
+
+    public void setDeviationWeight(BigDecimal deviationWeight) {
+        this.deviationWeight = deviationWeight;
+    }
+
+    public String getStandard() {
+        return standard;
+    }
+
+    public void setStandard(String standard) {
+        this.standard = standard == null ? null : standard.trim();
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo == null ? null : memo.trim();
+    }
+
+    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;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", standardNo=").append(standardNo);
+        sb.append(", calibrationTypeNo=").append(calibrationTypeNo);
+        sb.append(", calibrationTypeName=").append(calibrationTypeName);
+        sb.append(", upWeight=").append(upWeight);
+        sb.append(", downWeight=").append(downWeight);
+        sb.append(", deviationWeight=").append(deviationWeight);
+        sb.append(", standard=").append(standard);
+        sb.append(", memo=").append(memo);
+        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(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 33 - 0
src/main/java/com/steerinfo/baseinfo/meterbasecalibrastandard/service/IMeterBaseCalibraStandardService.java

@@ -0,0 +1,33 @@
+package com.steerinfo.baseinfo.meterbasecalibrastandard.service;
+
+import com.steerinfo.baseinfo.meterbasecalibrastandard.model.MeterBaseCalibraStandard;
+import com.steerinfo.baseinfo.meterbasecalibrationtime.model.MeterBaseCalibrationTime;
+import com.steerinfo.baseinfo.meterbasespotinfo.model.MeterBaseSpotInfo;
+import com.steerinfo.framework.service.IBaseService;
+
+import java.util.List;
+
+/**
+ * MeterBaseCalibraStandard服务接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-07 09:29
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-07
+ * 作者:generator
+ * 参考:
+ * 描述:MeterBaseCalibraStandard服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IMeterBaseCalibraStandardService extends IBaseService<MeterBaseCalibraStandard, String>{
+    //    查询全部
+    List<MeterBaseCalibraStandard> findAll();
+
+    String checkandadd(MeterBaseCalibraStandard model);
+
+    String checkandupdate(String id,MeterBaseCalibraStandard model);
+    String recovery(List<MeterBaseCalibraStandard> models);
+    String abolish(List<MeterBaseCalibraStandard> models);
+
+}

+ 149 - 0
src/main/java/com/steerinfo/baseinfo/meterbasecalibrastandard/service/impl/MeterBaseCalibraStandardServiceImpl.java

@@ -0,0 +1,149 @@
+package com.steerinfo.baseinfo.meterbasecalibrastandard.service.impl;
+
+import com.steerinfo.baseinfo.meterbasecalibrastandard.mapper.MeterBaseCalibraStandardMapper;
+import com.steerinfo.baseinfo.meterbasecalibrastandard.model.MeterBaseCalibraStandard;
+import com.steerinfo.baseinfo.meterbasecalibrastandard.service.IMeterBaseCalibraStandardService;
+
+
+import com.steerinfo.baseinfo.meterbasespotinfo.model.MeterBaseSpotInfo;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.framework.user.UserPayload;
+import com.steerinfo.framework.utils.base.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * MeterBaseCalibraStandard服务实现:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-07 09:29
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-07
+ * 作者:generator
+ * 参考:
+ * 描述:MeterBaseCalibraStandard服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "meterBaseCalibraStandardService")
+public class MeterBaseCalibraStandardServiceImpl extends BaseServiceImpl<MeterBaseCalibraStandard, String> implements IMeterBaseCalibraStandardService {
+
+    @Autowired
+    private MeterBaseCalibraStandardMapper meterBaseCalibraStandardMapper;
+
+    @Override
+    protected IBaseMapper<MeterBaseCalibraStandard, String> getMapper() {
+        return meterBaseCalibraStandardMapper;
+    }
+
+    @Override
+//    查询全部
+    public List<MeterBaseCalibraStandard> findAll() {
+
+        List<MeterBaseCalibraStandard> list=meterBaseCalibraStandardMapper.findAll();
+        System.out.println("meterBaseCalibraStandardMapper.findAll()"+ meterBaseCalibraStandardMapper.findAll());
+        return list;
+    }
+
+    @Override
+    public String checkandadd(MeterBaseCalibraStandard model)
+    {
+        if (model == null ) {
+            return "请传入参数!";
+        }
+        if (StringUtils.isEmpty(model.getCalibrationTypeNo())) {
+            return "校秤编码";
+        }
+        if (StringUtils.isEmpty(model.getCalibrationTypeName())) {
+            return "校秤类型名称";
+        }
+        String no=meterBaseCalibraStandardMapper.GetNewID();
+//        model.setId(new SimpleDateFormat("yyyyMMdd").format(new Date()) +no);
+        model.setStandardNo(new SimpleDateFormat("yyyyMMdd").format(new Date()) +no);
+
+//        UserPayload payload = UserPayload.getCurrUser();
+//        String userId = payload.getId();
+//        String userName = payload.getUserName();
+//        model.setCreateManNo(userId);
+//        model.setCreateManName(userName);
+        model.setCreateTime(new Date());
+        model.setValueFlag("0");
+        meterBaseCalibraStandardMapper.insertSelective(model);
+        return "";
+    }
+
+    @Override
+    public String checkandupdate(String id,MeterBaseCalibraStandard model) {
+        if (model == null ) {
+            return "请传入参数!";
+        }
+        if (StringUtils.isEmpty(model.getCalibrationTypeNo())) {
+            return "校秤编码不能为空";
+        }
+        if (StringUtils.isEmpty(model.getCalibrationTypeName())) {
+            return "校秤类型名称不能为空";
+        }
+        model.setUpdateTime(new Date());
+        //设置修改人、修改时间
+//        UserPayload payload = UserPayload.getCurrUser();
+//        String userId = payload.getId();
+//        String userName = payload.getUserName();
+        model.setUpdateTime(new Date());
+//        model.setUpdateManNo(userId);
+//        model.setUpdateManName(userName);
+        meterBaseCalibraStandardMapper.updateByPrimaryKey(model);
+        return "";
+    }
+
+    @Override
+    public String recovery(List<MeterBaseCalibraStandard> models) {
+        try {
+            if (models == null || models.size() < 1) {
+                return "请传入参数!";
+            }
+            for (MeterBaseCalibraStandard model:models) {
+                model.setStandardNo(model.getStandardNo());
+                model.setValueFlag("1");
+                model.setUpdateManName(model.getUpdateManName());
+                model.setUpdateManNo(model.getUpdateManNo());
+                model.setUpdateTime(new Date());
+                meterBaseCalibraStandardMapper.updateByPrimaryKey(model);
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return "操作异常,请联系管理员";
+        }
+        return "";
+    }
+
+    @Override
+    public String abolish(List<MeterBaseCalibraStandard> models) {
+        try {
+            if (models == null || models.size() < 1) {
+                return "请传入参数!";
+            }
+            for (MeterBaseCalibraStandard model:models) {
+                model.setStandardNo(model.getStandardNo());
+                model.setValueFlag("0");
+                model.setUpdateManName(model.getUpdateManName());
+                model.setUpdateManNo(model.getUpdateManNo());
+                model.setUpdateTime(new Date());
+                meterBaseCalibraStandardMapper.updateByPrimaryKey(model);
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return "操作异常,请联系管理员";
+        }
+        return "";
+    }
+
+
+}

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

@@ -0,0 +1,110 @@
+package com.steerinfo.baseinfo.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.baseinfo.meterworkcompareconfig.model.MeterWorkCompareConfig;
+import com.steerinfo.baseinfo.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-18 11:53
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-18
+ * 作者: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/baseinfo/meterworkcompareconfig/mapper/MeterWorkCompareConfigMapper.java

@@ -0,0 +1,10 @@
+package com.steerinfo.baseinfo.meterworkcompareconfig.mapper;
+
+import com.steerinfo.baseinfo.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> {
+}

+ 496 - 0
src/main/java/com/steerinfo/baseinfo/meterworkcompareconfig/mapper/MeterWorkCompareConfigMapper.xml

@@ -0,0 +1,496 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.baseinfo.meterworkcompareconfig.mapper.MeterWorkCompareConfigMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.baseinfo.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" />
+  </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
+  </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
+  </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>
+    </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>
+    </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>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.baseinfo.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)
+    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})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.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>
+    </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>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.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}
+    where COMPARE_ID = #{compareId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.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>
+    </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)
+    ( <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} 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>
+     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>

+ 273 - 0
src/main/java/com/steerinfo/baseinfo/meterworkcompareconfig/model/MeterWorkCompareConfig.java

@@ -0,0 +1,273 @@
+package com.steerinfo.baseinfo.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;
+
+    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();
+    }
+
+    @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(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

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

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

@@ -0,0 +1,36 @@
+package com.steerinfo.baseinfo.meterworkcompareconfig.service.impl;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.baseinfo.meterworkcompareconfig.model.MeterWorkCompareConfig;
+import com.steerinfo.baseinfo.meterworkcompareconfig.mapper.MeterWorkCompareConfigMapper;
+import com.steerinfo.baseinfo.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-18 11:53
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-18
+ * 作者: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/baseinfo/meterworkcompareresult/controller/MeterWorkCompareResultController.java

@@ -0,0 +1,110 @@
+package com.steerinfo.baseinfo.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.baseinfo.meterworkcompareresult.model.MeterWorkCompareResult;
+import com.steerinfo.baseinfo.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/baseinfo/meterworkcompareresult/mapper/MeterWorkCompareResultMapper.java

@@ -0,0 +1,10 @@
+package com.steerinfo.baseinfo.meterworkcompareresult.mapper;
+
+import com.steerinfo.baseinfo.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> {
+}

+ 651 - 0
src/main/java/com/steerinfo/baseinfo/meterworkcompareresult/mapper/MeterWorkCompareResultMapper.xml

@@ -0,0 +1,651 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.baseinfo.meterworkcompareresult.mapper.MeterWorkCompareResultMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.baseinfo.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>
+    </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>
+    </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.baseinfo.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.baseinfo.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.baseinfo.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.baseinfo.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/baseinfo/meterworkcompareresult/model/MeterWorkCompareResult.java

@@ -0,0 +1,363 @@
+package com.steerinfo.baseinfo.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/baseinfo/meterworkcompareresult/service/IMeterWorkCompareResultService.java

@@ -0,0 +1,23 @@
+package com.steerinfo.baseinfo.meterworkcompareresult.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.baseinfo.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/baseinfo/meterworkcompareresult/service/impl/MeterWorkCompareResultServiceImpl.java

@@ -0,0 +1,36 @@
+package com.steerinfo.baseinfo.meterworkcompareresult.service.impl;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.baseinfo.meterworkcompareresult.model.MeterWorkCompareResult;
+import com.steerinfo.baseinfo.meterworkcompareresult.mapper.MeterWorkCompareResultMapper;
+import com.steerinfo.baseinfo.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;
+    }
+}

+ 125 - 0
src/main/java/com/steerinfo/meterwork/meterworkprewgttype/controller/MeterWorkPreWgttypeController.java

@@ -0,0 +1,125 @@
+package com.steerinfo.meterwork.meterworkprewgttype.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.except.MarkerMetException;
+import com.steerinfo.meterwork.meterworkcarrecover.model.MeterWorkCarRecover;
+import com.steerinfo.meterwork.meterworkprewgttype.model.MeterWorkPreWgttype;
+import com.steerinfo.meterwork.meterworkprewgttype.service.IMeterWorkPreWgttypeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.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;
+
+/**
+ * MeterWorkPreWgttype RESTful接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-12 10:49
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-12
+ * 作者:generator
+ * 参考:
+ * 描述:MeterWorkPreWgttype RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/meterworkprewgttypes")
+@Api(value = "/${api.version}/meterworkprewgttypes", tags = "计量重量类型预处理 - MeterWorkPreWgttypeController")
+public class MeterWorkPreWgttypeController extends BaseRESTfulController {
+
+    @Autowired
+    IMeterWorkPreWgttypeService meterWorkPreWgttypeService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkprewgttype:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkPreWgttype> list = meterWorkPreWgttypeService.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("meterworkprewgttype:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkPreWgttype> list = meterWorkPreWgttypeService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据MeterWorkPreWgttype对象创建")
+    @ApiImplicitParam(name = "meterWorkPreWgttype", value = "详细实体meterWorkPreWgttype", required = true, dataType = "MeterWorkPreWgttype")
+    //@RequiresPermissions("meterworkprewgttype:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute MeterWorkPreWgttype model){
+        try {
+            HashMap map = meterWorkPreWgttypeService.addOrAbolish(model);
+
+            if (map.get("code").equals("0")){
+                return success();
+            }
+            else {
+                return failed(map.get("msg"));
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常!!");
+        }
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterworkprewgttype:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        MeterWorkPreWgttype meterWorkPreWgttype = meterWorkPreWgttypeService.getById(id);
+        return success(meterWorkPreWgttype);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象,并根据传过来的meterWorkPreWgttype信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "meterWorkPreWgttype", value = "详细实体meterWorkPreWgttype", required = true, dataType = "MeterWorkPreWgttype")
+    })
+    //@RequiresPermissions("meterworkprewgttype:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody MeterWorkPreWgttype model){
+        model.setId(id);
+        MeterWorkPreWgttype meterWorkPreWgttype = meterWorkPreWgttypeService.modify(model);
+        return success(meterWorkPreWgttype);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterworkprewgttype: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);
+			  meterWorkPreWgttypeService.delete(ids);
+    	}
+      return success();
+    }
+}

+ 11 - 0
src/main/java/com/steerinfo/meterwork/meterworkprewgttype/mapper/MeterWorkPreWgttypeMapper.java

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

+ 398 - 0
src/main/java/com/steerinfo/meterwork/meterworkprewgttype/mapper/MeterWorkPreWgttypeMapper.xml

@@ -0,0 +1,398 @@
+<?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.meterworkprewgttype.mapper.MeterWorkPreWgttypeMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.meterwork.meterworkprewgttype.model.MeterWorkPreWgttype">
+    <id column="WGT_TYPE_ID" jdbcType="VARCHAR" property="wgtTypeId" />
+    <result column="CAR_NO" jdbcType="VARCHAR" property="carNo" />
+    <result column="WEIGHT_TYPE_NO" jdbcType="VARCHAR" property="weightTypeNo" />
+    <result column="WEIGHT_TYPE_NAME" jdbcType="VARCHAR" property="weightTypeName" />
+    <result column="VALUE_FLAG" jdbcType="VARCHAR" property="valueFlag" />
+    <result column="CREATE_MAN_NAME" jdbcType="VARCHAR" property="createManName" />
+    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="UPDATE_MAN_NAME" jdbcType="VARCHAR" property="updateManName" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="CREATE_MAN_PHONE" jdbcType="VARCHAR" property="createManPhone" />
+    <result column="UPDATE_MAN_PHONE" jdbcType="VARCHAR" property="updateManPhone" />
+    <result column="ACTUAL_FIRST_NO" jdbcType="VARCHAR" property="actualFirstNo" />
+  </resultMap>
+  <sql id="columns">
+    WGT_TYPE_ID, CAR_NO, WEIGHT_TYPE_NO, WEIGHT_TYPE_NAME, VALUE_FLAG, CREATE_MAN_NAME, 
+    CREATE_TIME, UPDATE_MAN_NAME, UPDATE_TIME, CREATE_MAN_PHONE, UPDATE_MAN_PHONE, ACTUAL_FIRST_NO
+  </sql>
+  <sql id="columns_alias">
+    t.WGT_TYPE_ID, t.CAR_NO, t.WEIGHT_TYPE_NO, t.WEIGHT_TYPE_NAME, t.VALUE_FLAG, t.CREATE_MAN_NAME, 
+    t.CREATE_TIME, t.UPDATE_MAN_NAME, t.UPDATE_TIME, t.CREATE_MAN_PHONE, t.UPDATE_MAN_PHONE, 
+    t.ACTUAL_FIRST_NO
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_WORK_PRE_WGTTYPE
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_WORK_PRE_WGTTYPE t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="wgtTypeId != null and wgtTypeId != ''">
+        and WGT_TYPE_ID = #{wgtTypeId}
+      </if>
+      <if test="carNo != null and carNo != ''">
+        and CAR_NO = #{carNo}
+      </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="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG = #{valueFlag}
+      </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="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="createManPhone != null and createManPhone != ''">
+        and CREATE_MAN_PHONE = #{createManPhone}
+      </if>
+      <if test="updateManPhone != null and updateManPhone != ''">
+        and UPDATE_MAN_PHONE = #{updateManPhone}
+      </if>
+      <if test="actualFirstNo != null and actualFirstNo != ''">
+        and ACTUAL_FIRST_NO = #{actualFirstNo}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="wgtTypeId != null and wgtTypeId != ''">
+        and WGT_TYPE_ID LIKE '%${wgtTypeId}%'
+      </if>
+      <if test="carNo != null and carNo != ''">
+        and CAR_NO LIKE '%${carNo}%'
+      </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="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG LIKE '%${valueFlag}%'
+      </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="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="createManPhone != null and createManPhone != ''">
+        and CREATE_MAN_PHONE LIKE '%${createManPhone}%'
+      </if>
+      <if test="updateManPhone != null and updateManPhone != ''">
+        and UPDATE_MAN_PHONE LIKE '%${updateManPhone}%'
+      </if>
+      <if test="actualFirstNo != null and actualFirstNo != ''">
+        and ACTUAL_FIRST_NO LIKE '%${actualFirstNo}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_WORK_PRE_WGTTYPE
+    where WGT_TYPE_ID = #{wgtTypeId,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_WORK_PRE_WGTTYPE
+    where 1!=1 
+      <if test="carNo != null and carNo != ''">
+        or CAR_NO = #{carNo}
+      </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="valueFlag != null and valueFlag != ''">
+        or VALUE_FLAG = #{valueFlag}
+      </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="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="createManPhone != null and createManPhone != ''">
+        or CREATE_MAN_PHONE = #{createManPhone}
+      </if>
+      <if test="updateManPhone != null and updateManPhone != ''">
+        or UPDATE_MAN_PHONE = #{updateManPhone}
+      </if>
+      <if test="actualFirstNo != null and actualFirstNo != ''">
+        or ACTUAL_FIRST_NO = #{actualFirstNo}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkprewgttype.model.MeterWorkPreWgttype">
+    insert into METER_WORK_PRE_WGTTYPE (WGT_TYPE_ID, CAR_NO, WEIGHT_TYPE_NO, 
+      WEIGHT_TYPE_NAME, VALUE_FLAG, CREATE_MAN_NAME, 
+      CREATE_TIME, UPDATE_MAN_NAME, UPDATE_TIME, 
+      CREATE_MAN_PHONE, UPDATE_MAN_PHONE, ACTUAL_FIRST_NO
+      )
+    values (#{wgtTypeId,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR}, #{weightTypeNo,jdbcType=VARCHAR}, 
+      #{weightTypeName,jdbcType=VARCHAR}, #{valueFlag,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{createManPhone,jdbcType=VARCHAR}, #{updateManPhone,jdbcType=VARCHAR}, #{actualFirstNo,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkprewgttype.model.MeterWorkPreWgttype">
+    insert into METER_WORK_PRE_WGTTYPE
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="wgtTypeId != null">
+        WGT_TYPE_ID,
+      </if>
+      <if test="carNo != null">
+        CAR_NO,
+      </if>
+      <if test="weightTypeNo != null">
+        WEIGHT_TYPE_NO,
+      </if>
+      <if test="weightTypeName != null">
+        WEIGHT_TYPE_NAME,
+      </if>
+      <if test="valueFlag != null">
+        VALUE_FLAG,
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME,
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME,
+      </if>
+      <if test="updateManName != null">
+        UPDATE_MAN_NAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="createManPhone != null">
+        CREATE_MAN_PHONE,
+      </if>
+      <if test="updateManPhone != null">
+        UPDATE_MAN_PHONE,
+      </if>
+      <if test="actualFirstNo != null">
+        ACTUAL_FIRST_NO,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="wgtTypeId != null">
+        #{wgtTypeId,jdbcType=VARCHAR},
+      </if>
+      <if test="carNo != null">
+        #{carNo,jdbcType=VARCHAR},
+      </if>
+      <if test="weightTypeNo != null">
+        #{weightTypeNo,jdbcType=VARCHAR},
+      </if>
+      <if test="weightTypeName != null">
+        #{weightTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="valueFlag != null">
+        #{valueFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateManName != null">
+        #{updateManName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createManPhone != null">
+        #{createManPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManPhone != null">
+        #{updateManPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="actualFirstNo != null">
+        #{actualFirstNo,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkprewgttype.model.MeterWorkPreWgttype">
+    update METER_WORK_PRE_WGTTYPE
+    set CAR_NO = #{carNo,jdbcType=VARCHAR},
+      WEIGHT_TYPE_NO = #{weightTypeNo,jdbcType=VARCHAR},
+      WEIGHT_TYPE_NAME = #{weightTypeName,jdbcType=VARCHAR},
+      VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
+      CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      CREATE_MAN_PHONE = #{createManPhone,jdbcType=VARCHAR},
+      UPDATE_MAN_PHONE = #{updateManPhone,jdbcType=VARCHAR},
+      ACTUAL_FIRST_NO = #{actualFirstNo,jdbcType=VARCHAR}
+    where WGT_TYPE_ID = #{wgtTypeId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkprewgttype.model.MeterWorkPreWgttype">
+    update METER_WORK_PRE_WGTTYPE
+    <set>
+      <if test="carNo != null">
+        CAR_NO = #{carNo,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="valueFlag != null">
+        VALUE_FLAG = #{valueFlag,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="updateManName != null">
+        UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createManPhone != null">
+        CREATE_MAN_PHONE = #{createManPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="updateManPhone != null">
+        UPDATE_MAN_PHONE = #{updateManPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="actualFirstNo != null">
+        ACTUAL_FIRST_NO = #{actualFirstNo,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where WGT_TYPE_ID = #{wgtTypeId,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where WGT_TYPE_ID = #{wgtTypeId,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_PRE_WGTTYPE 
+      (WGT_TYPE_ID, 
+      CAR_NO, WEIGHT_TYPE_NO, WEIGHT_TYPE_NAME, 
+      VALUE_FLAG, CREATE_MAN_NAME, CREATE_TIME, 
+      UPDATE_MAN_NAME, UPDATE_TIME, 
+      CREATE_MAN_PHONE, UPDATE_MAN_PHONE, 
+      ACTUAL_FIRST_NO)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.wgtTypeId,jdbcType=VARCHAR}, 
+      #{item.carNo,jdbcType=VARCHAR}, #{item.weightTypeNo,jdbcType=VARCHAR}, #{item.weightTypeName,jdbcType=VARCHAR}, 
+      #{item.valueFlag,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
+      #{item.updateManName,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
+      #{item.createManPhone,jdbcType=VARCHAR}, #{item.updateManPhone,jdbcType=VARCHAR}, 
+      #{item.actualFirstNo,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_WORK_PRE_WGTTYPE
+     set
+       WGT_TYPE_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_TYPE_ID" close="end">
+          when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.wgtTypeId,jdbcType=VARCHAR}
+       </foreach>
+       ,CAR_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_TYPE_ID" close="end">
+          when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.carNo,jdbcType=VARCHAR}
+       </foreach>
+       ,WEIGHT_TYPE_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_TYPE_ID" close="end">
+          when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.weightTypeNo,jdbcType=VARCHAR}
+       </foreach>
+       ,WEIGHT_TYPE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_TYPE_ID" close="end">
+          when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.weightTypeName,jdbcType=VARCHAR}
+       </foreach>
+       ,VALUE_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_TYPE_ID" close="end">
+          when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.valueFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_TYPE_ID" close="end">
+          when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_TYPE_ID" close="end">
+          when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_TYPE_ID" close="end">
+          when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_TYPE_ID" close="end">
+          when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,CREATE_MAN_PHONE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_TYPE_ID" close="end">
+          when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.createManPhone,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_MAN_PHONE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_TYPE_ID" close="end">
+          when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.updateManPhone,jdbcType=VARCHAR}
+       </foreach>
+       ,ACTUAL_FIRST_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_TYPE_ID" close="end">
+          when #{item.wgtTypeId,jdbcType=VARCHAR} then #{item.actualFirstNo,jdbcType=VARCHAR}
+       </foreach>
+     where WGT_TYPE_ID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.wgtTypeId,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_WORK_PRE_WGTTYPE
+    where WGT_TYPE_ID in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示!!!-->
+  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+  <select id="GetNewID" parameterType="java.lang.String" resultType="java.lang.String">
+    SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(WGT_TYPE_ID, LENGTH(WGT_TYPE_ID) -3))),0) + 1,4,'0') WGT_TYPE_ID
+    FROM METER_WORK_PRE_WGTTYPE
+  </select>
+</mapper>

+ 212 - 0
src/main/java/com/steerinfo/meterwork/meterworkprewgttype/model/MeterWorkPreWgttype.java

@@ -0,0 +1,212 @@
+package com.steerinfo.meterwork.meterworkprewgttype.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+
+@ApiModel(value="车辆过磅重量类型表")
+public class MeterWorkPreWgttype implements IBasePO<String> {
+    /**
+     * 主键(WGT_TYPE_ID,VARCHAR,20)
+     */
+    @ApiModelProperty(value="主键",required=true)
+    private String wgtTypeId;
+
+    /**
+     * 车号(CAR_NO,VARCHAR,25)
+     */
+    @ApiModelProperty(value="车号",required=true)
+    private String carNo;
+
+    /**
+     * 重量类型编号(WEIGHT_TYPE_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="重量类型编号",required=false)
+    private String weightTypeNo;
+
+    /**
+     * 重量类型名称(WEIGHT_TYPE_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="重量类型名称",required=false)
+    private String weightTypeName;
+
+    /**
+     * 数据状态(0:作废,1:未使用, 2:已使用)(VALUE_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="数据状态(0:作废,1:未使用, 2:已使用)",required=false)
+    private String valueFlag;
+
+    /**
+     * 创建人(CREATE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="创建人",required=false)
+    private String createManName;
+
+    /**
+     * 创建时间(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="创建时间",required=false)
+    private Date createTime;
+
+    /**
+     * 修改人(UPDATE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="修改人",required=false)
+    private String updateManName;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 创建人手机号(CREATE_MAN_PHONE,VARCHAR,30)
+     */
+    @ApiModelProperty(value="创建人手机号",required=false)
+    private String createManPhone;
+
+    /**
+     * 修改人手机号码(UPDATE_MAN_PHONE,VARCHAR,30)
+     */
+    @ApiModelProperty(value="修改人手机号码",required=false)
+    private String updateManPhone;
+
+    /**
+     * 一次计量数据NO(ACTUAL_FIRST_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="一次计量数据NO",required=false)
+    private String actualFirstNo;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.wgtTypeId;
+    }
+
+    @Override
+    public void setId(String wgtTypeId) {
+        this.wgtTypeId = wgtTypeId == null ? null : wgtTypeId.trim();
+    }
+
+    public String getWgtTypeId() {
+        return wgtTypeId;
+    }
+
+    public void setWgtTypeId(String wgtTypeId) {
+        this.wgtTypeId = wgtTypeId == null ? null : wgtTypeId.trim();
+    }
+
+    public String getCarNo() {
+        return carNo;
+    }
+
+    public void setCarNo(String carNo) {
+        this.carNo = carNo == null ? null : carNo.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 getValueFlag() {
+        return valueFlag;
+    }
+
+    public void setValueFlag(String valueFlag) {
+        this.valueFlag = valueFlag == null ? null : valueFlag.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 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 getCreateManPhone() {
+        return createManPhone;
+    }
+
+    public void setCreateManPhone(String createManPhone) {
+        this.createManPhone = createManPhone == null ? null : createManPhone.trim();
+    }
+
+    public String getUpdateManPhone() {
+        return updateManPhone;
+    }
+
+    public void setUpdateManPhone(String updateManPhone) {
+        this.updateManPhone = updateManPhone == null ? null : updateManPhone.trim();
+    }
+
+    public String getActualFirstNo() {
+        return actualFirstNo;
+    }
+
+    public void setActualFirstNo(String actualFirstNo) {
+        this.actualFirstNo = actualFirstNo == null ? null : actualFirstNo.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", wgtTypeId=").append(wgtTypeId);
+        sb.append(", carNo=").append(carNo);
+        sb.append(", weightTypeNo=").append(weightTypeNo);
+        sb.append(", weightTypeName=").append(weightTypeName);
+        sb.append(", valueFlag=").append(valueFlag);
+        sb.append(", createManName=").append(createManName);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateManName=").append(updateManName);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", createManPhone=").append(createManPhone);
+        sb.append(", updateManPhone=").append(updateManPhone);
+        sb.append(", actualFirstNo=").append(actualFirstNo);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 26 - 0
src/main/java/com/steerinfo/meterwork/meterworkprewgttype/service/IMeterWorkPreWgttypeService.java

@@ -0,0 +1,26 @@
+package com.steerinfo.meterwork.meterworkprewgttype.service;
+
+import com.steerinfo.baseinfo.combaseinfo.model.ComBaseInfo;
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.meterwork.meterworkprewgttype.model.MeterWorkPreWgttype;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.util.HashMap;
+
+/**
+ * MeterWorkPreWgttype服务接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-12 10:49
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-12
+ * 作者:generator
+ * 参考:
+ * 描述:MeterWorkPreWgttype服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IMeterWorkPreWgttypeService extends IBaseService<MeterWorkPreWgttype, String>{
+
+    HashMap addOrAbolish(MeterWorkPreWgttype model)throws  Exception;
+}

+ 118 - 0
src/main/java/com/steerinfo/meterwork/meterworkprewgttype/service/impl/MeterWorkPreWgttypeServiceImpl.java

@@ -0,0 +1,118 @@
+package com.steerinfo.meterwork.meterworkprewgttype.service.impl;
+
+import com.steerinfo.baseinfo.combaseinfo.model.ComBaseInfo;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.meterwork.meterworkprewgttype.model.MeterWorkPreWgttype;
+import com.steerinfo.meterwork.meterworkprewgttype.mapper.MeterWorkPreWgttypeMapper;
+import com.steerinfo.meterwork.meterworkprewgttype.service.IMeterWorkPreWgttypeService;
+import com.steerinfo.util.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * MeterWorkPreWgttype服务实现:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-01-12 10:49
+ * 类描述
+ * 修订历史:
+ * 日期:2022-01-12
+ * 作者:generator
+ * 参考:
+ * 描述:MeterWorkPreWgttype服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "meterWorkPreWgttypeService")
+public class MeterWorkPreWgttypeServiceImpl extends BaseServiceImpl<MeterWorkPreWgttype, String> implements IMeterWorkPreWgttypeService {
+
+    @Autowired
+    private MeterWorkPreWgttypeMapper meterWorkPreWgttypeMapper;
+
+    @Override
+    protected IBaseMapper<MeterWorkPreWgttype, String> getMapper() {
+        return meterWorkPreWgttypeMapper;
+    }
+
+    @Transactional
+    @Override
+    public HashMap addOrAbolish(MeterWorkPreWgttype model) {
+        HashMap returnMap = new HashMap();
+
+        // 数据验证
+        if (StringUtils.isEmpty(model.getCarNo())) {
+            returnMap.put("code", "1");
+            returnMap.put("msg", "车号不能为空");
+        }
+        else if (StringUtils.isEmpty(model.getWeightTypeNo()) || StringUtils.isEmpty(model.getWeightTypeName())) {
+            returnMap.put("code", "1");
+            returnMap.put("msg", "重量类型编号/名称不能为空");
+        }
+        else if (StringUtils.isEmpty(model.getCreateManName())) {
+            returnMap.put("code", "1");
+            returnMap.put("msg", "创建人不能为空");
+        }
+        else if (StringUtils.isEmpty(model.getCreateManPhone())) {
+            returnMap.put("code", "1");
+            returnMap.put("msg", "创建人手机号不能为空");
+        }
+
+        if (returnMap.size() == 0) {
+            try {
+                // 根据车号,日期,状态未使用,判断当天当车是否有预处理数据
+                HashMap query = new HashMap();
+                query.put("carNo", model.getCarNo());
+                // 日期转字符串
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                Calendar calendar = Calendar.getInstance();
+                Date date = calendar.getTime();
+                String dateStringParse = sdf.format(date);
+                query.put("createTime", dateStringParse);
+                query.put("valueFlag", "1");
+
+                List<MeterWorkPreWgttype> list = meterWorkPreWgttypeMapper.selectByParameters(query);
+
+                // 如果没有,新增记录
+                if (list.size() == 0) {
+
+                }
+                // 如果有,作废原纪录,再新建记录
+                else {
+                    // 作废原纪录
+                    MeterWorkPreWgttype tempModel = list.get(0);
+
+                    tempModel.setValueFlag("0");
+                    tempModel.setUpdateManName(model.getCreateManName());
+                    tempModel.setUpdateManPhone(model.getCreateManPhone());
+                    tempModel.setUpdateTime(new Date());
+                    meterWorkPreWgttypeMapper.updateByPrimaryKey(tempModel);
+                }
+
+                String no = meterWorkPreWgttypeMapper.GetNewID();
+                model.setWgtTypeId(new SimpleDateFormat("yyyyMMdd").format(new Date()) + no);
+                model.setCreateTime(new Date());
+                model.setValueFlag("1");
+
+                meterWorkPreWgttypeMapper.insert(model);
+                returnMap.put("code", "0");
+
+
+            } catch (Exception ex) {
+                ex.printStackTrace();
+                returnMap.put("code", "1");
+                returnMap.put("msg", ex.toString());
+            }
+        }
+
+        return returnMap;
+    }
+}
+