Merge branch 'master' of https://git.steerinfo.com/caol/jg_wzjl_api.git

# Conflicts:
#	src/main/java/com/steerinfo/baseinfo/meterbasecar/mapper/MeterBaseCarMapper.java
#	src/main/java/com/steerinfo/baseinfo/meterbasecar/mapper/MeterBaseCarMapper.xml
#	src/main/java/com/steerinfo/baseinfo/meterbaseuserspot/controller/MeterBaseUserSpotController.java
#	src/main/java/com/steerinfo/baseinfo/meterbaseuserspot/service/IMeterBaseUserSpotService.java
#	src/main/java/com/steerinfo/baseinfo/meterbaseuserspot/service/impl/MeterBaseUserSpotServiceImpl.java
#	src/main/java/com/steerinfo/meterwork/meterworkcaractual/controller/MeterWorkCarActualController.java
#	src/main/java/com/steerinfo/meterwork/meterworkcaractual/mapper/MeterWorkCarActualMapper.java
#	src/main/java/com/steerinfo/meterwork/meterworkcaractual/mapper/MeterWorkCarActualMapper.xml
#	src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/IMeterWorkCarActualService.java
#	src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/impl/MeterWorkCarActualServiceImpl.java
#	src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/controller/MeterWorkCarActualFirstController.java
#	src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/mapper/MeterWorkCarActualFirstMapper.java
#	src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/mapper/MeterWorkCarActualFirstMapper.xml
#	src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/IMeterWorkCarActualFirstService.java
#	src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/impl/MeterWorkCarActualFirstServiceImpl.java
#	src/main/java/com/steerinfo/meterwork/meterworkmonitor/mapper/MeterWorkMonitorMapper.xml
#	src/main/java/com/steerinfo/meterwork/meterworkmonitor/model/MeterWorkMonitor.java
#	src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/impl/MeterWorkRailwayActFirstServiceImpl.java
#	src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/mapper/MeterWorkRailwayActualMapper.xml
#	src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/model/MeterWorkRailwayActual.java

src/main/java/com/steerinfo/SysManageApplication.java

@@ -1,108 +0,0 @@
-package com.steerinfo;
-
-import com.alibaba.fastjson.parser.ParserConfig;
-import com.alibaba.fastjson.serializer.SerializeConfig;
-import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.alibaba.fastjson.serializer.ToStringSerializer;
-import com.alibaba.fastjson.support.config.FastJsonConfig;
-import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.servlet.MultipartConfigFactory;
-import org.springframework.boot.web.servlet.ServletComponentScan;
-import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
-import org.springframework.cloud.netflix.hystrix.EnableHystrix;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.MediaType;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.context.request.RequestContextListener;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-import javax.servlet.MultipartConfigElement;
-import java.util.ArrayList;
-import java.util.List;
-
-@EnableTransactionManagement                      // mybatis中service实现类中加入事务注解
-@RestController                                   // 在启动类中注入HttpMessageConverters
-@MapperScan(basePackages = {"com.steerinfo.**","com.jisco.**"})
-@ComponentScan(basePackages = {"com.steerinfo.**","com.jisco.**"})
-@ServletComponentScan(basePackages = {"com.steerinfo.filter","com.jisco.filter"})
-@EnableCaching
-@SpringBootApplication
-@EnableSwagger2
-@EnableFeignClients("com.steerinfo.feign")
-@EnableCircuitBreaker
-@EnableHystrix
-@Configuration      //1.主要用于标记配置类，兼备Component的效果。
-//@EnableScheduling   // 2.开启定时任务
-public class SysManageApplication implements WebMvcConfigurer {
-
-    public static void main(String[] args) {
-        long startTime = System.currentTimeMillis();
-
-        SpringApplication app = new SpringApplication(SysManageApplication.class);
-//		app.addListeners(new ContextRefreshedListener());
-        app.run(args);
-
-        long endTime = System.currentTimeMillis();
-        float excTime = (float) (endTime - startTime) / 1000;
-        System.out.println("====================================>执行时间：" + excTime + "s");
-
-    }
-
-    @Bean
-    public RequestContextListener requestListener() {
-        return new RequestContextListener();
-    }
-
-    @Override
-    public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
-        // 1.创建一个converter对象
-        FastJsonHttpMessageConverter fastConverter = new FastJsonHttpMessageConverter();
-        // 2.创建配置对象
-        FastJsonConfig fastJsonConfig = new FastJsonConfig();
-        // 3.添加配置
-        fastJsonConfig.setDateFormat("yyyy-MM-dd HH:mm:ss");                       // 自定义时间格式
-        fastJsonConfig.setSerializerFeatures(SerializerFeature.WriteMapNullValue); // 正常转换 null 值
-        SerializeConfig serializeConfig = SerializeConfig.getGlobalInstance();
-        serializeConfig.put(Float.TYPE, ToStringSerializer.instance);
-        serializeConfig.put(Float.class, ToStringSerializer.instance);
-        fastJsonConfig.setSerializeConfig(serializeConfig);
-
-        //3.杨秀东添加添加autotype白名单；并启动autotype功能
-//		ParserConfig.getGlobalInstance().addAccept("com.steerinfo.baseinfo.combaseinfo."); //白名单
-//		ParserConfig.getGlobalInstance().addDeny("com.steerinfo.baseinfo.meterbasematterinfomatch."); //黑名单
-//      ParserConfig.getGlobalInstance().setAutoTypeSupport(true);
-
-
-        // 4.将配置添加到转换器对象中
-        fastConverter.setFastJsonConfig(fastJsonConfig);
-        // 5. 解决中文乱码问题
-        List<MediaType> mediaTypes = new ArrayList<MediaType>();
-        mediaTypes.add(MediaType.APPLICATION_JSON_UTF8);
-        mediaTypes.add(MediaType.APPLICATION_OCTET_STREAM);
-        fastConverter.setSupportedMediaTypes(mediaTypes);
-        // 6.将转换器对象转化为HttpMessageConverter对象
-        HttpMessageConverter<?> converter = fastConverter;
-        converters.add(fastConverter);
-    }
-
-    @Bean
-    public MultipartConfigElement multipartConfigElement() {
-        MultipartConfigFactory factory = new MultipartConfigFactory();
-        //单个文件最大
-        factory.setMaxFileSize("20MB");
-        //设置总上传数据总大小
-        factory.setMaxRequestSize("50MB");
-        return factory.createMultipartConfig();
-    }
-
-}

src/main/java/com/steerinfo/TimedTask/cmmcarweightresults/controller/CmmCarweightresultsController.java

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

src/main/java/com/steerinfo/TimedTask/cmmcarweightresults/mapper/CmmCarweightresultsMapper.java

@@ -1,9 +0,0 @@
-package com.steerinfo.TimedTask.cmmcarweightresults.mapper;
-
-import com.steerinfo.TimedTask.cmmcarweightresults.model.CmmCarweightresults;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface CmmCarweightresultsMapper extends IBaseMapper<CmmCarweightresults, String> {
-}

src/main/java/com/steerinfo/TimedTask/cmmcarweightresults/mapper/CmmCarweightresultsMapper.xml

@@ -1,2388 +0,0 @@
-<?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.TimedTask.cmmcarweightresults.mapper.CmmCarweightresultsMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.TimedTask.cmmcarweightresults.model.CmmCarweightresults">
-    <id column="WGT_NO" jdbcType="VARCHAR" property="wgtNo" />
-    <result column="BILLNO" jdbcType="VARCHAR" property="billno" />
-    <result column="TRU_NO" jdbcType="VARCHAR" property="truNo" />
-    <result column="LGS_NO" jdbcType="VARCHAR" property="lgsNo" />
-    <result column="CAR_NO" jdbcType="VARCHAR" property="carNo" />
-    <result column="ICD_NO" jdbcType="VARCHAR" property="icdNo" />
-    <result column="GRS_BOX_NO" jdbcType="DECIMAL" property="grsBoxNo" />
-    <result column="TAR_BOX_NO" jdbcType="DECIMAL" property="tarBoxNo" />
-    <result column="GRS_SPD" jdbcType="DECIMAL" property="grsSpd" />
-    <result column="TAR_SPD" jdbcType="DECIMAL" property="tarSpd" />
-    <result column="TRN_TYPE" jdbcType="VARCHAR" property="trnType" />
-    <result column="GRS_VDO_FILE" jdbcType="VARCHAR" property="grsVdoFile" />
-    <result column="TAR_VDO_FILE" jdbcType="VARCHAR" property="tarVdoFile" />
-    <result column="GRS_TRN_NO" jdbcType="VARCHAR" property="grsTrnNo" />
-    <result column="TAR_TRN_NO" jdbcType="VARCHAR" property="tarTrnNo" />
-    <result column="WGT_TYPE" jdbcType="VARCHAR" property="wgtType" />
-    <result column="GRS_WGT" jdbcType="DECIMAL" property="grsWgt" />
-    <result column="TAR_WGT" jdbcType="DECIMAL" property="tarWgt" />
-    <result column="NET_WGT" jdbcType="DECIMAL" property="netWgt" />
-    <result column="NO2_WGT" jdbcType="DECIMAL" property="no2Wgt" />
-    <result column="GRS_WGT_NO" jdbcType="VARCHAR" property="grsWgtNo" />
-    <result column="TAR_WGT_NO" jdbcType="VARCHAR" property="tarWgtNo" />
-    <result column="TAR_TYPE" jdbcType="CHAR" property="tarType" />
-    <result column="TAR_INF_MODE" jdbcType="CHAR" property="tarInfMode" />
-    <result column="GRS_INF_MODE" jdbcType="CHAR" property="grsInfMode" />
-    <result column="NET_INF_MODE" jdbcType="CHAR" property="netInfMode" />
-    <result column="GRS_TIME" jdbcType="TIMESTAMP" property="grsTime" />
-    <result column="TAR_TIME" jdbcType="TIMESTAMP" property="tarTime" />
-    <result column="NET_TIME" jdbcType="TIMESTAMP" property="netTime" />
-    <result column="GRS_WRK_ORD" jdbcType="VARCHAR" property="grsWrkOrd" />
-    <result column="TAR_WRK_ORD" jdbcType="VARCHAR" property="tarWrkOrd" />
-    <result column="NET_WRK_ORD" jdbcType="VARCHAR" property="netWrkOrd" />
-    <result column="GRS_WRK_GRP" jdbcType="VARCHAR" property="grsWrkGrp" />
-    <result column="TAR_WRK_GRP" jdbcType="VARCHAR" property="tarWrkGrp" />
-    <result column="NET_WRK_GRP" jdbcType="VARCHAR" property="netWrkGrp" />
-    <result column="GRS_OPR" jdbcType="VARCHAR" property="grsOpr" />
-    <result column="TAR_OPR" jdbcType="VARCHAR" property="tarOpr" />
-    <result column="NET_OPR" jdbcType="VARCHAR" property="netOpr" />
-    <result column="GRS_PNT_NAME" jdbcType="VARCHAR" property="grsPntName" />
-    <result column="TAR_PNT_NAME" jdbcType="VARCHAR" property="tarPntName" />
-    <result column="NET_PNT_NAME" jdbcType="VARCHAR" property="netPntName" />
-    <result column="GRS_PNT_NO" jdbcType="VARCHAR" property="grsPntNo" />
-    <result column="TAR_PNT_NO" jdbcType="VARCHAR" property="tarPntNo" />
-    <result column="NET_PNT_NO" jdbcType="VARCHAR" property="netPntNo" />
-    <result column="NOTE" jdbcType="VARCHAR" property="note" />
-    <result column="SDR_TYPE" jdbcType="VARCHAR" property="sdrType" />
-    <result column="SDR_NAME" jdbcType="VARCHAR" property="sdrName" />
-    <result column="SENDER" jdbcType="VARCHAR" property="sender" />
-    <result column="SDR_NOTE" jdbcType="VARCHAR" property="sdrNote" />
-    <result column="RCV_TYPE" jdbcType="VARCHAR" property="rcvType" />
-    <result column="RCV_NAME" jdbcType="VARCHAR" property="rcvName" />
-    <result column="RECEIVER" jdbcType="VARCHAR" property="receiver" />
-    <result column="RCV_NOTE" jdbcType="VARCHAR" property="rcvNote" />
-    <result column="MAT_NAME" jdbcType="VARCHAR" property="matName" />
-    <result column="MAT_CODE" jdbcType="VARCHAR" property="matCode" />
-    <result column="B1_PRN_NUM" jdbcType="DECIMAL" property="b1PrnNum" />
-    <result column="B2_PRN_NUM" jdbcType="DECIMAL" property="b2PrnNum" />
-    <result column="B1_PRN_NUM_2" jdbcType="DECIMAL" property="b1PrnNum2" />
-    <result column="UPL_FLG" jdbcType="VARCHAR" property="uplFlg" />
-    <result column="UPL_TIME" jdbcType="TIMESTAMP" property="uplTime" />
-    <result column="DEL_FLG" jdbcType="VARCHAR" property="delFlg" />
-    <result column="EXT_BOX" jdbcType="CHAR" property="extBox" />
-    <result column="SDR_GRS_WGT" jdbcType="DECIMAL" property="sdrGrsWgt" />
-    <result column="SDR_TAR_WGT" jdbcType="DECIMAL" property="sdrTarWgt" />
-    <result column="SDR_NET_WGT" jdbcType="DECIMAL" property="sdrNetWgt" />
-    <result column="DIS_WGT" jdbcType="DECIMAL" property="disWgt" />
-    <result column="DIS_RATIO" jdbcType="DECIMAL" property="disRatio" />
-    <result column="NET_END" jdbcType="DECIMAL" property="netEnd" />
-    <result column="NO1_WGT_MODE" jdbcType="VARCHAR" property="no1WgtMode" />
-    <result column="NO2_WGT_MODE" jdbcType="VARCHAR" property="no2WgtMode" />
-    <result column="RFID_NO" jdbcType="VARCHAR" property="rfidNo" />
-    <result column="CHK_FLG" jdbcType="VARCHAR" property="chkFlg" />
-    <result column="CHECKER" jdbcType="VARCHAR" property="checker" />
-    <result column="CHK_TIME" jdbcType="TIMESTAMP" property="chkTime" />
-    <result column="CHM_PER" jdbcType="VARCHAR" property="chmPer" />
-    <result column="CHM_TIME" jdbcType="TIMESTAMP" property="chmTime" />
-    <result column="CHM_TYPE" jdbcType="VARCHAR" property="chmType" />
-    <result column="TRANSPORT" jdbcType="VARCHAR" property="transport" />
-    <result column="TRANS_NAME" jdbcType="VARCHAR" property="transName" />
-    <result column="GRS_WGT_CURVE" jdbcType="VARCHAR" property="grsWgtCurve" />
-    <result column="TAR_WGT_CURVE" jdbcType="VARCHAR" property="tarWgtCurve" />
-    <result column="DIS_OPR" jdbcType="VARCHAR" property="disOpr" />
-    <result column="DIS_TIME" jdbcType="TIMESTAMP" property="disTime" />
-    <result column="FD_UPFLG" jdbcType="VARCHAR" property="fdUpflg" />
-    <result column="CH_UP" jdbcType="VARCHAR" property="chUp" />
-    <result column="CH_OPR" jdbcType="VARCHAR" property="chOpr" />
-    <result column="CH_TIME" jdbcType="TIMESTAMP" property="chTime" />
-    <result column="TD_NO" jdbcType="VARCHAR" property="tdNo" />
-    <result column="TD_WGT" jdbcType="DECIMAL" property="tdWgt" />
-    <result column="DD_NO" jdbcType="VARCHAR" property="ddNo" />
-  </resultMap>
-  <sql id="columns">
-    WGT_NO, BILLNO, TRU_NO, LGS_NO, CAR_NO, ICD_NO, GRS_BOX_NO, TAR_BOX_NO, GRS_SPD, 
-    TAR_SPD, TRN_TYPE, GRS_VDO_FILE, TAR_VDO_FILE, GRS_TRN_NO, TAR_TRN_NO, WGT_TYPE, 
-    GRS_WGT, TAR_WGT, NET_WGT, NO2_WGT, GRS_WGT_NO, TAR_WGT_NO, TAR_TYPE, TAR_INF_MODE, 
-    GRS_INF_MODE, NET_INF_MODE, GRS_TIME, TAR_TIME, NET_TIME, GRS_WRK_ORD, TAR_WRK_ORD, 
-    NET_WRK_ORD, GRS_WRK_GRP, TAR_WRK_GRP, NET_WRK_GRP, GRS_OPR, TAR_OPR, NET_OPR, GRS_PNT_NAME, 
-    TAR_PNT_NAME, NET_PNT_NAME, GRS_PNT_NO, TAR_PNT_NO, NET_PNT_NO, NOTE, SDR_TYPE, SDR_NAME, 
-    SENDER, SDR_NOTE, RCV_TYPE, RCV_NAME, RECEIVER, RCV_NOTE, MAT_NAME, MAT_CODE, B1_PRN_NUM, 
-    B2_PRN_NUM, B1_PRN_NUM_2, UPL_FLG, UPL_TIME, DEL_FLG, EXT_BOX, SDR_GRS_WGT, SDR_TAR_WGT, 
-    SDR_NET_WGT, DIS_WGT, DIS_RATIO, NET_END, NO1_WGT_MODE, NO2_WGT_MODE, RFID_NO, CHK_FLG, 
-    CHECKER, CHK_TIME, CHM_PER, CHM_TIME, CHM_TYPE, TRANSPORT, TRANS_NAME, GRS_WGT_CURVE, 
-    TAR_WGT_CURVE, DIS_OPR, DIS_TIME, FD_UPFLG, CH_UP, CH_OPR, CH_TIME, TD_NO, TD_WGT, 
-    DD_NO
-  </sql>
-  <sql id="columns_alias">
-    t.WGT_NO, t.BILLNO, t.TRU_NO, t.LGS_NO, t.CAR_NO, t.ICD_NO, t.GRS_BOX_NO, t.TAR_BOX_NO, 
-    t.GRS_SPD, t.TAR_SPD, t.TRN_TYPE, t.GRS_VDO_FILE, t.TAR_VDO_FILE, t.GRS_TRN_NO, t.TAR_TRN_NO, 
-    t.WGT_TYPE, t.GRS_WGT, t.TAR_WGT, t.NET_WGT, t.NO2_WGT, t.GRS_WGT_NO, t.TAR_WGT_NO, 
-    t.TAR_TYPE, t.TAR_INF_MODE, t.GRS_INF_MODE, t.NET_INF_MODE, t.GRS_TIME, t.TAR_TIME, 
-    t.NET_TIME, t.GRS_WRK_ORD, t.TAR_WRK_ORD, t.NET_WRK_ORD, t.GRS_WRK_GRP, t.TAR_WRK_GRP, 
-    t.NET_WRK_GRP, t.GRS_OPR, t.TAR_OPR, t.NET_OPR, t.GRS_PNT_NAME, t.TAR_PNT_NAME, t.NET_PNT_NAME, 
-    t.GRS_PNT_NO, t.TAR_PNT_NO, t.NET_PNT_NO, t.NOTE, t.SDR_TYPE, t.SDR_NAME, t.SENDER, 
-    t.SDR_NOTE, t.RCV_TYPE, t.RCV_NAME, t.RECEIVER, t.RCV_NOTE, t.MAT_NAME, t.MAT_CODE, 
-    t.B1_PRN_NUM, t.B2_PRN_NUM, t.B1_PRN_NUM_2, t.UPL_FLG, t.UPL_TIME, t.DEL_FLG, t.EXT_BOX, 
-    t.SDR_GRS_WGT, t.SDR_TAR_WGT, t.SDR_NET_WGT, t.DIS_WGT, t.DIS_RATIO, t.NET_END, t.NO1_WGT_MODE, 
-    t.NO2_WGT_MODE, t.RFID_NO, t.CHK_FLG, t.CHECKER, t.CHK_TIME, t.CHM_PER, t.CHM_TIME, 
-    t.CHM_TYPE, t.TRANSPORT, t.TRANS_NAME, t.GRS_WGT_CURVE, t.TAR_WGT_CURVE, t.DIS_OPR, 
-    t.DIS_TIME, t.FD_UPFLG, t.CH_UP, t.CH_OPR, t.CH_TIME, t.TD_NO, t.TD_WGT, t.DD_NO
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns" /> FROM  JGWEIGHT_USER.CMM_CARWEIGHTRESULTS 
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias" /> FROM  JGWEIGHT_USER.CMM_CARWEIGHTRESULTS  t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="wgtNo != null and wgtNo != ''">
-        and WGT_NO = #{wgtNo}
-      </if>
-      <if test="billno != null and billno != ''">
-        and BILLNO = #{billno}
-      </if>
-      <if test="truNo != null and truNo != ''">
-        and TRU_NO = #{truNo}
-      </if>
-      <if test="lgsNo != null and lgsNo != ''">
-        and LGS_NO = #{lgsNo}
-      </if>
-      <if test="carNo != null and carNo != ''">
-        and CAR_NO = #{carNo}
-      </if>
-      <if test="icdNo != null and icdNo != ''">
-        and ICD_NO = #{icdNo}
-      </if>
-      <if test="grsBoxNo != null">
-        and GRS_BOX_NO = #{grsBoxNo}
-      </if>
-      <if test="tarBoxNo != null">
-        and TAR_BOX_NO = #{tarBoxNo}
-      </if>
-      <if test="grsSpd != null">
-        and GRS_SPD = #{grsSpd}
-      </if>
-      <if test="tarSpd != null">
-        and TAR_SPD = #{tarSpd}
-      </if>
-      <if test="trnType != null and trnType != ''">
-        and TRN_TYPE = #{trnType}
-      </if>
-      <if test="grsVdoFile != null and grsVdoFile != ''">
-        and GRS_VDO_FILE = #{grsVdoFile}
-      </if>
-      <if test="tarVdoFile != null and tarVdoFile != ''">
-        and TAR_VDO_FILE = #{tarVdoFile}
-      </if>
-      <if test="grsTrnNo != null and grsTrnNo != ''">
-        and GRS_TRN_NO = #{grsTrnNo}
-      </if>
-      <if test="tarTrnNo != null and tarTrnNo != ''">
-        and TAR_TRN_NO = #{tarTrnNo}
-      </if>
-      <if test="wgtType != null and wgtType != ''">
-        and WGT_TYPE = #{wgtType}
-      </if>
-      <if test="grsWgt != null">
-        and GRS_WGT = #{grsWgt}
-      </if>
-      <if test="tarWgt != null">
-        and TAR_WGT = #{tarWgt}
-      </if>
-      <if test="netWgt != null">
-        and NET_WGT = #{netWgt}
-      </if>
-      <if test="no2Wgt != null">
-        and NO2_WGT = #{no2Wgt}
-      </if>
-      <if test="grsWgtNo != null and grsWgtNo != ''">
-        and GRS_WGT_NO = #{grsWgtNo}
-      </if>
-      <if test="tarWgtNo != null and tarWgtNo != ''">
-        and TAR_WGT_NO = #{tarWgtNo}
-      </if>
-      <if test="tarType != null">
-        and TAR_TYPE = #{tarType}
-      </if>
-      <if test="tarInfMode != null">
-        and TAR_INF_MODE = #{tarInfMode}
-      </if>
-      <if test="grsInfMode != null">
-        and GRS_INF_MODE = #{grsInfMode}
-      </if>
-      <if test="netInfMode != null">
-        and NET_INF_MODE = #{netInfMode}
-      </if>
-      <if test="grsTime != null">
-        and TO_CHAR(GRS_TIME,'yyyy-MM-dd') = #{grsTime}
-      </if>
-      <if test="tarTime != null">
-        and TO_CHAR(TAR_TIME,'yyyy-MM-dd') = #{tarTime}
-      </if>
-      <if test="netTime != null">
-        and TO_CHAR(NET_TIME,'yyyy-MM-dd') = #{netTime}
-      </if>
-      <if test="grsWrkOrd != null and grsWrkOrd != ''">
-        and GRS_WRK_ORD = #{grsWrkOrd}
-      </if>
-      <if test="tarWrkOrd != null and tarWrkOrd != ''">
-        and TAR_WRK_ORD = #{tarWrkOrd}
-      </if>
-      <if test="netWrkOrd != null and netWrkOrd != ''">
-        and NET_WRK_ORD = #{netWrkOrd}
-      </if>
-      <if test="grsWrkGrp != null and grsWrkGrp != ''">
-        and GRS_WRK_GRP = #{grsWrkGrp}
-      </if>
-      <if test="tarWrkGrp != null and tarWrkGrp != ''">
-        and TAR_WRK_GRP = #{tarWrkGrp}
-      </if>
-      <if test="netWrkGrp != null and netWrkGrp != ''">
-        and NET_WRK_GRP = #{netWrkGrp}
-      </if>
-      <if test="grsOpr != null and grsOpr != ''">
-        and GRS_OPR = #{grsOpr}
-      </if>
-      <if test="tarOpr != null and tarOpr != ''">
-        and TAR_OPR = #{tarOpr}
-      </if>
-      <if test="netOpr != null and netOpr != ''">
-        and NET_OPR = #{netOpr}
-      </if>
-      <if test="grsPntName != null and grsPntName != ''">
-        and GRS_PNT_NAME = #{grsPntName}
-      </if>
-      <if test="tarPntName != null and tarPntName != ''">
-        and TAR_PNT_NAME = #{tarPntName}
-      </if>
-      <if test="netPntName != null and netPntName != ''">
-        and NET_PNT_NAME = #{netPntName}
-      </if>
-      <if test="grsPntNo != null and grsPntNo != ''">
-        and GRS_PNT_NO = #{grsPntNo}
-      </if>
-      <if test="tarPntNo != null and tarPntNo != ''">
-        and TAR_PNT_NO = #{tarPntNo}
-      </if>
-      <if test="netPntNo != null and netPntNo != ''">
-        and NET_PNT_NO = #{netPntNo}
-      </if>
-      <if test="note != null and note != ''">
-        and NOTE = #{note}
-      </if>
-      <if test="sdrType != null and sdrType != ''">
-        and SDR_TYPE = #{sdrType}
-      </if>
-      <if test="sdrName != null and sdrName != ''">
-        and SDR_NAME = #{sdrName}
-      </if>
-      <if test="sender != null and sender != ''">
-        and SENDER = #{sender}
-      </if>
-      <if test="sdrNote != null and sdrNote != ''">
-        and SDR_NOTE = #{sdrNote}
-      </if>
-      <if test="rcvType != null and rcvType != ''">
-        and RCV_TYPE = #{rcvType}
-      </if>
-      <if test="rcvName != null and rcvName != ''">
-        and RCV_NAME = #{rcvName}
-      </if>
-      <if test="receiver != null and receiver != ''">
-        and RECEIVER = #{receiver}
-      </if>
-      <if test="rcvNote != null and rcvNote != ''">
-        and RCV_NOTE = #{rcvNote}
-      </if>
-      <if test="matName != null and matName != ''">
-        and MAT_NAME = #{matName}
-      </if>
-      <if test="matCode != null and matCode != ''">
-        and MAT_CODE = #{matCode}
-      </if>
-      <if test="b1PrnNum != null">
-        and B1_PRN_NUM = #{b1PrnNum}
-      </if>
-      <if test="b2PrnNum != null">
-        and B2_PRN_NUM = #{b2PrnNum}
-      </if>
-      <if test="b1PrnNum2 != null">
-        and B1_PRN_NUM_2 = #{b1PrnNum2}
-      </if>
-      <if test="uplFlg != null and uplFlg != ''">
-        and UPL_FLG = #{uplFlg}
-      </if>
-      <if test="uplTime != null">
-        and TO_CHAR(UPL_TIME,'yyyy-MM-dd') = #{uplTime}
-      </if>
-      <if test="delFlg != null and delFlg != ''">
-        and DEL_FLG = #{delFlg}
-      </if>
-      <if test="extBox != null">
-        and EXT_BOX = #{extBox}
-      </if>
-      <if test="sdrGrsWgt != null">
-        and SDR_GRS_WGT = #{sdrGrsWgt}
-      </if>
-      <if test="sdrTarWgt != null">
-        and SDR_TAR_WGT = #{sdrTarWgt}
-      </if>
-      <if test="sdrNetWgt != null">
-        and SDR_NET_WGT = #{sdrNetWgt}
-      </if>
-      <if test="disWgt != null">
-        and DIS_WGT = #{disWgt}
-      </if>
-      <if test="disRatio != null">
-        and DIS_RATIO = #{disRatio}
-      </if>
-      <if test="netEnd != null">
-        and NET_END = #{netEnd}
-      </if>
-      <if test="no1WgtMode != null and no1WgtMode != ''">
-        and NO1_WGT_MODE = #{no1WgtMode}
-      </if>
-      <if test="no2WgtMode != null and no2WgtMode != ''">
-        and NO2_WGT_MODE = #{no2WgtMode}
-      </if>
-      <if test="rfidNo != null and rfidNo != ''">
-        and RFID_NO = #{rfidNo}
-      </if>
-      <if test="chkFlg != null and chkFlg != ''">
-        and CHK_FLG = #{chkFlg}
-      </if>
-      <if test="checker != null and checker != ''">
-        and CHECKER = #{checker}
-      </if>
-      <if test="chkTime != null">
-        and TO_CHAR(CHK_TIME,'yyyy-MM-dd') = #{chkTime}
-      </if>
-      <if test="chmPer != null and chmPer != ''">
-        and CHM_PER = #{chmPer}
-      </if>
-      <if test="chmTime != null">
-        and TO_CHAR(CHM_TIME,'yyyy-MM-dd') = #{chmTime}
-      </if>
-      <if test="chmType != null and chmType != ''">
-        and CHM_TYPE = #{chmType}
-      </if>
-      <if test="transport != null and transport != ''">
-        and TRANSPORT = #{transport}
-      </if>
-      <if test="transName != null and transName != ''">
-        and TRANS_NAME = #{transName}
-      </if>
-      <if test="grsWgtCurve != null and grsWgtCurve != ''">
-        and GRS_WGT_CURVE = #{grsWgtCurve}
-      </if>
-      <if test="tarWgtCurve != null and tarWgtCurve != ''">
-        and TAR_WGT_CURVE = #{tarWgtCurve}
-      </if>
-      <if test="disOpr != null and disOpr != ''">
-        and DIS_OPR = #{disOpr}
-      </if>
-      <if test="disTime != null">
-        and TO_CHAR(DIS_TIME,'yyyy-MM-dd') = #{disTime}
-      </if>
-      <if test="fdUpflg != null and fdUpflg != ''">
-        and FD_UPFLG = #{fdUpflg}
-      </if>
-      <if test="chUp != null and chUp != ''">
-        and CH_UP = #{chUp}
-      </if>
-      <if test="chOpr != null and chOpr != ''">
-        and CH_OPR = #{chOpr}
-      </if>
-      <if test="chTime != null">
-        and TO_CHAR(CH_TIME,'yyyy-MM-dd') = #{chTime}
-      </if>
-      <if test="tdNo != null and tdNo != ''">
-        and TD_NO = #{tdNo}
-      </if>
-      <if test="tdWgt != null">
-        and TD_WGT = #{tdWgt}
-      </if>
-      <if test="ddNo != null and ddNo != ''">
-        and DD_NO = #{ddNo}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="wgtNo != null and wgtNo != ''">
-        and WGT_NO LIKE '%${wgtNo}%'
-      </if>
-      <if test="billno != null and billno != ''">
-        and BILLNO LIKE '%${billno}%'
-      </if>
-      <if test="truNo != null and truNo != ''">
-        and TRU_NO LIKE '%${truNo}%'
-      </if>
-      <if test="lgsNo != null and lgsNo != ''">
-        and LGS_NO LIKE '%${lgsNo}%'
-      </if>
-      <if test="carNo != null and carNo != ''">
-        and CAR_NO LIKE '%${carNo}%'
-      </if>
-      <if test="icdNo != null and icdNo != ''">
-        and ICD_NO LIKE '%${icdNo}%'
-      </if>
-      <if test="grsBoxNo != null">
-        and GRS_BOX_NO = #{grsBoxNo}
-      </if>
-      <if test="tarBoxNo != null">
-        and TAR_BOX_NO = #{tarBoxNo}
-      </if>
-      <if test="grsSpd != null">
-        and GRS_SPD = #{grsSpd}
-      </if>
-      <if test="tarSpd != null">
-        and TAR_SPD = #{tarSpd}
-      </if>
-      <if test="trnType != null and trnType != ''">
-        and TRN_TYPE LIKE '%${trnType}%'
-      </if>
-      <if test="grsVdoFile != null and grsVdoFile != ''">
-        and GRS_VDO_FILE LIKE '%${grsVdoFile}%'
-      </if>
-      <if test="tarVdoFile != null and tarVdoFile != ''">
-        and TAR_VDO_FILE LIKE '%${tarVdoFile}%'
-      </if>
-      <if test="grsTrnNo != null and grsTrnNo != ''">
-        and GRS_TRN_NO LIKE '%${grsTrnNo}%'
-      </if>
-      <if test="tarTrnNo != null and tarTrnNo != ''">
-        and TAR_TRN_NO LIKE '%${tarTrnNo}%'
-      </if>
-      <if test="wgtType != null and wgtType != ''">
-        and WGT_TYPE LIKE '%${wgtType}%'
-      </if>
-      <if test="grsWgt != null">
-        and GRS_WGT = #{grsWgt}
-      </if>
-      <if test="tarWgt != null">
-        and TAR_WGT = #{tarWgt}
-      </if>
-      <if test="netWgt != null">
-        and NET_WGT = #{netWgt}
-      </if>
-      <if test="no2Wgt != null">
-        and NO2_WGT = #{no2Wgt}
-      </if>
-      <if test="grsWgtNo != null and grsWgtNo != ''">
-        and GRS_WGT_NO LIKE '%${grsWgtNo}%'
-      </if>
-      <if test="tarWgtNo != null and tarWgtNo != ''">
-        and TAR_WGT_NO LIKE '%${tarWgtNo}%'
-      </if>
-      <if test="tarType != null">
-        and TAR_TYPE = #{tarType}
-      </if>
-      <if test="tarInfMode != null">
-        and TAR_INF_MODE = #{tarInfMode}
-      </if>
-      <if test="grsInfMode != null">
-        and GRS_INF_MODE = #{grsInfMode}
-      </if>
-      <if test="netInfMode != null">
-        and NET_INF_MODE = #{netInfMode}
-      </if>
-      <if test="grsTime != null">
-        and TO_CHAR(GRS_TIME,'yyyy-MM-dd') = #{grsTime}
-      </if>
-      <if test="tarTime != null">
-        and TO_CHAR(TAR_TIME,'yyyy-MM-dd') = #{tarTime}
-      </if>
-      <if test="netTime != null">
-        and TO_CHAR(NET_TIME,'yyyy-MM-dd') = #{netTime}
-      </if>
-      <if test="grsWrkOrd != null and grsWrkOrd != ''">
-        and GRS_WRK_ORD LIKE '%${grsWrkOrd}%'
-      </if>
-      <if test="tarWrkOrd != null and tarWrkOrd != ''">
-        and TAR_WRK_ORD LIKE '%${tarWrkOrd}%'
-      </if>
-      <if test="netWrkOrd != null and netWrkOrd != ''">
-        and NET_WRK_ORD LIKE '%${netWrkOrd}%'
-      </if>
-      <if test="grsWrkGrp != null and grsWrkGrp != ''">
-        and GRS_WRK_GRP LIKE '%${grsWrkGrp}%'
-      </if>
-      <if test="tarWrkGrp != null and tarWrkGrp != ''">
-        and TAR_WRK_GRP LIKE '%${tarWrkGrp}%'
-      </if>
-      <if test="netWrkGrp != null and netWrkGrp != ''">
-        and NET_WRK_GRP LIKE '%${netWrkGrp}%'
-      </if>
-      <if test="grsOpr != null and grsOpr != ''">
-        and GRS_OPR LIKE '%${grsOpr}%'
-      </if>
-      <if test="tarOpr != null and tarOpr != ''">
-        and TAR_OPR LIKE '%${tarOpr}%'
-      </if>
-      <if test="netOpr != null and netOpr != ''">
-        and NET_OPR LIKE '%${netOpr}%'
-      </if>
-      <if test="grsPntName != null and grsPntName != ''">
-        and GRS_PNT_NAME LIKE '%${grsPntName}%'
-      </if>
-      <if test="tarPntName != null and tarPntName != ''">
-        and TAR_PNT_NAME LIKE '%${tarPntName}%'
-      </if>
-      <if test="netPntName != null and netPntName != ''">
-        and NET_PNT_NAME LIKE '%${netPntName}%'
-      </if>
-      <if test="grsPntNo != null and grsPntNo != ''">
-        and GRS_PNT_NO LIKE '%${grsPntNo}%'
-      </if>
-      <if test="tarPntNo != null and tarPntNo != ''">
-        and TAR_PNT_NO LIKE '%${tarPntNo}%'
-      </if>
-      <if test="netPntNo != null and netPntNo != ''">
-        and NET_PNT_NO LIKE '%${netPntNo}%'
-      </if>
-      <if test="note != null and note != ''">
-        and NOTE LIKE '%${note}%'
-      </if>
-      <if test="sdrType != null and sdrType != ''">
-        and SDR_TYPE LIKE '%${sdrType}%'
-      </if>
-      <if test="sdrName != null and sdrName != ''">
-        and SDR_NAME LIKE '%${sdrName}%'
-      </if>
-      <if test="sender != null and sender != ''">
-        and SENDER LIKE '%${sender}%'
-      </if>
-      <if test="sdrNote != null and sdrNote != ''">
-        and SDR_NOTE LIKE '%${sdrNote}%'
-      </if>
-      <if test="rcvType != null and rcvType != ''">
-        and RCV_TYPE LIKE '%${rcvType}%'
-      </if>
-      <if test="rcvName != null and rcvName != ''">
-        and RCV_NAME LIKE '%${rcvName}%'
-      </if>
-      <if test="receiver != null and receiver != ''">
-        and RECEIVER LIKE '%${receiver}%'
-      </if>
-      <if test="rcvNote != null and rcvNote != ''">
-        and RCV_NOTE LIKE '%${rcvNote}%'
-      </if>
-      <if test="matName != null and matName != ''">
-        and MAT_NAME LIKE '%${matName}%'
-      </if>
-      <if test="matCode != null and matCode != ''">
-        and MAT_CODE LIKE '%${matCode}%'
-      </if>
-      <if test="b1PrnNum != null">
-        and B1_PRN_NUM = #{b1PrnNum}
-      </if>
-      <if test="b2PrnNum != null">
-        and B2_PRN_NUM = #{b2PrnNum}
-      </if>
-      <if test="b1PrnNum2 != null">
-        and B1_PRN_NUM_2 = #{b1PrnNum2}
-      </if>
-      <if test="uplFlg != null and uplFlg != ''">
-        and UPL_FLG LIKE '%${uplFlg}%'
-      </if>
-      <if test="uplTime != null">
-        and TO_CHAR(UPL_TIME,'yyyy-MM-dd') = #{uplTime}
-      </if>
-      <if test="delFlg != null and delFlg != ''">
-        and DEL_FLG LIKE '%${delFlg}%'
-      </if>
-      <if test="extBox != null">
-        and EXT_BOX = #{extBox}
-      </if>
-      <if test="sdrGrsWgt != null">
-        and SDR_GRS_WGT = #{sdrGrsWgt}
-      </if>
-      <if test="sdrTarWgt != null">
-        and SDR_TAR_WGT = #{sdrTarWgt}
-      </if>
-      <if test="sdrNetWgt != null">
-        and SDR_NET_WGT = #{sdrNetWgt}
-      </if>
-      <if test="disWgt != null">
-        and DIS_WGT = #{disWgt}
-      </if>
-      <if test="disRatio != null">
-        and DIS_RATIO = #{disRatio}
-      </if>
-      <if test="netEnd != null">
-        and NET_END = #{netEnd}
-      </if>
-      <if test="no1WgtMode != null and no1WgtMode != ''">
-        and NO1_WGT_MODE LIKE '%${no1WgtMode}%'
-      </if>
-      <if test="no2WgtMode != null and no2WgtMode != ''">
-        and NO2_WGT_MODE LIKE '%${no2WgtMode}%'
-      </if>
-      <if test="rfidNo != null and rfidNo != ''">
-        and RFID_NO LIKE '%${rfidNo}%'
-      </if>
-      <if test="chkFlg != null and chkFlg != ''">
-        and CHK_FLG LIKE '%${chkFlg}%'
-      </if>
-      <if test="checker != null and checker != ''">
-        and CHECKER LIKE '%${checker}%'
-      </if>
-      <if test="chkTime != null">
-        and TO_CHAR(CHK_TIME,'yyyy-MM-dd') = #{chkTime}
-      </if>
-      <if test="chmPer != null and chmPer != ''">
-        and CHM_PER LIKE '%${chmPer}%'
-      </if>
-      <if test="chmTime != null">
-        and TO_CHAR(CHM_TIME,'yyyy-MM-dd') = #{chmTime}
-      </if>
-      <if test="chmType != null and chmType != ''">
-        and CHM_TYPE LIKE '%${chmType}%'
-      </if>
-      <if test="transport != null and transport != ''">
-        and TRANSPORT LIKE '%${transport}%'
-      </if>
-      <if test="transName != null and transName != ''">
-        and TRANS_NAME LIKE '%${transName}%'
-      </if>
-      <if test="grsWgtCurve != null and grsWgtCurve != ''">
-        and GRS_WGT_CURVE LIKE '%${grsWgtCurve}%'
-      </if>
-      <if test="tarWgtCurve != null and tarWgtCurve != ''">
-        and TAR_WGT_CURVE LIKE '%${tarWgtCurve}%'
-      </if>
-      <if test="disOpr != null and disOpr != ''">
-        and DIS_OPR LIKE '%${disOpr}%'
-      </if>
-      <if test="disTime != null">
-        and TO_CHAR(DIS_TIME,'yyyy-MM-dd') = #{disTime}
-      </if>
-      <if test="fdUpflg != null and fdUpflg != ''">
-        and FD_UPFLG LIKE '%${fdUpflg}%'
-      </if>
-      <if test="chUp != null and chUp != ''">
-        and CH_UP LIKE '%${chUp}%'
-      </if>
-      <if test="chOpr != null and chOpr != ''">
-        and CH_OPR LIKE '%${chOpr}%'
-      </if>
-      <if test="chTime != null">
-        and TO_CHAR(CH_TIME,'yyyy-MM-dd') = #{chTime}
-      </if>
-      <if test="tdNo != null and tdNo != ''">
-        and TD_NO LIKE '%${tdNo}%'
-      </if>
-      <if test="tdWgt != null">
-        and TD_WGT = #{tdWgt}
-      </if>
-      <if test="ddNo != null and ddNo != ''">
-        and DD_NO LIKE '%${ddNo}%'
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from  JGWEIGHT_USER.CMM_CARWEIGHTRESULTS 
-    where WGT_NO = #{wgtNo,jdbcType=VARCHAR}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from  JGWEIGHT_USER.CMM_CARWEIGHTRESULTS 
-    where 1!=1 
-      <if test="billno != null and billno != ''">
-        or BILLNO = #{billno}
-      </if>
-      <if test="truNo != null and truNo != ''">
-        or TRU_NO = #{truNo}
-      </if>
-      <if test="lgsNo != null and lgsNo != ''">
-        or LGS_NO = #{lgsNo}
-      </if>
-      <if test="carNo != null and carNo != ''">
-        or CAR_NO = #{carNo}
-      </if>
-      <if test="icdNo != null and icdNo != ''">
-        or ICD_NO = #{icdNo}
-      </if>
-      <if test="grsBoxNo != null">
-        or GRS_BOX_NO = #{grsBoxNo}
-      </if>
-      <if test="tarBoxNo != null">
-        or TAR_BOX_NO = #{tarBoxNo}
-      </if>
-      <if test="grsSpd != null">
-        or GRS_SPD = #{grsSpd}
-      </if>
-      <if test="tarSpd != null">
-        or TAR_SPD = #{tarSpd}
-      </if>
-      <if test="trnType != null and trnType != ''">
-        or TRN_TYPE = #{trnType}
-      </if>
-      <if test="grsVdoFile != null and grsVdoFile != ''">
-        or GRS_VDO_FILE = #{grsVdoFile}
-      </if>
-      <if test="tarVdoFile != null and tarVdoFile != ''">
-        or TAR_VDO_FILE = #{tarVdoFile}
-      </if>
-      <if test="grsTrnNo != null and grsTrnNo != ''">
-        or GRS_TRN_NO = #{grsTrnNo}
-      </if>
-      <if test="tarTrnNo != null and tarTrnNo != ''">
-        or TAR_TRN_NO = #{tarTrnNo}
-      </if>
-      <if test="wgtType != null and wgtType != ''">
-        or WGT_TYPE = #{wgtType}
-      </if>
-      <if test="grsWgt != null">
-        or GRS_WGT = #{grsWgt}
-      </if>
-      <if test="tarWgt != null">
-        or TAR_WGT = #{tarWgt}
-      </if>
-      <if test="netWgt != null">
-        or NET_WGT = #{netWgt}
-      </if>
-      <if test="no2Wgt != null">
-        or NO2_WGT = #{no2Wgt}
-      </if>
-      <if test="grsWgtNo != null and grsWgtNo != ''">
-        or GRS_WGT_NO = #{grsWgtNo}
-      </if>
-      <if test="tarWgtNo != null and tarWgtNo != ''">
-        or TAR_WGT_NO = #{tarWgtNo}
-      </if>
-      <if test="tarType != null">
-        or TAR_TYPE = #{tarType}
-      </if>
-      <if test="tarInfMode != null">
-        or TAR_INF_MODE = #{tarInfMode}
-      </if>
-      <if test="grsInfMode != null">
-        or GRS_INF_MODE = #{grsInfMode}
-      </if>
-      <if test="netInfMode != null">
-        or NET_INF_MODE = #{netInfMode}
-      </if>
-      <if test="grsTime != null">
-        or TO_CHAR(GRS_TIME,'yyyy-MM-dd') = '#{grsTime}'
-      </if>
-      <if test="tarTime != null">
-        or TO_CHAR(TAR_TIME,'yyyy-MM-dd') = '#{tarTime}'
-      </if>
-      <if test="netTime != null">
-        or TO_CHAR(NET_TIME,'yyyy-MM-dd') = '#{netTime}'
-      </if>
-      <if test="grsWrkOrd != null and grsWrkOrd != ''">
-        or GRS_WRK_ORD = #{grsWrkOrd}
-      </if>
-      <if test="tarWrkOrd != null and tarWrkOrd != ''">
-        or TAR_WRK_ORD = #{tarWrkOrd}
-      </if>
-      <if test="netWrkOrd != null and netWrkOrd != ''">
-        or NET_WRK_ORD = #{netWrkOrd}
-      </if>
-      <if test="grsWrkGrp != null and grsWrkGrp != ''">
-        or GRS_WRK_GRP = #{grsWrkGrp}
-      </if>
-      <if test="tarWrkGrp != null and tarWrkGrp != ''">
-        or TAR_WRK_GRP = #{tarWrkGrp}
-      </if>
-      <if test="netWrkGrp != null and netWrkGrp != ''">
-        or NET_WRK_GRP = #{netWrkGrp}
-      </if>
-      <if test="grsOpr != null and grsOpr != ''">
-        or GRS_OPR = #{grsOpr}
-      </if>
-      <if test="tarOpr != null and tarOpr != ''">
-        or TAR_OPR = #{tarOpr}
-      </if>
-      <if test="netOpr != null and netOpr != ''">
-        or NET_OPR = #{netOpr}
-      </if>
-      <if test="grsPntName != null and grsPntName != ''">
-        or GRS_PNT_NAME = #{grsPntName}
-      </if>
-      <if test="tarPntName != null and tarPntName != ''">
-        or TAR_PNT_NAME = #{tarPntName}
-      </if>
-      <if test="netPntName != null and netPntName != ''">
-        or NET_PNT_NAME = #{netPntName}
-      </if>
-      <if test="grsPntNo != null and grsPntNo != ''">
-        or GRS_PNT_NO = #{grsPntNo}
-      </if>
-      <if test="tarPntNo != null and tarPntNo != ''">
-        or TAR_PNT_NO = #{tarPntNo}
-      </if>
-      <if test="netPntNo != null and netPntNo != ''">
-        or NET_PNT_NO = #{netPntNo}
-      </if>
-      <if test="note != null and note != ''">
-        or NOTE = #{note}
-      </if>
-      <if test="sdrType != null and sdrType != ''">
-        or SDR_TYPE = #{sdrType}
-      </if>
-      <if test="sdrName != null and sdrName != ''">
-        or SDR_NAME = #{sdrName}
-      </if>
-      <if test="sender != null and sender != ''">
-        or SENDER = #{sender}
-      </if>
-      <if test="sdrNote != null and sdrNote != ''">
-        or SDR_NOTE = #{sdrNote}
-      </if>
-      <if test="rcvType != null and rcvType != ''">
-        or RCV_TYPE = #{rcvType}
-      </if>
-      <if test="rcvName != null and rcvName != ''">
-        or RCV_NAME = #{rcvName}
-      </if>
-      <if test="receiver != null and receiver != ''">
-        or RECEIVER = #{receiver}
-      </if>
-      <if test="rcvNote != null and rcvNote != ''">
-        or RCV_NOTE = #{rcvNote}
-      </if>
-      <if test="matName != null and matName != ''">
-        or MAT_NAME = #{matName}
-      </if>
-      <if test="matCode != null and matCode != ''">
-        or MAT_CODE = #{matCode}
-      </if>
-      <if test="b1PrnNum != null">
-        or B1_PRN_NUM = #{b1PrnNum}
-      </if>
-      <if test="b2PrnNum != null">
-        or B2_PRN_NUM = #{b2PrnNum}
-      </if>
-      <if test="b1PrnNum2 != null">
-        or B1_PRN_NUM_2 = #{b1PrnNum2}
-      </if>
-      <if test="uplFlg != null and uplFlg != ''">
-        or UPL_FLG = #{uplFlg}
-      </if>
-      <if test="uplTime != null">
-        or TO_CHAR(UPL_TIME,'yyyy-MM-dd') = '#{uplTime}'
-      </if>
-      <if test="delFlg != null and delFlg != ''">
-        or DEL_FLG = #{delFlg}
-      </if>
-      <if test="extBox != null">
-        or EXT_BOX = #{extBox}
-      </if>
-      <if test="sdrGrsWgt != null">
-        or SDR_GRS_WGT = #{sdrGrsWgt}
-      </if>
-      <if test="sdrTarWgt != null">
-        or SDR_TAR_WGT = #{sdrTarWgt}
-      </if>
-      <if test="sdrNetWgt != null">
-        or SDR_NET_WGT = #{sdrNetWgt}
-      </if>
-      <if test="disWgt != null">
-        or DIS_WGT = #{disWgt}
-      </if>
-      <if test="disRatio != null">
-        or DIS_RATIO = #{disRatio}
-      </if>
-      <if test="netEnd != null">
-        or NET_END = #{netEnd}
-      </if>
-      <if test="no1WgtMode != null and no1WgtMode != ''">
-        or NO1_WGT_MODE = #{no1WgtMode}
-      </if>
-      <if test="no2WgtMode != null and no2WgtMode != ''">
-        or NO2_WGT_MODE = #{no2WgtMode}
-      </if>
-      <if test="rfidNo != null and rfidNo != ''">
-        or RFID_NO = #{rfidNo}
-      </if>
-      <if test="chkFlg != null and chkFlg != ''">
-        or CHK_FLG = #{chkFlg}
-      </if>
-      <if test="checker != null and checker != ''">
-        or CHECKER = #{checker}
-      </if>
-      <if test="chkTime != null">
-        or TO_CHAR(CHK_TIME,'yyyy-MM-dd') = '#{chkTime}'
-      </if>
-      <if test="chmPer != null and chmPer != ''">
-        or CHM_PER = #{chmPer}
-      </if>
-      <if test="chmTime != null">
-        or TO_CHAR(CHM_TIME,'yyyy-MM-dd') = '#{chmTime}'
-      </if>
-      <if test="chmType != null and chmType != ''">
-        or CHM_TYPE = #{chmType}
-      </if>
-      <if test="transport != null and transport != ''">
-        or TRANSPORT = #{transport}
-      </if>
-      <if test="transName != null and transName != ''">
-        or TRANS_NAME = #{transName}
-      </if>
-      <if test="grsWgtCurve != null and grsWgtCurve != ''">
-        or GRS_WGT_CURVE = #{grsWgtCurve}
-      </if>
-      <if test="tarWgtCurve != null and tarWgtCurve != ''">
-        or TAR_WGT_CURVE = #{tarWgtCurve}
-      </if>
-      <if test="disOpr != null and disOpr != ''">
-        or DIS_OPR = #{disOpr}
-      </if>
-      <if test="disTime != null">
-        or TO_CHAR(DIS_TIME,'yyyy-MM-dd') = '#{disTime}'
-      </if>
-      <if test="fdUpflg != null and fdUpflg != ''">
-        or FD_UPFLG = #{fdUpflg}
-      </if>
-      <if test="chUp != null and chUp != ''">
-        or CH_UP = #{chUp}
-      </if>
-      <if test="chOpr != null and chOpr != ''">
-        or CH_OPR = #{chOpr}
-      </if>
-      <if test="chTime != null">
-        or TO_CHAR(CH_TIME,'yyyy-MM-dd') = '#{chTime}'
-      </if>
-      <if test="tdNo != null and tdNo != ''">
-        or TD_NO = #{tdNo}
-      </if>
-      <if test="tdWgt != null">
-        or TD_WGT = #{tdWgt}
-      </if>
-      <if test="ddNo != null and ddNo != ''">
-        or DD_NO = #{ddNo}
-      </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.TimedTask.cmmcarweightresults.model.CmmCarweightresults">
-    insert into  JGWEIGHT_USER.CMM_CARWEIGHTRESULTS  (WGT_NO, BILLNO, TRU_NO, 
-      LGS_NO, CAR_NO, ICD_NO, 
-      GRS_BOX_NO, TAR_BOX_NO, GRS_SPD, 
-      TAR_SPD, TRN_TYPE, GRS_VDO_FILE, 
-      TAR_VDO_FILE, GRS_TRN_NO, TAR_TRN_NO, 
-      WGT_TYPE, GRS_WGT, TAR_WGT, 
-      NET_WGT, NO2_WGT, GRS_WGT_NO, 
-      TAR_WGT_NO, TAR_TYPE, TAR_INF_MODE, 
-      GRS_INF_MODE, NET_INF_MODE, GRS_TIME, 
-      TAR_TIME, NET_TIME, GRS_WRK_ORD, 
-      TAR_WRK_ORD, NET_WRK_ORD, GRS_WRK_GRP, 
-      TAR_WRK_GRP, NET_WRK_GRP, GRS_OPR, 
-      TAR_OPR, NET_OPR, GRS_PNT_NAME, 
-      TAR_PNT_NAME, NET_PNT_NAME, GRS_PNT_NO, 
-      TAR_PNT_NO, NET_PNT_NO, NOTE, 
-      SDR_TYPE, SDR_NAME, SENDER, 
-      SDR_NOTE, RCV_TYPE, RCV_NAME, 
-      RECEIVER, RCV_NOTE, MAT_NAME, 
-      MAT_CODE, B1_PRN_NUM, B2_PRN_NUM, 
-      B1_PRN_NUM_2, UPL_FLG, UPL_TIME, 
-      DEL_FLG, EXT_BOX, SDR_GRS_WGT, 
-      SDR_TAR_WGT, SDR_NET_WGT, DIS_WGT, 
-      DIS_RATIO, NET_END, NO1_WGT_MODE, 
-      NO2_WGT_MODE, RFID_NO, CHK_FLG, 
-      CHECKER, CHK_TIME, CHM_PER, 
-      CHM_TIME, CHM_TYPE, TRANSPORT, 
-      TRANS_NAME, GRS_WGT_CURVE, TAR_WGT_CURVE, 
-      DIS_OPR, DIS_TIME, FD_UPFLG, 
-      CH_UP, CH_OPR, CH_TIME, 
-      TD_NO, TD_WGT, DD_NO)
-    values (#{wgtNo,jdbcType=VARCHAR}, #{billno,jdbcType=VARCHAR}, #{truNo,jdbcType=VARCHAR}, 
-      #{lgsNo,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR}, #{icdNo,jdbcType=VARCHAR}, 
-      #{grsBoxNo,jdbcType=DECIMAL}, #{tarBoxNo,jdbcType=DECIMAL}, #{grsSpd,jdbcType=DECIMAL}, 
-      #{tarSpd,jdbcType=DECIMAL}, #{trnType,jdbcType=VARCHAR}, #{grsVdoFile,jdbcType=VARCHAR}, 
-      #{tarVdoFile,jdbcType=VARCHAR}, #{grsTrnNo,jdbcType=VARCHAR}, #{tarTrnNo,jdbcType=VARCHAR}, 
-      #{wgtType,jdbcType=VARCHAR}, #{grsWgt,jdbcType=DECIMAL}, #{tarWgt,jdbcType=DECIMAL}, 
-      #{netWgt,jdbcType=DECIMAL}, #{no2Wgt,jdbcType=DECIMAL}, #{grsWgtNo,jdbcType=VARCHAR}, 
-      #{tarWgtNo,jdbcType=VARCHAR}, #{tarType,jdbcType=CHAR}, #{tarInfMode,jdbcType=CHAR}, 
-      #{grsInfMode,jdbcType=CHAR}, #{netInfMode,jdbcType=CHAR}, #{grsTime,jdbcType=TIMESTAMP}, 
-      #{tarTime,jdbcType=TIMESTAMP}, #{netTime,jdbcType=TIMESTAMP}, #{grsWrkOrd,jdbcType=VARCHAR}, 
-      #{tarWrkOrd,jdbcType=VARCHAR}, #{netWrkOrd,jdbcType=VARCHAR}, #{grsWrkGrp,jdbcType=VARCHAR}, 
-      #{tarWrkGrp,jdbcType=VARCHAR}, #{netWrkGrp,jdbcType=VARCHAR}, #{grsOpr,jdbcType=VARCHAR}, 
-      #{tarOpr,jdbcType=VARCHAR}, #{netOpr,jdbcType=VARCHAR}, #{grsPntName,jdbcType=VARCHAR}, 
-      #{tarPntName,jdbcType=VARCHAR}, #{netPntName,jdbcType=VARCHAR}, #{grsPntNo,jdbcType=VARCHAR}, 
-      #{tarPntNo,jdbcType=VARCHAR}, #{netPntNo,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, 
-      #{sdrType,jdbcType=VARCHAR}, #{sdrName,jdbcType=VARCHAR}, #{sender,jdbcType=VARCHAR}, 
-      #{sdrNote,jdbcType=VARCHAR}, #{rcvType,jdbcType=VARCHAR}, #{rcvName,jdbcType=VARCHAR}, 
-      #{receiver,jdbcType=VARCHAR}, #{rcvNote,jdbcType=VARCHAR}, #{matName,jdbcType=VARCHAR}, 
-      #{matCode,jdbcType=VARCHAR}, #{b1PrnNum,jdbcType=DECIMAL}, #{b2PrnNum,jdbcType=DECIMAL}, 
-      #{b1PrnNum2,jdbcType=DECIMAL}, #{uplFlg,jdbcType=VARCHAR}, #{uplTime,jdbcType=TIMESTAMP}, 
-      #{delFlg,jdbcType=VARCHAR}, #{extBox,jdbcType=CHAR}, #{sdrGrsWgt,jdbcType=DECIMAL}, 
-      #{sdrTarWgt,jdbcType=DECIMAL}, #{sdrNetWgt,jdbcType=DECIMAL}, #{disWgt,jdbcType=DECIMAL}, 
-      #{disRatio,jdbcType=DECIMAL}, #{netEnd,jdbcType=DECIMAL}, #{no1WgtMode,jdbcType=VARCHAR}, 
-      #{no2WgtMode,jdbcType=VARCHAR}, #{rfidNo,jdbcType=VARCHAR}, #{chkFlg,jdbcType=VARCHAR}, 
-      #{checker,jdbcType=VARCHAR}, #{chkTime,jdbcType=TIMESTAMP}, #{chmPer,jdbcType=VARCHAR}, 
-      #{chmTime,jdbcType=TIMESTAMP}, #{chmType,jdbcType=VARCHAR}, #{transport,jdbcType=VARCHAR}, 
-      #{transName,jdbcType=VARCHAR}, #{grsWgtCurve,jdbcType=VARCHAR}, #{tarWgtCurve,jdbcType=VARCHAR}, 
-      #{disOpr,jdbcType=VARCHAR}, #{disTime,jdbcType=TIMESTAMP}, #{fdUpflg,jdbcType=VARCHAR}, 
-      #{chUp,jdbcType=VARCHAR}, #{chOpr,jdbcType=VARCHAR}, #{chTime,jdbcType=TIMESTAMP}, 
-      #{tdNo,jdbcType=VARCHAR}, #{tdWgt,jdbcType=DECIMAL}, #{ddNo,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.TimedTask.cmmcarweightresults.model.CmmCarweightresults">
-    insert into  JGWEIGHT_USER.CMM_CARWEIGHTRESULTS 
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="wgtNo != null">
-        WGT_NO,
-      </if>
-      <if test="billno != null">
-        BILLNO,
-      </if>
-      <if test="truNo != null">
-        TRU_NO,
-      </if>
-      <if test="lgsNo != null">
-        LGS_NO,
-      </if>
-      <if test="carNo != null">
-        CAR_NO,
-      </if>
-      <if test="icdNo != null">
-        ICD_NO,
-      </if>
-      <if test="grsBoxNo != null">
-        GRS_BOX_NO,
-      </if>
-      <if test="tarBoxNo != null">
-        TAR_BOX_NO,
-      </if>
-      <if test="grsSpd != null">
-        GRS_SPD,
-      </if>
-      <if test="tarSpd != null">
-        TAR_SPD,
-      </if>
-      <if test="trnType != null">
-        TRN_TYPE,
-      </if>
-      <if test="grsVdoFile != null">
-        GRS_VDO_FILE,
-      </if>
-      <if test="tarVdoFile != null">
-        TAR_VDO_FILE,
-      </if>
-      <if test="grsTrnNo != null">
-        GRS_TRN_NO,
-      </if>
-      <if test="tarTrnNo != null">
-        TAR_TRN_NO,
-      </if>
-      <if test="wgtType != null">
-        WGT_TYPE,
-      </if>
-      <if test="grsWgt != null">
-        GRS_WGT,
-      </if>
-      <if test="tarWgt != null">
-        TAR_WGT,
-      </if>
-      <if test="netWgt != null">
-        NET_WGT,
-      </if>
-      <if test="no2Wgt != null">
-        NO2_WGT,
-      </if>
-      <if test="grsWgtNo != null">
-        GRS_WGT_NO,
-      </if>
-      <if test="tarWgtNo != null">
-        TAR_WGT_NO,
-      </if>
-      <if test="tarType != null">
-        TAR_TYPE,
-      </if>
-      <if test="tarInfMode != null">
-        TAR_INF_MODE,
-      </if>
-      <if test="grsInfMode != null">
-        GRS_INF_MODE,
-      </if>
-      <if test="netInfMode != null">
-        NET_INF_MODE,
-      </if>
-      <if test="grsTime != null">
-        GRS_TIME,
-      </if>
-      <if test="tarTime != null">
-        TAR_TIME,
-      </if>
-      <if test="netTime != null">
-        NET_TIME,
-      </if>
-      <if test="grsWrkOrd != null">
-        GRS_WRK_ORD,
-      </if>
-      <if test="tarWrkOrd != null">
-        TAR_WRK_ORD,
-      </if>
-      <if test="netWrkOrd != null">
-        NET_WRK_ORD,
-      </if>
-      <if test="grsWrkGrp != null">
-        GRS_WRK_GRP,
-      </if>
-      <if test="tarWrkGrp != null">
-        TAR_WRK_GRP,
-      </if>
-      <if test="netWrkGrp != null">
-        NET_WRK_GRP,
-      </if>
-      <if test="grsOpr != null">
-        GRS_OPR,
-      </if>
-      <if test="tarOpr != null">
-        TAR_OPR,
-      </if>
-      <if test="netOpr != null">
-        NET_OPR,
-      </if>
-      <if test="grsPntName != null">
-        GRS_PNT_NAME,
-      </if>
-      <if test="tarPntName != null">
-        TAR_PNT_NAME,
-      </if>
-      <if test="netPntName != null">
-        NET_PNT_NAME,
-      </if>
-      <if test="grsPntNo != null">
-        GRS_PNT_NO,
-      </if>
-      <if test="tarPntNo != null">
-        TAR_PNT_NO,
-      </if>
-      <if test="netPntNo != null">
-        NET_PNT_NO,
-      </if>
-      <if test="note != null">
-        NOTE,
-      </if>
-      <if test="sdrType != null">
-        SDR_TYPE,
-      </if>
-      <if test="sdrName != null">
-        SDR_NAME,
-      </if>
-      <if test="sender != null">
-        SENDER,
-      </if>
-      <if test="sdrNote != null">
-        SDR_NOTE,
-      </if>
-      <if test="rcvType != null">
-        RCV_TYPE,
-      </if>
-      <if test="rcvName != null">
-        RCV_NAME,
-      </if>
-      <if test="receiver != null">
-        RECEIVER,
-      </if>
-      <if test="rcvNote != null">
-        RCV_NOTE,
-      </if>
-      <if test="matName != null">
-        MAT_NAME,
-      </if>
-      <if test="matCode != null">
-        MAT_CODE,
-      </if>
-      <if test="b1PrnNum != null">
-        B1_PRN_NUM,
-      </if>
-      <if test="b2PrnNum != null">
-        B2_PRN_NUM,
-      </if>
-      <if test="b1PrnNum2 != null">
-        B1_PRN_NUM_2,
-      </if>
-      <if test="uplFlg != null">
-        UPL_FLG,
-      </if>
-      <if test="uplTime != null">
-        UPL_TIME,
-      </if>
-      <if test="delFlg != null">
-        DEL_FLG,
-      </if>
-      <if test="extBox != null">
-        EXT_BOX,
-      </if>
-      <if test="sdrGrsWgt != null">
-        SDR_GRS_WGT,
-      </if>
-      <if test="sdrTarWgt != null">
-        SDR_TAR_WGT,
-      </if>
-      <if test="sdrNetWgt != null">
-        SDR_NET_WGT,
-      </if>
-      <if test="disWgt != null">
-        DIS_WGT,
-      </if>
-      <if test="disRatio != null">
-        DIS_RATIO,
-      </if>
-      <if test="netEnd != null">
-        NET_END,
-      </if>
-      <if test="no1WgtMode != null">
-        NO1_WGT_MODE,
-      </if>
-      <if test="no2WgtMode != null">
-        NO2_WGT_MODE,
-      </if>
-      <if test="rfidNo != null">
-        RFID_NO,
-      </if>
-      <if test="chkFlg != null">
-        CHK_FLG,
-      </if>
-      <if test="checker != null">
-        CHECKER,
-      </if>
-      <if test="chkTime != null">
-        CHK_TIME,
-      </if>
-      <if test="chmPer != null">
-        CHM_PER,
-      </if>
-      <if test="chmTime != null">
-        CHM_TIME,
-      </if>
-      <if test="chmType != null">
-        CHM_TYPE,
-      </if>
-      <if test="transport != null">
-        TRANSPORT,
-      </if>
-      <if test="transName != null">
-        TRANS_NAME,
-      </if>
-      <if test="grsWgtCurve != null">
-        GRS_WGT_CURVE,
-      </if>
-      <if test="tarWgtCurve != null">
-        TAR_WGT_CURVE,
-      </if>
-      <if test="disOpr != null">
-        DIS_OPR,
-      </if>
-      <if test="disTime != null">
-        DIS_TIME,
-      </if>
-      <if test="fdUpflg != null">
-        FD_UPFLG,
-      </if>
-      <if test="chUp != null">
-        CH_UP,
-      </if>
-      <if test="chOpr != null">
-        CH_OPR,
-      </if>
-      <if test="chTime != null">
-        CH_TIME,
-      </if>
-      <if test="tdNo != null">
-        TD_NO,
-      </if>
-      <if test="tdWgt != null">
-        TD_WGT,
-      </if>
-      <if test="ddNo != null">
-        DD_NO,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="wgtNo != null">
-        #{wgtNo,jdbcType=VARCHAR},
-      </if>
-      <if test="billno != null">
-        #{billno,jdbcType=VARCHAR},
-      </if>
-      <if test="truNo != null">
-        #{truNo,jdbcType=VARCHAR},
-      </if>
-      <if test="lgsNo != null">
-        #{lgsNo,jdbcType=VARCHAR},
-      </if>
-      <if test="carNo != null">
-        #{carNo,jdbcType=VARCHAR},
-      </if>
-      <if test="icdNo != null">
-        #{icdNo,jdbcType=VARCHAR},
-      </if>
-      <if test="grsBoxNo != null">
-        #{grsBoxNo,jdbcType=DECIMAL},
-      </if>
-      <if test="tarBoxNo != null">
-        #{tarBoxNo,jdbcType=DECIMAL},
-      </if>
-      <if test="grsSpd != null">
-        #{grsSpd,jdbcType=DECIMAL},
-      </if>
-      <if test="tarSpd != null">
-        #{tarSpd,jdbcType=DECIMAL},
-      </if>
-      <if test="trnType != null">
-        #{trnType,jdbcType=VARCHAR},
-      </if>
-      <if test="grsVdoFile != null">
-        #{grsVdoFile,jdbcType=VARCHAR},
-      </if>
-      <if test="tarVdoFile != null">
-        #{tarVdoFile,jdbcType=VARCHAR},
-      </if>
-      <if test="grsTrnNo != null">
-        #{grsTrnNo,jdbcType=VARCHAR},
-      </if>
-      <if test="tarTrnNo != null">
-        #{tarTrnNo,jdbcType=VARCHAR},
-      </if>
-      <if test="wgtType != null">
-        #{wgtType,jdbcType=VARCHAR},
-      </if>
-      <if test="grsWgt != null">
-        #{grsWgt,jdbcType=DECIMAL},
-      </if>
-      <if test="tarWgt != null">
-        #{tarWgt,jdbcType=DECIMAL},
-      </if>
-      <if test="netWgt != null">
-        #{netWgt,jdbcType=DECIMAL},
-      </if>
-      <if test="no2Wgt != null">
-        #{no2Wgt,jdbcType=DECIMAL},
-      </if>
-      <if test="grsWgtNo != null">
-        #{grsWgtNo,jdbcType=VARCHAR},
-      </if>
-      <if test="tarWgtNo != null">
-        #{tarWgtNo,jdbcType=VARCHAR},
-      </if>
-      <if test="tarType != null">
-        #{tarType,jdbcType=CHAR},
-      </if>
-      <if test="tarInfMode != null">
-        #{tarInfMode,jdbcType=CHAR},
-      </if>
-      <if test="grsInfMode != null">
-        #{grsInfMode,jdbcType=CHAR},
-      </if>
-      <if test="netInfMode != null">
-        #{netInfMode,jdbcType=CHAR},
-      </if>
-      <if test="grsTime != null">
-        #{grsTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="tarTime != null">
-        #{tarTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="netTime != null">
-        #{netTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="grsWrkOrd != null">
-        #{grsWrkOrd,jdbcType=VARCHAR},
-      </if>
-      <if test="tarWrkOrd != null">
-        #{tarWrkOrd,jdbcType=VARCHAR},
-      </if>
-      <if test="netWrkOrd != null">
-        #{netWrkOrd,jdbcType=VARCHAR},
-      </if>
-      <if test="grsWrkGrp != null">
-        #{grsWrkGrp,jdbcType=VARCHAR},
-      </if>
-      <if test="tarWrkGrp != null">
-        #{tarWrkGrp,jdbcType=VARCHAR},
-      </if>
-      <if test="netWrkGrp != null">
-        #{netWrkGrp,jdbcType=VARCHAR},
-      </if>
-      <if test="grsOpr != null">
-        #{grsOpr,jdbcType=VARCHAR},
-      </if>
-      <if test="tarOpr != null">
-        #{tarOpr,jdbcType=VARCHAR},
-      </if>
-      <if test="netOpr != null">
-        #{netOpr,jdbcType=VARCHAR},
-      </if>
-      <if test="grsPntName != null">
-        #{grsPntName,jdbcType=VARCHAR},
-      </if>
-      <if test="tarPntName != null">
-        #{tarPntName,jdbcType=VARCHAR},
-      </if>
-      <if test="netPntName != null">
-        #{netPntName,jdbcType=VARCHAR},
-      </if>
-      <if test="grsPntNo != null">
-        #{grsPntNo,jdbcType=VARCHAR},
-      </if>
-      <if test="tarPntNo != null">
-        #{tarPntNo,jdbcType=VARCHAR},
-      </if>
-      <if test="netPntNo != null">
-        #{netPntNo,jdbcType=VARCHAR},
-      </if>
-      <if test="note != null">
-        #{note,jdbcType=VARCHAR},
-      </if>
-      <if test="sdrType != null">
-        #{sdrType,jdbcType=VARCHAR},
-      </if>
-      <if test="sdrName != null">
-        #{sdrName,jdbcType=VARCHAR},
-      </if>
-      <if test="sender != null">
-        #{sender,jdbcType=VARCHAR},
-      </if>
-      <if test="sdrNote != null">
-        #{sdrNote,jdbcType=VARCHAR},
-      </if>
-      <if test="rcvType != null">
-        #{rcvType,jdbcType=VARCHAR},
-      </if>
-      <if test="rcvName != null">
-        #{rcvName,jdbcType=VARCHAR},
-      </if>
-      <if test="receiver != null">
-        #{receiver,jdbcType=VARCHAR},
-      </if>
-      <if test="rcvNote != null">
-        #{rcvNote,jdbcType=VARCHAR},
-      </if>
-      <if test="matName != null">
-        #{matName,jdbcType=VARCHAR},
-      </if>
-      <if test="matCode != null">
-        #{matCode,jdbcType=VARCHAR},
-      </if>
-      <if test="b1PrnNum != null">
-        #{b1PrnNum,jdbcType=DECIMAL},
-      </if>
-      <if test="b2PrnNum != null">
-        #{b2PrnNum,jdbcType=DECIMAL},
-      </if>
-      <if test="b1PrnNum2 != null">
-        #{b1PrnNum2,jdbcType=DECIMAL},
-      </if>
-      <if test="uplFlg != null">
-        #{uplFlg,jdbcType=VARCHAR},
-      </if>
-      <if test="uplTime != null">
-        #{uplTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="delFlg != null">
-        #{delFlg,jdbcType=VARCHAR},
-      </if>
-      <if test="extBox != null">
-        #{extBox,jdbcType=CHAR},
-      </if>
-      <if test="sdrGrsWgt != null">
-        #{sdrGrsWgt,jdbcType=DECIMAL},
-      </if>
-      <if test="sdrTarWgt != null">
-        #{sdrTarWgt,jdbcType=DECIMAL},
-      </if>
-      <if test="sdrNetWgt != null">
-        #{sdrNetWgt,jdbcType=DECIMAL},
-      </if>
-      <if test="disWgt != null">
-        #{disWgt,jdbcType=DECIMAL},
-      </if>
-      <if test="disRatio != null">
-        #{disRatio,jdbcType=DECIMAL},
-      </if>
-      <if test="netEnd != null">
-        #{netEnd,jdbcType=DECIMAL},
-      </if>
-      <if test="no1WgtMode != null">
-        #{no1WgtMode,jdbcType=VARCHAR},
-      </if>
-      <if test="no2WgtMode != null">
-        #{no2WgtMode,jdbcType=VARCHAR},
-      </if>
-      <if test="rfidNo != null">
-        #{rfidNo,jdbcType=VARCHAR},
-      </if>
-      <if test="chkFlg != null">
-        #{chkFlg,jdbcType=VARCHAR},
-      </if>
-      <if test="checker != null">
-        #{checker,jdbcType=VARCHAR},
-      </if>
-      <if test="chkTime != null">
-        #{chkTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="chmPer != null">
-        #{chmPer,jdbcType=VARCHAR},
-      </if>
-      <if test="chmTime != null">
-        #{chmTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="chmType != null">
-        #{chmType,jdbcType=VARCHAR},
-      </if>
-      <if test="transport != null">
-        #{transport,jdbcType=VARCHAR},
-      </if>
-      <if test="transName != null">
-        #{transName,jdbcType=VARCHAR},
-      </if>
-      <if test="grsWgtCurve != null">
-        #{grsWgtCurve,jdbcType=VARCHAR},
-      </if>
-      <if test="tarWgtCurve != null">
-        #{tarWgtCurve,jdbcType=VARCHAR},
-      </if>
-      <if test="disOpr != null">
-        #{disOpr,jdbcType=VARCHAR},
-      </if>
-      <if test="disTime != null">
-        #{disTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="fdUpflg != null">
-        #{fdUpflg,jdbcType=VARCHAR},
-      </if>
-      <if test="chUp != null">
-        #{chUp,jdbcType=VARCHAR},
-      </if>
-      <if test="chOpr != null">
-        #{chOpr,jdbcType=VARCHAR},
-      </if>
-      <if test="chTime != null">
-        #{chTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="tdNo != null">
-        #{tdNo,jdbcType=VARCHAR},
-      </if>
-      <if test="tdWgt != null">
-        #{tdWgt,jdbcType=DECIMAL},
-      </if>
-      <if test="ddNo != null">
-        #{ddNo,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.TimedTask.cmmcarweightresults.model.CmmCarweightresults">
-    update  JGWEIGHT_USER.CMM_CARWEIGHTRESULTS 
-    set BILLNO = #{billno,jdbcType=VARCHAR},
-      TRU_NO = #{truNo,jdbcType=VARCHAR},
-      LGS_NO = #{lgsNo,jdbcType=VARCHAR},
-      CAR_NO = #{carNo,jdbcType=VARCHAR},
-      ICD_NO = #{icdNo,jdbcType=VARCHAR},
-      GRS_BOX_NO = #{grsBoxNo,jdbcType=DECIMAL},
-      TAR_BOX_NO = #{tarBoxNo,jdbcType=DECIMAL},
-      GRS_SPD = #{grsSpd,jdbcType=DECIMAL},
-      TAR_SPD = #{tarSpd,jdbcType=DECIMAL},
-      TRN_TYPE = #{trnType,jdbcType=VARCHAR},
-      GRS_VDO_FILE = #{grsVdoFile,jdbcType=VARCHAR},
-      TAR_VDO_FILE = #{tarVdoFile,jdbcType=VARCHAR},
-      GRS_TRN_NO = #{grsTrnNo,jdbcType=VARCHAR},
-      TAR_TRN_NO = #{tarTrnNo,jdbcType=VARCHAR},
-      WGT_TYPE = #{wgtType,jdbcType=VARCHAR},
-      GRS_WGT = #{grsWgt,jdbcType=DECIMAL},
-      TAR_WGT = #{tarWgt,jdbcType=DECIMAL},
-      NET_WGT = #{netWgt,jdbcType=DECIMAL},
-      NO2_WGT = #{no2Wgt,jdbcType=DECIMAL},
-      GRS_WGT_NO = #{grsWgtNo,jdbcType=VARCHAR},
-      TAR_WGT_NO = #{tarWgtNo,jdbcType=VARCHAR},
-      TAR_TYPE = #{tarType,jdbcType=CHAR},
-      TAR_INF_MODE = #{tarInfMode,jdbcType=CHAR},
-      GRS_INF_MODE = #{grsInfMode,jdbcType=CHAR},
-      NET_INF_MODE = #{netInfMode,jdbcType=CHAR},
-      GRS_TIME = #{grsTime,jdbcType=TIMESTAMP},
-      TAR_TIME = #{tarTime,jdbcType=TIMESTAMP},
-      NET_TIME = #{netTime,jdbcType=TIMESTAMP},
-      GRS_WRK_ORD = #{grsWrkOrd,jdbcType=VARCHAR},
-      TAR_WRK_ORD = #{tarWrkOrd,jdbcType=VARCHAR},
-      NET_WRK_ORD = #{netWrkOrd,jdbcType=VARCHAR},
-      GRS_WRK_GRP = #{grsWrkGrp,jdbcType=VARCHAR},
-      TAR_WRK_GRP = #{tarWrkGrp,jdbcType=VARCHAR},
-      NET_WRK_GRP = #{netWrkGrp,jdbcType=VARCHAR},
-      GRS_OPR = #{grsOpr,jdbcType=VARCHAR},
-      TAR_OPR = #{tarOpr,jdbcType=VARCHAR},
-      NET_OPR = #{netOpr,jdbcType=VARCHAR},
-      GRS_PNT_NAME = #{grsPntName,jdbcType=VARCHAR},
-      TAR_PNT_NAME = #{tarPntName,jdbcType=VARCHAR},
-      NET_PNT_NAME = #{netPntName,jdbcType=VARCHAR},
-      GRS_PNT_NO = #{grsPntNo,jdbcType=VARCHAR},
-      TAR_PNT_NO = #{tarPntNo,jdbcType=VARCHAR},
-      NET_PNT_NO = #{netPntNo,jdbcType=VARCHAR},
-      NOTE = #{note,jdbcType=VARCHAR},
-      SDR_TYPE = #{sdrType,jdbcType=VARCHAR},
-      SDR_NAME = #{sdrName,jdbcType=VARCHAR},
-      SENDER = #{sender,jdbcType=VARCHAR},
-      SDR_NOTE = #{sdrNote,jdbcType=VARCHAR},
-      RCV_TYPE = #{rcvType,jdbcType=VARCHAR},
-      RCV_NAME = #{rcvName,jdbcType=VARCHAR},
-      RECEIVER = #{receiver,jdbcType=VARCHAR},
-      RCV_NOTE = #{rcvNote,jdbcType=VARCHAR},
-      MAT_NAME = #{matName,jdbcType=VARCHAR},
-      MAT_CODE = #{matCode,jdbcType=VARCHAR},
-      B1_PRN_NUM = #{b1PrnNum,jdbcType=DECIMAL},
-      B2_PRN_NUM = #{b2PrnNum,jdbcType=DECIMAL},
-      B1_PRN_NUM_2 = #{b1PrnNum2,jdbcType=DECIMAL},
-      UPL_FLG = #{uplFlg,jdbcType=VARCHAR},
-      UPL_TIME = #{uplTime,jdbcType=TIMESTAMP},
-      DEL_FLG = #{delFlg,jdbcType=VARCHAR},
-      EXT_BOX = #{extBox,jdbcType=CHAR},
-      SDR_GRS_WGT = #{sdrGrsWgt,jdbcType=DECIMAL},
-      SDR_TAR_WGT = #{sdrTarWgt,jdbcType=DECIMAL},
-      SDR_NET_WGT = #{sdrNetWgt,jdbcType=DECIMAL},
-      DIS_WGT = #{disWgt,jdbcType=DECIMAL},
-      DIS_RATIO = #{disRatio,jdbcType=DECIMAL},
-      NET_END = #{netEnd,jdbcType=DECIMAL},
-      NO1_WGT_MODE = #{no1WgtMode,jdbcType=VARCHAR},
-      NO2_WGT_MODE = #{no2WgtMode,jdbcType=VARCHAR},
-      RFID_NO = #{rfidNo,jdbcType=VARCHAR},
-      CHK_FLG = #{chkFlg,jdbcType=VARCHAR},
-      CHECKER = #{checker,jdbcType=VARCHAR},
-      CHK_TIME = #{chkTime,jdbcType=TIMESTAMP},
-      CHM_PER = #{chmPer,jdbcType=VARCHAR},
-      CHM_TIME = #{chmTime,jdbcType=TIMESTAMP},
-      CHM_TYPE = #{chmType,jdbcType=VARCHAR},
-      TRANSPORT = #{transport,jdbcType=VARCHAR},
-      TRANS_NAME = #{transName,jdbcType=VARCHAR},
-      GRS_WGT_CURVE = #{grsWgtCurve,jdbcType=VARCHAR},
-      TAR_WGT_CURVE = #{tarWgtCurve,jdbcType=VARCHAR},
-      DIS_OPR = #{disOpr,jdbcType=VARCHAR},
-      DIS_TIME = #{disTime,jdbcType=TIMESTAMP},
-      FD_UPFLG = #{fdUpflg,jdbcType=VARCHAR},
-      CH_UP = #{chUp,jdbcType=VARCHAR},
-      CH_OPR = #{chOpr,jdbcType=VARCHAR},
-      CH_TIME = #{chTime,jdbcType=TIMESTAMP},
-      TD_NO = #{tdNo,jdbcType=VARCHAR},
-      TD_WGT = #{tdWgt,jdbcType=DECIMAL},
-      DD_NO = #{ddNo,jdbcType=VARCHAR}
-    where WGT_NO = #{wgtNo,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.TimedTask.cmmcarweightresults.model.CmmCarweightresults">
-    update  JGWEIGHT_USER.CMM_CARWEIGHTRESULTS 
-    <set>
-      <if test="billno != null">
-        BILLNO = #{billno,jdbcType=VARCHAR},
-      </if>
-      <if test="truNo != null">
-        TRU_NO = #{truNo,jdbcType=VARCHAR},
-      </if>
-      <if test="lgsNo != null">
-        LGS_NO = #{lgsNo,jdbcType=VARCHAR},
-      </if>
-      <if test="carNo != null">
-        CAR_NO = #{carNo,jdbcType=VARCHAR},
-      </if>
-      <if test="icdNo != null">
-        ICD_NO = #{icdNo,jdbcType=VARCHAR},
-      </if>
-      <if test="grsBoxNo != null">
-        GRS_BOX_NO = #{grsBoxNo,jdbcType=DECIMAL},
-      </if>
-      <if test="tarBoxNo != null">
-        TAR_BOX_NO = #{tarBoxNo,jdbcType=DECIMAL},
-      </if>
-      <if test="grsSpd != null">
-        GRS_SPD = #{grsSpd,jdbcType=DECIMAL},
-      </if>
-      <if test="tarSpd != null">
-        TAR_SPD = #{tarSpd,jdbcType=DECIMAL},
-      </if>
-      <if test="trnType != null">
-        TRN_TYPE = #{trnType,jdbcType=VARCHAR},
-      </if>
-      <if test="grsVdoFile != null">
-        GRS_VDO_FILE = #{grsVdoFile,jdbcType=VARCHAR},
-      </if>
-      <if test="tarVdoFile != null">
-        TAR_VDO_FILE = #{tarVdoFile,jdbcType=VARCHAR},
-      </if>
-      <if test="grsTrnNo != null">
-        GRS_TRN_NO = #{grsTrnNo,jdbcType=VARCHAR},
-      </if>
-      <if test="tarTrnNo != null">
-        TAR_TRN_NO = #{tarTrnNo,jdbcType=VARCHAR},
-      </if>
-      <if test="wgtType != null">
-        WGT_TYPE = #{wgtType,jdbcType=VARCHAR},
-      </if>
-      <if test="grsWgt != null">
-        GRS_WGT = #{grsWgt,jdbcType=DECIMAL},
-      </if>
-      <if test="tarWgt != null">
-        TAR_WGT = #{tarWgt,jdbcType=DECIMAL},
-      </if>
-      <if test="netWgt != null">
-        NET_WGT = #{netWgt,jdbcType=DECIMAL},
-      </if>
-      <if test="no2Wgt != null">
-        NO2_WGT = #{no2Wgt,jdbcType=DECIMAL},
-      </if>
-      <if test="grsWgtNo != null">
-        GRS_WGT_NO = #{grsWgtNo,jdbcType=VARCHAR},
-      </if>
-      <if test="tarWgtNo != null">
-        TAR_WGT_NO = #{tarWgtNo,jdbcType=VARCHAR},
-      </if>
-      <if test="tarType != null">
-        TAR_TYPE = #{tarType,jdbcType=CHAR},
-      </if>
-      <if test="tarInfMode != null">
-        TAR_INF_MODE = #{tarInfMode,jdbcType=CHAR},
-      </if>
-      <if test="grsInfMode != null">
-        GRS_INF_MODE = #{grsInfMode,jdbcType=CHAR},
-      </if>
-      <if test="netInfMode != null">
-        NET_INF_MODE = #{netInfMode,jdbcType=CHAR},
-      </if>
-      <if test="grsTime != null">
-        GRS_TIME = #{grsTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="tarTime != null">
-        TAR_TIME = #{tarTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="netTime != null">
-        NET_TIME = #{netTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="grsWrkOrd != null">
-        GRS_WRK_ORD = #{grsWrkOrd,jdbcType=VARCHAR},
-      </if>
-      <if test="tarWrkOrd != null">
-        TAR_WRK_ORD = #{tarWrkOrd,jdbcType=VARCHAR},
-      </if>
-      <if test="netWrkOrd != null">
-        NET_WRK_ORD = #{netWrkOrd,jdbcType=VARCHAR},
-      </if>
-      <if test="grsWrkGrp != null">
-        GRS_WRK_GRP = #{grsWrkGrp,jdbcType=VARCHAR},
-      </if>
-      <if test="tarWrkGrp != null">
-        TAR_WRK_GRP = #{tarWrkGrp,jdbcType=VARCHAR},
-      </if>
-      <if test="netWrkGrp != null">
-        NET_WRK_GRP = #{netWrkGrp,jdbcType=VARCHAR},
-      </if>
-      <if test="grsOpr != null">
-        GRS_OPR = #{grsOpr,jdbcType=VARCHAR},
-      </if>
-      <if test="tarOpr != null">
-        TAR_OPR = #{tarOpr,jdbcType=VARCHAR},
-      </if>
-      <if test="netOpr != null">
-        NET_OPR = #{netOpr,jdbcType=VARCHAR},
-      </if>
-      <if test="grsPntName != null">
-        GRS_PNT_NAME = #{grsPntName,jdbcType=VARCHAR},
-      </if>
-      <if test="tarPntName != null">
-        TAR_PNT_NAME = #{tarPntName,jdbcType=VARCHAR},
-      </if>
-      <if test="netPntName != null">
-        NET_PNT_NAME = #{netPntName,jdbcType=VARCHAR},
-      </if>
-      <if test="grsPntNo != null">
-        GRS_PNT_NO = #{grsPntNo,jdbcType=VARCHAR},
-      </if>
-      <if test="tarPntNo != null">
-        TAR_PNT_NO = #{tarPntNo,jdbcType=VARCHAR},
-      </if>
-      <if test="netPntNo != null">
-        NET_PNT_NO = #{netPntNo,jdbcType=VARCHAR},
-      </if>
-      <if test="note != null">
-        NOTE = #{note,jdbcType=VARCHAR},
-      </if>
-      <if test="sdrType != null">
-        SDR_TYPE = #{sdrType,jdbcType=VARCHAR},
-      </if>
-      <if test="sdrName != null">
-        SDR_NAME = #{sdrName,jdbcType=VARCHAR},
-      </if>
-      <if test="sender != null">
-        SENDER = #{sender,jdbcType=VARCHAR},
-      </if>
-      <if test="sdrNote != null">
-        SDR_NOTE = #{sdrNote,jdbcType=VARCHAR},
-      </if>
-      <if test="rcvType != null">
-        RCV_TYPE = #{rcvType,jdbcType=VARCHAR},
-      </if>
-      <if test="rcvName != null">
-        RCV_NAME = #{rcvName,jdbcType=VARCHAR},
-      </if>
-      <if test="receiver != null">
-        RECEIVER = #{receiver,jdbcType=VARCHAR},
-      </if>
-      <if test="rcvNote != null">
-        RCV_NOTE = #{rcvNote,jdbcType=VARCHAR},
-      </if>
-      <if test="matName != null">
-        MAT_NAME = #{matName,jdbcType=VARCHAR},
-      </if>
-      <if test="matCode != null">
-        MAT_CODE = #{matCode,jdbcType=VARCHAR},
-      </if>
-      <if test="b1PrnNum != null">
-        B1_PRN_NUM = #{b1PrnNum,jdbcType=DECIMAL},
-      </if>
-      <if test="b2PrnNum != null">
-        B2_PRN_NUM = #{b2PrnNum,jdbcType=DECIMAL},
-      </if>
-      <if test="b1PrnNum2 != null">
-        B1_PRN_NUM_2 = #{b1PrnNum2,jdbcType=DECIMAL},
-      </if>
-      <if test="uplFlg != null">
-        UPL_FLG = #{uplFlg,jdbcType=VARCHAR},
-      </if>
-      <if test="uplTime != null">
-        UPL_TIME = #{uplTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="delFlg != null">
-        DEL_FLG = #{delFlg,jdbcType=VARCHAR},
-      </if>
-      <if test="extBox != null">
-        EXT_BOX = #{extBox,jdbcType=CHAR},
-      </if>
-      <if test="sdrGrsWgt != null">
-        SDR_GRS_WGT = #{sdrGrsWgt,jdbcType=DECIMAL},
-      </if>
-      <if test="sdrTarWgt != null">
-        SDR_TAR_WGT = #{sdrTarWgt,jdbcType=DECIMAL},
-      </if>
-      <if test="sdrNetWgt != null">
-        SDR_NET_WGT = #{sdrNetWgt,jdbcType=DECIMAL},
-      </if>
-      <if test="disWgt != null">
-        DIS_WGT = #{disWgt,jdbcType=DECIMAL},
-      </if>
-      <if test="disRatio != null">
-        DIS_RATIO = #{disRatio,jdbcType=DECIMAL},
-      </if>
-      <if test="netEnd != null">
-        NET_END = #{netEnd,jdbcType=DECIMAL},
-      </if>
-      <if test="no1WgtMode != null">
-        NO1_WGT_MODE = #{no1WgtMode,jdbcType=VARCHAR},
-      </if>
-      <if test="no2WgtMode != null">
-        NO2_WGT_MODE = #{no2WgtMode,jdbcType=VARCHAR},
-      </if>
-      <if test="rfidNo != null">
-        RFID_NO = #{rfidNo,jdbcType=VARCHAR},
-      </if>
-      <if test="chkFlg != null">
-        CHK_FLG = #{chkFlg,jdbcType=VARCHAR},
-      </if>
-      <if test="checker != null">
-        CHECKER = #{checker,jdbcType=VARCHAR},
-      </if>
-      <if test="chkTime != null">
-        CHK_TIME = #{chkTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="chmPer != null">
-        CHM_PER = #{chmPer,jdbcType=VARCHAR},
-      </if>
-      <if test="chmTime != null">
-        CHM_TIME = #{chmTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="chmType != null">
-        CHM_TYPE = #{chmType,jdbcType=VARCHAR},
-      </if>
-      <if test="transport != null">
-        TRANSPORT = #{transport,jdbcType=VARCHAR},
-      </if>
-      <if test="transName != null">
-        TRANS_NAME = #{transName,jdbcType=VARCHAR},
-      </if>
-      <if test="grsWgtCurve != null">
-        GRS_WGT_CURVE = #{grsWgtCurve,jdbcType=VARCHAR},
-      </if>
-      <if test="tarWgtCurve != null">
-        TAR_WGT_CURVE = #{tarWgtCurve,jdbcType=VARCHAR},
-      </if>
-      <if test="disOpr != null">
-        DIS_OPR = #{disOpr,jdbcType=VARCHAR},
-      </if>
-      <if test="disTime != null">
-        DIS_TIME = #{disTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="fdUpflg != null">
-        FD_UPFLG = #{fdUpflg,jdbcType=VARCHAR},
-      </if>
-      <if test="chUp != null">
-        CH_UP = #{chUp,jdbcType=VARCHAR},
-      </if>
-      <if test="chOpr != null">
-        CH_OPR = #{chOpr,jdbcType=VARCHAR},
-      </if>
-      <if test="chTime != null">
-        CH_TIME = #{chTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="tdNo != null">
-        TD_NO = #{tdNo,jdbcType=VARCHAR},
-      </if>
-      <if test="tdWgt != null">
-        TD_WGT = #{tdWgt,jdbcType=DECIMAL},
-      </if>
-      <if test="ddNo != null">
-        DD_NO = #{ddNo,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where WGT_NO = #{wgtNo,jdbcType=VARCHAR}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    <include refid="select" />
-    where WGT_NO = #{wgtNo,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  JGWEIGHT_USER.CMM_CARWEIGHTRESULTS  
-      (WGT_NO, 
-      BILLNO, TRU_NO, LGS_NO, 
-      CAR_NO, ICD_NO, GRS_BOX_NO, 
-      TAR_BOX_NO, GRS_SPD, TAR_SPD, 
-      TRN_TYPE, GRS_VDO_FILE, TAR_VDO_FILE, 
-      GRS_TRN_NO, TAR_TRN_NO, WGT_TYPE, 
-      GRS_WGT, TAR_WGT, NET_WGT, 
-      NO2_WGT, GRS_WGT_NO, TAR_WGT_NO, 
-      TAR_TYPE, TAR_INF_MODE, GRS_INF_MODE, 
-      NET_INF_MODE, GRS_TIME, TAR_TIME, 
-      NET_TIME, GRS_WRK_ORD, TAR_WRK_ORD, 
-      NET_WRK_ORD, GRS_WRK_GRP, TAR_WRK_GRP, 
-      NET_WRK_GRP, GRS_OPR, TAR_OPR, 
-      NET_OPR, GRS_PNT_NAME, TAR_PNT_NAME, 
-      NET_PNT_NAME, GRS_PNT_NO, TAR_PNT_NO, 
-      NET_PNT_NO, NOTE, SDR_TYPE, 
-      SDR_NAME, SENDER, SDR_NOTE, 
-      RCV_TYPE, RCV_NAME, RECEIVER, 
-      RCV_NOTE, MAT_NAME, MAT_CODE, 
-      B1_PRN_NUM, B2_PRN_NUM, B1_PRN_NUM_2, 
-      UPL_FLG, UPL_TIME, DEL_FLG, 
-      EXT_BOX, SDR_GRS_WGT, SDR_TAR_WGT, 
-      SDR_NET_WGT, DIS_WGT, DIS_RATIO, 
-      NET_END, NO1_WGT_MODE, NO2_WGT_MODE, 
-      RFID_NO, CHK_FLG, CHECKER, 
-      CHK_TIME, CHM_PER, CHM_TIME, 
-      CHM_TYPE, TRANSPORT, TRANS_NAME, 
-      GRS_WGT_CURVE, TAR_WGT_CURVE, DIS_OPR, 
-      DIS_TIME, FD_UPFLG, CH_UP, 
-      CH_OPR, CH_TIME, TD_NO, 
-      TD_WGT, DD_NO)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.wgtNo,jdbcType=VARCHAR}, 
-      #{item.billno,jdbcType=VARCHAR}, #{item.truNo,jdbcType=VARCHAR}, #{item.lgsNo,jdbcType=VARCHAR}, 
-      #{item.carNo,jdbcType=VARCHAR}, #{item.icdNo,jdbcType=VARCHAR}, #{item.grsBoxNo,jdbcType=DECIMAL}, 
-      #{item.tarBoxNo,jdbcType=DECIMAL}, #{item.grsSpd,jdbcType=DECIMAL}, #{item.tarSpd,jdbcType=DECIMAL}, 
-      #{item.trnType,jdbcType=VARCHAR}, #{item.grsVdoFile,jdbcType=VARCHAR}, #{item.tarVdoFile,jdbcType=VARCHAR}, 
-      #{item.grsTrnNo,jdbcType=VARCHAR}, #{item.tarTrnNo,jdbcType=VARCHAR}, #{item.wgtType,jdbcType=VARCHAR}, 
-      #{item.grsWgt,jdbcType=DECIMAL}, #{item.tarWgt,jdbcType=DECIMAL}, #{item.netWgt,jdbcType=DECIMAL}, 
-      #{item.no2Wgt,jdbcType=DECIMAL}, #{item.grsWgtNo,jdbcType=VARCHAR}, #{item.tarWgtNo,jdbcType=VARCHAR}, 
-      #{item.tarType,jdbcType=CHAR}, #{item.tarInfMode,jdbcType=CHAR}, #{item.grsInfMode,jdbcType=CHAR}, 
-      #{item.netInfMode,jdbcType=CHAR}, #{item.grsTime,jdbcType=TIMESTAMP}, #{item.tarTime,jdbcType=TIMESTAMP}, 
-      #{item.netTime,jdbcType=TIMESTAMP}, #{item.grsWrkOrd,jdbcType=VARCHAR}, #{item.tarWrkOrd,jdbcType=VARCHAR}, 
-      #{item.netWrkOrd,jdbcType=VARCHAR}, #{item.grsWrkGrp,jdbcType=VARCHAR}, #{item.tarWrkGrp,jdbcType=VARCHAR}, 
-      #{item.netWrkGrp,jdbcType=VARCHAR}, #{item.grsOpr,jdbcType=VARCHAR}, #{item.tarOpr,jdbcType=VARCHAR}, 
-      #{item.netOpr,jdbcType=VARCHAR}, #{item.grsPntName,jdbcType=VARCHAR}, #{item.tarPntName,jdbcType=VARCHAR}, 
-      #{item.netPntName,jdbcType=VARCHAR}, #{item.grsPntNo,jdbcType=VARCHAR}, #{item.tarPntNo,jdbcType=VARCHAR}, 
-      #{item.netPntNo,jdbcType=VARCHAR}, #{item.note,jdbcType=VARCHAR}, #{item.sdrType,jdbcType=VARCHAR}, 
-      #{item.sdrName,jdbcType=VARCHAR}, #{item.sender,jdbcType=VARCHAR}, #{item.sdrNote,jdbcType=VARCHAR}, 
-      #{item.rcvType,jdbcType=VARCHAR}, #{item.rcvName,jdbcType=VARCHAR}, #{item.receiver,jdbcType=VARCHAR}, 
-      #{item.rcvNote,jdbcType=VARCHAR}, #{item.matName,jdbcType=VARCHAR}, #{item.matCode,jdbcType=VARCHAR}, 
-      #{item.b1PrnNum,jdbcType=DECIMAL}, #{item.b2PrnNum,jdbcType=DECIMAL}, #{item.b1PrnNum2,jdbcType=DECIMAL}, 
-      #{item.uplFlg,jdbcType=VARCHAR}, #{item.uplTime,jdbcType=TIMESTAMP}, #{item.delFlg,jdbcType=VARCHAR}, 
-      #{item.extBox,jdbcType=CHAR}, #{item.sdrGrsWgt,jdbcType=DECIMAL}, #{item.sdrTarWgt,jdbcType=DECIMAL}, 
-      #{item.sdrNetWgt,jdbcType=DECIMAL}, #{item.disWgt,jdbcType=DECIMAL}, #{item.disRatio,jdbcType=DECIMAL}, 
-      #{item.netEnd,jdbcType=DECIMAL}, #{item.no1WgtMode,jdbcType=VARCHAR}, #{item.no2WgtMode,jdbcType=VARCHAR}, 
-      #{item.rfidNo,jdbcType=VARCHAR}, #{item.chkFlg,jdbcType=VARCHAR}, #{item.checker,jdbcType=VARCHAR}, 
-      #{item.chkTime,jdbcType=TIMESTAMP}, #{item.chmPer,jdbcType=VARCHAR}, #{item.chmTime,jdbcType=TIMESTAMP}, 
-      #{item.chmType,jdbcType=VARCHAR}, #{item.transport,jdbcType=VARCHAR}, #{item.transName,jdbcType=VARCHAR}, 
-      #{item.grsWgtCurve,jdbcType=VARCHAR}, #{item.tarWgtCurve,jdbcType=VARCHAR}, #{item.disOpr,jdbcType=VARCHAR}, 
-      #{item.disTime,jdbcType=TIMESTAMP}, #{item.fdUpflg,jdbcType=VARCHAR}, #{item.chUp,jdbcType=VARCHAR}, 
-      #{item.chOpr,jdbcType=VARCHAR}, #{item.chTime,jdbcType=TIMESTAMP}, #{item.tdNo,jdbcType=VARCHAR}, 
-      #{item.tdWgt,jdbcType=DECIMAL}, #{item.ddNo,jdbcType=VARCHAR} from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update  JGWEIGHT_USER.CMM_CARWEIGHTRESULTS 
-     set
-       WGT_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.wgtNo,jdbcType=VARCHAR}
-       </foreach>
-       ,BILLNO=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.billno,jdbcType=VARCHAR}
-       </foreach>
-       ,TRU_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.truNo,jdbcType=VARCHAR}
-       </foreach>
-       ,LGS_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.lgsNo,jdbcType=VARCHAR}
-       </foreach>
-       ,CAR_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.carNo,jdbcType=VARCHAR}
-       </foreach>
-       ,ICD_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.icdNo,jdbcType=VARCHAR}
-       </foreach>
-       ,GRS_BOX_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.grsBoxNo,jdbcType=DECIMAL}
-       </foreach>
-       ,TAR_BOX_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tarBoxNo,jdbcType=DECIMAL}
-       </foreach>
-       ,GRS_SPD=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.grsSpd,jdbcType=DECIMAL}
-       </foreach>
-       ,TAR_SPD=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tarSpd,jdbcType=DECIMAL}
-       </foreach>
-       ,TRN_TYPE=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.trnType,jdbcType=VARCHAR}
-       </foreach>
-       ,GRS_VDO_FILE=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.grsVdoFile,jdbcType=VARCHAR}
-       </foreach>
-       ,TAR_VDO_FILE=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tarVdoFile,jdbcType=VARCHAR}
-       </foreach>
-       ,GRS_TRN_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.grsTrnNo,jdbcType=VARCHAR}
-       </foreach>
-       ,TAR_TRN_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tarTrnNo,jdbcType=VARCHAR}
-       </foreach>
-       ,WGT_TYPE=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.wgtType,jdbcType=VARCHAR}
-       </foreach>
-       ,GRS_WGT=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.grsWgt,jdbcType=DECIMAL}
-       </foreach>
-       ,TAR_WGT=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tarWgt,jdbcType=DECIMAL}
-       </foreach>
-       ,NET_WGT=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.netWgt,jdbcType=DECIMAL}
-       </foreach>
-       ,NO2_WGT=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.no2Wgt,jdbcType=DECIMAL}
-       </foreach>
-       ,GRS_WGT_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.grsWgtNo,jdbcType=VARCHAR}
-       </foreach>
-       ,TAR_WGT_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tarWgtNo,jdbcType=VARCHAR}
-       </foreach>
-       ,TAR_TYPE=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tarType,jdbcType=CHAR}
-       </foreach>
-       ,TAR_INF_MODE=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tarInfMode,jdbcType=CHAR}
-       </foreach>
-       ,GRS_INF_MODE=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.grsInfMode,jdbcType=CHAR}
-       </foreach>
-       ,NET_INF_MODE=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.netInfMode,jdbcType=CHAR}
-       </foreach>
-       ,GRS_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.grsTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,TAR_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tarTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,NET_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.netTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,GRS_WRK_ORD=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.grsWrkOrd,jdbcType=VARCHAR}
-       </foreach>
-       ,TAR_WRK_ORD=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tarWrkOrd,jdbcType=VARCHAR}
-       </foreach>
-       ,NET_WRK_ORD=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.netWrkOrd,jdbcType=VARCHAR}
-       </foreach>
-       ,GRS_WRK_GRP=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.grsWrkGrp,jdbcType=VARCHAR}
-       </foreach>
-       ,TAR_WRK_GRP=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tarWrkGrp,jdbcType=VARCHAR}
-       </foreach>
-       ,NET_WRK_GRP=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.netWrkGrp,jdbcType=VARCHAR}
-       </foreach>
-       ,GRS_OPR=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.grsOpr,jdbcType=VARCHAR}
-       </foreach>
-       ,TAR_OPR=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tarOpr,jdbcType=VARCHAR}
-       </foreach>
-       ,NET_OPR=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.netOpr,jdbcType=VARCHAR}
-       </foreach>
-       ,GRS_PNT_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.grsPntName,jdbcType=VARCHAR}
-       </foreach>
-       ,TAR_PNT_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tarPntName,jdbcType=VARCHAR}
-       </foreach>
-       ,NET_PNT_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.netPntName,jdbcType=VARCHAR}
-       </foreach>
-       ,GRS_PNT_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.grsPntNo,jdbcType=VARCHAR}
-       </foreach>
-       ,TAR_PNT_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tarPntNo,jdbcType=VARCHAR}
-       </foreach>
-       ,NET_PNT_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.netPntNo,jdbcType=VARCHAR}
-       </foreach>
-       ,NOTE=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.note,jdbcType=VARCHAR}
-       </foreach>
-       ,SDR_TYPE=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.sdrType,jdbcType=VARCHAR}
-       </foreach>
-       ,SDR_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.sdrName,jdbcType=VARCHAR}
-       </foreach>
-       ,SENDER=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.sender,jdbcType=VARCHAR}
-       </foreach>
-       ,SDR_NOTE=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.sdrNote,jdbcType=VARCHAR}
-       </foreach>
-       ,RCV_TYPE=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.rcvType,jdbcType=VARCHAR}
-       </foreach>
-       ,RCV_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.rcvName,jdbcType=VARCHAR}
-       </foreach>
-       ,RECEIVER=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.receiver,jdbcType=VARCHAR}
-       </foreach>
-       ,RCV_NOTE=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.rcvNote,jdbcType=VARCHAR}
-       </foreach>
-       ,MAT_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.matName,jdbcType=VARCHAR}
-       </foreach>
-       ,MAT_CODE=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.matCode,jdbcType=VARCHAR}
-       </foreach>
-       ,B1_PRN_NUM=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.b1PrnNum,jdbcType=DECIMAL}
-       </foreach>
-       ,B2_PRN_NUM=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.b2PrnNum,jdbcType=DECIMAL}
-       </foreach>
-       ,B1_PRN_NUM_2=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.b1PrnNum2,jdbcType=DECIMAL}
-       </foreach>
-       ,UPL_FLG=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.uplFlg,jdbcType=VARCHAR}
-       </foreach>
-       ,UPL_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.uplTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,DEL_FLG=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.delFlg,jdbcType=VARCHAR}
-       </foreach>
-       ,EXT_BOX=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.extBox,jdbcType=CHAR}
-       </foreach>
-       ,SDR_GRS_WGT=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.sdrGrsWgt,jdbcType=DECIMAL}
-       </foreach>
-       ,SDR_TAR_WGT=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.sdrTarWgt,jdbcType=DECIMAL}
-       </foreach>
-       ,SDR_NET_WGT=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.sdrNetWgt,jdbcType=DECIMAL}
-       </foreach>
-       ,DIS_WGT=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.disWgt,jdbcType=DECIMAL}
-       </foreach>
-       ,DIS_RATIO=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.disRatio,jdbcType=DECIMAL}
-       </foreach>
-       ,NET_END=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.netEnd,jdbcType=DECIMAL}
-       </foreach>
-       ,NO1_WGT_MODE=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.no1WgtMode,jdbcType=VARCHAR}
-       </foreach>
-       ,NO2_WGT_MODE=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.no2WgtMode,jdbcType=VARCHAR}
-       </foreach>
-       ,RFID_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.rfidNo,jdbcType=VARCHAR}
-       </foreach>
-       ,CHK_FLG=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.chkFlg,jdbcType=VARCHAR}
-       </foreach>
-       ,CHECKER=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.checker,jdbcType=VARCHAR}
-       </foreach>
-       ,CHK_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.chkTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,CHM_PER=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.chmPer,jdbcType=VARCHAR}
-       </foreach>
-       ,CHM_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.chmTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,CHM_TYPE=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.chmType,jdbcType=VARCHAR}
-       </foreach>
-       ,TRANSPORT=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.transport,jdbcType=VARCHAR}
-       </foreach>
-       ,TRANS_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.transName,jdbcType=VARCHAR}
-       </foreach>
-       ,GRS_WGT_CURVE=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.grsWgtCurve,jdbcType=VARCHAR}
-       </foreach>
-       ,TAR_WGT_CURVE=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tarWgtCurve,jdbcType=VARCHAR}
-       </foreach>
-       ,DIS_OPR=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.disOpr,jdbcType=VARCHAR}
-       </foreach>
-       ,DIS_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.disTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,FD_UPFLG=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.fdUpflg,jdbcType=VARCHAR}
-       </foreach>
-       ,CH_UP=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.chUp,jdbcType=VARCHAR}
-       </foreach>
-       ,CH_OPR=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.chOpr,jdbcType=VARCHAR}
-       </foreach>
-       ,CH_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.chTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,TD_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tdNo,jdbcType=VARCHAR}
-       </foreach>
-       ,TD_WGT=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tdWgt,jdbcType=DECIMAL}
-       </foreach>
-       ,DD_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case WGT_NO" separator=" ">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.ddNo,jdbcType=VARCHAR}
-       </foreach>
-     where WGT_NO in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.wgtNo,jdbcType=VARCHAR}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from  JGWEIGHT_USER.CMM_CARWEIGHTRESULTS 
-    where WGT_NO in 
-    <foreach close=")" collection="list" item="id" open="(" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  
-</mapper>

src/main/java/com/steerinfo/TimedTask/cmmcarweightresults/model/CmmCarweightresults.java

@@ -1,1387 +0,0 @@
-package com.steerinfo.TimedTask.cmmcarweightresults.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 CmmCarweightresults implements IBasePO<String> {
-    /**
-     * 作业编号(WGT_NO,VARCHAR,30)
-     */
-    @ApiModelProperty(value="作业编号",required=true)
-    private String wgtNo;
-
-    /**
-     * 票据单号(BILLNO,VARCHAR,30)
-     */
-    @ApiModelProperty(value="票据单号",required=false)
-    private String billno;
-
-    /**
-     * 计量委托编号(TRU_NO,VARCHAR,30)
-     */
-    @ApiModelProperty(value="计量委托编号",required=false)
-    private String truNo;
-
-    /**
-     * 计量批次号(LGS_NO,VARCHAR,30)
-     */
-    @ApiModelProperty(value="计量批次号",required=false)
-    private String lgsNo;
-
-    /**
-     * 车号(CAR_NO,VARCHAR,16)
-     */
-    @ApiModelProperty(value="车号",required=false)
-    private String carNo;
-
-    /**
-     * 车证卡号(ICD_NO,VARCHAR,10)
-     */
-    @ApiModelProperty(value="车证卡号",required=false)
-    private String icdNo;
-
-    /**
-     * 毛重车厢序号(用在轨道衡)(GRS_BOX_NO,DECIMAL,2)
-     */
-    @ApiModelProperty(value="毛重车厢序号(用在轨道衡)",required=false)
-    private Short grsBoxNo;
-
-    /**
-     * 皮重车厢序号(用在轨道衡)(TAR_BOX_NO,DECIMAL,2)
-     */
-    @ApiModelProperty(value="皮重车厢序号(用在轨道衡)",required=false)
-    private Short tarBoxNo;
-
-    /**
-     * 毛重车速(用在轨道衡)(GRS_SPD,DECIMAL,4)
-     */
-    @ApiModelProperty(value="毛重车速(用在轨道衡)",required=false)
-    private BigDecimal grsSpd;
-
-    /**
-     * 皮重车速(用在轨道衡)(TAR_SPD,DECIMAL,4)
-     */
-    @ApiModelProperty(value="皮重车速(用在轨道衡)",required=false)
-    private BigDecimal tarSpd;
-
-    /**
-     * 车型(用在轨道衡)(用在轨道衡)(TRN_TYPE,VARCHAR,10)
-     */
-    @ApiModelProperty(value="车型(用在轨道衡)(用在轨道衡)",required=false)
-    private String trnType;
-
-    /**
-     * 毛重录像文件名称(用在轨道衡)改用于成品与汽车对比分析表中的备注( MES报表)(GRS_VDO_FILE,VARCHAR,50)
-     */
-    @ApiModelProperty(value="毛重录像文件名称(用在轨道衡)改用于成品与汽车对比分析表中的备注( MES报表)",required=false)
-    private String grsVdoFile;
-
-    /**
-     * 皮重录像文件名称(用在轨道衡)(TAR_VDO_FILE,VARCHAR,50)
-     */
-    @ApiModelProperty(value="皮重录像文件名称(用在轨道衡)",required=false)
-    private String tarVdoFile;
-
-    /**
-     * 毛重列车编号(用在轨道衡)(GRS_TRN_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="毛重列车编号(用在轨道衡)",required=false)
-    private String grsTrnNo;
-
-    /**
-     * 皮重列车编号(用在轨道衡)(TAR_TRN_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="皮重列车编号(用在轨道衡)",required=false)
-    private String tarTrnNo;
-
-    /**
-     * 检斤类型(WGT_TYPE,VARCHAR,10)
-     */
-    @ApiModelProperty(value="检斤类型",required=false)
-    private String wgtType;
-
-    /**
-     * 毛重(GRS_WGT,DECIMAL,12)
-     */
-    @ApiModelProperty(value="毛重",required=false)
-    private BigDecimal grsWgt;
-
-    /**
-     * 皮重(TAR_WGT,DECIMAL,12)
-     */
-    @ApiModelProperty(value="皮重",required=false)
-    private BigDecimal tarWgt;
-
-    /**
-     * 净重(NET_WGT,DECIMAL,12)
-     */
-    @ApiModelProperty(value="净重",required=false)
-    private BigDecimal netWgt;
-
-    /**
-     * 第二磅单重量(NO2_WGT,DECIMAL,12)
-     */
-    @ApiModelProperty(value="第二磅单重量",required=false)
-    private BigDecimal no2Wgt;
-
-    /**
-     * 毛重计量编号(GRS_WGT_NO,VARCHAR,30)
-     */
-    @ApiModelProperty(value="毛重计量编号",required=false)
-    private String grsWgtNo;
-
-    /**
-     * 皮重计量编号(TAR_WGT_NO,VARCHAR,30)
-     */
-    @ApiModelProperty(value="皮重计量编号",required=false)
-    private String tarWgtNo;
-
-    /**
-     * "0=毛重
-1=常规皮重
-2=期限皮重 3=历史皮重，
-4=标识皮重，
-5=自重皮重(TAR_TYPE,CHAR,1)
-     */
-    @ApiModelProperty(value="0=毛重1=常规皮重2=期限皮重 3=历史皮重，4=标识皮重，5=自重皮重",required=false)
-    private String tarType;
-
-    /**
-     * 皮重来源0=仪表采集，1=手工录入(TAR_INF_MODE,CHAR,1)
-     */
-    @ApiModelProperty(value="皮重来源0=仪表采集，1=手工录入",required=false)
-    private String tarInfMode;
-
-    /**
-     * 毛重来源0=仪表采集，1=手工录入(GRS_INF_MODE,CHAR,1)
-     */
-    @ApiModelProperty(value="毛重来源0=仪表采集，1=手工录入",required=false)
-    private String grsInfMode;
-
-    /**
-     * 净重来源0=计算，1=手工录入(NET_INF_MODE,CHAR,1)
-     */
-    @ApiModelProperty(value="净重来源0=计算，1=手工录入",required=false)
-    private String netInfMode;
-
-    /**
-     * 毛重时间(GRS_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="毛重时间",required=false)
-    private Date grsTime;
-
-    /**
-     * 皮重时间(TAR_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="皮重时间",required=false)
-    private Date tarTime;
-
-    /**
-     * 二次计量时间(NET_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="二次计量时间",required=false)
-    private Date netTime;
-
-    /**
-     * 毛重班次(GRS_WRK_ORD,VARCHAR,10)
-     */
-    @ApiModelProperty(value="毛重班次",required=false)
-    private String grsWrkOrd;
-
-    /**
-     * 皮重班次(TAR_WRK_ORD,VARCHAR,10)
-     */
-    @ApiModelProperty(value="皮重班次",required=false)
-    private String tarWrkOrd;
-
-    /**
-     * 净重班次(NET_WRK_ORD,VARCHAR,10)
-     */
-    @ApiModelProperty(value="净重班次",required=false)
-    private String netWrkOrd;
-
-    /**
-     * 毛重班别(GRS_WRK_GRP,VARCHAR,10)
-     */
-    @ApiModelProperty(value="毛重班别",required=false)
-    private String grsWrkGrp;
-
-    /**
-     * 皮重班别(TAR_WRK_GRP,VARCHAR,10)
-     */
-    @ApiModelProperty(value="皮重班别",required=false)
-    private String tarWrkGrp;
-
-    /**
-     * 净重班别(NET_WRK_GRP,VARCHAR,10)
-     */
-    @ApiModelProperty(value="净重班别",required=false)
-    private String netWrkGrp;
-
-    /**
-     * 毛重计量员(GRS_OPR,VARCHAR,10)
-     */
-    @ApiModelProperty(value="毛重计量员",required=false)
-    private String grsOpr;
-
-    /**
-     * 皮重计量员(TAR_OPR,VARCHAR,10)
-     */
-    @ApiModelProperty(value="皮重计量员",required=false)
-    private String tarOpr;
-
-    /**
-     * 净重计量员(NET_OPR,VARCHAR,10)
-     */
-    @ApiModelProperty(value="净重计量员",required=false)
-    private String netOpr;
-
-    /**
-     * 毛重计量点(GRS_PNT_NAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="毛重计量点",required=false)
-    private String grsPntName;
-
-    /**
-     * 皮重计量点(TAR_PNT_NAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="皮重计量点",required=false)
-    private String tarPntName;
-
-    /**
-     * 净重计量点(NET_PNT_NAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="净重计量点",required=false)
-    private String netPntName;
-
-    /**
-     * 毛重计量点编号(GRS_PNT_NO,VARCHAR,10)
-     */
-    @ApiModelProperty(value="毛重计量点编号",required=false)
-    private String grsPntNo;
-
-    /**
-     * 皮重计量点编号(TAR_PNT_NO,VARCHAR,10)
-     */
-    @ApiModelProperty(value="皮重计量点编号",required=false)
-    private String tarPntNo;
-
-    /**
-     * 净重计量点编号(NET_PNT_NO,VARCHAR,10)
-     */
-    @ApiModelProperty(value="净重计量点编号",required=false)
-    private String netPntNo;
-
-    /**
-     * 备注(NOTE,VARCHAR,100)
-     */
-    @ApiModelProperty(value="备注",required=false)
-    private String note;
-
-    /**
-     * 发货点类型(SDR_TYPE,VARCHAR,20)
-     */
-    @ApiModelProperty(value="发货点类型",required=false)
-    private String sdrType;
-
-    /**
-     * 发货单位(SDR_NAME,VARCHAR,100)
-     */
-    @ApiModelProperty(value="发货单位",required=false)
-    private String sdrName;
-
-    /**
-     * 发货单位编码(SENDER,VARCHAR,20)
-     */
-    @ApiModelProperty(value="发货单位编码",required=false)
-    private String sender;
-
-    /**
-     * 发货点备注(即货源)(SDR_NOTE,VARCHAR,100)
-     */
-    @ApiModelProperty(value="发货点备注(即货源)",required=false)
-    private String sdrNote;
-
-    /**
-     * 收货点类型(RCV_TYPE,VARCHAR,20)
-     */
-    @ApiModelProperty(value="收货点类型",required=false)
-    private String rcvType;
-
-    /**
-     * 收货单位(RCV_NAME,VARCHAR,100)
-     */
-    @ApiModelProperty(value="收货单位",required=false)
-    private String rcvName;
-
-    /**
-     * 收货单位编码(RECEIVER,VARCHAR,20)
-     */
-    @ApiModelProperty(value="收货单位编码",required=false)
-    private String receiver;
-
-    /**
-     * 收货点备注(RCV_NOTE,VARCHAR,100)
-     */
-    @ApiModelProperty(value="收货点备注",required=false)
-    private String rcvNote;
-
-    /**
-     * 物料名称(MAT_NAME,VARCHAR,50)
-     */
-    @ApiModelProperty(value="物料名称",required=false)
-    private String matName;
-
-    /**
-     * 物料编码(MAT_CODE,VARCHAR,20)
-     */
-    @ApiModelProperty(value="物料编码",required=false)
-    private String matCode;
-
-    /**
-     * 小票打印次数(B1_PRN_NUM,DECIMAL,3)
-     */
-    @ApiModelProperty(value="小票打印次数",required=false)
-    private Short b1PrnNum;
-
-    /**
-     * 大票打印次数(B2_PRN_NUM,DECIMAL,3)
-     */
-    @ApiModelProperty(value="大票打印次数",required=false)
-    private Short b2PrnNum;
-
-    /**
-     * 小票2打印次数(B1_PRN_NUM_2,DECIMAL,3)
-     */
-    @ApiModelProperty(value="小票2打印次数",required=false)
-    private Short b1PrnNum2;
-
-    /**
-     * MES上传标志 0：未上传，1：上传成功，2：撤销成功，3：撤销失败，4：上传失败(UPL_FLG,VARCHAR,1)
-     */
-    @ApiModelProperty(value="MES上传标志 0：未上传，1：上传成功，2：撤销成功，3：撤销失败，4：上传失败",required=false)
-    private String uplFlg;
-
-    /**
-     * mes上传时间(UPL_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="mes上传时间",required=false)
-    private Date uplTime;
-
-    /**
-     * 是否删除：0=有效，1=无效，2=删除(DEL_FLG,VARCHAR,1)
-     */
-    @ApiModelProperty(value="是否删除：0=有效，1=无效，2=删除",required=false)
-    private String delFlg;
-
-    /**
-     * 是否换长数据(用在轨道衡)0=未换长，1=换长(EXT_BOX,CHAR,1)
-     */
-    @ApiModelProperty(value="是否换长数据(用在轨道衡)0=未换长，1=换长",required=false)
-    private String extBox;
-
-    /**
-     * 预报总重(对方毛重)(SDR_GRS_WGT,DECIMAL,12)
-     */
-    @ApiModelProperty(value="预报总重(对方毛重)",required=false)
-    private BigDecimal sdrGrsWgt;
-
-    /**
-     * 预报皮重(对方皮重)(SDR_TAR_WGT,DECIMAL,12)
-     */
-    @ApiModelProperty(value="预报皮重(对方皮重)",required=false)
-    private BigDecimal sdrTarWgt;
-
-    /**
-     * 预报净重(对方净重)(SDR_NET_WGT,DECIMAL,12)
-     */
-    @ApiModelProperty(value="预报净重(对方净重)",required=false)
-    private BigDecimal sdrNetWgt;
-
-    /**
-     * 应扣除重量(KG)(DIS_WGT,DECIMAL,12)
-     */
-    @ApiModelProperty(value="应扣除重量(KG)",required=false)
-    private BigDecimal disWgt;
-
-    /**
-     * 应扣比率%(DIS_RATIO,DECIMAL,4)
-     */
-    @ApiModelProperty(value="应扣比率%",required=false)
-    private BigDecimal disRatio;
-
-    /**
-     * 最终净重（扣水扣渣后净重）(NET_END,DECIMAL,12)
-     */
-    @ApiModelProperty(value="最终净重（扣水扣渣后净重）",required=false)
-    private BigDecimal netEnd;
-
-    /**
-     * 一次计量方式(NO1_WGT_MODE,VARCHAR,10)
-     */
-    @ApiModelProperty(value="一次计量方式",required=false)
-    private String no1WgtMode;
-
-    /**
-     * 二次次计量方式(NO2_WGT_MODE,VARCHAR,10)
-     */
-    @ApiModelProperty(value="二次次计量方式",required=false)
-    private String no2WgtMode;
-
-    /**
-     * rfid号(RFID_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="rfid号",required=false)
-    private String rfidNo;
-
-    /**
-     * 审核标记；0=未审核，1=审核(CHK_FLG,VARCHAR,1)
-     */
-    @ApiModelProperty(value="审核标记；0=未审核，1=审核",required=false)
-    private String chkFlg;
-
-    /**
-     * 审核人(CHECKER,VARCHAR,20)
-     */
-    @ApiModelProperty(value="审核人",required=false)
-    private String checker;
-
-    /**
-     * 审核时间(CHK_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="审核时间",required=false)
-    private Date chkTime;
-
-    /**
-     * 修改操作人(CHM_PER,VARCHAR,20)
-     */
-    @ApiModelProperty(value="修改操作人",required=false)
-    private String chmPer;
-
-    /**
-     * 修改时间(CHM_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="修改时间",required=false)
-    private Date chmTime;
-
-    /**
-     * 修改类型(CHM_TYPE,VARCHAR,20)
-     */
-    @ApiModelProperty(value="修改类型",required=false)
-    private String chmType;
-
-    /**
-     * 运输单位编码(TRANSPORT,VARCHAR,20)
-     */
-    @ApiModelProperty(value="运输单位编码",required=false)
-    private String transport;
-
-    /**
-     * 运输单位(TRANS_NAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="运输单位",required=false)
-    private String transName;
-
-    /**
-     * 毛重曲线(GRS_WGT_CURVE,VARCHAR,2000)
-     */
-    @ApiModelProperty(value="毛重曲线",required=false)
-    private String grsWgtCurve;
-
-    /**
-     * 皮重曲线(TAR_WGT_CURVE,VARCHAR,2000)
-     */
-    @ApiModelProperty(value="皮重曲线",required=false)
-    private String tarWgtCurve;
-
-    /**
-     * 扣渣人(DIS_OPR,VARCHAR,20)
-     */
-    @ApiModelProperty(value="扣渣人",required=false)
-    private String disOpr;
-
-    /**
-     * 扣渣时间(DIS_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="扣渣时间",required=false)
-    private Date disTime;
-
-    /**
-     * 方大上传标志，0没上传，1已上传(FD_UPFLG,VARCHAR,1)
-     */
-    @ApiModelProperty(value="方大上传标志，0没上传，1已上传",required=false)
-    private String fdUpflg;
-
-    /**
-     * 船转汽标志(CH_UP,VARCHAR,1)
-     */
-    @ApiModelProperty(value="船转汽标志",required=false)
-    private String chUp;
-
-    /**
-     * 船转汽操作人(CH_OPR,VARCHAR,20)
-     */
-    @ApiModelProperty(value="船转汽操作人",required=false)
-    private String chOpr;
-
-    /**
-     * 船转汽操作时间(CH_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="船转汽操作时间",required=false)
-    private Date chTime;
-
-    /**
-     * 提单号(TD_NO,VARCHAR,40)
-     */
-    @ApiModelProperty(value="提单号",required=false)
-    private String tdNo;
-
-    /**
-     * 提单量(TD_WGT,DECIMAL,16)
-     */
-    @ApiModelProperty(value="提单量",required=false)
-    private BigDecimal tdWgt;
-
-    /**
-     * 订单号(DD_NO,VARCHAR,40)
-     */
-    @ApiModelProperty(value="订单号",required=false)
-    private String ddNo;
-
-    private static final long serialVersionUID = 1L;
-
-    @Override
-    public String getId() {
-        return this.wgtNo;
-    }
-
-    @Override
-    public void setId(String wgtNo) {
-        this.wgtNo = wgtNo == null ? null : wgtNo.trim();
-    }
-
-    public String getWgtNo() {
-        return wgtNo;
-    }
-
-    public void setWgtNo(String wgtNo) {
-        this.wgtNo = wgtNo == null ? null : wgtNo.trim();
-    }
-
-    public String getBillno() {
-        return billno;
-    }
-
-    public void setBillno(String billno) {
-        this.billno = billno == null ? null : billno.trim();
-    }
-
-    public String getTruNo() {
-        return truNo;
-    }
-
-    public void setTruNo(String truNo) {
-        this.truNo = truNo == null ? null : truNo.trim();
-    }
-
-    public String getLgsNo() {
-        return lgsNo;
-    }
-
-    public void setLgsNo(String lgsNo) {
-        this.lgsNo = lgsNo == null ? null : lgsNo.trim();
-    }
-
-    public String getCarNo() {
-        return carNo;
-    }
-
-    public void setCarNo(String carNo) {
-        this.carNo = carNo == null ? null : carNo.trim();
-    }
-
-    public String getIcdNo() {
-        return icdNo;
-    }
-
-    public void setIcdNo(String icdNo) {
-        this.icdNo = icdNo == null ? null : icdNo.trim();
-    }
-
-    public Short getGrsBoxNo() {
-        return grsBoxNo;
-    }
-
-    public void setGrsBoxNo(Short grsBoxNo) {
-        this.grsBoxNo = grsBoxNo;
-    }
-
-    public Short getTarBoxNo() {
-        return tarBoxNo;
-    }
-
-    public void setTarBoxNo(Short tarBoxNo) {
-        this.tarBoxNo = tarBoxNo;
-    }
-
-    public BigDecimal getGrsSpd() {
-        return grsSpd;
-    }
-
-    public void setGrsSpd(BigDecimal grsSpd) {
-        this.grsSpd = grsSpd;
-    }
-
-    public BigDecimal getTarSpd() {
-        return tarSpd;
-    }
-
-    public void setTarSpd(BigDecimal tarSpd) {
-        this.tarSpd = tarSpd;
-    }
-
-    public String getTrnType() {
-        return trnType;
-    }
-
-    public void setTrnType(String trnType) {
-        this.trnType = trnType == null ? null : trnType.trim();
-    }
-
-    public String getGrsVdoFile() {
-        return grsVdoFile;
-    }
-
-    public void setGrsVdoFile(String grsVdoFile) {
-        this.grsVdoFile = grsVdoFile == null ? null : grsVdoFile.trim();
-    }
-
-    public String getTarVdoFile() {
-        return tarVdoFile;
-    }
-
-    public void setTarVdoFile(String tarVdoFile) {
-        this.tarVdoFile = tarVdoFile == null ? null : tarVdoFile.trim();
-    }
-
-    public String getGrsTrnNo() {
-        return grsTrnNo;
-    }
-
-    public void setGrsTrnNo(String grsTrnNo) {
-        this.grsTrnNo = grsTrnNo == null ? null : grsTrnNo.trim();
-    }
-
-    public String getTarTrnNo() {
-        return tarTrnNo;
-    }
-
-    public void setTarTrnNo(String tarTrnNo) {
-        this.tarTrnNo = tarTrnNo == null ? null : tarTrnNo.trim();
-    }
-
-    public String getWgtType() {
-        return wgtType;
-    }
-
-    public void setWgtType(String wgtType) {
-        this.wgtType = wgtType == null ? null : wgtType.trim();
-    }
-
-    public BigDecimal getGrsWgt() {
-        return grsWgt;
-    }
-
-    public void setGrsWgt(BigDecimal grsWgt) {
-        this.grsWgt = grsWgt;
-    }
-
-    public BigDecimal getTarWgt() {
-        return tarWgt;
-    }
-
-    public void setTarWgt(BigDecimal tarWgt) {
-        this.tarWgt = tarWgt;
-    }
-
-    public BigDecimal getNetWgt() {
-        return netWgt;
-    }
-
-    public void setNetWgt(BigDecimal netWgt) {
-        this.netWgt = netWgt;
-    }
-
-    public BigDecimal getNo2Wgt() {
-        return no2Wgt;
-    }
-
-    public void setNo2Wgt(BigDecimal no2Wgt) {
-        this.no2Wgt = no2Wgt;
-    }
-
-    public String getGrsWgtNo() {
-        return grsWgtNo;
-    }
-
-    public void setGrsWgtNo(String grsWgtNo) {
-        this.grsWgtNo = grsWgtNo == null ? null : grsWgtNo.trim();
-    }
-
-    public String getTarWgtNo() {
-        return tarWgtNo;
-    }
-
-    public void setTarWgtNo(String tarWgtNo) {
-        this.tarWgtNo = tarWgtNo == null ? null : tarWgtNo.trim();
-    }
-
-    public String getTarType() {
-        return tarType;
-    }
-
-    public void setTarType(String tarType) {
-        this.tarType = tarType == null ? null : tarType.trim();
-    }
-
-    public String getTarInfMode() {
-        return tarInfMode;
-    }
-
-    public void setTarInfMode(String tarInfMode) {
-        this.tarInfMode = tarInfMode == null ? null : tarInfMode.trim();
-    }
-
-    public String getGrsInfMode() {
-        return grsInfMode;
-    }
-
-    public void setGrsInfMode(String grsInfMode) {
-        this.grsInfMode = grsInfMode == null ? null : grsInfMode.trim();
-    }
-
-    public String getNetInfMode() {
-        return netInfMode;
-    }
-
-    public void setNetInfMode(String netInfMode) {
-        this.netInfMode = netInfMode == null ? null : netInfMode.trim();
-    }
-
-    public Date getGrsTime() {
-        return grsTime;
-    }
-
-    public void setGrsTime(Date grsTime) {
-        this.grsTime = grsTime;
-    }
-
-    public Date getTarTime() {
-        return tarTime;
-    }
-
-    public void setTarTime(Date tarTime) {
-        this.tarTime = tarTime;
-    }
-
-    public Date getNetTime() {
-        return netTime;
-    }
-
-    public void setNetTime(Date netTime) {
-        this.netTime = netTime;
-    }
-
-    public String getGrsWrkOrd() {
-        return grsWrkOrd;
-    }
-
-    public void setGrsWrkOrd(String grsWrkOrd) {
-        this.grsWrkOrd = grsWrkOrd == null ? null : grsWrkOrd.trim();
-    }
-
-    public String getTarWrkOrd() {
-        return tarWrkOrd;
-    }
-
-    public void setTarWrkOrd(String tarWrkOrd) {
-        this.tarWrkOrd = tarWrkOrd == null ? null : tarWrkOrd.trim();
-    }
-
-    public String getNetWrkOrd() {
-        return netWrkOrd;
-    }
-
-    public void setNetWrkOrd(String netWrkOrd) {
-        this.netWrkOrd = netWrkOrd == null ? null : netWrkOrd.trim();
-    }
-
-    public String getGrsWrkGrp() {
-        return grsWrkGrp;
-    }
-
-    public void setGrsWrkGrp(String grsWrkGrp) {
-        this.grsWrkGrp = grsWrkGrp == null ? null : grsWrkGrp.trim();
-    }
-
-    public String getTarWrkGrp() {
-        return tarWrkGrp;
-    }
-
-    public void setTarWrkGrp(String tarWrkGrp) {
-        this.tarWrkGrp = tarWrkGrp == null ? null : tarWrkGrp.trim();
-    }
-
-    public String getNetWrkGrp() {
-        return netWrkGrp;
-    }
-
-    public void setNetWrkGrp(String netWrkGrp) {
-        this.netWrkGrp = netWrkGrp == null ? null : netWrkGrp.trim();
-    }
-
-    public String getGrsOpr() {
-        return grsOpr;
-    }
-
-    public void setGrsOpr(String grsOpr) {
-        this.grsOpr = grsOpr == null ? null : grsOpr.trim();
-    }
-
-    public String getTarOpr() {
-        return tarOpr;
-    }
-
-    public void setTarOpr(String tarOpr) {
-        this.tarOpr = tarOpr == null ? null : tarOpr.trim();
-    }
-
-    public String getNetOpr() {
-        return netOpr;
-    }
-
-    public void setNetOpr(String netOpr) {
-        this.netOpr = netOpr == null ? null : netOpr.trim();
-    }
-
-    public String getGrsPntName() {
-        return grsPntName;
-    }
-
-    public void setGrsPntName(String grsPntName) {
-        this.grsPntName = grsPntName == null ? null : grsPntName.trim();
-    }
-
-    public String getTarPntName() {
-        return tarPntName;
-    }
-
-    public void setTarPntName(String tarPntName) {
-        this.tarPntName = tarPntName == null ? null : tarPntName.trim();
-    }
-
-    public String getNetPntName() {
-        return netPntName;
-    }
-
-    public void setNetPntName(String netPntName) {
-        this.netPntName = netPntName == null ? null : netPntName.trim();
-    }
-
-    public String getGrsPntNo() {
-        return grsPntNo;
-    }
-
-    public void setGrsPntNo(String grsPntNo) {
-        this.grsPntNo = grsPntNo == null ? null : grsPntNo.trim();
-    }
-
-    public String getTarPntNo() {
-        return tarPntNo;
-    }
-
-    public void setTarPntNo(String tarPntNo) {
-        this.tarPntNo = tarPntNo == null ? null : tarPntNo.trim();
-    }
-
-    public String getNetPntNo() {
-        return netPntNo;
-    }
-
-    public void setNetPntNo(String netPntNo) {
-        this.netPntNo = netPntNo == null ? null : netPntNo.trim();
-    }
-
-    public String getNote() {
-        return note;
-    }
-
-    public void setNote(String note) {
-        this.note = note == null ? null : note.trim();
-    }
-
-    public String getSdrType() {
-        return sdrType;
-    }
-
-    public void setSdrType(String sdrType) {
-        this.sdrType = sdrType == null ? null : sdrType.trim();
-    }
-
-    public String getSdrName() {
-        return sdrName;
-    }
-
-    public void setSdrName(String sdrName) {
-        this.sdrName = sdrName == null ? null : sdrName.trim();
-    }
-
-    public String getSender() {
-        return sender;
-    }
-
-    public void setSender(String sender) {
-        this.sender = sender == null ? null : sender.trim();
-    }
-
-    public String getSdrNote() {
-        return sdrNote;
-    }
-
-    public void setSdrNote(String sdrNote) {
-        this.sdrNote = sdrNote == null ? null : sdrNote.trim();
-    }
-
-    public String getRcvType() {
-        return rcvType;
-    }
-
-    public void setRcvType(String rcvType) {
-        this.rcvType = rcvType == null ? null : rcvType.trim();
-    }
-
-    public String getRcvName() {
-        return rcvName;
-    }
-
-    public void setRcvName(String rcvName) {
-        this.rcvName = rcvName == null ? null : rcvName.trim();
-    }
-
-    public String getReceiver() {
-        return receiver;
-    }
-
-    public void setReceiver(String receiver) {
-        this.receiver = receiver == null ? null : receiver.trim();
-    }
-
-    public String getRcvNote() {
-        return rcvNote;
-    }
-
-    public void setRcvNote(String rcvNote) {
-        this.rcvNote = rcvNote == null ? null : rcvNote.trim();
-    }
-
-    public String getMatName() {
-        return matName;
-    }
-
-    public void setMatName(String matName) {
-        this.matName = matName == null ? null : matName.trim();
-    }
-
-    public String getMatCode() {
-        return matCode;
-    }
-
-    public void setMatCode(String matCode) {
-        this.matCode = matCode == null ? null : matCode.trim();
-    }
-
-    public Short getB1PrnNum() {
-        return b1PrnNum;
-    }
-
-    public void setB1PrnNum(Short b1PrnNum) {
-        this.b1PrnNum = b1PrnNum;
-    }
-
-    public Short getB2PrnNum() {
-        return b2PrnNum;
-    }
-
-    public void setB2PrnNum(Short b2PrnNum) {
-        this.b2PrnNum = b2PrnNum;
-    }
-
-    public Short getB1PrnNum2() {
-        return b1PrnNum2;
-    }
-
-    public void setB1PrnNum2(Short b1PrnNum2) {
-        this.b1PrnNum2 = b1PrnNum2;
-    }
-
-    public String getUplFlg() {
-        return uplFlg;
-    }
-
-    public void setUplFlg(String uplFlg) {
-        this.uplFlg = uplFlg == null ? null : uplFlg.trim();
-    }
-
-    public Date getUplTime() {
-        return uplTime;
-    }
-
-    public void setUplTime(Date uplTime) {
-        this.uplTime = uplTime;
-    }
-
-    public String getDelFlg() {
-        return delFlg;
-    }
-
-    public void setDelFlg(String delFlg) {
-        this.delFlg = delFlg == null ? null : delFlg.trim();
-    }
-
-    public String getExtBox() {
-        return extBox;
-    }
-
-    public void setExtBox(String extBox) {
-        this.extBox = extBox == null ? null : extBox.trim();
-    }
-
-    public BigDecimal getSdrGrsWgt() {
-        return sdrGrsWgt;
-    }
-
-    public void setSdrGrsWgt(BigDecimal sdrGrsWgt) {
-        this.sdrGrsWgt = sdrGrsWgt;
-    }
-
-    public BigDecimal getSdrTarWgt() {
-        return sdrTarWgt;
-    }
-
-    public void setSdrTarWgt(BigDecimal sdrTarWgt) {
-        this.sdrTarWgt = sdrTarWgt;
-    }
-
-    public BigDecimal getSdrNetWgt() {
-        return sdrNetWgt;
-    }
-
-    public void setSdrNetWgt(BigDecimal sdrNetWgt) {
-        this.sdrNetWgt = sdrNetWgt;
-    }
-
-    public BigDecimal getDisWgt() {
-        return disWgt;
-    }
-
-    public void setDisWgt(BigDecimal disWgt) {
-        this.disWgt = disWgt;
-    }
-
-    public BigDecimal getDisRatio() {
-        return disRatio;
-    }
-
-    public void setDisRatio(BigDecimal disRatio) {
-        this.disRatio = disRatio;
-    }
-
-    public BigDecimal getNetEnd() {
-        return netEnd;
-    }
-
-    public void setNetEnd(BigDecimal netEnd) {
-        this.netEnd = netEnd;
-    }
-
-    public String getNo1WgtMode() {
-        return no1WgtMode;
-    }
-
-    public void setNo1WgtMode(String no1WgtMode) {
-        this.no1WgtMode = no1WgtMode == null ? null : no1WgtMode.trim();
-    }
-
-    public String getNo2WgtMode() {
-        return no2WgtMode;
-    }
-
-    public void setNo2WgtMode(String no2WgtMode) {
-        this.no2WgtMode = no2WgtMode == null ? null : no2WgtMode.trim();
-    }
-
-    public String getRfidNo() {
-        return rfidNo;
-    }
-
-    public void setRfidNo(String rfidNo) {
-        this.rfidNo = rfidNo == null ? null : rfidNo.trim();
-    }
-
-    public String getChkFlg() {
-        return chkFlg;
-    }
-
-    public void setChkFlg(String chkFlg) {
-        this.chkFlg = chkFlg == null ? null : chkFlg.trim();
-    }
-
-    public String getChecker() {
-        return checker;
-    }
-
-    public void setChecker(String checker) {
-        this.checker = checker == null ? null : checker.trim();
-    }
-
-    public Date getChkTime() {
-        return chkTime;
-    }
-
-    public void setChkTime(Date chkTime) {
-        this.chkTime = chkTime;
-    }
-
-    public String getChmPer() {
-        return chmPer;
-    }
-
-    public void setChmPer(String chmPer) {
-        this.chmPer = chmPer == null ? null : chmPer.trim();
-    }
-
-    public Date getChmTime() {
-        return chmTime;
-    }
-
-    public void setChmTime(Date chmTime) {
-        this.chmTime = chmTime;
-    }
-
-    public String getChmType() {
-        return chmType;
-    }
-
-    public void setChmType(String chmType) {
-        this.chmType = chmType == null ? null : chmType.trim();
-    }
-
-    public String getTransport() {
-        return transport;
-    }
-
-    public void setTransport(String transport) {
-        this.transport = transport == null ? null : transport.trim();
-    }
-
-    public String getTransName() {
-        return transName;
-    }
-
-    public void setTransName(String transName) {
-        this.transName = transName == null ? null : transName.trim();
-    }
-
-    public String getGrsWgtCurve() {
-        return grsWgtCurve;
-    }
-
-    public void setGrsWgtCurve(String grsWgtCurve) {
-        this.grsWgtCurve = grsWgtCurve == null ? null : grsWgtCurve.trim();
-    }
-
-    public String getTarWgtCurve() {
-        return tarWgtCurve;
-    }
-
-    public void setTarWgtCurve(String tarWgtCurve) {
-        this.tarWgtCurve = tarWgtCurve == null ? null : tarWgtCurve.trim();
-    }
-
-    public String getDisOpr() {
-        return disOpr;
-    }
-
-    public void setDisOpr(String disOpr) {
-        this.disOpr = disOpr == null ? null : disOpr.trim();
-    }
-
-    public Date getDisTime() {
-        return disTime;
-    }
-
-    public void setDisTime(Date disTime) {
-        this.disTime = disTime;
-    }
-
-    public String getFdUpflg() {
-        return fdUpflg;
-    }
-
-    public void setFdUpflg(String fdUpflg) {
-        this.fdUpflg = fdUpflg == null ? null : fdUpflg.trim();
-    }
-
-    public String getChUp() {
-        return chUp;
-    }
-
-    public void setChUp(String chUp) {
-        this.chUp = chUp == null ? null : chUp.trim();
-    }
-
-    public String getChOpr() {
-        return chOpr;
-    }
-
-    public void setChOpr(String chOpr) {
-        this.chOpr = chOpr == null ? null : chOpr.trim();
-    }
-
-    public Date getChTime() {
-        return chTime;
-    }
-
-    public void setChTime(Date chTime) {
-        this.chTime = chTime;
-    }
-
-    public String getTdNo() {
-        return tdNo;
-    }
-
-    public void setTdNo(String tdNo) {
-        this.tdNo = tdNo == null ? null : tdNo.trim();
-    }
-
-    public BigDecimal getTdWgt() {
-        return tdWgt;
-    }
-
-    public void setTdWgt(BigDecimal tdWgt) {
-        this.tdWgt = tdWgt;
-    }
-
-    public String getDdNo() {
-        return ddNo;
-    }
-
-    public void setDdNo(String ddNo) {
-        this.ddNo = ddNo == null ? null : ddNo.trim();
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", wgtNo=").append(wgtNo);
-        sb.append(", billno=").append(billno);
-        sb.append(", truNo=").append(truNo);
-        sb.append(", lgsNo=").append(lgsNo);
-        sb.append(", carNo=").append(carNo);
-        sb.append(", icdNo=").append(icdNo);
-        sb.append(", grsBoxNo=").append(grsBoxNo);
-        sb.append(", tarBoxNo=").append(tarBoxNo);
-        sb.append(", grsSpd=").append(grsSpd);
-        sb.append(", tarSpd=").append(tarSpd);
-        sb.append(", trnType=").append(trnType);
-        sb.append(", grsVdoFile=").append(grsVdoFile);
-        sb.append(", tarVdoFile=").append(tarVdoFile);
-        sb.append(", grsTrnNo=").append(grsTrnNo);
-        sb.append(", tarTrnNo=").append(tarTrnNo);
-        sb.append(", wgtType=").append(wgtType);
-        sb.append(", grsWgt=").append(grsWgt);
-        sb.append(", tarWgt=").append(tarWgt);
-        sb.append(", netWgt=").append(netWgt);
-        sb.append(", no2Wgt=").append(no2Wgt);
-        sb.append(", grsWgtNo=").append(grsWgtNo);
-        sb.append(", tarWgtNo=").append(tarWgtNo);
-        sb.append(", tarType=").append(tarType);
-        sb.append(", tarInfMode=").append(tarInfMode);
-        sb.append(", grsInfMode=").append(grsInfMode);
-        sb.append(", netInfMode=").append(netInfMode);
-        sb.append(", grsTime=").append(grsTime);
-        sb.append(", tarTime=").append(tarTime);
-        sb.append(", netTime=").append(netTime);
-        sb.append(", grsWrkOrd=").append(grsWrkOrd);
-        sb.append(", tarWrkOrd=").append(tarWrkOrd);
-        sb.append(", netWrkOrd=").append(netWrkOrd);
-        sb.append(", grsWrkGrp=").append(grsWrkGrp);
-        sb.append(", tarWrkGrp=").append(tarWrkGrp);
-        sb.append(", netWrkGrp=").append(netWrkGrp);
-        sb.append(", grsOpr=").append(grsOpr);
-        sb.append(", tarOpr=").append(tarOpr);
-        sb.append(", netOpr=").append(netOpr);
-        sb.append(", grsPntName=").append(grsPntName);
-        sb.append(", tarPntName=").append(tarPntName);
-        sb.append(", netPntName=").append(netPntName);
-        sb.append(", grsPntNo=").append(grsPntNo);
-        sb.append(", tarPntNo=").append(tarPntNo);
-        sb.append(", netPntNo=").append(netPntNo);
-        sb.append(", note=").append(note);
-        sb.append(", sdrType=").append(sdrType);
-        sb.append(", sdrName=").append(sdrName);
-        sb.append(", sender=").append(sender);
-        sb.append(", sdrNote=").append(sdrNote);
-        sb.append(", rcvType=").append(rcvType);
-        sb.append(", rcvName=").append(rcvName);
-        sb.append(", receiver=").append(receiver);
-        sb.append(", rcvNote=").append(rcvNote);
-        sb.append(", matName=").append(matName);
-        sb.append(", matCode=").append(matCode);
-        sb.append(", b1PrnNum=").append(b1PrnNum);
-        sb.append(", b2PrnNum=").append(b2PrnNum);
-        sb.append(", b1PrnNum2=").append(b1PrnNum2);
-        sb.append(", uplFlg=").append(uplFlg);
-        sb.append(", uplTime=").append(uplTime);
-        sb.append(", delFlg=").append(delFlg);
-        sb.append(", extBox=").append(extBox);
-        sb.append(", sdrGrsWgt=").append(sdrGrsWgt);
-        sb.append(", sdrTarWgt=").append(sdrTarWgt);
-        sb.append(", sdrNetWgt=").append(sdrNetWgt);
-        sb.append(", disWgt=").append(disWgt);
-        sb.append(", disRatio=").append(disRatio);
-        sb.append(", netEnd=").append(netEnd);
-        sb.append(", no1WgtMode=").append(no1WgtMode);
-        sb.append(", no2WgtMode=").append(no2WgtMode);
-        sb.append(", rfidNo=").append(rfidNo);
-        sb.append(", chkFlg=").append(chkFlg);
-        sb.append(", checker=").append(checker);
-        sb.append(", chkTime=").append(chkTime);
-        sb.append(", chmPer=").append(chmPer);
-        sb.append(", chmTime=").append(chmTime);
-        sb.append(", chmType=").append(chmType);
-        sb.append(", transport=").append(transport);
-        sb.append(", transName=").append(transName);
-        sb.append(", grsWgtCurve=").append(grsWgtCurve);
-        sb.append(", tarWgtCurve=").append(tarWgtCurve);
-        sb.append(", disOpr=").append(disOpr);
-        sb.append(", disTime=").append(disTime);
-        sb.append(", fdUpflg=").append(fdUpflg);
-        sb.append(", chUp=").append(chUp);
-        sb.append(", chOpr=").append(chOpr);
-        sb.append(", chTime=").append(chTime);
-        sb.append(", tdNo=").append(tdNo);
-        sb.append(", tdWgt=").append(tdWgt);
-        sb.append(", ddNo=").append(ddNo);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}

src/main/java/com/steerinfo/TimedTask/cmmcarweightresults/service/ICmmCarweightresultsService.java

@@ -1,21 +0,0 @@
-package com.steerinfo.TimedTask.cmmcarweightresults.service;
-
-import com.steerinfo.framework.service.IBaseService;
-import com.steerinfo.TimedTask.cmmcarweightresults.model.CmmCarweightresults;
-
-/**
- * CmmCarweightresults服务接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-11-04 08:46
- * 类描述
- * 修订历史：
- * 日期：2021-11-04
- * 作者：generator
- * 参考：
- * 描述：CmmCarweightresults服务接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-public interface ICmmCarweightresultsService extends IBaseService<CmmCarweightresults, String>{
-
-}

src/main/java/com/steerinfo/TimedTask/cmmcarweightresults/service/impl/CmmCarweightresultsServiceImpl.java

@@ -1,34 +0,0 @@
-package com.steerinfo.TimedTask.cmmcarweightresults.service.impl;
-
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
-import com.steerinfo.TimedTask.cmmcarweightresults.model.CmmCarweightresults;
-import com.steerinfo.TimedTask.cmmcarweightresults.mapper.CmmCarweightresultsMapper;
-import com.steerinfo.TimedTask.cmmcarweightresults.service.ICmmCarweightresultsService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * CmmCarweightresults服务实现：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-11-04 08:46
- * 类描述
- * 修订历史：
- * 日期：2021-11-04
- * 作者：generator
- * 参考：
- * 描述：CmmCarweightresults服务实现
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@Service(value = "cmmCarweightresultsService")
-public class CmmCarweightresultsServiceImpl extends BaseServiceImpl<CmmCarweightresults, String> implements ICmmCarweightresultsService {
-
-    @Autowired
-    private CmmCarweightresultsMapper cmmCarweightresultsMapper;
-
-    @Override
-    protected IBaseMapper<CmmCarweightresults, String> getMapper() {
-        return cmmCarweightresultsMapper;
-    }
-}

src/main/java/com/steerinfo/TimedTask/lgwgt/controller/LgWgtController.java

@@ -1,106 +0,0 @@
-package com.steerinfo.TimedTask.lgwgt.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.TimedTask.lgwgt.model.LgWgt;
-import com.steerinfo.TimedTask.lgwgt.service.ILgWgtService;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * LgWgt RESTful接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-10-22 04:55
- * 类描述
- * 修订历史：
- * 日期：2021-10-22
- * 作者：generator
- * 参考：
- * 描述：LgWgt RESTful接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@RestController
-@RequestMapping("/${api.version}/lgwgts")
-public class LgWgtController extends BaseRESTfulController {
-
-    @Autowired
-    ILgWgtService lgWgtService;
-
-    @ApiOperation(value="获取列表", notes="分页查询")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
-    })
-    //@RequiresPermissions("lgwgt:view")
-    @GetMapping(value = "/")
-    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
-        PageList<LgWgt> list = lgWgtService.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("lgwgt:view")
-    @GetMapping(value = "/like/")
-    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
-        PageList<LgWgt> list = lgWgtService.queryLikeForPage(parmas, pageNum, pageSize);
-        return success(list);
-    }
-    
-    @ApiOperation(value="创建", notes="根据LgWgt对象创建")
-    @ApiImplicitParam(name = "lgWgt", value = "详细实体lgWgt", required = true, dataType = "LgWgt")
-    //@RequiresPermissions("lgwgt:create")
-    @PostMapping(value = "/")
-    public RESTfulResult add(@ModelAttribute LgWgt model){
-        LgWgt lgWgt = lgWgtService.add(model);
-        return success(lgWgt);
-    }
-
-    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
-    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "Long")
-    //@RequiresPermissions("lgwgt:view")
-    @GetMapping(value = "/{id}")
-    public RESTfulResult get(@PathVariable Long id){
-        LgWgt lgWgt = lgWgtService.getById(id);
-        return success(lgWgt);
-    }
-
-    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的lgWgt信息来更新详细信息")
-    @ApiImplicitParams({
-        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "Long"),
-        @ApiImplicitParam(name = "lgWgt", value = "详细实体lgWgt", required = true, dataType = "LgWgt")
-    })
-    //@RequiresPermissions("lgwgt:update")
-    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
-    public RESTfulResult update(@PathVariable Long id, @RequestBody LgWgt model){
-        model.setId(id);
-        LgWgt lgWgt = lgWgtService.modify(model);
-        return success(lgWgt);
-    }
-
-    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
-    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "Long")
-    //@RequiresPermissions("lgwgt:delete")
-    @DeleteMapping(value = "/{id}")//Long
-    public RESTfulResult delete(@PathVariable String id){
-    	List<String> list = Arrays.asList(id.split(","));
-    	if(ListUtils.isNotEmpty(list)) {
-	    	List<Long> ids = ListUtils.convertList(list);
-			  lgWgtService.delete(ids);
-    	}
-      return success();
-    }
-}

src/main/java/com/steerinfo/TimedTask/lgwgt/mapper/LgWgtMapper.java

@@ -1,15 +0,0 @@
-package com.steerinfo.TimedTask.lgwgt.mapper;
-
-import com.steerinfo.TimedTask.lgwgt.model.LgWgt;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface LgWgtMapper extends IBaseMapper<LgWgt, Long> {
-
-    /**
-     * 获取最大的id+1
-     * @return
-     */
-    String queryMaxId();
-}

src/main/java/com/steerinfo/TimedTask/lgwgt/mapper/LgWgtMapper.xml

@@ -1,445 +0,0 @@
-<?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.TimedTask.lgwgt.mapper.LgWgtMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.TimedTask.lgwgt.model.LgWgt">
-    <id column="SEQ" jdbcType="DECIMAL" property="seq" />
-    <result column="IN_TIME" jdbcType="VARCHAR" property="inTime" />
-    <result column="WGT" jdbcType="DECIMAL" property="wgt" />
-    <result column="GX_NO" jdbcType="DECIMAL" property="gxNo" />
-    <result column="STATUS" jdbcType="DECIMAL" property="status" />
-    <result column="UP_TIME" jdbcType="VARCHAR" property="upTime" />
-    <result column="GET_TIME" jdbcType="TIMESTAMP" property="getTime" />
-    <result column="SMP_LOT" jdbcType="VARCHAR" property="smpLot" />
-    <result column="BC" jdbcType="VARCHAR" property="bc" />
-    <result column="BZ" jdbcType="VARCHAR" property="bz" />
-    <result column="GG" jdbcType="VARCHAR" property="gg" />
-    <result column="GZ" jdbcType="VARCHAR" property="gz" />
-    <result column="LLZL" jdbcType="DECIMAL" property="llzl" />
-    <result column="ST_FLAG" jdbcType="VARCHAR" property="stFlag" />
-  </resultMap>
-  <sql id="columns">
-    SEQ, IN_TIME, WGT, GX_NO, STATUS, UP_TIME, GET_TIME, SMP_LOT, BC, BZ, GG, GZ, LLZL, 
-    ST_FLAG
-  </sql>
-  <sql id="columns_alias">
-    t.SEQ, t.IN_TIME, t.WGT, t.GX_NO, t.STATUS, t.UP_TIME, t.GET_TIME, t.SMP_LOT, t.BC, 
-    t.BZ, t.GG, t.GZ, t.LLZL, t.ST_FLAG
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns" /> FROM jgweight_user.lg_wgt
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias" /> FROM jgweight_user.lg_wgt t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="seq != null">
-        and SEQ = #{seq}
-      </if>
-      <if test="inTime != null and inTime != ''">
-        and IN_TIME = #{inTime}
-      </if>
-      <if test="wgt != null">
-        and WGT = #{wgt}
-      </if>
-      <if test="gxNo != null">
-        and GX_NO = #{gxNo}
-      </if>
-      <if test="status != null">
-        and STATUS = #{status}
-      </if>
-      <if test="upTime != null and upTime != ''">
-        and UP_TIME = #{upTime}
-      </if>
-      <if test="getTime != null">
-        and TO_CHAR(GET_TIME,'yyyy-MM-dd') = #{getTime}
-      </if>
-      <if test="smpLot != null and smpLot != ''">
-        and SMP_LOT = #{smpLot}
-      </if>
-      <if test="bc != null and bc != ''">
-        and BC = #{bc}
-      </if>
-      <if test="bz != null and bz != ''">
-        and BZ = #{bz}
-      </if>
-      <if test="gg != null and gg != ''">
-        and GG = #{gg}
-      </if>
-      <if test="gz != null and gz != ''">
-        and GZ = #{gz}
-      </if>
-      <if test="llzl != null">
-        and LLZL = #{llzl}
-      </if>
-      <if test="stFlag != null and stFlag != ''">
-        and ST_FLAG = #{stFlag}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="seq != null">
-        and SEQ = #{seq}
-      </if>
-      <if test="inTime != null and inTime != ''">
-        and IN_TIME LIKE '%${inTime}%'
-      </if>
-      <if test="wgt != null">
-        and WGT = #{wgt}
-      </if>
-      <if test="gxNo != null">
-        and GX_NO = #{gxNo}
-      </if>
-      <if test="status != null">
-        and STATUS = #{status}
-      </if>
-      <if test="upTime != null and upTime != ''">
-        and UP_TIME LIKE '%${upTime}%'
-      </if>
-      <if test="getTime != null">
-        and TO_CHAR(GET_TIME,'yyyy-MM-dd') = #{getTime}
-      </if>
-      <if test="smpLot != null and smpLot != ''">
-        and SMP_LOT LIKE '%${smpLot}%'
-      </if>
-      <if test="bc != null and bc != ''">
-        and BC LIKE '%${bc}%'
-      </if>
-      <if test="bz != null and bz != ''">
-        and BZ LIKE '%${bz}%'
-      </if>
-      <if test="gg != null and gg != ''">
-        and GG LIKE '%${gg}%'
-      </if>
-      <if test="gz != null and gz != ''">
-        and GZ LIKE '%${gz}%'
-      </if>
-      <if test="llzl != null">
-        and LLZL = #{llzl}
-      </if>
-      <if test="stFlag != null and stFlag != ''">
-        and ST_FLAG LIKE '%${stFlag}%'
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from jgweight_user.lg_wgt
-    where SEQ = #{seq,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from jgweight_user.lg_wgt
-    where 1!=1 
-      <if test="inTime != null and inTime != ''">
-        or IN_TIME = #{inTime}
-      </if>
-      <if test="wgt != null">
-        or WGT = #{wgt}
-      </if>
-      <if test="gxNo != null">
-        or GX_NO = #{gxNo}
-      </if>
-      <if test="status != null">
-        or STATUS = #{status}
-      </if>
-      <if test="upTime != null and upTime != ''">
-        or UP_TIME = #{upTime}
-      </if>
-      <if test="getTime != null">
-        or TO_CHAR(GET_TIME,'yyyy-MM-dd') = '#{getTime}'
-      </if>
-      <if test="smpLot != null and smpLot != ''">
-        or SMP_LOT = #{smpLot}
-      </if>
-      <if test="bc != null and bc != ''">
-        or BC = #{bc}
-      </if>
-      <if test="bz != null and bz != ''">
-        or BZ = #{bz}
-      </if>
-      <if test="gg != null and gg != ''">
-        or GG = #{gg}
-      </if>
-      <if test="gz != null and gz != ''">
-        or GZ = #{gz}
-      </if>
-      <if test="llzl != null">
-        or LLZL = #{llzl}
-      </if>
-      <if test="stFlag != null and stFlag != ''">
-        or ST_FLAG = #{stFlag}
-      </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.TimedTask.lgwgt.model.LgWgt">
-    insert into jgweight_user.lg_wgt (SEQ, IN_TIME, WGT, 
-      GX_NO, STATUS, UP_TIME, 
-      GET_TIME, SMP_LOT, BC, 
-      BZ, GG, GZ, LLZL, 
-      ST_FLAG)
-    values (#{seq,jdbcType=DECIMAL}, #{inTime,jdbcType=VARCHAR}, #{wgt,jdbcType=DECIMAL}, 
-      #{gxNo,jdbcType=DECIMAL}, #{status,jdbcType=DECIMAL}, #{upTime,jdbcType=VARCHAR}, 
-      #{getTime,jdbcType=TIMESTAMP}, #{smpLot,jdbcType=VARCHAR}, #{bc,jdbcType=VARCHAR}, 
-      #{bz,jdbcType=VARCHAR}, #{gg,jdbcType=VARCHAR}, #{gz,jdbcType=VARCHAR}, #{llzl,jdbcType=DECIMAL}, 
-      #{stFlag,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.TimedTask.lgwgt.model.LgWgt">
-    insert into jgweight_user.lg_wgt
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="seq != null">
-        SEQ,
-      </if>
-      <if test="inTime != null">
-        IN_TIME,
-      </if>
-      <if test="wgt != null">
-        WGT,
-      </if>
-      <if test="gxNo != null">
-        GX_NO,
-      </if>
-      <if test="status != null">
-        STATUS,
-      </if>
-      <if test="upTime != null">
-        UP_TIME,
-      </if>
-      <if test="getTime != null">
-        GET_TIME,
-      </if>
-      <if test="smpLot != null">
-        SMP_LOT,
-      </if>
-      <if test="bc != null">
-        BC,
-      </if>
-      <if test="bz != null">
-        BZ,
-      </if>
-      <if test="gg != null">
-        GG,
-      </if>
-      <if test="gz != null">
-        GZ,
-      </if>
-      <if test="llzl != null">
-        LLZL,
-      </if>
-      <if test="stFlag != null">
-        ST_FLAG,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="seq != null">
-        #{seq,jdbcType=DECIMAL},
-      </if>
-      <if test="inTime != null">
-        #{inTime,jdbcType=VARCHAR},
-      </if>
-      <if test="wgt != null">
-        #{wgt,jdbcType=DECIMAL},
-      </if>
-      <if test="gxNo != null">
-        #{gxNo,jdbcType=DECIMAL},
-      </if>
-      <if test="status != null">
-        #{status,jdbcType=DECIMAL},
-      </if>
-      <if test="upTime != null">
-        #{upTime,jdbcType=VARCHAR},
-      </if>
-      <if test="getTime != null">
-        #{getTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="smpLot != null">
-        #{smpLot,jdbcType=VARCHAR},
-      </if>
-      <if test="bc != null">
-        #{bc,jdbcType=VARCHAR},
-      </if>
-      <if test="bz != null">
-        #{bz,jdbcType=VARCHAR},
-      </if>
-      <if test="gg != null">
-        #{gg,jdbcType=VARCHAR},
-      </if>
-      <if test="gz != null">
-        #{gz,jdbcType=VARCHAR},
-      </if>
-      <if test="llzl != null">
-        #{llzl,jdbcType=DECIMAL},
-      </if>
-      <if test="stFlag != null">
-        #{stFlag,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.TimedTask.lgwgt.model.LgWgt">
-    update jgweight_user.lg_wgt
-    set IN_TIME = #{inTime,jdbcType=VARCHAR},
-      WGT = #{wgt,jdbcType=DECIMAL},
-      GX_NO = #{gxNo,jdbcType=DECIMAL},
-      STATUS = #{status,jdbcType=DECIMAL},
-      UP_TIME = #{upTime,jdbcType=VARCHAR},
-      GET_TIME = #{getTime,jdbcType=TIMESTAMP},
-      SMP_LOT = #{smpLot,jdbcType=VARCHAR},
-      BC = #{bc,jdbcType=VARCHAR},
-      BZ = #{bz,jdbcType=VARCHAR},
-      GG = #{gg,jdbcType=VARCHAR},
-      GZ = #{gz,jdbcType=VARCHAR},
-      LLZL = #{llzl,jdbcType=DECIMAL},
-      ST_FLAG = #{stFlag,jdbcType=VARCHAR}
-    where SEQ = #{seq,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.TimedTask.lgwgt.model.LgWgt">
-    update jgweight_user.lg_wgt
-    <set>
-      <if test="inTime != null">
-        IN_TIME = #{inTime,jdbcType=VARCHAR},
-      </if>
-      <if test="wgt != null">
-        WGT = #{wgt,jdbcType=DECIMAL},
-      </if>
-      <if test="gxNo != null">
-        GX_NO = #{gxNo,jdbcType=DECIMAL},
-      </if>
-      <if test="status != null">
-        STATUS = #{status,jdbcType=DECIMAL},
-      </if>
-      <if test="upTime != null">
-        UP_TIME = #{upTime,jdbcType=VARCHAR},
-      </if>
-      <if test="getTime != null">
-        GET_TIME = #{getTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="smpLot != null">
-        SMP_LOT = #{smpLot,jdbcType=VARCHAR},
-      </if>
-      <if test="bc != null">
-        BC = #{bc,jdbcType=VARCHAR},
-      </if>
-      <if test="bz != null">
-        BZ = #{bz,jdbcType=VARCHAR},
-      </if>
-      <if test="gg != null">
-        GG = #{gg,jdbcType=VARCHAR},
-      </if>
-      <if test="gz != null">
-        GZ = #{gz,jdbcType=VARCHAR},
-      </if>
-      <if test="llzl != null">
-        LLZL = #{llzl,jdbcType=DECIMAL},
-      </if>
-      <if test="stFlag != null">
-        ST_FLAG = #{stFlag,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where SEQ = #{seq,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    <include refid="select" />
-    where SEQ = #{seq,jdbcType=DECIMAL}
-  </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 jgweight_user.lg_wgt 
-      (SEQ, 
-      IN_TIME, WGT, GX_NO, 
-      STATUS, UP_TIME, GET_TIME, 
-      SMP_LOT, BC, BZ, 
-      GG, GZ, LLZL, 
-      ST_FLAG)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.seq,jdbcType=DECIMAL}, 
-      #{item.inTime,jdbcType=VARCHAR}, #{item.wgt,jdbcType=DECIMAL}, #{item.gxNo,jdbcType=DECIMAL}, 
-      #{item.status,jdbcType=DECIMAL}, #{item.upTime,jdbcType=VARCHAR}, #{item.getTime,jdbcType=TIMESTAMP}, 
-      #{item.smpLot,jdbcType=VARCHAR}, #{item.bc,jdbcType=VARCHAR}, #{item.bz,jdbcType=VARCHAR}, 
-      #{item.gg,jdbcType=VARCHAR}, #{item.gz,jdbcType=VARCHAR}, #{item.llzl,jdbcType=DECIMAL}, 
-      #{item.stFlag,jdbcType=VARCHAR} from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update jgweight_user.lg_wgt
-     set
-       SEQ=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEQ" separator=" ">
-          when #{item.seq,jdbcType=DECIMAL} then #{item.seq,jdbcType=DECIMAL}
-       </foreach>
-       ,IN_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEQ" separator=" ">
-          when #{item.seq,jdbcType=DECIMAL} then #{item.inTime,jdbcType=VARCHAR}
-       </foreach>
-       ,WGT=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEQ" separator=" ">
-          when #{item.seq,jdbcType=DECIMAL} then #{item.wgt,jdbcType=DECIMAL}
-       </foreach>
-       ,GX_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEQ" separator=" ">
-          when #{item.seq,jdbcType=DECIMAL} then #{item.gxNo,jdbcType=DECIMAL}
-       </foreach>
-       ,STATUS=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEQ" separator=" ">
-          when #{item.seq,jdbcType=DECIMAL} then #{item.status,jdbcType=DECIMAL}
-       </foreach>
-       ,UP_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEQ" separator=" ">
-          when #{item.seq,jdbcType=DECIMAL} then #{item.upTime,jdbcType=VARCHAR}
-       </foreach>
-       ,GET_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEQ" separator=" ">
-          when #{item.seq,jdbcType=DECIMAL} then #{item.getTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,SMP_LOT=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEQ" separator=" ">
-          when #{item.seq,jdbcType=DECIMAL} then #{item.smpLot,jdbcType=VARCHAR}
-       </foreach>
-       ,BC=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEQ" separator=" ">
-          when #{item.seq,jdbcType=DECIMAL} then #{item.bc,jdbcType=VARCHAR}
-       </foreach>
-       ,BZ=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEQ" separator=" ">
-          when #{item.seq,jdbcType=DECIMAL} then #{item.bz,jdbcType=VARCHAR}
-       </foreach>
-       ,GG=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEQ" separator=" ">
-          when #{item.seq,jdbcType=DECIMAL} then #{item.gg,jdbcType=VARCHAR}
-       </foreach>
-       ,GZ=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEQ" separator=" ">
-          when #{item.seq,jdbcType=DECIMAL} then #{item.gz,jdbcType=VARCHAR}
-       </foreach>
-       ,LLZL=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEQ" separator=" ">
-          when #{item.seq,jdbcType=DECIMAL} then #{item.llzl,jdbcType=DECIMAL}
-       </foreach>
-       ,ST_FLAG=
-       <foreach close="end" collection="list" index="index" item="item" open="case SEQ" separator=" ">
-          when #{item.seq,jdbcType=DECIMAL} then #{item.stFlag,jdbcType=VARCHAR}
-       </foreach>
-     where SEQ in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.seq,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from jgweight_user.lg_wgt
-    where SEQ in 
-    <foreach close=")" collection="list" item="id" open="(" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-
-  <!--获取最大的ID+1，用作主键-->
-  <select id="queryMaxId" parameterType="java.lang.String" resultType="java.lang.String">
-    SELECT NVL(MAX(SEQ),0)+1   FROM jgweight_user.lg_wgt
-  </select>
-</mapper>

src/main/java/com/steerinfo/TimedTask/lgwgt/model/LgWgt.java

@@ -1,200 +0,0 @@
-package com.steerinfo.TimedTask.lgwgt.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 LgWgt implements IBasePO<Long> {
-    @ApiModelProperty(value="",required=true)
-    private Long seq;
-
-    @ApiModelProperty(value="",required=false)
-    private String inTime;
-
-    @ApiModelProperty(value="",required=false)
-    private Integer wgt;
-
-    @ApiModelProperty(value="",required=false)
-    private Short gxNo;
-
-    @ApiModelProperty(value="",required=false)
-    private Short status;
-
-    @ApiModelProperty(value="",required=false)
-    private String upTime;
-
-    @ApiModelProperty(value="",required=false)
-    private Date getTime;
-
-    @ApiModelProperty(value="",required=false)
-    private String smpLot;
-
-    @ApiModelProperty(value="",required=false)
-    private String bc;
-
-    @ApiModelProperty(value="",required=false)
-    private String bz;
-
-    @ApiModelProperty(value="",required=false)
-    private String gg;
-
-    @ApiModelProperty(value="",required=false)
-    private String gz;
-
-    @ApiModelProperty(value="",required=false)
-    private Short llzl;
-
-    @ApiModelProperty(value="",required=false)
-    private String stFlag;
-
-    private static final long serialVersionUID = 1L;
-
-    @Override
-    public Long getId() {
-        return this.seq;
-    }
-
-    @Override
-    public void setId(Long seq) {
-        this.seq = seq;
-    }
-
-    public Long getSeq() {
-        return seq;
-    }
-
-    public void setSeq(Long seq) {
-        this.seq = seq;
-    }
-
-    public String getInTime() {
-        return inTime;
-    }
-
-    public void setInTime(String inTime) {
-        this.inTime = inTime == null ? null : inTime.trim();
-    }
-
-    public Integer getWgt() {
-        return wgt;
-    }
-
-    public void setWgt(Integer wgt) {
-        this.wgt = wgt;
-    }
-
-    public Short getGxNo() {
-        return gxNo;
-    }
-
-    public void setGxNo(Short gxNo) {
-        this.gxNo = gxNo;
-    }
-
-    public Short getStatus() {
-        return status;
-    }
-
-    public void setStatus(Short status) {
-        this.status = status;
-    }
-
-    public String getUpTime() {
-        return upTime;
-    }
-
-    public void setUpTime(String upTime) {
-        this.upTime = upTime == null ? null : upTime.trim();
-    }
-
-    public Date getGetTime() {
-        return getTime;
-    }
-
-    public void setGetTime(Date getTime) {
-        this.getTime = getTime;
-    }
-
-    public String getSmpLot() {
-        return smpLot;
-    }
-
-    public void setSmpLot(String smpLot) {
-        this.smpLot = smpLot == null ? null : smpLot.trim();
-    }
-
-    public String getBc() {
-        return bc;
-    }
-
-    public void setBc(String bc) {
-        this.bc = bc == null ? null : bc.trim();
-    }
-
-    public String getBz() {
-        return bz;
-    }
-
-    public void setBz(String bz) {
-        this.bz = bz == null ? null : bz.trim();
-    }
-
-    public String getGg() {
-        return gg;
-    }
-
-    public void setGg(String gg) {
-        this.gg = gg == null ? null : gg.trim();
-    }
-
-    public String getGz() {
-        return gz;
-    }
-
-    public void setGz(String gz) {
-        this.gz = gz == null ? null : gz.trim();
-    }
-
-    public Short getLlzl() {
-        return llzl;
-    }
-
-    public void setLlzl(Short llzl) {
-        this.llzl = llzl;
-    }
-
-    public String getStFlag() {
-        return stFlag;
-    }
-
-    public void setStFlag(String stFlag) {
-        this.stFlag = stFlag == null ? null : stFlag.trim();
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", seq=").append(seq);
-        sb.append(", inTime=").append(inTime);
-        sb.append(", wgt=").append(wgt);
-        sb.append(", gxNo=").append(gxNo);
-        sb.append(", status=").append(status);
-        sb.append(", upTime=").append(upTime);
-        sb.append(", getTime=").append(getTime);
-        sb.append(", smpLot=").append(smpLot);
-        sb.append(", bc=").append(bc);
-        sb.append(", bz=").append(bz);
-        sb.append(", gg=").append(gg);
-        sb.append(", gz=").append(gz);
-        sb.append(", llzl=").append(llzl);
-        sb.append(", stFlag=").append(stFlag);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}

src/main/java/com/steerinfo/TimedTask/lgwgt/service/ILgWgtService.java

@@ -1,21 +0,0 @@
-package com.steerinfo.TimedTask.lgwgt.service;
-
-import com.steerinfo.framework.service.IBaseService;
-import com.steerinfo.TimedTask.lgwgt.model.LgWgt;
-
-/**
- * LgWgt服务接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-10-22 04:55
- * 类描述
- * 修订历史：
- * 日期：2021-10-22
- * 作者：generator
- * 参考：
- * 描述：LgWgt服务接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-public interface ILgWgtService extends IBaseService<LgWgt, Long>{
-
-}

src/main/java/com/steerinfo/TimedTask/lgwgt/service/impl/LgWgtServiceImpl.java

@@ -1,34 +0,0 @@
-package com.steerinfo.TimedTask.lgwgt.service.impl;
-
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
-import com.steerinfo.TimedTask.lgwgt.model.LgWgt;
-import com.steerinfo.TimedTask.lgwgt.mapper.LgWgtMapper;
-import com.steerinfo.TimedTask.lgwgt.service.ILgWgtService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * LgWgt服务实现：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-10-22 04:55
- * 类描述
- * 修订历史：
- * 日期：2021-10-22
- * 作者：generator
- * 参考：
- * 描述：LgWgt服务实现
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@Service(value = "lgWgtService")
-public class LgWgtServiceImpl extends BaseServiceImpl<LgWgt, Long> implements ILgWgtService {
-
-    @Autowired
-    private LgWgtMapper lgWgtMapper;
-
-    @Override
-    protected IBaseMapper<LgWgt, Long> getMapper() {
-        return lgWgtMapper;
-    }
-}

src/main/java/com/steerinfo/TimedTask/rsbcread/controller/RsBcreadController.java

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

src/main/java/com/steerinfo/TimedTask/rsbcread/mapper/RsBcreadMapper.java

@@ -1,10 +0,0 @@
-package com.steerinfo.TimedTask.rsbcread.mapper;
-
-import com.steerinfo.TimedTask.rsbcread.model.RsBcread;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import java.math.*;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface RsBcreadMapper extends IBaseMapper<RsBcread, BigDecimal> {
-}

src/main/java/com/steerinfo/TimedTask/rsbcread/mapper/RsBcreadMapper.xml

@@ -1,136 +0,0 @@
-<?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.TimedTask.rsbcread.mapper.RsBcreadMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.TimedTask.rsbcread.model.RsBcread">
-    <id column="XH" jdbcType="DECIMAL" property="xh" />
-    <result column="ZHONGLIAN" jdbcType="DECIMAL" property="zhonglian" />
-  </resultMap>
-  <sql id="columns">
-    XH, ZHONGLIAN
-  </sql>
-  <sql id="columns_alias">
-    t.XH, t.ZHONGLIAN
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns" /> FROM RS_BCREAD
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias" /> FROM RS_BCREAD t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="xh != null">
-        and XH = #{xh}
-      </if>
-      <if test="zhonglian != null">
-        and ZHONGLIAN = #{zhonglian}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="xh != null">
-        and XH = #{xh}
-      </if>
-      <if test="zhonglian != null">
-        and ZHONGLIAN = #{zhonglian}
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from RS_BCREAD
-    where XH = #{xh,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from RS_BCREAD
-    where 1!=1 
-      <if test="zhonglian != null">
-        or ZHONGLIAN = #{zhonglian}
-      </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.TimedTask.rsbcread.model.RsBcread">
-    insert into RS_BCREAD (XH, ZHONGLIAN)
-    values (#{xh,jdbcType=DECIMAL}, #{zhonglian,jdbcType=DECIMAL})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.TimedTask.rsbcread.model.RsBcread">
-    insert into RS_BCREAD
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="xh != null">
-        XH,
-      </if>
-      <if test="zhonglian != null">
-        ZHONGLIAN,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="xh != null">
-        #{xh,jdbcType=DECIMAL},
-      </if>
-      <if test="zhonglian != null">
-        #{zhonglian,jdbcType=DECIMAL},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.TimedTask.rsbcread.model.RsBcread">
-    update RS_BCREAD
-    set ZHONGLIAN = #{zhonglian,jdbcType=DECIMAL}
-    where XH = #{xh,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.TimedTask.rsbcread.model.RsBcread">
-    update RS_BCREAD
-    <set>
-      <if test="zhonglian != null">
-        ZHONGLIAN = #{zhonglian,jdbcType=DECIMAL},
-      </if>
-    </set>
-    where XH = #{xh,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select" />
-    where XH = #{xh,jdbcType=DECIMAL}
-  </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 RS_BCREAD 
-      (XH, 
-      ZHONGLIAN)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.xh,jdbcType=DECIMAL}, 
-      #{item.zhonglian,jdbcType=DECIMAL} from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update RS_BCREAD
-     set
-       XH=
-       <foreach close="end" collection="list" index="index" item="item" open="case XH" separator=" ">
-          when #{item.xh,jdbcType=DECIMAL} then #{item.xh,jdbcType=DECIMAL}
-       </foreach>
-       ,ZHONGLIAN=
-       <foreach close="end" collection="list" index="index" item="item" open="case XH" separator=" ">
-          when #{item.xh,jdbcType=DECIMAL} then #{item.zhonglian,jdbcType=DECIMAL}
-       </foreach>
-     where XH in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.xh,jdbcType=DECIMAL}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from RS_BCREAD
-    where XH in 
-    <foreach close=")" collection="list" item="id" open="(" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-
-</mapper>

src/main/java/com/steerinfo/TimedTask/rsbcread/model/RsBcread.java

@@ -1,56 +0,0 @@
-package com.steerinfo.TimedTask.rsbcread.model;
-
-import com.steerinfo.framework.model.IBasePO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-
-@ApiModel(value="null")
-public class RsBcread implements IBasePO<BigDecimal> {
-    @ApiModelProperty(value="",required=false)
-    private BigDecimal xh;
-
-    @ApiModelProperty(value="",required=false)
-    private Integer zhonglian;
-
-    private static final long serialVersionUID = 1L;
-
-    @Override
-    public BigDecimal getId() {
-        return this.xh;
-    }
-
-    @Override
-    public void setId(BigDecimal xh) {
-        this.xh = xh;
-    }
-
-    public BigDecimal getXh() {
-        return xh;
-    }
-
-    public void setXh(BigDecimal xh) {
-        this.xh = xh;
-    }
-
-    public Integer getZhonglian() {
-        return zhonglian;
-    }
-
-    public void setZhonglian(Integer zhonglian) {
-        this.zhonglian = zhonglian;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", xh=").append(xh);
-        sb.append(", zhonglian=").append(zhonglian);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}

src/main/java/com/steerinfo/TimedTask/rsbcread/service/IRsBcreadService.java

@@ -1,23 +0,0 @@
-package com.steerinfo.TimedTask.rsbcread.service;
-
-import com.steerinfo.framework.service.IBaseService;
-import com.steerinfo.TimedTask.rsbcread.model.RsBcread;
-
-import java.math.BigDecimal;
-
-/**
- * RsBcread服务接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-10-28 07:23
- * 类描述
- * 修订历史：
- * 日期：2021-10-28
- * 作者：generator
- * 参考：
- * 描述：RsBcread服务接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-public interface IRsBcreadService extends IBaseService<RsBcread, BigDecimal>{
-
-}

src/main/java/com/steerinfo/TimedTask/rsbcread/service/impl/RsBcreadServiceImpl.java

@@ -1,36 +0,0 @@
-package com.steerinfo.TimedTask.rsbcread.service.impl;
-
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
-import com.steerinfo.TimedTask.rsbcread.model.RsBcread;
-import com.steerinfo.TimedTask.rsbcread.mapper.RsBcreadMapper;
-import com.steerinfo.TimedTask.rsbcread.service.IRsBcreadService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-
-/**
- * RsBcread服务实现：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-10-28 07:23
- * 类描述
- * 修订历史：
- * 日期：2021-10-28
- * 作者：generator
- * 参考：
- * 描述：RsBcread服务实现
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@Service(value = "rsBcreadService")
-public class RsBcreadServiceImpl extends BaseServiceImpl<RsBcread, BigDecimal> implements IRsBcreadService {
-
-    @Autowired
-    private RsBcreadMapper rsBcreadMapper;
-
-    @Override
-    protected IBaseMapper<RsBcread, BigDecimal> getMapper() {
-        return rsBcreadMapper;
-    }
-}

src/main/java/com/steerinfo/appservice/appcmmcarweightresults/controller/AppCmmCarweightresultsController.java

@@ -1,136 +0,0 @@
-package com.steerinfo.appservice.appcmmcarweightresults.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.appservice.appcmmcarweightresults.model.AppCmmCarweightresults;
-import com.steerinfo.appservice.appcmmcarweightresults.service.IAppCmmCarweightresultsService;
-import com.steerinfo.meterwork.except.MarkerMetException;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * AppCmmCarweightresults RESTful接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-11-05 11:06
- * 类描述
- * 修订历史：
- * 日期：2021-11-05
- * 作者：generator
- * 参考：
- * 描述：AppCmmCarweightresults RESTful接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@RestController
-@RequestMapping("/${api.version}/appservice/appcmmcarweightresultss")
-public class AppCmmCarweightresultsController extends BaseRESTfulController {
-
-    @Autowired
-    IAppCmmCarweightresultsService appCmmCarweightresultsService;
-
-    @ApiOperation(value="获取列表", notes="分页查询")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
-    })
-    //@RequiresPermissions("appcmmcarweightresults:view")
-    @GetMapping(value = "/")
-    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
-        PageList<AppCmmCarweightresults> list = appCmmCarweightresultsService.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("appcmmcarweightresults:view")
-    @GetMapping(value = "/like/")
-    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
-        PageList<AppCmmCarweightresults> list = appCmmCarweightresultsService.queryLikeForPage(parmas, pageNum, pageSize);
-        return success(list);
-    }
-    
-    @ApiOperation(value="创建", notes="根据AppCmmCarweightresults对象创建")
-    @ApiImplicitParam(name = "appCmmCarweightresults", value = "详细实体appCmmCarweightresults", required = true, dataType = "AppCmmCarweightresults")
-    //@RequiresPermissions("appcmmcarweightresults:create")
-    @PostMapping(value = "/")
-    public RESTfulResult add(@ModelAttribute AppCmmCarweightresults model){
-        AppCmmCarweightresults appCmmCarweightresults = appCmmCarweightresultsService.add(model);
-        return success(appCmmCarweightresults);
-    }
-
-    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
-    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
-    //@RequiresPermissions("appcmmcarweightresults:view")
-    @GetMapping(value = "/{id}")
-    public RESTfulResult get(@PathVariable String id){
-        AppCmmCarweightresults appCmmCarweightresults = appCmmCarweightresultsService.getById(id);
-        return success(appCmmCarweightresults);
-    }
-
-    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的appCmmCarweightresults信息来更新详细信息")
-    @ApiImplicitParams({
-        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
-        @ApiImplicitParam(name = "appCmmCarweightresults", value = "详细实体appCmmCarweightresults", required = true, dataType = "AppCmmCarweightresults")
-    })
-    //@RequiresPermissions("appcmmcarweightresults:update")
-    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
-    public RESTfulResult update(@PathVariable String id, @RequestBody AppCmmCarweightresults model){
-        model.setId(id);
-        AppCmmCarweightresults appCmmCarweightresults = appCmmCarweightresultsService.modify(model);
-        return success(appCmmCarweightresults);
-    }
-
-    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
-    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
-    //@RequiresPermissions("appcmmcarweightresults: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);
-			  appCmmCarweightresultsService.delete(ids);
-    	}
-      return success();
-    }
-
-
-    @ApiOperation(value = "车辆管理-计量实绩-明细查询（旧系统）", notes = "根据车号参数查询数据，查询明细数据")
-    @GetMapping(value = "/selectNetByCarOld")
-    public RESTfulResult selectNetByCarOld(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
-        try {
-            PageList<AppCmmCarweightresults> list = appCmmCarweightresultsService.selectNetByCarOld(parmas, pageNum, pageSize);
-            return success(list);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new MarkerMetException(500, "操作异常！！");
-        }
-    }
-
-    @ApiOperation(value = "车辆管理-计量实绩-分类查询汇总（旧系统）", notes = " 通过车号获取总数,分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
-    })
-    @GetMapping(value = "/selectSumForAppByCarOld")
-    public RESTfulResult selectSumForAppByCarOld(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
-        try {
-            PageList<AppCmmCarweightresults> list = appCmmCarweightresultsService.selectSumForAppByCarOld(parmas, pageNum, pageSize);
-            return success(list);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new MarkerMetException(500, "操作异常！！");
-        }
-    }
-}

src/main/java/com/steerinfo/appservice/appcmmcarweightresults/mapper/AppCmmCarweightresultsMapper.java

@@ -1,26 +0,0 @@
-package com.steerinfo.appservice.appcmmcarweightresults.mapper;
-
-import com.steerinfo.appservice.appcmmcarweightresults.model.AppCmmCarweightresults;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.HashMap;
-import java.util.List;
-
-@Mapper
-public interface AppCmmCarweightresultsMapper extends IBaseMapper<AppCmmCarweightresults, String> {
-
-    /**
-     * 车辆管理-计量实绩-明细查询（旧系统）
-     * @param params
-     * @return
-     */
-    List<AppCmmCarweightresults> selectNetByCarOld(HashMap params);
-
-    /**
-     * 车辆管理-计量实绩-分类查询汇总（旧系统）
-     * @param params
-     * @return
-     */
-    List<AppCmmCarweightresults> selectSumForAppByCarOld(HashMap params);
-}

src/main/java/com/steerinfo/appservice/appcmmcarweightresults/mapper/AppCmmCarweightresultsMapper.xml

@@ -1,2410 +0,0 @@
-<?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.appservice.appcmmcarweightresults.mapper.AppCmmCarweightresultsMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.appservice.appcmmcarweightresults.model.AppCmmCarweightresults">
-    <id column="WGT_NO" jdbcType="VARCHAR" property="wgtNo" />
-    <result column="BILLNO" jdbcType="VARCHAR" property="billno" />
-    <result column="TRU_NO" jdbcType="VARCHAR" property="truNo" />
-    <result column="LGS_NO" jdbcType="VARCHAR" property="lgsNo" />
-    <result column="CAR_NO" jdbcType="VARCHAR" property="carNo" />
-    <result column="ICD_NO" jdbcType="VARCHAR" property="icdNo" />
-    <result column="GRS_BOX_NO" jdbcType="DECIMAL" property="grsBoxNo" />
-    <result column="TAR_BOX_NO" jdbcType="DECIMAL" property="tarBoxNo" />
-    <result column="GRS_SPD" jdbcType="DECIMAL" property="grsSpd" />
-    <result column="TAR_SPD" jdbcType="DECIMAL" property="tarSpd" />
-    <result column="TRN_TYPE" jdbcType="VARCHAR" property="trnType" />
-    <result column="GRS_VDO_FILE" jdbcType="VARCHAR" property="grsVdoFile" />
-    <result column="TAR_VDO_FILE" jdbcType="VARCHAR" property="tarVdoFile" />
-    <result column="GRS_TRN_NO" jdbcType="VARCHAR" property="grsTrnNo" />
-    <result column="TAR_TRN_NO" jdbcType="VARCHAR" property="tarTrnNo" />
-    <result column="WGT_TYPE" jdbcType="VARCHAR" property="wgtType" />
-    <result column="GRS_WGT" jdbcType="DECIMAL" property="grsWgt" />
-    <result column="TAR_WGT" jdbcType="DECIMAL" property="tarWgt" />
-    <result column="NET_WGT" jdbcType="DECIMAL" property="netWgt" />
-    <result column="NO2_WGT" jdbcType="DECIMAL" property="no2Wgt" />
-    <result column="GRS_WGT_NO" jdbcType="VARCHAR" property="grsWgtNo" />
-    <result column="TAR_WGT_NO" jdbcType="VARCHAR" property="tarWgtNo" />
-    <result column="TAR_TYPE" jdbcType="CHAR" property="tarType" />
-    <result column="TAR_INF_MODE" jdbcType="CHAR" property="tarInfMode" />
-    <result column="GRS_INF_MODE" jdbcType="CHAR" property="grsInfMode" />
-    <result column="NET_INF_MODE" jdbcType="CHAR" property="netInfMode" />
-    <result column="GRS_TIME" jdbcType="TIMESTAMP" property="grsTime" />
-    <result column="TAR_TIME" jdbcType="TIMESTAMP" property="tarTime" />
-    <result column="NET_TIME" jdbcType="TIMESTAMP" property="netTime" />
-    <result column="GRS_WRK_ORD" jdbcType="VARCHAR" property="grsWrkOrd" />
-    <result column="TAR_WRK_ORD" jdbcType="VARCHAR" property="tarWrkOrd" />
-    <result column="NET_WRK_ORD" jdbcType="VARCHAR" property="netWrkOrd" />
-    <result column="GRS_WRK_GRP" jdbcType="VARCHAR" property="grsWrkGrp" />
-    <result column="TAR_WRK_GRP" jdbcType="VARCHAR" property="tarWrkGrp" />
-    <result column="NET_WRK_GRP" jdbcType="VARCHAR" property="netWrkGrp" />
-    <result column="GRS_OPR" jdbcType="VARCHAR" property="grsOpr" />
-    <result column="TAR_OPR" jdbcType="VARCHAR" property="tarOpr" />
-    <result column="NET_OPR" jdbcType="VARCHAR" property="netOpr" />
-    <result column="GRS_PNT_NAME" jdbcType="VARCHAR" property="grsPntName" />
-    <result column="TAR_PNT_NAME" jdbcType="VARCHAR" property="tarPntName" />
-    <result column="NET_PNT_NAME" jdbcType="VARCHAR" property="netPntName" />
-    <result column="GRS_PNT_NO" jdbcType="VARCHAR" property="grsPntNo" />
-    <result column="TAR_PNT_NO" jdbcType="VARCHAR" property="tarPntNo" />
-    <result column="NET_PNT_NO" jdbcType="VARCHAR" property="netPntNo" />
-    <result column="NOTE" jdbcType="VARCHAR" property="note" />
-    <result column="SDR_TYPE" jdbcType="VARCHAR" property="sdrType" />
-    <result column="SDR_NAME" jdbcType="VARCHAR" property="sdrName" />
-    <result column="SENDER" jdbcType="VARCHAR" property="sender" />
-    <result column="SDR_NOTE" jdbcType="VARCHAR" property="sdrNote" />
-    <result column="RCV_TYPE" jdbcType="VARCHAR" property="rcvType" />
-    <result column="RCV_NAME" jdbcType="VARCHAR" property="rcvName" />
-    <result column="RECEIVER" jdbcType="VARCHAR" property="receiver" />
-    <result column="RCV_NOTE" jdbcType="VARCHAR" property="rcvNote" />
-    <result column="MAT_NAME" jdbcType="VARCHAR" property="matName" />
-    <result column="MAT_CODE" jdbcType="VARCHAR" property="matCode" />
-    <result column="B1_PRN_NUM" jdbcType="DECIMAL" property="b1PrnNum" />
-    <result column="B2_PRN_NUM" jdbcType="DECIMAL" property="b2PrnNum" />
-    <result column="B1_PRN_NUM_2" jdbcType="DECIMAL" property="b1PrnNum2" />
-    <result column="UPL_FLG" jdbcType="VARCHAR" property="uplFlg" />
-    <result column="UPL_TIME" jdbcType="TIMESTAMP" property="uplTime" />
-    <result column="DEL_FLG" jdbcType="VARCHAR" property="delFlg" />
-    <result column="EXT_BOX" jdbcType="CHAR" property="extBox" />
-    <result column="SDR_GRS_WGT" jdbcType="DECIMAL" property="sdrGrsWgt" />
-    <result column="SDR_TAR_WGT" jdbcType="DECIMAL" property="sdrTarWgt" />
-    <result column="SDR_NET_WGT" jdbcType="DECIMAL" property="sdrNetWgt" />
-    <result column="DIS_WGT" jdbcType="DECIMAL" property="disWgt" />
-    <result column="DIS_RATIO" jdbcType="DECIMAL" property="disRatio" />
-    <result column="NET_END" jdbcType="DECIMAL" property="netEnd" />
-    <result column="NO1_WGT_MODE" jdbcType="VARCHAR" property="no1WgtMode" />
-    <result column="NO2_WGT_MODE" jdbcType="VARCHAR" property="no2WgtMode" />
-    <result column="RFID_NO" jdbcType="VARCHAR" property="rfidNo" />
-    <result column="CHK_FLG" jdbcType="VARCHAR" property="chkFlg" />
-    <result column="CHECKER" jdbcType="VARCHAR" property="checker" />
-    <result column="CHK_TIME" jdbcType="TIMESTAMP" property="chkTime" />
-    <result column="CHM_PER" jdbcType="VARCHAR" property="chmPer" />
-    <result column="CHM_TIME" jdbcType="TIMESTAMP" property="chmTime" />
-    <result column="CHM_TYPE" jdbcType="VARCHAR" property="chmType" />
-    <result column="TRANSPORT" jdbcType="VARCHAR" property="transport" />
-    <result column="TRANS_NAME" jdbcType="VARCHAR" property="transName" />
-    <result column="GRS_WGT_CURVE" jdbcType="VARCHAR" property="grsWgtCurve" />
-    <result column="TAR_WGT_CURVE" jdbcType="VARCHAR" property="tarWgtCurve" />
-    <result column="DIS_OPR" jdbcType="VARCHAR" property="disOpr" />
-    <result column="DIS_TIME" jdbcType="TIMESTAMP" property="disTime" />
-    <result column="FD_UPFLG" jdbcType="VARCHAR" property="fdUpflg" />
-    <result column="CH_UP" jdbcType="VARCHAR" property="chUp" />
-    <result column="CH_OPR" jdbcType="VARCHAR" property="chOpr" />
-    <result column="CH_TIME" jdbcType="TIMESTAMP" property="chTime" />
-    <result column="TD_NO" jdbcType="VARCHAR" property="tdNo" />
-    <result column="TD_WGT" jdbcType="DECIMAL" property="tdWgt" />
-    <result column="DD_NO" jdbcType="VARCHAR" property="ddNo" />
-  </resultMap>
-  <sql id="columns">
-    WGT_NO, BILLNO, TRU_NO, LGS_NO, CAR_NO, ICD_NO, GRS_BOX_NO, TAR_BOX_NO, GRS_SPD, 
-    TAR_SPD, TRN_TYPE, GRS_VDO_FILE, TAR_VDO_FILE, GRS_TRN_NO, TAR_TRN_NO, WGT_TYPE, 
-    GRS_WGT, TAR_WGT, NET_WGT, NO2_WGT, GRS_WGT_NO, TAR_WGT_NO, TAR_TYPE, TAR_INF_MODE, 
-    GRS_INF_MODE, NET_INF_MODE, GRS_TIME, TAR_TIME, NET_TIME, GRS_WRK_ORD, TAR_WRK_ORD, 
-    NET_WRK_ORD, GRS_WRK_GRP, TAR_WRK_GRP, NET_WRK_GRP, GRS_OPR, TAR_OPR, NET_OPR, GRS_PNT_NAME, 
-    TAR_PNT_NAME, NET_PNT_NAME, GRS_PNT_NO, TAR_PNT_NO, NET_PNT_NO, NOTE, SDR_TYPE, SDR_NAME, 
-    SENDER, SDR_NOTE, RCV_TYPE, RCV_NAME, RECEIVER, RCV_NOTE, MAT_NAME, MAT_CODE, B1_PRN_NUM, 
-    B2_PRN_NUM, B1_PRN_NUM_2, UPL_FLG, UPL_TIME, DEL_FLG, EXT_BOX, SDR_GRS_WGT, SDR_TAR_WGT, 
-    SDR_NET_WGT, DIS_WGT, DIS_RATIO, NET_END, NO1_WGT_MODE, NO2_WGT_MODE, RFID_NO, CHK_FLG, 
-    CHECKER, CHK_TIME, CHM_PER, CHM_TIME, CHM_TYPE, TRANSPORT, TRANS_NAME, GRS_WGT_CURVE, 
-    TAR_WGT_CURVE, DIS_OPR, DIS_TIME, FD_UPFLG, CH_UP, CH_OPR, CH_TIME, TD_NO, TD_WGT, 
-    DD_NO
-  </sql>
-  <sql id="columns_alias">
-    t.WGT_NO, t.BILLNO, t.TRU_NO, t.LGS_NO, t.CAR_NO, t.ICD_NO, t.GRS_BOX_NO, t.TAR_BOX_NO, 
-    t.GRS_SPD, t.TAR_SPD, t.TRN_TYPE, t.GRS_VDO_FILE, t.TAR_VDO_FILE, t.GRS_TRN_NO, t.TAR_TRN_NO, 
-    t.WGT_TYPE, t.GRS_WGT, t.TAR_WGT, t.NET_WGT, t.NO2_WGT, t.GRS_WGT_NO, t.TAR_WGT_NO, 
-    t.TAR_TYPE, t.TAR_INF_MODE, t.GRS_INF_MODE, t.NET_INF_MODE, t.GRS_TIME, t.TAR_TIME, 
-    t.NET_TIME, t.GRS_WRK_ORD, t.TAR_WRK_ORD, t.NET_WRK_ORD, t.GRS_WRK_GRP, t.TAR_WRK_GRP, 
-    t.NET_WRK_GRP, t.GRS_OPR, t.TAR_OPR, t.NET_OPR, t.GRS_PNT_NAME, t.TAR_PNT_NAME, t.NET_PNT_NAME, 
-    t.GRS_PNT_NO, t.TAR_PNT_NO, t.NET_PNT_NO, t.NOTE, t.SDR_TYPE, t.SDR_NAME, t.SENDER, 
-    t.SDR_NOTE, t.RCV_TYPE, t.RCV_NAME, t.RECEIVER, t.RCV_NOTE, t.MAT_NAME, t.MAT_CODE, 
-    t.B1_PRN_NUM, t.B2_PRN_NUM, t.B1_PRN_NUM_2, t.UPL_FLG, t.UPL_TIME, t.DEL_FLG, t.EXT_BOX, 
-    t.SDR_GRS_WGT, t.SDR_TAR_WGT, t.SDR_NET_WGT, t.DIS_WGT, t.DIS_RATIO, t.NET_END, t.NO1_WGT_MODE, 
-    t.NO2_WGT_MODE, t.RFID_NO, t.CHK_FLG, t.CHECKER, t.CHK_TIME, t.CHM_PER, t.CHM_TIME, 
-    t.CHM_TYPE, t.TRANSPORT, t.TRANS_NAME, t.GRS_WGT_CURVE, t.TAR_WGT_CURVE, t.DIS_OPR, 
-    t.DIS_TIME, t.FD_UPFLG, t.CH_UP, t.CH_OPR, t.CH_TIME, t.TD_NO, t.TD_WGT, t.DD_NO
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns"/> FROM  JGWEIGHT_USER.CMM_CARWEIGHTRESULTS 
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM  JGWEIGHT_USER.CMM_CARWEIGHTRESULTS  t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="wgtNo != null and wgtNo != ''">
-        and WGT_NO = #{wgtNo}
-      </if>
-      <if test="billno != null and billno != ''">
-        and BILLNO = #{billno}
-      </if>
-      <if test="truNo != null and truNo != ''">
-        and TRU_NO = #{truNo}
-      </if>
-      <if test="lgsNo != null and lgsNo != ''">
-        and LGS_NO = #{lgsNo}
-      </if>
-      <if test="carNo != null and carNo != ''">
-        and CAR_NO = #{carNo}
-      </if>
-      <if test="icdNo != null and icdNo != ''">
-        and ICD_NO = #{icdNo}
-      </if>
-      <if test="grsBoxNo != null">
-        and GRS_BOX_NO = #{grsBoxNo}
-      </if>
-      <if test="tarBoxNo != null">
-        and TAR_BOX_NO = #{tarBoxNo}
-      </if>
-      <if test="grsSpd != null">
-        and GRS_SPD = #{grsSpd}
-      </if>
-      <if test="tarSpd != null">
-        and TAR_SPD = #{tarSpd}
-      </if>
-      <if test="trnType != null and trnType != ''">
-        and TRN_TYPE = #{trnType}
-      </if>
-      <if test="grsVdoFile != null and grsVdoFile != ''">
-        and GRS_VDO_FILE = #{grsVdoFile}
-      </if>
-      <if test="tarVdoFile != null and tarVdoFile != ''">
-        and TAR_VDO_FILE = #{tarVdoFile}
-      </if>
-      <if test="grsTrnNo != null and grsTrnNo != ''">
-        and GRS_TRN_NO = #{grsTrnNo}
-      </if>
-      <if test="tarTrnNo != null and tarTrnNo != ''">
-        and TAR_TRN_NO = #{tarTrnNo}
-      </if>
-      <if test="wgtType != null and wgtType != ''">
-        and WGT_TYPE = #{wgtType}
-      </if>
-      <if test="grsWgt != null">
-        and GRS_WGT = #{grsWgt}
-      </if>
-      <if test="tarWgt != null">
-        and TAR_WGT = #{tarWgt}
-      </if>
-      <if test="netWgt != null">
-        and NET_WGT = #{netWgt}
-      </if>
-      <if test="no2Wgt != null">
-        and NO2_WGT = #{no2Wgt}
-      </if>
-      <if test="grsWgtNo != null and grsWgtNo != ''">
-        and GRS_WGT_NO = #{grsWgtNo}
-      </if>
-      <if test="tarWgtNo != null and tarWgtNo != ''">
-        and TAR_WGT_NO = #{tarWgtNo}
-      </if>
-      <if test="tarType != null">
-        and TAR_TYPE = #{tarType}
-      </if>
-      <if test="tarInfMode != null">
-        and TAR_INF_MODE = #{tarInfMode}
-      </if>
-      <if test="grsInfMode != null">
-        and GRS_INF_MODE = #{grsInfMode}
-      </if>
-      <if test="netInfMode != null">
-        and NET_INF_MODE = #{netInfMode}
-      </if>
-      <if test="grsTime != null">
-        and TO_CHAR(GRS_TIME,'yyyy-MM-dd') = #{grsTime}
-      </if>
-      <if test="tarTime != null">
-        and TO_CHAR(TAR_TIME,'yyyy-MM-dd') = #{tarTime}
-      </if>
-      <if test="netTime != null">
-        and TO_CHAR(NET_TIME,'yyyy-MM-dd') = #{netTime}
-      </if>
-      <if test="grsWrkOrd != null and grsWrkOrd != ''">
-        and GRS_WRK_ORD = #{grsWrkOrd}
-      </if>
-      <if test="tarWrkOrd != null and tarWrkOrd != ''">
-        and TAR_WRK_ORD = #{tarWrkOrd}
-      </if>
-      <if test="netWrkOrd != null and netWrkOrd != ''">
-        and NET_WRK_ORD = #{netWrkOrd}
-      </if>
-      <if test="grsWrkGrp != null and grsWrkGrp != ''">
-        and GRS_WRK_GRP = #{grsWrkGrp}
-      </if>
-      <if test="tarWrkGrp != null and tarWrkGrp != ''">
-        and TAR_WRK_GRP = #{tarWrkGrp}
-      </if>
-      <if test="netWrkGrp != null and netWrkGrp != ''">
-        and NET_WRK_GRP = #{netWrkGrp}
-      </if>
-      <if test="grsOpr != null and grsOpr != ''">
-        and GRS_OPR = #{grsOpr}
-      </if>
-      <if test="tarOpr != null and tarOpr != ''">
-        and TAR_OPR = #{tarOpr}
-      </if>
-      <if test="netOpr != null and netOpr != ''">
-        and NET_OPR = #{netOpr}
-      </if>
-      <if test="grsPntName != null and grsPntName != ''">
-        and GRS_PNT_NAME = #{grsPntName}
-      </if>
-      <if test="tarPntName != null and tarPntName != ''">
-        and TAR_PNT_NAME = #{tarPntName}
-      </if>
-      <if test="netPntName != null and netPntName != ''">
-        and NET_PNT_NAME = #{netPntName}
-      </if>
-      <if test="grsPntNo != null and grsPntNo != ''">
-        and GRS_PNT_NO = #{grsPntNo}
-      </if>
-      <if test="tarPntNo != null and tarPntNo != ''">
-        and TAR_PNT_NO = #{tarPntNo}
-      </if>
-      <if test="netPntNo != null and netPntNo != ''">
-        and NET_PNT_NO = #{netPntNo}
-      </if>
-      <if test="note != null and note != ''">
-        and (SDR_NAME = #{note} or RCV_NAME = #{note})
-      </if>
-      <if test="sdrType != null and sdrType != ''">
-        and SDR_TYPE = #{sdrType}
-      </if>
-      <if test="sdrName != null and sdrName != ''">
-        and SDR_NAME = #{sdrName}
-      </if>
-      <if test="sender != null and sender != ''">
-        and SENDER = #{sender}
-      </if>
-      <if test="sdrNote != null and sdrNote != ''">
-        and SDR_NOTE = #{sdrNote}
-      </if>
-      <if test="rcvType != null and rcvType != ''">
-        and RCV_TYPE = #{rcvType}
-      </if>
-      <if test="rcvName != null and rcvName != ''">
-        and RCV_NAME = #{rcvName}
-      </if>
-      <if test="receiver != null and receiver != ''">
-        and RECEIVER = #{receiver}
-      </if>
-      <if test="rcvNote != null and rcvNote != ''">
-        and RCV_NOTE = #{rcvNote}
-      </if>
-      <if test="matName != null and matName != ''">
-        and MAT_NAME = #{matName}
-      </if>
-      <if test="matCode != null and matCode != ''">
-        and MAT_CODE = #{matCode}
-      </if>
-      <if test="b1PrnNum != null">
-        and B1_PRN_NUM = #{b1PrnNum}
-      </if>
-      <if test="b2PrnNum != null">
-        and B2_PRN_NUM = #{b2PrnNum}
-      </if>
-      <if test="b1PrnNum2 != null">
-        and B1_PRN_NUM_2 = #{b1PrnNum2}
-      </if>
-      <if test="uplFlg != null and uplFlg != ''">
-        and UPL_FLG = #{uplFlg}
-      </if>
-      <if test="uplTime != null">
-        and TO_CHAR(UPL_TIME,'yyyy-MM-dd') = #{uplTime}
-      </if>
-      <if test="delFlg != null and delFlg != ''">
-        and DEL_FLG = #{delFlg}
-      </if>
-      <if test="extBox != null">
-        and EXT_BOX = #{extBox}
-      </if>
-      <if test="sdrGrsWgt != null">
-        and SDR_GRS_WGT = #{sdrGrsWgt}
-      </if>
-      <if test="sdrTarWgt != null">
-        and SDR_TAR_WGT = #{sdrTarWgt}
-      </if>
-      <if test="sdrNetWgt != null">
-        and SDR_NET_WGT = #{sdrNetWgt}
-      </if>
-      <if test="disWgt != null">
-        and DIS_WGT = #{disWgt}
-      </if>
-      <if test="disRatio != null">
-        and DIS_RATIO = #{disRatio}
-      </if>
-      <if test="netEnd != null">
-        and NET_END = #{netEnd}
-      </if>
-      <if test="no1WgtMode != null and no1WgtMode != ''">
-        and NO1_WGT_MODE = #{no1WgtMode}
-      </if>
-      <if test="no2WgtMode != null and no2WgtMode != ''">
-        and NO2_WGT_MODE = #{no2WgtMode}
-      </if>
-      <if test="rfidNo != null and rfidNo != ''">
-        and RFID_NO = #{rfidNo}
-      </if>
-      <if test="chkFlg != null and chkFlg != ''">
-        and CHK_FLG = #{chkFlg}
-      </if>
-      <if test="checker != null and checker != ''">
-        and CHECKER = #{checker}
-      </if>
-      <if test="chkTime != null">
-        and TO_CHAR(CHK_TIME,'yyyy-MM-dd') = #{chkTime}
-      </if>
-      <if test="chmPer != null and chmPer != ''">
-        and CHM_PER = #{chmPer}
-      </if>
-      <if test="chmTime != null">
-        and TO_CHAR(CHM_TIME,'yyyy-MM-dd') = #{chmTime}
-      </if>
-      <if test="chmType != null and chmType != ''">
-        and CHM_TYPE = #{chmType}
-      </if>
-      <if test="transport != null and transport != ''">
-        and TRANSPORT = #{transport}
-      </if>
-      <if test="transName != null and transName != ''">
-        and TRANS_NAME = #{transName}
-      </if>
-      <if test="grsWgtCurve != null and grsWgtCurve != ''">
-        and GRS_WGT_CURVE = #{grsWgtCurve}
-      </if>
-      <if test="tarWgtCurve != null and tarWgtCurve != ''">
-        and TAR_WGT_CURVE = #{tarWgtCurve}
-      </if>
-      <if test="disOpr != null and disOpr != ''">
-        and DIS_OPR = #{disOpr}
-      </if>
-      <if test="disTime != null">
-        and TO_CHAR(DIS_TIME,'yyyy-MM-dd') = #{disTime}
-      </if>
-      <if test="fdUpflg != null and fdUpflg != ''">
-        and FD_UPFLG = #{fdUpflg}
-      </if>
-      <if test="chUp != null and chUp != ''">
-        and CH_UP = #{chUp}
-      </if>
-      <if test="chOpr != null and chOpr != ''">
-        and CH_OPR = #{chOpr}
-      </if>
-      <if test="chTime != null">
-        and TO_CHAR(CH_TIME,'yyyy-MM-dd') = #{chTime}
-      </if>
-      <if test="tdNo != null and tdNo != ''">
-        and TD_NO = #{tdNo}
-      </if>
-      <if test="tdWgt != null">
-        and TD_WGT = #{tdWgt}
-      </if>
-      <if test="ddNo != null and ddNo != ''">
-        and DD_NO = #{ddNo}
-      </if>
-      <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
-        and TO_CHAR(NET_TIME,'yyyy-MM-dd HH24:mi:ss') >= #{startTime} and TO_CHAR(NET_TIME,'yyyy-MM-dd HH24:mi:ss') &lt;= #{endTime}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="wgtNo != null and wgtNo != ''">
-        and WGT_NO LIKE '%${wgtNo}%'
-      </if>
-      <if test="billno != null and billno != ''">
-        and BILLNO LIKE '%${billno}%'
-      </if>
-      <if test="truNo != null and truNo != ''">
-        and TRU_NO LIKE '%${truNo}%'
-      </if>
-      <if test="lgsNo != null and lgsNo != ''">
-        and LGS_NO LIKE '%${lgsNo}%'
-      </if>
-      <if test="carNo != null and carNo != ''">
-        and CAR_NO LIKE '%${carNo}%'
-      </if>
-      <if test="icdNo != null and icdNo != ''">
-        and ICD_NO LIKE '%${icdNo}%'
-      </if>
-      <if test="grsBoxNo != null">
-        and GRS_BOX_NO = #{grsBoxNo}
-      </if>
-      <if test="tarBoxNo != null">
-        and TAR_BOX_NO = #{tarBoxNo}
-      </if>
-      <if test="grsSpd != null">
-        and GRS_SPD = #{grsSpd}
-      </if>
-      <if test="tarSpd != null">
-        and TAR_SPD = #{tarSpd}
-      </if>
-      <if test="trnType != null and trnType != ''">
-        and TRN_TYPE LIKE '%${trnType}%'
-      </if>
-      <if test="grsVdoFile != null and grsVdoFile != ''">
-        and GRS_VDO_FILE LIKE '%${grsVdoFile}%'
-      </if>
-      <if test="tarVdoFile != null and tarVdoFile != ''">
-        and TAR_VDO_FILE LIKE '%${tarVdoFile}%'
-      </if>
-      <if test="grsTrnNo != null and grsTrnNo != ''">
-        and GRS_TRN_NO LIKE '%${grsTrnNo}%'
-      </if>
-      <if test="tarTrnNo != null and tarTrnNo != ''">
-        and TAR_TRN_NO LIKE '%${tarTrnNo}%'
-      </if>
-      <if test="wgtType != null and wgtType != ''">
-        and WGT_TYPE LIKE '%${wgtType}%'
-      </if>
-      <if test="grsWgt != null">
-        and GRS_WGT = #{grsWgt}
-      </if>
-      <if test="tarWgt != null">
-        and TAR_WGT = #{tarWgt}
-      </if>
-      <if test="netWgt != null">
-        and NET_WGT = #{netWgt}
-      </if>
-      <if test="no2Wgt != null">
-        and NO2_WGT = #{no2Wgt}
-      </if>
-      <if test="grsWgtNo != null and grsWgtNo != ''">
-        and GRS_WGT_NO LIKE '%${grsWgtNo}%'
-      </if>
-      <if test="tarWgtNo != null and tarWgtNo != ''">
-        and TAR_WGT_NO LIKE '%${tarWgtNo}%'
-      </if>
-      <if test="tarType != null">
-        and TAR_TYPE = #{tarType}
-      </if>
-      <if test="tarInfMode != null">
-        and TAR_INF_MODE = #{tarInfMode}
-      </if>
-      <if test="grsInfMode != null">
-        and GRS_INF_MODE = #{grsInfMode}
-      </if>
-      <if test="netInfMode != null">
-        and NET_INF_MODE = #{netInfMode}
-      </if>
-      <if test="grsTime != null">
-        and TO_CHAR(GRS_TIME,'yyyy-MM-dd') = #{grsTime}
-      </if>
-      <if test="tarTime != null">
-        and TO_CHAR(TAR_TIME,'yyyy-MM-dd') = #{tarTime}
-      </if>
-      <if test="netTime != null">
-        and TO_CHAR(NET_TIME,'yyyy-MM-dd') = #{netTime}
-      </if>
-      <if test="grsWrkOrd != null and grsWrkOrd != ''">
-        and GRS_WRK_ORD LIKE '%${grsWrkOrd}%'
-      </if>
-      <if test="tarWrkOrd != null and tarWrkOrd != ''">
-        and TAR_WRK_ORD LIKE '%${tarWrkOrd}%'
-      </if>
-      <if test="netWrkOrd != null and netWrkOrd != ''">
-        and NET_WRK_ORD LIKE '%${netWrkOrd}%'
-      </if>
-      <if test="grsWrkGrp != null and grsWrkGrp != ''">
-        and GRS_WRK_GRP LIKE '%${grsWrkGrp}%'
-      </if>
-      <if test="tarWrkGrp != null and tarWrkGrp != ''">
-        and TAR_WRK_GRP LIKE '%${tarWrkGrp}%'
-      </if>
-      <if test="netWrkGrp != null and netWrkGrp != ''">
-        and NET_WRK_GRP LIKE '%${netWrkGrp}%'
-      </if>
-      <if test="grsOpr != null and grsOpr != ''">
-        and GRS_OPR LIKE '%${grsOpr}%'
-      </if>
-      <if test="tarOpr != null and tarOpr != ''">
-        and TAR_OPR LIKE '%${tarOpr}%'
-      </if>
-      <if test="netOpr != null and netOpr != ''">
-        and NET_OPR LIKE '%${netOpr}%'
-      </if>
-      <if test="grsPntName != null and grsPntName != ''">
-        and GRS_PNT_NAME LIKE '%${grsPntName}%'
-      </if>
-      <if test="tarPntName != null and tarPntName != ''">
-        and TAR_PNT_NAME LIKE '%${tarPntName}%'
-      </if>
-      <if test="netPntName != null and netPntName != ''">
-        and NET_PNT_NAME LIKE '%${netPntName}%'
-      </if>
-      <if test="grsPntNo != null and grsPntNo != ''">
-        and GRS_PNT_NO LIKE '%${grsPntNo}%'
-      </if>
-      <if test="tarPntNo != null and tarPntNo != ''">
-        and TAR_PNT_NO LIKE '%${tarPntNo}%'
-      </if>
-      <if test="netPntNo != null and netPntNo != ''">
-        and NET_PNT_NO LIKE '%${netPntNo}%'
-      </if>
-      <if test="note != null and note != ''">
-        and NOTE LIKE '%${note}%'
-      </if>
-      <if test="sdrType != null and sdrType != ''">
-        and SDR_TYPE LIKE '%${sdrType}%'
-      </if>
-      <if test="sdrName != null and sdrName != ''">
-        and SDR_NAME LIKE '%${sdrName}%'
-      </if>
-      <if test="sender != null and sender != ''">
-        and SENDER LIKE '%${sender}%'
-      </if>
-      <if test="sdrNote != null and sdrNote != ''">
-        and SDR_NOTE LIKE '%${sdrNote}%'
-      </if>
-      <if test="rcvType != null and rcvType != ''">
-        and RCV_TYPE LIKE '%${rcvType}%'
-      </if>
-      <if test="rcvName != null and rcvName != ''">
-        and RCV_NAME LIKE '%${rcvName}%'
-      </if>
-      <if test="receiver != null and receiver != ''">
-        and RECEIVER LIKE '%${receiver}%'
-      </if>
-      <if test="rcvNote != null and rcvNote != ''">
-        and RCV_NOTE LIKE '%${rcvNote}%'
-      </if>
-      <if test="matName != null and matName != ''">
-        and MAT_NAME LIKE '%${matName}%'
-      </if>
-      <if test="matCode != null and matCode != ''">
-        and MAT_CODE LIKE '%${matCode}%'
-      </if>
-      <if test="b1PrnNum != null">
-        and B1_PRN_NUM = #{b1PrnNum}
-      </if>
-      <if test="b2PrnNum != null">
-        and B2_PRN_NUM = #{b2PrnNum}
-      </if>
-      <if test="b1PrnNum2 != null">
-        and B1_PRN_NUM_2 = #{b1PrnNum2}
-      </if>
-      <if test="uplFlg != null and uplFlg != ''">
-        and UPL_FLG LIKE '%${uplFlg}%'
-      </if>
-      <if test="uplTime != null">
-        and TO_CHAR(UPL_TIME,'yyyy-MM-dd') = #{uplTime}
-      </if>
-      <if test="delFlg != null and delFlg != ''">
-        and DEL_FLG LIKE '%${delFlg}%'
-      </if>
-      <if test="extBox != null">
-        and EXT_BOX = #{extBox}
-      </if>
-      <if test="sdrGrsWgt != null">
-        and SDR_GRS_WGT = #{sdrGrsWgt}
-      </if>
-      <if test="sdrTarWgt != null">
-        and SDR_TAR_WGT = #{sdrTarWgt}
-      </if>
-      <if test="sdrNetWgt != null">
-        and SDR_NET_WGT = #{sdrNetWgt}
-      </if>
-      <if test="disWgt != null">
-        and DIS_WGT = #{disWgt}
-      </if>
-      <if test="disRatio != null">
-        and DIS_RATIO = #{disRatio}
-      </if>
-      <if test="netEnd != null">
-        and NET_END = #{netEnd}
-      </if>
-      <if test="no1WgtMode != null and no1WgtMode != ''">
-        and NO1_WGT_MODE LIKE '%${no1WgtMode}%'
-      </if>
-      <if test="no2WgtMode != null and no2WgtMode != ''">
-        and NO2_WGT_MODE LIKE '%${no2WgtMode}%'
-      </if>
-      <if test="rfidNo != null and rfidNo != ''">
-        and RFID_NO LIKE '%${rfidNo}%'
-      </if>
-      <if test="chkFlg != null and chkFlg != ''">
-        and CHK_FLG LIKE '%${chkFlg}%'
-      </if>
-      <if test="checker != null and checker != ''">
-        and CHECKER LIKE '%${checker}%'
-      </if>
-      <if test="chkTime != null">
-        and TO_CHAR(CHK_TIME,'yyyy-MM-dd') = #{chkTime}
-      </if>
-      <if test="chmPer != null and chmPer != ''">
-        and CHM_PER LIKE '%${chmPer}%'
-      </if>
-      <if test="chmTime != null">
-        and TO_CHAR(CHM_TIME,'yyyy-MM-dd') = #{chmTime}
-      </if>
-      <if test="chmType != null and chmType != ''">
-        and CHM_TYPE LIKE '%${chmType}%'
-      </if>
-      <if test="transport != null and transport != ''">
-        and TRANSPORT LIKE '%${transport}%'
-      </if>
-      <if test="transName != null and transName != ''">
-        and TRANS_NAME LIKE '%${transName}%'
-      </if>
-      <if test="grsWgtCurve != null and grsWgtCurve != ''">
-        and GRS_WGT_CURVE LIKE '%${grsWgtCurve}%'
-      </if>
-      <if test="tarWgtCurve != null and tarWgtCurve != ''">
-        and TAR_WGT_CURVE LIKE '%${tarWgtCurve}%'
-      </if>
-      <if test="disOpr != null and disOpr != ''">
-        and DIS_OPR LIKE '%${disOpr}%'
-      </if>
-      <if test="disTime != null">
-        and TO_CHAR(DIS_TIME,'yyyy-MM-dd') = #{disTime}
-      </if>
-      <if test="fdUpflg != null and fdUpflg != ''">
-        and FD_UPFLG LIKE '%${fdUpflg}%'
-      </if>
-      <if test="chUp != null and chUp != ''">
-        and CH_UP LIKE '%${chUp}%'
-      </if>
-      <if test="chOpr != null and chOpr != ''">
-        and CH_OPR LIKE '%${chOpr}%'
-      </if>
-      <if test="chTime != null">
-        and TO_CHAR(CH_TIME,'yyyy-MM-dd') = #{chTime}
-      </if>
-      <if test="tdNo != null and tdNo != ''">
-        and TD_NO LIKE '%${tdNo}%'
-      </if>
-      <if test="tdWgt != null">
-        and TD_WGT = #{tdWgt}
-      </if>
-      <if test="ddNo != null and ddNo != ''">
-        and DD_NO LIKE '%${ddNo}%'
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from  JGWEIGHT_USER.CMM_CARWEIGHTRESULTS 
-    where WGT_NO = #{wgtNo,jdbcType=VARCHAR}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from  JGWEIGHT_USER.CMM_CARWEIGHTRESULTS 
-    where 1!=1 
-      <if test="billno != null and billno != ''">
-        or BILLNO = #{billno}
-      </if>
-      <if test="truNo != null and truNo != ''">
-        or TRU_NO = #{truNo}
-      </if>
-      <if test="lgsNo != null and lgsNo != ''">
-        or LGS_NO = #{lgsNo}
-      </if>
-      <if test="carNo != null and carNo != ''">
-        or CAR_NO = #{carNo}
-      </if>
-      <if test="icdNo != null and icdNo != ''">
-        or ICD_NO = #{icdNo}
-      </if>
-      <if test="grsBoxNo != null">
-        or GRS_BOX_NO = #{grsBoxNo}
-      </if>
-      <if test="tarBoxNo != null">
-        or TAR_BOX_NO = #{tarBoxNo}
-      </if>
-      <if test="grsSpd != null">
-        or GRS_SPD = #{grsSpd}
-      </if>
-      <if test="tarSpd != null">
-        or TAR_SPD = #{tarSpd}
-      </if>
-      <if test="trnType != null and trnType != ''">
-        or TRN_TYPE = #{trnType}
-      </if>
-      <if test="grsVdoFile != null and grsVdoFile != ''">
-        or GRS_VDO_FILE = #{grsVdoFile}
-      </if>
-      <if test="tarVdoFile != null and tarVdoFile != ''">
-        or TAR_VDO_FILE = #{tarVdoFile}
-      </if>
-      <if test="grsTrnNo != null and grsTrnNo != ''">
-        or GRS_TRN_NO = #{grsTrnNo}
-      </if>
-      <if test="tarTrnNo != null and tarTrnNo != ''">
-        or TAR_TRN_NO = #{tarTrnNo}
-      </if>
-      <if test="wgtType != null and wgtType != ''">
-        or WGT_TYPE = #{wgtType}
-      </if>
-      <if test="grsWgt != null">
-        or GRS_WGT = #{grsWgt}
-      </if>
-      <if test="tarWgt != null">
-        or TAR_WGT = #{tarWgt}
-      </if>
-      <if test="netWgt != null">
-        or NET_WGT = #{netWgt}
-      </if>
-      <if test="no2Wgt != null">
-        or NO2_WGT = #{no2Wgt}
-      </if>
-      <if test="grsWgtNo != null and grsWgtNo != ''">
-        or GRS_WGT_NO = #{grsWgtNo}
-      </if>
-      <if test="tarWgtNo != null and tarWgtNo != ''">
-        or TAR_WGT_NO = #{tarWgtNo}
-      </if>
-      <if test="tarType != null">
-        or TAR_TYPE = #{tarType}
-      </if>
-      <if test="tarInfMode != null">
-        or TAR_INF_MODE = #{tarInfMode}
-      </if>
-      <if test="grsInfMode != null">
-        or GRS_INF_MODE = #{grsInfMode}
-      </if>
-      <if test="netInfMode != null">
-        or NET_INF_MODE = #{netInfMode}
-      </if>
-      <if test="grsTime != null">
-        or TO_CHAR(GRS_TIME,'yyyy-MM-dd') = '#{grsTime}'
-      </if>
-      <if test="tarTime != null">
-        or TO_CHAR(TAR_TIME,'yyyy-MM-dd') = '#{tarTime}'
-      </if>
-      <if test="netTime != null">
-        or TO_CHAR(NET_TIME,'yyyy-MM-dd') = '#{netTime}'
-      </if>
-      <if test="grsWrkOrd != null and grsWrkOrd != ''">
-        or GRS_WRK_ORD = #{grsWrkOrd}
-      </if>
-      <if test="tarWrkOrd != null and tarWrkOrd != ''">
-        or TAR_WRK_ORD = #{tarWrkOrd}
-      </if>
-      <if test="netWrkOrd != null and netWrkOrd != ''">
-        or NET_WRK_ORD = #{netWrkOrd}
-      </if>
-      <if test="grsWrkGrp != null and grsWrkGrp != ''">
-        or GRS_WRK_GRP = #{grsWrkGrp}
-      </if>
-      <if test="tarWrkGrp != null and tarWrkGrp != ''">
-        or TAR_WRK_GRP = #{tarWrkGrp}
-      </if>
-      <if test="netWrkGrp != null and netWrkGrp != ''">
-        or NET_WRK_GRP = #{netWrkGrp}
-      </if>
-      <if test="grsOpr != null and grsOpr != ''">
-        or GRS_OPR = #{grsOpr}
-      </if>
-      <if test="tarOpr != null and tarOpr != ''">
-        or TAR_OPR = #{tarOpr}
-      </if>
-      <if test="netOpr != null and netOpr != ''">
-        or NET_OPR = #{netOpr}
-      </if>
-      <if test="grsPntName != null and grsPntName != ''">
-        or GRS_PNT_NAME = #{grsPntName}
-      </if>
-      <if test="tarPntName != null and tarPntName != ''">
-        or TAR_PNT_NAME = #{tarPntName}
-      </if>
-      <if test="netPntName != null and netPntName != ''">
-        or NET_PNT_NAME = #{netPntName}
-      </if>
-      <if test="grsPntNo != null and grsPntNo != ''">
-        or GRS_PNT_NO = #{grsPntNo}
-      </if>
-      <if test="tarPntNo != null and tarPntNo != ''">
-        or TAR_PNT_NO = #{tarPntNo}
-      </if>
-      <if test="netPntNo != null and netPntNo != ''">
-        or NET_PNT_NO = #{netPntNo}
-      </if>
-      <if test="note != null and note != ''">
-        or NOTE = #{note}
-      </if>
-      <if test="sdrType != null and sdrType != ''">
-        or SDR_TYPE = #{sdrType}
-      </if>
-      <if test="sdrName != null and sdrName != ''">
-        or SDR_NAME = #{sdrName}
-      </if>
-      <if test="sender != null and sender != ''">
-        or SENDER = #{sender}
-      </if>
-      <if test="sdrNote != null and sdrNote != ''">
-        or SDR_NOTE = #{sdrNote}
-      </if>
-      <if test="rcvType != null and rcvType != ''">
-        or RCV_TYPE = #{rcvType}
-      </if>
-      <if test="rcvName != null and rcvName != ''">
-        or RCV_NAME = #{rcvName}
-      </if>
-      <if test="receiver != null and receiver != ''">
-        or RECEIVER = #{receiver}
-      </if>
-      <if test="rcvNote != null and rcvNote != ''">
-        or RCV_NOTE = #{rcvNote}
-      </if>
-      <if test="matName != null and matName != ''">
-        or MAT_NAME = #{matName}
-      </if>
-      <if test="matCode != null and matCode != ''">
-        or MAT_CODE = #{matCode}
-      </if>
-      <if test="b1PrnNum != null">
-        or B1_PRN_NUM = #{b1PrnNum}
-      </if>
-      <if test="b2PrnNum != null">
-        or B2_PRN_NUM = #{b2PrnNum}
-      </if>
-      <if test="b1PrnNum2 != null">
-        or B1_PRN_NUM_2 = #{b1PrnNum2}
-      </if>
-      <if test="uplFlg != null and uplFlg != ''">
-        or UPL_FLG = #{uplFlg}
-      </if>
-      <if test="uplTime != null">
-        or TO_CHAR(UPL_TIME,'yyyy-MM-dd') = '#{uplTime}'
-      </if>
-      <if test="delFlg != null and delFlg != ''">
-        or DEL_FLG = #{delFlg}
-      </if>
-      <if test="extBox != null">
-        or EXT_BOX = #{extBox}
-      </if>
-      <if test="sdrGrsWgt != null">
-        or SDR_GRS_WGT = #{sdrGrsWgt}
-      </if>
-      <if test="sdrTarWgt != null">
-        or SDR_TAR_WGT = #{sdrTarWgt}
-      </if>
-      <if test="sdrNetWgt != null">
-        or SDR_NET_WGT = #{sdrNetWgt}
-      </if>
-      <if test="disWgt != null">
-        or DIS_WGT = #{disWgt}
-      </if>
-      <if test="disRatio != null">
-        or DIS_RATIO = #{disRatio}
-      </if>
-      <if test="netEnd != null">
-        or NET_END = #{netEnd}
-      </if>
-      <if test="no1WgtMode != null and no1WgtMode != ''">
-        or NO1_WGT_MODE = #{no1WgtMode}
-      </if>
-      <if test="no2WgtMode != null and no2WgtMode != ''">
-        or NO2_WGT_MODE = #{no2WgtMode}
-      </if>
-      <if test="rfidNo != null and rfidNo != ''">
-        or RFID_NO = #{rfidNo}
-      </if>
-      <if test="chkFlg != null and chkFlg != ''">
-        or CHK_FLG = #{chkFlg}
-      </if>
-      <if test="checker != null and checker != ''">
-        or CHECKER = #{checker}
-      </if>
-      <if test="chkTime != null">
-        or TO_CHAR(CHK_TIME,'yyyy-MM-dd') = '#{chkTime}'
-      </if>
-      <if test="chmPer != null and chmPer != ''">
-        or CHM_PER = #{chmPer}
-      </if>
-      <if test="chmTime != null">
-        or TO_CHAR(CHM_TIME,'yyyy-MM-dd') = '#{chmTime}'
-      </if>
-      <if test="chmType != null and chmType != ''">
-        or CHM_TYPE = #{chmType}
-      </if>
-      <if test="transport != null and transport != ''">
-        or TRANSPORT = #{transport}
-      </if>
-      <if test="transName != null and transName != ''">
-        or TRANS_NAME = #{transName}
-      </if>
-      <if test="grsWgtCurve != null and grsWgtCurve != ''">
-        or GRS_WGT_CURVE = #{grsWgtCurve}
-      </if>
-      <if test="tarWgtCurve != null and tarWgtCurve != ''">
-        or TAR_WGT_CURVE = #{tarWgtCurve}
-      </if>
-      <if test="disOpr != null and disOpr != ''">
-        or DIS_OPR = #{disOpr}
-      </if>
-      <if test="disTime != null">
-        or TO_CHAR(DIS_TIME,'yyyy-MM-dd') = '#{disTime}'
-      </if>
-      <if test="fdUpflg != null and fdUpflg != ''">
-        or FD_UPFLG = #{fdUpflg}
-      </if>
-      <if test="chUp != null and chUp != ''">
-        or CH_UP = #{chUp}
-      </if>
-      <if test="chOpr != null and chOpr != ''">
-        or CH_OPR = #{chOpr}
-      </if>
-      <if test="chTime != null">
-        or TO_CHAR(CH_TIME,'yyyy-MM-dd') = '#{chTime}'
-      </if>
-      <if test="tdNo != null and tdNo != ''">
-        or TD_NO = #{tdNo}
-      </if>
-      <if test="tdWgt != null">
-        or TD_WGT = #{tdWgt}
-      </if>
-      <if test="ddNo != null and ddNo != ''">
-        or DD_NO = #{ddNo}
-      </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.appservice.appcmmcarweightresults.model.AppCmmCarweightresults">
-    insert into  JGWEIGHT_USER.CMM_CARWEIGHTRESULTS  (WGT_NO, BILLNO, TRU_NO, 
-      LGS_NO, CAR_NO, ICD_NO, 
-      GRS_BOX_NO, TAR_BOX_NO, GRS_SPD, 
-      TAR_SPD, TRN_TYPE, GRS_VDO_FILE, 
-      TAR_VDO_FILE, GRS_TRN_NO, TAR_TRN_NO, 
-      WGT_TYPE, GRS_WGT, TAR_WGT, 
-      NET_WGT, NO2_WGT, GRS_WGT_NO, 
-      TAR_WGT_NO, TAR_TYPE, TAR_INF_MODE, 
-      GRS_INF_MODE, NET_INF_MODE, GRS_TIME, 
-      TAR_TIME, NET_TIME, GRS_WRK_ORD, 
-      TAR_WRK_ORD, NET_WRK_ORD, GRS_WRK_GRP, 
-      TAR_WRK_GRP, NET_WRK_GRP, GRS_OPR, 
-      TAR_OPR, NET_OPR, GRS_PNT_NAME, 
-      TAR_PNT_NAME, NET_PNT_NAME, GRS_PNT_NO, 
-      TAR_PNT_NO, NET_PNT_NO, NOTE, 
-      SDR_TYPE, SDR_NAME, SENDER, 
-      SDR_NOTE, RCV_TYPE, RCV_NAME, 
-      RECEIVER, RCV_NOTE, MAT_NAME, 
-      MAT_CODE, B1_PRN_NUM, B2_PRN_NUM, 
-      B1_PRN_NUM_2, UPL_FLG, UPL_TIME, 
-      DEL_FLG, EXT_BOX, SDR_GRS_WGT, 
-      SDR_TAR_WGT, SDR_NET_WGT, DIS_WGT, 
-      DIS_RATIO, NET_END, NO1_WGT_MODE, 
-      NO2_WGT_MODE, RFID_NO, CHK_FLG, 
-      CHECKER, CHK_TIME, CHM_PER, 
-      CHM_TIME, CHM_TYPE, TRANSPORT, 
-      TRANS_NAME, GRS_WGT_CURVE, TAR_WGT_CURVE, 
-      DIS_OPR, DIS_TIME, FD_UPFLG, 
-      CH_UP, CH_OPR, CH_TIME, 
-      TD_NO, TD_WGT, DD_NO)
-    values (#{wgtNo,jdbcType=VARCHAR}, #{billno,jdbcType=VARCHAR}, #{truNo,jdbcType=VARCHAR}, 
-      #{lgsNo,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR}, #{icdNo,jdbcType=VARCHAR}, 
-      #{grsBoxNo,jdbcType=DECIMAL}, #{tarBoxNo,jdbcType=DECIMAL}, #{grsSpd,jdbcType=DECIMAL}, 
-      #{tarSpd,jdbcType=DECIMAL}, #{trnType,jdbcType=VARCHAR}, #{grsVdoFile,jdbcType=VARCHAR}, 
-      #{tarVdoFile,jdbcType=VARCHAR}, #{grsTrnNo,jdbcType=VARCHAR}, #{tarTrnNo,jdbcType=VARCHAR}, 
-      #{wgtType,jdbcType=VARCHAR}, #{grsWgt,jdbcType=DECIMAL}, #{tarWgt,jdbcType=DECIMAL}, 
-      #{netWgt,jdbcType=DECIMAL}, #{no2Wgt,jdbcType=DECIMAL}, #{grsWgtNo,jdbcType=VARCHAR}, 
-      #{tarWgtNo,jdbcType=VARCHAR}, #{tarType,jdbcType=CHAR}, #{tarInfMode,jdbcType=CHAR}, 
-      #{grsInfMode,jdbcType=CHAR}, #{netInfMode,jdbcType=CHAR}, #{grsTime,jdbcType=TIMESTAMP}, 
-      #{tarTime,jdbcType=TIMESTAMP}, #{netTime,jdbcType=TIMESTAMP}, #{grsWrkOrd,jdbcType=VARCHAR}, 
-      #{tarWrkOrd,jdbcType=VARCHAR}, #{netWrkOrd,jdbcType=VARCHAR}, #{grsWrkGrp,jdbcType=VARCHAR}, 
-      #{tarWrkGrp,jdbcType=VARCHAR}, #{netWrkGrp,jdbcType=VARCHAR}, #{grsOpr,jdbcType=VARCHAR}, 
-      #{tarOpr,jdbcType=VARCHAR}, #{netOpr,jdbcType=VARCHAR}, #{grsPntName,jdbcType=VARCHAR}, 
-      #{tarPntName,jdbcType=VARCHAR}, #{netPntName,jdbcType=VARCHAR}, #{grsPntNo,jdbcType=VARCHAR}, 
-      #{tarPntNo,jdbcType=VARCHAR}, #{netPntNo,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, 
-      #{sdrType,jdbcType=VARCHAR}, #{sdrName,jdbcType=VARCHAR}, #{sender,jdbcType=VARCHAR}, 
-      #{sdrNote,jdbcType=VARCHAR}, #{rcvType,jdbcType=VARCHAR}, #{rcvName,jdbcType=VARCHAR}, 
-      #{receiver,jdbcType=VARCHAR}, #{rcvNote,jdbcType=VARCHAR}, #{matName,jdbcType=VARCHAR}, 
-      #{matCode,jdbcType=VARCHAR}, #{b1PrnNum,jdbcType=DECIMAL}, #{b2PrnNum,jdbcType=DECIMAL}, 
-      #{b1PrnNum2,jdbcType=DECIMAL}, #{uplFlg,jdbcType=VARCHAR}, #{uplTime,jdbcType=TIMESTAMP}, 
-      #{delFlg,jdbcType=VARCHAR}, #{extBox,jdbcType=CHAR}, #{sdrGrsWgt,jdbcType=DECIMAL}, 
-      #{sdrTarWgt,jdbcType=DECIMAL}, #{sdrNetWgt,jdbcType=DECIMAL}, #{disWgt,jdbcType=DECIMAL}, 
-      #{disRatio,jdbcType=DECIMAL}, #{netEnd,jdbcType=DECIMAL}, #{no1WgtMode,jdbcType=VARCHAR}, 
-      #{no2WgtMode,jdbcType=VARCHAR}, #{rfidNo,jdbcType=VARCHAR}, #{chkFlg,jdbcType=VARCHAR}, 
-      #{checker,jdbcType=VARCHAR}, #{chkTime,jdbcType=TIMESTAMP}, #{chmPer,jdbcType=VARCHAR}, 
-      #{chmTime,jdbcType=TIMESTAMP}, #{chmType,jdbcType=VARCHAR}, #{transport,jdbcType=VARCHAR}, 
-      #{transName,jdbcType=VARCHAR}, #{grsWgtCurve,jdbcType=VARCHAR}, #{tarWgtCurve,jdbcType=VARCHAR}, 
-      #{disOpr,jdbcType=VARCHAR}, #{disTime,jdbcType=TIMESTAMP}, #{fdUpflg,jdbcType=VARCHAR}, 
-      #{chUp,jdbcType=VARCHAR}, #{chOpr,jdbcType=VARCHAR}, #{chTime,jdbcType=TIMESTAMP}, 
-      #{tdNo,jdbcType=VARCHAR}, #{tdWgt,jdbcType=DECIMAL}, #{ddNo,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.appservice.appcmmcarweightresults.model.AppCmmCarweightresults">
-    insert into  JGWEIGHT_USER.CMM_CARWEIGHTRESULTS 
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="wgtNo != null">
-        WGT_NO,
-      </if>
-      <if test="billno != null">
-        BILLNO,
-      </if>
-      <if test="truNo != null">
-        TRU_NO,
-      </if>
-      <if test="lgsNo != null">
-        LGS_NO,
-      </if>
-      <if test="carNo != null">
-        CAR_NO,
-      </if>
-      <if test="icdNo != null">
-        ICD_NO,
-      </if>
-      <if test="grsBoxNo != null">
-        GRS_BOX_NO,
-      </if>
-      <if test="tarBoxNo != null">
-        TAR_BOX_NO,
-      </if>
-      <if test="grsSpd != null">
-        GRS_SPD,
-      </if>
-      <if test="tarSpd != null">
-        TAR_SPD,
-      </if>
-      <if test="trnType != null">
-        TRN_TYPE,
-      </if>
-      <if test="grsVdoFile != null">
-        GRS_VDO_FILE,
-      </if>
-      <if test="tarVdoFile != null">
-        TAR_VDO_FILE,
-      </if>
-      <if test="grsTrnNo != null">
-        GRS_TRN_NO,
-      </if>
-      <if test="tarTrnNo != null">
-        TAR_TRN_NO,
-      </if>
-      <if test="wgtType != null">
-        WGT_TYPE,
-      </if>
-      <if test="grsWgt != null">
-        GRS_WGT,
-      </if>
-      <if test="tarWgt != null">
-        TAR_WGT,
-      </if>
-      <if test="netWgt != null">
-        NET_WGT,
-      </if>
-      <if test="no2Wgt != null">
-        NO2_WGT,
-      </if>
-      <if test="grsWgtNo != null">
-        GRS_WGT_NO,
-      </if>
-      <if test="tarWgtNo != null">
-        TAR_WGT_NO,
-      </if>
-      <if test="tarType != null">
-        TAR_TYPE,
-      </if>
-      <if test="tarInfMode != null">
-        TAR_INF_MODE,
-      </if>
-      <if test="grsInfMode != null">
-        GRS_INF_MODE,
-      </if>
-      <if test="netInfMode != null">
-        NET_INF_MODE,
-      </if>
-      <if test="grsTime != null">
-        GRS_TIME,
-      </if>
-      <if test="tarTime != null">
-        TAR_TIME,
-      </if>
-      <if test="netTime != null">
-        NET_TIME,
-      </if>
-      <if test="grsWrkOrd != null">
-        GRS_WRK_ORD,
-      </if>
-      <if test="tarWrkOrd != null">
-        TAR_WRK_ORD,
-      </if>
-      <if test="netWrkOrd != null">
-        NET_WRK_ORD,
-      </if>
-      <if test="grsWrkGrp != null">
-        GRS_WRK_GRP,
-      </if>
-      <if test="tarWrkGrp != null">
-        TAR_WRK_GRP,
-      </if>
-      <if test="netWrkGrp != null">
-        NET_WRK_GRP,
-      </if>
-      <if test="grsOpr != null">
-        GRS_OPR,
-      </if>
-      <if test="tarOpr != null">
-        TAR_OPR,
-      </if>
-      <if test="netOpr != null">
-        NET_OPR,
-      </if>
-      <if test="grsPntName != null">
-        GRS_PNT_NAME,
-      </if>
-      <if test="tarPntName != null">
-        TAR_PNT_NAME,
-      </if>
-      <if test="netPntName != null">
-        NET_PNT_NAME,
-      </if>
-      <if test="grsPntNo != null">
-        GRS_PNT_NO,
-      </if>
-      <if test="tarPntNo != null">
-        TAR_PNT_NO,
-      </if>
-      <if test="netPntNo != null">
-        NET_PNT_NO,
-      </if>
-      <if test="note != null">
-        NOTE,
-      </if>
-      <if test="sdrType != null">
-        SDR_TYPE,
-      </if>
-      <if test="sdrName != null">
-        SDR_NAME,
-      </if>
-      <if test="sender != null">
-        SENDER,
-      </if>
-      <if test="sdrNote != null">
-        SDR_NOTE,
-      </if>
-      <if test="rcvType != null">
-        RCV_TYPE,
-      </if>
-      <if test="rcvName != null">
-        RCV_NAME,
-      </if>
-      <if test="receiver != null">
-        RECEIVER,
-      </if>
-      <if test="rcvNote != null">
-        RCV_NOTE,
-      </if>
-      <if test="matName != null">
-        MAT_NAME,
-      </if>
-      <if test="matCode != null">
-        MAT_CODE,
-      </if>
-      <if test="b1PrnNum != null">
-        B1_PRN_NUM,
-      </if>
-      <if test="b2PrnNum != null">
-        B2_PRN_NUM,
-      </if>
-      <if test="b1PrnNum2 != null">
-        B1_PRN_NUM_2,
-      </if>
-      <if test="uplFlg != null">
-        UPL_FLG,
-      </if>
-      <if test="uplTime != null">
-        UPL_TIME,
-      </if>
-      <if test="delFlg != null">
-        DEL_FLG,
-      </if>
-      <if test="extBox != null">
-        EXT_BOX,
-      </if>
-      <if test="sdrGrsWgt != null">
-        SDR_GRS_WGT,
-      </if>
-      <if test="sdrTarWgt != null">
-        SDR_TAR_WGT,
-      </if>
-      <if test="sdrNetWgt != null">
-        SDR_NET_WGT,
-      </if>
-      <if test="disWgt != null">
-        DIS_WGT,
-      </if>
-      <if test="disRatio != null">
-        DIS_RATIO,
-      </if>
-      <if test="netEnd != null">
-        NET_END,
-      </if>
-      <if test="no1WgtMode != null">
-        NO1_WGT_MODE,
-      </if>
-      <if test="no2WgtMode != null">
-        NO2_WGT_MODE,
-      </if>
-      <if test="rfidNo != null">
-        RFID_NO,
-      </if>
-      <if test="chkFlg != null">
-        CHK_FLG,
-      </if>
-      <if test="checker != null">
-        CHECKER,
-      </if>
-      <if test="chkTime != null">
-        CHK_TIME,
-      </if>
-      <if test="chmPer != null">
-        CHM_PER,
-      </if>
-      <if test="chmTime != null">
-        CHM_TIME,
-      </if>
-      <if test="chmType != null">
-        CHM_TYPE,
-      </if>
-      <if test="transport != null">
-        TRANSPORT,
-      </if>
-      <if test="transName != null">
-        TRANS_NAME,
-      </if>
-      <if test="grsWgtCurve != null">
-        GRS_WGT_CURVE,
-      </if>
-      <if test="tarWgtCurve != null">
-        TAR_WGT_CURVE,
-      </if>
-      <if test="disOpr != null">
-        DIS_OPR,
-      </if>
-      <if test="disTime != null">
-        DIS_TIME,
-      </if>
-      <if test="fdUpflg != null">
-        FD_UPFLG,
-      </if>
-      <if test="chUp != null">
-        CH_UP,
-      </if>
-      <if test="chOpr != null">
-        CH_OPR,
-      </if>
-      <if test="chTime != null">
-        CH_TIME,
-      </if>
-      <if test="tdNo != null">
-        TD_NO,
-      </if>
-      <if test="tdWgt != null">
-        TD_WGT,
-      </if>
-      <if test="ddNo != null">
-        DD_NO,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="wgtNo != null">
-        #{wgtNo,jdbcType=VARCHAR},
-      </if>
-      <if test="billno != null">
-        #{billno,jdbcType=VARCHAR},
-      </if>
-      <if test="truNo != null">
-        #{truNo,jdbcType=VARCHAR},
-      </if>
-      <if test="lgsNo != null">
-        #{lgsNo,jdbcType=VARCHAR},
-      </if>
-      <if test="carNo != null">
-        #{carNo,jdbcType=VARCHAR},
-      </if>
-      <if test="icdNo != null">
-        #{icdNo,jdbcType=VARCHAR},
-      </if>
-      <if test="grsBoxNo != null">
-        #{grsBoxNo,jdbcType=DECIMAL},
-      </if>
-      <if test="tarBoxNo != null">
-        #{tarBoxNo,jdbcType=DECIMAL},
-      </if>
-      <if test="grsSpd != null">
-        #{grsSpd,jdbcType=DECIMAL},
-      </if>
-      <if test="tarSpd != null">
-        #{tarSpd,jdbcType=DECIMAL},
-      </if>
-      <if test="trnType != null">
-        #{trnType,jdbcType=VARCHAR},
-      </if>
-      <if test="grsVdoFile != null">
-        #{grsVdoFile,jdbcType=VARCHAR},
-      </if>
-      <if test="tarVdoFile != null">
-        #{tarVdoFile,jdbcType=VARCHAR},
-      </if>
-      <if test="grsTrnNo != null">
-        #{grsTrnNo,jdbcType=VARCHAR},
-      </if>
-      <if test="tarTrnNo != null">
-        #{tarTrnNo,jdbcType=VARCHAR},
-      </if>
-      <if test="wgtType != null">
-        #{wgtType,jdbcType=VARCHAR},
-      </if>
-      <if test="grsWgt != null">
-        #{grsWgt,jdbcType=DECIMAL},
-      </if>
-      <if test="tarWgt != null">
-        #{tarWgt,jdbcType=DECIMAL},
-      </if>
-      <if test="netWgt != null">
-        #{netWgt,jdbcType=DECIMAL},
-      </if>
-      <if test="no2Wgt != null">
-        #{no2Wgt,jdbcType=DECIMAL},
-      </if>
-      <if test="grsWgtNo != null">
-        #{grsWgtNo,jdbcType=VARCHAR},
-      </if>
-      <if test="tarWgtNo != null">
-        #{tarWgtNo,jdbcType=VARCHAR},
-      </if>
-      <if test="tarType != null">
-        #{tarType,jdbcType=CHAR},
-      </if>
-      <if test="tarInfMode != null">
-        #{tarInfMode,jdbcType=CHAR},
-      </if>
-      <if test="grsInfMode != null">
-        #{grsInfMode,jdbcType=CHAR},
-      </if>
-      <if test="netInfMode != null">
-        #{netInfMode,jdbcType=CHAR},
-      </if>
-      <if test="grsTime != null">
-        #{grsTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="tarTime != null">
-        #{tarTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="netTime != null">
-        #{netTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="grsWrkOrd != null">
-        #{grsWrkOrd,jdbcType=VARCHAR},
-      </if>
-      <if test="tarWrkOrd != null">
-        #{tarWrkOrd,jdbcType=VARCHAR},
-      </if>
-      <if test="netWrkOrd != null">
-        #{netWrkOrd,jdbcType=VARCHAR},
-      </if>
-      <if test="grsWrkGrp != null">
-        #{grsWrkGrp,jdbcType=VARCHAR},
-      </if>
-      <if test="tarWrkGrp != null">
-        #{tarWrkGrp,jdbcType=VARCHAR},
-      </if>
-      <if test="netWrkGrp != null">
-        #{netWrkGrp,jdbcType=VARCHAR},
-      </if>
-      <if test="grsOpr != null">
-        #{grsOpr,jdbcType=VARCHAR},
-      </if>
-      <if test="tarOpr != null">
-        #{tarOpr,jdbcType=VARCHAR},
-      </if>
-      <if test="netOpr != null">
-        #{netOpr,jdbcType=VARCHAR},
-      </if>
-      <if test="grsPntName != null">
-        #{grsPntName,jdbcType=VARCHAR},
-      </if>
-      <if test="tarPntName != null">
-        #{tarPntName,jdbcType=VARCHAR},
-      </if>
-      <if test="netPntName != null">
-        #{netPntName,jdbcType=VARCHAR},
-      </if>
-      <if test="grsPntNo != null">
-        #{grsPntNo,jdbcType=VARCHAR},
-      </if>
-      <if test="tarPntNo != null">
-        #{tarPntNo,jdbcType=VARCHAR},
-      </if>
-      <if test="netPntNo != null">
-        #{netPntNo,jdbcType=VARCHAR},
-      </if>
-      <if test="note != null">
-        #{note,jdbcType=VARCHAR},
-      </if>
-      <if test="sdrType != null">
-        #{sdrType,jdbcType=VARCHAR},
-      </if>
-      <if test="sdrName != null">
-        #{sdrName,jdbcType=VARCHAR},
-      </if>
-      <if test="sender != null">
-        #{sender,jdbcType=VARCHAR},
-      </if>
-      <if test="sdrNote != null">
-        #{sdrNote,jdbcType=VARCHAR},
-      </if>
-      <if test="rcvType != null">
-        #{rcvType,jdbcType=VARCHAR},
-      </if>
-      <if test="rcvName != null">
-        #{rcvName,jdbcType=VARCHAR},
-      </if>
-      <if test="receiver != null">
-        #{receiver,jdbcType=VARCHAR},
-      </if>
-      <if test="rcvNote != null">
-        #{rcvNote,jdbcType=VARCHAR},
-      </if>
-      <if test="matName != null">
-        #{matName,jdbcType=VARCHAR},
-      </if>
-      <if test="matCode != null">
-        #{matCode,jdbcType=VARCHAR},
-      </if>
-      <if test="b1PrnNum != null">
-        #{b1PrnNum,jdbcType=DECIMAL},
-      </if>
-      <if test="b2PrnNum != null">
-        #{b2PrnNum,jdbcType=DECIMAL},
-      </if>
-      <if test="b1PrnNum2 != null">
-        #{b1PrnNum2,jdbcType=DECIMAL},
-      </if>
-      <if test="uplFlg != null">
-        #{uplFlg,jdbcType=VARCHAR},
-      </if>
-      <if test="uplTime != null">
-        #{uplTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="delFlg != null">
-        #{delFlg,jdbcType=VARCHAR},
-      </if>
-      <if test="extBox != null">
-        #{extBox,jdbcType=CHAR},
-      </if>
-      <if test="sdrGrsWgt != null">
-        #{sdrGrsWgt,jdbcType=DECIMAL},
-      </if>
-      <if test="sdrTarWgt != null">
-        #{sdrTarWgt,jdbcType=DECIMAL},
-      </if>
-      <if test="sdrNetWgt != null">
-        #{sdrNetWgt,jdbcType=DECIMAL},
-      </if>
-      <if test="disWgt != null">
-        #{disWgt,jdbcType=DECIMAL},
-      </if>
-      <if test="disRatio != null">
-        #{disRatio,jdbcType=DECIMAL},
-      </if>
-      <if test="netEnd != null">
-        #{netEnd,jdbcType=DECIMAL},
-      </if>
-      <if test="no1WgtMode != null">
-        #{no1WgtMode,jdbcType=VARCHAR},
-      </if>
-      <if test="no2WgtMode != null">
-        #{no2WgtMode,jdbcType=VARCHAR},
-      </if>
-      <if test="rfidNo != null">
-        #{rfidNo,jdbcType=VARCHAR},
-      </if>
-      <if test="chkFlg != null">
-        #{chkFlg,jdbcType=VARCHAR},
-      </if>
-      <if test="checker != null">
-        #{checker,jdbcType=VARCHAR},
-      </if>
-      <if test="chkTime != null">
-        #{chkTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="chmPer != null">
-        #{chmPer,jdbcType=VARCHAR},
-      </if>
-      <if test="chmTime != null">
-        #{chmTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="chmType != null">
-        #{chmType,jdbcType=VARCHAR},
-      </if>
-      <if test="transport != null">
-        #{transport,jdbcType=VARCHAR},
-      </if>
-      <if test="transName != null">
-        #{transName,jdbcType=VARCHAR},
-      </if>
-      <if test="grsWgtCurve != null">
-        #{grsWgtCurve,jdbcType=VARCHAR},
-      </if>
-      <if test="tarWgtCurve != null">
-        #{tarWgtCurve,jdbcType=VARCHAR},
-      </if>
-      <if test="disOpr != null">
-        #{disOpr,jdbcType=VARCHAR},
-      </if>
-      <if test="disTime != null">
-        #{disTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="fdUpflg != null">
-        #{fdUpflg,jdbcType=VARCHAR},
-      </if>
-      <if test="chUp != null">
-        #{chUp,jdbcType=VARCHAR},
-      </if>
-      <if test="chOpr != null">
-        #{chOpr,jdbcType=VARCHAR},
-      </if>
-      <if test="chTime != null">
-        #{chTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="tdNo != null">
-        #{tdNo,jdbcType=VARCHAR},
-      </if>
-      <if test="tdWgt != null">
-        #{tdWgt,jdbcType=DECIMAL},
-      </if>
-      <if test="ddNo != null">
-        #{ddNo,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.appservice.appcmmcarweightresults.model.AppCmmCarweightresults">
-    update  JGWEIGHT_USER.CMM_CARWEIGHTRESULTS 
-    set BILLNO = #{billno,jdbcType=VARCHAR},
-      TRU_NO = #{truNo,jdbcType=VARCHAR},
-      LGS_NO = #{lgsNo,jdbcType=VARCHAR},
-      CAR_NO = #{carNo,jdbcType=VARCHAR},
-      ICD_NO = #{icdNo,jdbcType=VARCHAR},
-      GRS_BOX_NO = #{grsBoxNo,jdbcType=DECIMAL},
-      TAR_BOX_NO = #{tarBoxNo,jdbcType=DECIMAL},
-      GRS_SPD = #{grsSpd,jdbcType=DECIMAL},
-      TAR_SPD = #{tarSpd,jdbcType=DECIMAL},
-      TRN_TYPE = #{trnType,jdbcType=VARCHAR},
-      GRS_VDO_FILE = #{grsVdoFile,jdbcType=VARCHAR},
-      TAR_VDO_FILE = #{tarVdoFile,jdbcType=VARCHAR},
-      GRS_TRN_NO = #{grsTrnNo,jdbcType=VARCHAR},
-      TAR_TRN_NO = #{tarTrnNo,jdbcType=VARCHAR},
-      WGT_TYPE = #{wgtType,jdbcType=VARCHAR},
-      GRS_WGT = #{grsWgt,jdbcType=DECIMAL},
-      TAR_WGT = #{tarWgt,jdbcType=DECIMAL},
-      NET_WGT = #{netWgt,jdbcType=DECIMAL},
-      NO2_WGT = #{no2Wgt,jdbcType=DECIMAL},
-      GRS_WGT_NO = #{grsWgtNo,jdbcType=VARCHAR},
-      TAR_WGT_NO = #{tarWgtNo,jdbcType=VARCHAR},
-      TAR_TYPE = #{tarType,jdbcType=CHAR},
-      TAR_INF_MODE = #{tarInfMode,jdbcType=CHAR},
-      GRS_INF_MODE = #{grsInfMode,jdbcType=CHAR},
-      NET_INF_MODE = #{netInfMode,jdbcType=CHAR},
-      GRS_TIME = #{grsTime,jdbcType=TIMESTAMP},
-      TAR_TIME = #{tarTime,jdbcType=TIMESTAMP},
-      NET_TIME = #{netTime,jdbcType=TIMESTAMP},
-      GRS_WRK_ORD = #{grsWrkOrd,jdbcType=VARCHAR},
-      TAR_WRK_ORD = #{tarWrkOrd,jdbcType=VARCHAR},
-      NET_WRK_ORD = #{netWrkOrd,jdbcType=VARCHAR},
-      GRS_WRK_GRP = #{grsWrkGrp,jdbcType=VARCHAR},
-      TAR_WRK_GRP = #{tarWrkGrp,jdbcType=VARCHAR},
-      NET_WRK_GRP = #{netWrkGrp,jdbcType=VARCHAR},
-      GRS_OPR = #{grsOpr,jdbcType=VARCHAR},
-      TAR_OPR = #{tarOpr,jdbcType=VARCHAR},
-      NET_OPR = #{netOpr,jdbcType=VARCHAR},
-      GRS_PNT_NAME = #{grsPntName,jdbcType=VARCHAR},
-      TAR_PNT_NAME = #{tarPntName,jdbcType=VARCHAR},
-      NET_PNT_NAME = #{netPntName,jdbcType=VARCHAR},
-      GRS_PNT_NO = #{grsPntNo,jdbcType=VARCHAR},
-      TAR_PNT_NO = #{tarPntNo,jdbcType=VARCHAR},
-      NET_PNT_NO = #{netPntNo,jdbcType=VARCHAR},
-      NOTE = #{note,jdbcType=VARCHAR},
-      SDR_TYPE = #{sdrType,jdbcType=VARCHAR},
-      SDR_NAME = #{sdrName,jdbcType=VARCHAR},
-      SENDER = #{sender,jdbcType=VARCHAR},
-      SDR_NOTE = #{sdrNote,jdbcType=VARCHAR},
-      RCV_TYPE = #{rcvType,jdbcType=VARCHAR},
-      RCV_NAME = #{rcvName,jdbcType=VARCHAR},
-      RECEIVER = #{receiver,jdbcType=VARCHAR},
-      RCV_NOTE = #{rcvNote,jdbcType=VARCHAR},
-      MAT_NAME = #{matName,jdbcType=VARCHAR},
-      MAT_CODE = #{matCode,jdbcType=VARCHAR},
-      B1_PRN_NUM = #{b1PrnNum,jdbcType=DECIMAL},
-      B2_PRN_NUM = #{b2PrnNum,jdbcType=DECIMAL},
-      B1_PRN_NUM_2 = #{b1PrnNum2,jdbcType=DECIMAL},
-      UPL_FLG = #{uplFlg,jdbcType=VARCHAR},
-      UPL_TIME = #{uplTime,jdbcType=TIMESTAMP},
-      DEL_FLG = #{delFlg,jdbcType=VARCHAR},
-      EXT_BOX = #{extBox,jdbcType=CHAR},
-      SDR_GRS_WGT = #{sdrGrsWgt,jdbcType=DECIMAL},
-      SDR_TAR_WGT = #{sdrTarWgt,jdbcType=DECIMAL},
-      SDR_NET_WGT = #{sdrNetWgt,jdbcType=DECIMAL},
-      DIS_WGT = #{disWgt,jdbcType=DECIMAL},
-      DIS_RATIO = #{disRatio,jdbcType=DECIMAL},
-      NET_END = #{netEnd,jdbcType=DECIMAL},
-      NO1_WGT_MODE = #{no1WgtMode,jdbcType=VARCHAR},
-      NO2_WGT_MODE = #{no2WgtMode,jdbcType=VARCHAR},
-      RFID_NO = #{rfidNo,jdbcType=VARCHAR},
-      CHK_FLG = #{chkFlg,jdbcType=VARCHAR},
-      CHECKER = #{checker,jdbcType=VARCHAR},
-      CHK_TIME = #{chkTime,jdbcType=TIMESTAMP},
-      CHM_PER = #{chmPer,jdbcType=VARCHAR},
-      CHM_TIME = #{chmTime,jdbcType=TIMESTAMP},
-      CHM_TYPE = #{chmType,jdbcType=VARCHAR},
-      TRANSPORT = #{transport,jdbcType=VARCHAR},
-      TRANS_NAME = #{transName,jdbcType=VARCHAR},
-      GRS_WGT_CURVE = #{grsWgtCurve,jdbcType=VARCHAR},
-      TAR_WGT_CURVE = #{tarWgtCurve,jdbcType=VARCHAR},
-      DIS_OPR = #{disOpr,jdbcType=VARCHAR},
-      DIS_TIME = #{disTime,jdbcType=TIMESTAMP},
-      FD_UPFLG = #{fdUpflg,jdbcType=VARCHAR},
-      CH_UP = #{chUp,jdbcType=VARCHAR},
-      CH_OPR = #{chOpr,jdbcType=VARCHAR},
-      CH_TIME = #{chTime,jdbcType=TIMESTAMP},
-      TD_NO = #{tdNo,jdbcType=VARCHAR},
-      TD_WGT = #{tdWgt,jdbcType=DECIMAL},
-      DD_NO = #{ddNo,jdbcType=VARCHAR}
-    where WGT_NO = #{wgtNo,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.appservice.appcmmcarweightresults.model.AppCmmCarweightresults">
-    update  JGWEIGHT_USER.CMM_CARWEIGHTRESULTS 
-    <set>
-      <if test="billno != null">
-        BILLNO = #{billno,jdbcType=VARCHAR},
-      </if>
-      <if test="truNo != null">
-        TRU_NO = #{truNo,jdbcType=VARCHAR},
-      </if>
-      <if test="lgsNo != null">
-        LGS_NO = #{lgsNo,jdbcType=VARCHAR},
-      </if>
-      <if test="carNo != null">
-        CAR_NO = #{carNo,jdbcType=VARCHAR},
-      </if>
-      <if test="icdNo != null">
-        ICD_NO = #{icdNo,jdbcType=VARCHAR},
-      </if>
-      <if test="grsBoxNo != null">
-        GRS_BOX_NO = #{grsBoxNo,jdbcType=DECIMAL},
-      </if>
-      <if test="tarBoxNo != null">
-        TAR_BOX_NO = #{tarBoxNo,jdbcType=DECIMAL},
-      </if>
-      <if test="grsSpd != null">
-        GRS_SPD = #{grsSpd,jdbcType=DECIMAL},
-      </if>
-      <if test="tarSpd != null">
-        TAR_SPD = #{tarSpd,jdbcType=DECIMAL},
-      </if>
-      <if test="trnType != null">
-        TRN_TYPE = #{trnType,jdbcType=VARCHAR},
-      </if>
-      <if test="grsVdoFile != null">
-        GRS_VDO_FILE = #{grsVdoFile,jdbcType=VARCHAR},
-      </if>
-      <if test="tarVdoFile != null">
-        TAR_VDO_FILE = #{tarVdoFile,jdbcType=VARCHAR},
-      </if>
-      <if test="grsTrnNo != null">
-        GRS_TRN_NO = #{grsTrnNo,jdbcType=VARCHAR},
-      </if>
-      <if test="tarTrnNo != null">
-        TAR_TRN_NO = #{tarTrnNo,jdbcType=VARCHAR},
-      </if>
-      <if test="wgtType != null">
-        WGT_TYPE = #{wgtType,jdbcType=VARCHAR},
-      </if>
-      <if test="grsWgt != null">
-        GRS_WGT = #{grsWgt,jdbcType=DECIMAL},
-      </if>
-      <if test="tarWgt != null">
-        TAR_WGT = #{tarWgt,jdbcType=DECIMAL},
-      </if>
-      <if test="netWgt != null">
-        NET_WGT = #{netWgt,jdbcType=DECIMAL},
-      </if>
-      <if test="no2Wgt != null">
-        NO2_WGT = #{no2Wgt,jdbcType=DECIMAL},
-      </if>
-      <if test="grsWgtNo != null">
-        GRS_WGT_NO = #{grsWgtNo,jdbcType=VARCHAR},
-      </if>
-      <if test="tarWgtNo != null">
-        TAR_WGT_NO = #{tarWgtNo,jdbcType=VARCHAR},
-      </if>
-      <if test="tarType != null">
-        TAR_TYPE = #{tarType,jdbcType=CHAR},
-      </if>
-      <if test="tarInfMode != null">
-        TAR_INF_MODE = #{tarInfMode,jdbcType=CHAR},
-      </if>
-      <if test="grsInfMode != null">
-        GRS_INF_MODE = #{grsInfMode,jdbcType=CHAR},
-      </if>
-      <if test="netInfMode != null">
-        NET_INF_MODE = #{netInfMode,jdbcType=CHAR},
-      </if>
-      <if test="grsTime != null">
-        GRS_TIME = #{grsTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="tarTime != null">
-        TAR_TIME = #{tarTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="netTime != null">
-        NET_TIME = #{netTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="grsWrkOrd != null">
-        GRS_WRK_ORD = #{grsWrkOrd,jdbcType=VARCHAR},
-      </if>
-      <if test="tarWrkOrd != null">
-        TAR_WRK_ORD = #{tarWrkOrd,jdbcType=VARCHAR},
-      </if>
-      <if test="netWrkOrd != null">
-        NET_WRK_ORD = #{netWrkOrd,jdbcType=VARCHAR},
-      </if>
-      <if test="grsWrkGrp != null">
-        GRS_WRK_GRP = #{grsWrkGrp,jdbcType=VARCHAR},
-      </if>
-      <if test="tarWrkGrp != null">
-        TAR_WRK_GRP = #{tarWrkGrp,jdbcType=VARCHAR},
-      </if>
-      <if test="netWrkGrp != null">
-        NET_WRK_GRP = #{netWrkGrp,jdbcType=VARCHAR},
-      </if>
-      <if test="grsOpr != null">
-        GRS_OPR = #{grsOpr,jdbcType=VARCHAR},
-      </if>
-      <if test="tarOpr != null">
-        TAR_OPR = #{tarOpr,jdbcType=VARCHAR},
-      </if>
-      <if test="netOpr != null">
-        NET_OPR = #{netOpr,jdbcType=VARCHAR},
-      </if>
-      <if test="grsPntName != null">
-        GRS_PNT_NAME = #{grsPntName,jdbcType=VARCHAR},
-      </if>
-      <if test="tarPntName != null">
-        TAR_PNT_NAME = #{tarPntName,jdbcType=VARCHAR},
-      </if>
-      <if test="netPntName != null">
-        NET_PNT_NAME = #{netPntName,jdbcType=VARCHAR},
-      </if>
-      <if test="grsPntNo != null">
-        GRS_PNT_NO = #{grsPntNo,jdbcType=VARCHAR},
-      </if>
-      <if test="tarPntNo != null">
-        TAR_PNT_NO = #{tarPntNo,jdbcType=VARCHAR},
-      </if>
-      <if test="netPntNo != null">
-        NET_PNT_NO = #{netPntNo,jdbcType=VARCHAR},
-      </if>
-      <if test="note != null">
-        NOTE = #{note,jdbcType=VARCHAR},
-      </if>
-      <if test="sdrType != null">
-        SDR_TYPE = #{sdrType,jdbcType=VARCHAR},
-      </if>
-      <if test="sdrName != null">
-        SDR_NAME = #{sdrName,jdbcType=VARCHAR},
-      </if>
-      <if test="sender != null">
-        SENDER = #{sender,jdbcType=VARCHAR},
-      </if>
-      <if test="sdrNote != null">
-        SDR_NOTE = #{sdrNote,jdbcType=VARCHAR},
-      </if>
-      <if test="rcvType != null">
-        RCV_TYPE = #{rcvType,jdbcType=VARCHAR},
-      </if>
-      <if test="rcvName != null">
-        RCV_NAME = #{rcvName,jdbcType=VARCHAR},
-      </if>
-      <if test="receiver != null">
-        RECEIVER = #{receiver,jdbcType=VARCHAR},
-      </if>
-      <if test="rcvNote != null">
-        RCV_NOTE = #{rcvNote,jdbcType=VARCHAR},
-      </if>
-      <if test="matName != null">
-        MAT_NAME = #{matName,jdbcType=VARCHAR},
-      </if>
-      <if test="matCode != null">
-        MAT_CODE = #{matCode,jdbcType=VARCHAR},
-      </if>
-      <if test="b1PrnNum != null">
-        B1_PRN_NUM = #{b1PrnNum,jdbcType=DECIMAL},
-      </if>
-      <if test="b2PrnNum != null">
-        B2_PRN_NUM = #{b2PrnNum,jdbcType=DECIMAL},
-      </if>
-      <if test="b1PrnNum2 != null">
-        B1_PRN_NUM_2 = #{b1PrnNum2,jdbcType=DECIMAL},
-      </if>
-      <if test="uplFlg != null">
-        UPL_FLG = #{uplFlg,jdbcType=VARCHAR},
-      </if>
-      <if test="uplTime != null">
-        UPL_TIME = #{uplTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="delFlg != null">
-        DEL_FLG = #{delFlg,jdbcType=VARCHAR},
-      </if>
-      <if test="extBox != null">
-        EXT_BOX = #{extBox,jdbcType=CHAR},
-      </if>
-      <if test="sdrGrsWgt != null">
-        SDR_GRS_WGT = #{sdrGrsWgt,jdbcType=DECIMAL},
-      </if>
-      <if test="sdrTarWgt != null">
-        SDR_TAR_WGT = #{sdrTarWgt,jdbcType=DECIMAL},
-      </if>
-      <if test="sdrNetWgt != null">
-        SDR_NET_WGT = #{sdrNetWgt,jdbcType=DECIMAL},
-      </if>
-      <if test="disWgt != null">
-        DIS_WGT = #{disWgt,jdbcType=DECIMAL},
-      </if>
-      <if test="disRatio != null">
-        DIS_RATIO = #{disRatio,jdbcType=DECIMAL},
-      </if>
-      <if test="netEnd != null">
-        NET_END = #{netEnd,jdbcType=DECIMAL},
-      </if>
-      <if test="no1WgtMode != null">
-        NO1_WGT_MODE = #{no1WgtMode,jdbcType=VARCHAR},
-      </if>
-      <if test="no2WgtMode != null">
-        NO2_WGT_MODE = #{no2WgtMode,jdbcType=VARCHAR},
-      </if>
-      <if test="rfidNo != null">
-        RFID_NO = #{rfidNo,jdbcType=VARCHAR},
-      </if>
-      <if test="chkFlg != null">
-        CHK_FLG = #{chkFlg,jdbcType=VARCHAR},
-      </if>
-      <if test="checker != null">
-        CHECKER = #{checker,jdbcType=VARCHAR},
-      </if>
-      <if test="chkTime != null">
-        CHK_TIME = #{chkTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="chmPer != null">
-        CHM_PER = #{chmPer,jdbcType=VARCHAR},
-      </if>
-      <if test="chmTime != null">
-        CHM_TIME = #{chmTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="chmType != null">
-        CHM_TYPE = #{chmType,jdbcType=VARCHAR},
-      </if>
-      <if test="transport != null">
-        TRANSPORT = #{transport,jdbcType=VARCHAR},
-      </if>
-      <if test="transName != null">
-        TRANS_NAME = #{transName,jdbcType=VARCHAR},
-      </if>
-      <if test="grsWgtCurve != null">
-        GRS_WGT_CURVE = #{grsWgtCurve,jdbcType=VARCHAR},
-      </if>
-      <if test="tarWgtCurve != null">
-        TAR_WGT_CURVE = #{tarWgtCurve,jdbcType=VARCHAR},
-      </if>
-      <if test="disOpr != null">
-        DIS_OPR = #{disOpr,jdbcType=VARCHAR},
-      </if>
-      <if test="disTime != null">
-        DIS_TIME = #{disTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="fdUpflg != null">
-        FD_UPFLG = #{fdUpflg,jdbcType=VARCHAR},
-      </if>
-      <if test="chUp != null">
-        CH_UP = #{chUp,jdbcType=VARCHAR},
-      </if>
-      <if test="chOpr != null">
-        CH_OPR = #{chOpr,jdbcType=VARCHAR},
-      </if>
-      <if test="chTime != null">
-        CH_TIME = #{chTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="tdNo != null">
-        TD_NO = #{tdNo,jdbcType=VARCHAR},
-      </if>
-      <if test="tdWgt != null">
-        TD_WGT = #{tdWgt,jdbcType=DECIMAL},
-      </if>
-      <if test="ddNo != null">
-        DD_NO = #{ddNo,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where WGT_NO = #{wgtNo,jdbcType=VARCHAR}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where WGT_NO = #{wgtNo,jdbcType=VARCHAR}
-  </select>
-  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="where"/>
-    order by net_Time desc
-  </select>
-  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="whereLike"/>
-    order by net_Time desc
-  </select>
-  <insert id="batchInsert" parameterType="java.util.List">
-    insert into  JGWEIGHT_USER.CMM_CARWEIGHTRESULTS  
-      (WGT_NO, 
-      BILLNO, TRU_NO, LGS_NO, 
-      CAR_NO, ICD_NO, GRS_BOX_NO, 
-      TAR_BOX_NO, GRS_SPD, TAR_SPD, 
-      TRN_TYPE, GRS_VDO_FILE, TAR_VDO_FILE, 
-      GRS_TRN_NO, TAR_TRN_NO, WGT_TYPE, 
-      GRS_WGT, TAR_WGT, NET_WGT, 
-      NO2_WGT, GRS_WGT_NO, TAR_WGT_NO, 
-      TAR_TYPE, TAR_INF_MODE, GRS_INF_MODE, 
-      NET_INF_MODE, GRS_TIME, TAR_TIME, 
-      NET_TIME, GRS_WRK_ORD, TAR_WRK_ORD, 
-      NET_WRK_ORD, GRS_WRK_GRP, TAR_WRK_GRP, 
-      NET_WRK_GRP, GRS_OPR, TAR_OPR, 
-      NET_OPR, GRS_PNT_NAME, TAR_PNT_NAME, 
-      NET_PNT_NAME, GRS_PNT_NO, TAR_PNT_NO, 
-      NET_PNT_NO, NOTE, SDR_TYPE, 
-      SDR_NAME, SENDER, SDR_NOTE, 
-      RCV_TYPE, RCV_NAME, RECEIVER, 
-      RCV_NOTE, MAT_NAME, MAT_CODE, 
-      B1_PRN_NUM, B2_PRN_NUM, B1_PRN_NUM_2, 
-      UPL_FLG, UPL_TIME, DEL_FLG, 
-      EXT_BOX, SDR_GRS_WGT, SDR_TAR_WGT, 
-      SDR_NET_WGT, DIS_WGT, DIS_RATIO, 
-      NET_END, NO1_WGT_MODE, NO2_WGT_MODE, 
-      RFID_NO, CHK_FLG, CHECKER, 
-      CHK_TIME, CHM_PER, CHM_TIME, 
-      CHM_TYPE, TRANSPORT, TRANS_NAME, 
-      GRS_WGT_CURVE, TAR_WGT_CURVE, DIS_OPR, 
-      DIS_TIME, FD_UPFLG, CH_UP, 
-      CH_OPR, CH_TIME, TD_NO, 
-      TD_WGT, DD_NO)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.wgtNo,jdbcType=VARCHAR}, 
-      #{item.billno,jdbcType=VARCHAR}, #{item.truNo,jdbcType=VARCHAR}, #{item.lgsNo,jdbcType=VARCHAR}, 
-      #{item.carNo,jdbcType=VARCHAR}, #{item.icdNo,jdbcType=VARCHAR}, #{item.grsBoxNo,jdbcType=DECIMAL}, 
-      #{item.tarBoxNo,jdbcType=DECIMAL}, #{item.grsSpd,jdbcType=DECIMAL}, #{item.tarSpd,jdbcType=DECIMAL}, 
-      #{item.trnType,jdbcType=VARCHAR}, #{item.grsVdoFile,jdbcType=VARCHAR}, #{item.tarVdoFile,jdbcType=VARCHAR}, 
-      #{item.grsTrnNo,jdbcType=VARCHAR}, #{item.tarTrnNo,jdbcType=VARCHAR}, #{item.wgtType,jdbcType=VARCHAR}, 
-      #{item.grsWgt,jdbcType=DECIMAL}, #{item.tarWgt,jdbcType=DECIMAL}, #{item.netWgt,jdbcType=DECIMAL}, 
-      #{item.no2Wgt,jdbcType=DECIMAL}, #{item.grsWgtNo,jdbcType=VARCHAR}, #{item.tarWgtNo,jdbcType=VARCHAR}, 
-      #{item.tarType,jdbcType=CHAR}, #{item.tarInfMode,jdbcType=CHAR}, #{item.grsInfMode,jdbcType=CHAR}, 
-      #{item.netInfMode,jdbcType=CHAR}, #{item.grsTime,jdbcType=TIMESTAMP}, #{item.tarTime,jdbcType=TIMESTAMP}, 
-      #{item.netTime,jdbcType=TIMESTAMP}, #{item.grsWrkOrd,jdbcType=VARCHAR}, #{item.tarWrkOrd,jdbcType=VARCHAR}, 
-      #{item.netWrkOrd,jdbcType=VARCHAR}, #{item.grsWrkGrp,jdbcType=VARCHAR}, #{item.tarWrkGrp,jdbcType=VARCHAR}, 
-      #{item.netWrkGrp,jdbcType=VARCHAR}, #{item.grsOpr,jdbcType=VARCHAR}, #{item.tarOpr,jdbcType=VARCHAR}, 
-      #{item.netOpr,jdbcType=VARCHAR}, #{item.grsPntName,jdbcType=VARCHAR}, #{item.tarPntName,jdbcType=VARCHAR}, 
-      #{item.netPntName,jdbcType=VARCHAR}, #{item.grsPntNo,jdbcType=VARCHAR}, #{item.tarPntNo,jdbcType=VARCHAR}, 
-      #{item.netPntNo,jdbcType=VARCHAR}, #{item.note,jdbcType=VARCHAR}, #{item.sdrType,jdbcType=VARCHAR}, 
-      #{item.sdrName,jdbcType=VARCHAR}, #{item.sender,jdbcType=VARCHAR}, #{item.sdrNote,jdbcType=VARCHAR}, 
-      #{item.rcvType,jdbcType=VARCHAR}, #{item.rcvName,jdbcType=VARCHAR}, #{item.receiver,jdbcType=VARCHAR}, 
-      #{item.rcvNote,jdbcType=VARCHAR}, #{item.matName,jdbcType=VARCHAR}, #{item.matCode,jdbcType=VARCHAR}, 
-      #{item.b1PrnNum,jdbcType=DECIMAL}, #{item.b2PrnNum,jdbcType=DECIMAL}, #{item.b1PrnNum2,jdbcType=DECIMAL}, 
-      #{item.uplFlg,jdbcType=VARCHAR}, #{item.uplTime,jdbcType=TIMESTAMP}, #{item.delFlg,jdbcType=VARCHAR}, 
-      #{item.extBox,jdbcType=CHAR}, #{item.sdrGrsWgt,jdbcType=DECIMAL}, #{item.sdrTarWgt,jdbcType=DECIMAL}, 
-      #{item.sdrNetWgt,jdbcType=DECIMAL}, #{item.disWgt,jdbcType=DECIMAL}, #{item.disRatio,jdbcType=DECIMAL}, 
-      #{item.netEnd,jdbcType=DECIMAL}, #{item.no1WgtMode,jdbcType=VARCHAR}, #{item.no2WgtMode,jdbcType=VARCHAR}, 
-      #{item.rfidNo,jdbcType=VARCHAR}, #{item.chkFlg,jdbcType=VARCHAR}, #{item.checker,jdbcType=VARCHAR}, 
-      #{item.chkTime,jdbcType=TIMESTAMP}, #{item.chmPer,jdbcType=VARCHAR}, #{item.chmTime,jdbcType=TIMESTAMP}, 
-      #{item.chmType,jdbcType=VARCHAR}, #{item.transport,jdbcType=VARCHAR}, #{item.transName,jdbcType=VARCHAR}, 
-      #{item.grsWgtCurve,jdbcType=VARCHAR}, #{item.tarWgtCurve,jdbcType=VARCHAR}, #{item.disOpr,jdbcType=VARCHAR}, 
-      #{item.disTime,jdbcType=TIMESTAMP}, #{item.fdUpflg,jdbcType=VARCHAR}, #{item.chUp,jdbcType=VARCHAR}, 
-      #{item.chOpr,jdbcType=VARCHAR}, #{item.chTime,jdbcType=TIMESTAMP}, #{item.tdNo,jdbcType=VARCHAR}, 
-      #{item.tdWgt,jdbcType=DECIMAL}, #{item.ddNo,jdbcType=VARCHAR} from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update  JGWEIGHT_USER.CMM_CARWEIGHTRESULTS 
-     set
-       WGT_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.wgtNo,jdbcType=VARCHAR}
-       </foreach>
-       ,BILLNO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.billno,jdbcType=VARCHAR}
-       </foreach>
-       ,TRU_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.truNo,jdbcType=VARCHAR}
-       </foreach>
-       ,LGS_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.lgsNo,jdbcType=VARCHAR}
-       </foreach>
-       ,CAR_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.carNo,jdbcType=VARCHAR}
-       </foreach>
-       ,ICD_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.icdNo,jdbcType=VARCHAR}
-       </foreach>
-       ,GRS_BOX_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.grsBoxNo,jdbcType=DECIMAL}
-       </foreach>
-       ,TAR_BOX_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tarBoxNo,jdbcType=DECIMAL}
-       </foreach>
-       ,GRS_SPD=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.grsSpd,jdbcType=DECIMAL}
-       </foreach>
-       ,TAR_SPD=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tarSpd,jdbcType=DECIMAL}
-       </foreach>
-       ,TRN_TYPE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.trnType,jdbcType=VARCHAR}
-       </foreach>
-       ,GRS_VDO_FILE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.grsVdoFile,jdbcType=VARCHAR}
-       </foreach>
-       ,TAR_VDO_FILE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tarVdoFile,jdbcType=VARCHAR}
-       </foreach>
-       ,GRS_TRN_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.grsTrnNo,jdbcType=VARCHAR}
-       </foreach>
-       ,TAR_TRN_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tarTrnNo,jdbcType=VARCHAR}
-       </foreach>
-       ,WGT_TYPE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.wgtType,jdbcType=VARCHAR}
-       </foreach>
-       ,GRS_WGT=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.grsWgt,jdbcType=DECIMAL}
-       </foreach>
-       ,TAR_WGT=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tarWgt,jdbcType=DECIMAL}
-       </foreach>
-       ,NET_WGT=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.netWgt,jdbcType=DECIMAL}
-       </foreach>
-       ,NO2_WGT=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.no2Wgt,jdbcType=DECIMAL}
-       </foreach>
-       ,GRS_WGT_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.grsWgtNo,jdbcType=VARCHAR}
-       </foreach>
-       ,TAR_WGT_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tarWgtNo,jdbcType=VARCHAR}
-       </foreach>
-       ,TAR_TYPE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tarType,jdbcType=CHAR}
-       </foreach>
-       ,TAR_INF_MODE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tarInfMode,jdbcType=CHAR}
-       </foreach>
-       ,GRS_INF_MODE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.grsInfMode,jdbcType=CHAR}
-       </foreach>
-       ,NET_INF_MODE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.netInfMode,jdbcType=CHAR}
-       </foreach>
-       ,GRS_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.grsTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,TAR_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tarTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,NET_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.netTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,GRS_WRK_ORD=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.grsWrkOrd,jdbcType=VARCHAR}
-       </foreach>
-       ,TAR_WRK_ORD=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tarWrkOrd,jdbcType=VARCHAR}
-       </foreach>
-       ,NET_WRK_ORD=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.netWrkOrd,jdbcType=VARCHAR}
-       </foreach>
-       ,GRS_WRK_GRP=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.grsWrkGrp,jdbcType=VARCHAR}
-       </foreach>
-       ,TAR_WRK_GRP=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tarWrkGrp,jdbcType=VARCHAR}
-       </foreach>
-       ,NET_WRK_GRP=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.netWrkGrp,jdbcType=VARCHAR}
-       </foreach>
-       ,GRS_OPR=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.grsOpr,jdbcType=VARCHAR}
-       </foreach>
-       ,TAR_OPR=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tarOpr,jdbcType=VARCHAR}
-       </foreach>
-       ,NET_OPR=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.netOpr,jdbcType=VARCHAR}
-       </foreach>
-       ,GRS_PNT_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.grsPntName,jdbcType=VARCHAR}
-       </foreach>
-       ,TAR_PNT_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tarPntName,jdbcType=VARCHAR}
-       </foreach>
-       ,NET_PNT_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.netPntName,jdbcType=VARCHAR}
-       </foreach>
-       ,GRS_PNT_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.grsPntNo,jdbcType=VARCHAR}
-       </foreach>
-       ,TAR_PNT_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tarPntNo,jdbcType=VARCHAR}
-       </foreach>
-       ,NET_PNT_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.netPntNo,jdbcType=VARCHAR}
-       </foreach>
-       ,NOTE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.note,jdbcType=VARCHAR}
-       </foreach>
-       ,SDR_TYPE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.sdrType,jdbcType=VARCHAR}
-       </foreach>
-       ,SDR_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.sdrName,jdbcType=VARCHAR}
-       </foreach>
-       ,SENDER=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.sender,jdbcType=VARCHAR}
-       </foreach>
-       ,SDR_NOTE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.sdrNote,jdbcType=VARCHAR}
-       </foreach>
-       ,RCV_TYPE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.rcvType,jdbcType=VARCHAR}
-       </foreach>
-       ,RCV_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.rcvName,jdbcType=VARCHAR}
-       </foreach>
-       ,RECEIVER=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.receiver,jdbcType=VARCHAR}
-       </foreach>
-       ,RCV_NOTE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.rcvNote,jdbcType=VARCHAR}
-       </foreach>
-       ,MAT_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.matName,jdbcType=VARCHAR}
-       </foreach>
-       ,MAT_CODE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.matCode,jdbcType=VARCHAR}
-       </foreach>
-       ,B1_PRN_NUM=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.b1PrnNum,jdbcType=DECIMAL}
-       </foreach>
-       ,B2_PRN_NUM=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.b2PrnNum,jdbcType=DECIMAL}
-       </foreach>
-       ,B1_PRN_NUM_2=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.b1PrnNum2,jdbcType=DECIMAL}
-       </foreach>
-       ,UPL_FLG=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.uplFlg,jdbcType=VARCHAR}
-       </foreach>
-       ,UPL_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.uplTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,DEL_FLG=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.delFlg,jdbcType=VARCHAR}
-       </foreach>
-       ,EXT_BOX=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.extBox,jdbcType=CHAR}
-       </foreach>
-       ,SDR_GRS_WGT=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.sdrGrsWgt,jdbcType=DECIMAL}
-       </foreach>
-       ,SDR_TAR_WGT=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.sdrTarWgt,jdbcType=DECIMAL}
-       </foreach>
-       ,SDR_NET_WGT=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.sdrNetWgt,jdbcType=DECIMAL}
-       </foreach>
-       ,DIS_WGT=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.disWgt,jdbcType=DECIMAL}
-       </foreach>
-       ,DIS_RATIO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.disRatio,jdbcType=DECIMAL}
-       </foreach>
-       ,NET_END=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.netEnd,jdbcType=DECIMAL}
-       </foreach>
-       ,NO1_WGT_MODE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.no1WgtMode,jdbcType=VARCHAR}
-       </foreach>
-       ,NO2_WGT_MODE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.no2WgtMode,jdbcType=VARCHAR}
-       </foreach>
-       ,RFID_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.rfidNo,jdbcType=VARCHAR}
-       </foreach>
-       ,CHK_FLG=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.chkFlg,jdbcType=VARCHAR}
-       </foreach>
-       ,CHECKER=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.checker,jdbcType=VARCHAR}
-       </foreach>
-       ,CHK_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.chkTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,CHM_PER=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.chmPer,jdbcType=VARCHAR}
-       </foreach>
-       ,CHM_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.chmTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,CHM_TYPE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.chmType,jdbcType=VARCHAR}
-       </foreach>
-       ,TRANSPORT=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.transport,jdbcType=VARCHAR}
-       </foreach>
-       ,TRANS_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.transName,jdbcType=VARCHAR}
-       </foreach>
-       ,GRS_WGT_CURVE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.grsWgtCurve,jdbcType=VARCHAR}
-       </foreach>
-       ,TAR_WGT_CURVE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tarWgtCurve,jdbcType=VARCHAR}
-       </foreach>
-       ,DIS_OPR=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.disOpr,jdbcType=VARCHAR}
-       </foreach>
-       ,DIS_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.disTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,FD_UPFLG=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.fdUpflg,jdbcType=VARCHAR}
-       </foreach>
-       ,CH_UP=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.chUp,jdbcType=VARCHAR}
-       </foreach>
-       ,CH_OPR=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.chOpr,jdbcType=VARCHAR}
-       </foreach>
-       ,CH_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.chTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,TD_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tdNo,jdbcType=VARCHAR}
-       </foreach>
-       ,TD_WGT=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.tdWgt,jdbcType=DECIMAL}
-       </foreach>
-       ,DD_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case WGT_NO" close="end">
-          when #{item.wgtNo,jdbcType=VARCHAR} then #{item.ddNo,jdbcType=VARCHAR}
-       </foreach>
-     where WGT_NO in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-    #{item.wgtNo,jdbcType=VARCHAR}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from  JGWEIGHT_USER.CMM_CARWEIGHTRESULTS 
-    where WGT_NO in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-
-  <select id="selectSumForAppByCarOld" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-  select t.mat_Name mat_Name,
-    decode(t.wgt_Type,
-    '100101',
-    '外购进厂计量',
-    '100102',
-    '外销出厂计量',
-    '100103',
-    '厂内倒转计量',
-    '100104',
-    '厂际调拨计量',
-    '非计量') wgt_Type,
-    sum(t.net_Wgt) net_Wgt,
-    count (1) car_No
-    from JGWEIGHT_USER.CMM_CARWEIGHTRESULTS  t
-    <include refid="where"/>
-    group by t.mat_Name, t.wgt_Type
-  </select>
-</mapper>

src/main/java/com/steerinfo/appservice/appcmmcarweightresults/model/AppCmmCarweightresults.java

@@ -1,1387 +0,0 @@
-package com.steerinfo.appservice.appcmmcarweightresults.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 AppCmmCarweightresults implements IBasePO<String> {
-    /**
-     * 作业编号(WGT_NO,VARCHAR,30)
-     */
-    @ApiModelProperty(value="作业编号",required=true)
-    private String wgtNo;
-
-    /**
-     * 票据单号(BILLNO,VARCHAR,30)
-     */
-    @ApiModelProperty(value="票据单号",required=false)
-    private String billno;
-
-    /**
-     * 计量委托编号(TRU_NO,VARCHAR,30)
-     */
-    @ApiModelProperty(value="计量委托编号",required=false)
-    private String truNo;
-
-    /**
-     * 计量批次号(LGS_NO,VARCHAR,30)
-     */
-    @ApiModelProperty(value="计量批次号",required=false)
-    private String lgsNo;
-
-    /**
-     * 车号(CAR_NO,VARCHAR,16)
-     */
-    @ApiModelProperty(value="车号",required=false)
-    private String carNo;
-
-    /**
-     * 车证卡号(ICD_NO,VARCHAR,10)
-     */
-    @ApiModelProperty(value="车证卡号",required=false)
-    private String icdNo;
-
-    /**
-     * 毛重车厢序号(用在轨道衡)(GRS_BOX_NO,DECIMAL,2)
-     */
-    @ApiModelProperty(value="毛重车厢序号(用在轨道衡)",required=false)
-    private Short grsBoxNo;
-
-    /**
-     * 皮重车厢序号(用在轨道衡)(TAR_BOX_NO,DECIMAL,2)
-     */
-    @ApiModelProperty(value="皮重车厢序号(用在轨道衡)",required=false)
-    private Short tarBoxNo;
-
-    /**
-     * 毛重车速(用在轨道衡)(GRS_SPD,DECIMAL,4)
-     */
-    @ApiModelProperty(value="毛重车速(用在轨道衡)",required=false)
-    private BigDecimal grsSpd;
-
-    /**
-     * 皮重车速(用在轨道衡)(TAR_SPD,DECIMAL,4)
-     */
-    @ApiModelProperty(value="皮重车速(用在轨道衡)",required=false)
-    private BigDecimal tarSpd;
-
-    /**
-     * 车型(用在轨道衡)(用在轨道衡)(TRN_TYPE,VARCHAR,10)
-     */
-    @ApiModelProperty(value="车型(用在轨道衡)(用在轨道衡)",required=false)
-    private String trnType;
-
-    /**
-     * 毛重录像文件名称(用在轨道衡)改用于成品与汽车对比分析表中的备注( MES报表)(GRS_VDO_FILE,VARCHAR,50)
-     */
-    @ApiModelProperty(value="毛重录像文件名称(用在轨道衡)改用于成品与汽车对比分析表中的备注( MES报表)",required=false)
-    private String grsVdoFile;
-
-    /**
-     * 皮重录像文件名称(用在轨道衡)(TAR_VDO_FILE,VARCHAR,50)
-     */
-    @ApiModelProperty(value="皮重录像文件名称(用在轨道衡)",required=false)
-    private String tarVdoFile;
-
-    /**
-     * 毛重列车编号(用在轨道衡)(GRS_TRN_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="毛重列车编号(用在轨道衡)",required=false)
-    private String grsTrnNo;
-
-    /**
-     * 皮重列车编号(用在轨道衡)(TAR_TRN_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="皮重列车编号(用在轨道衡)",required=false)
-    private String tarTrnNo;
-
-    /**
-     * 检斤类型(WGT_TYPE,VARCHAR,10)
-     */
-    @ApiModelProperty(value="检斤类型",required=false)
-    private String wgtType;
-
-    /**
-     * 毛重(GRS_WGT,DECIMAL,12)
-     */
-    @ApiModelProperty(value="毛重",required=false)
-    private BigDecimal grsWgt;
-
-    /**
-     * 皮重(TAR_WGT,DECIMAL,12)
-     */
-    @ApiModelProperty(value="皮重",required=false)
-    private BigDecimal tarWgt;
-
-    /**
-     * 净重(NET_WGT,DECIMAL,12)
-     */
-    @ApiModelProperty(value="净重",required=false)
-    private BigDecimal netWgt;
-
-    /**
-     * 第二磅单重量(NO2_WGT,DECIMAL,12)
-     */
-    @ApiModelProperty(value="第二磅单重量",required=false)
-    private BigDecimal no2Wgt;
-
-    /**
-     * 毛重计量编号(GRS_WGT_NO,VARCHAR,30)
-     */
-    @ApiModelProperty(value="毛重计量编号",required=false)
-    private String grsWgtNo;
-
-    /**
-     * 皮重计量编号(TAR_WGT_NO,VARCHAR,30)
-     */
-    @ApiModelProperty(value="皮重计量编号",required=false)
-    private String tarWgtNo;
-
-    /**
-     * "0=毛重
-1=常规皮重
-2=期限皮重 3=历史皮重，
-4=标识皮重，
-5=自重皮重(TAR_TYPE,CHAR,1)
-     */
-    @ApiModelProperty(value="0=毛重1=常规皮重2=期限皮重 3=历史皮重，4=标识皮重，5=自重皮重",required=false)
-    private String tarType;
-
-    /**
-     * 皮重来源0=仪表采集，1=手工录入(TAR_INF_MODE,CHAR,1)
-     */
-    @ApiModelProperty(value="皮重来源0=仪表采集，1=手工录入",required=false)
-    private String tarInfMode;
-
-    /**
-     * 毛重来源0=仪表采集，1=手工录入(GRS_INF_MODE,CHAR,1)
-     */
-    @ApiModelProperty(value="毛重来源0=仪表采集，1=手工录入",required=false)
-    private String grsInfMode;
-
-    /**
-     * 净重来源0=计算，1=手工录入(NET_INF_MODE,CHAR,1)
-     */
-    @ApiModelProperty(value="净重来源0=计算，1=手工录入",required=false)
-    private String netInfMode;
-
-    /**
-     * 毛重时间(GRS_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="毛重时间",required=false)
-    private Date grsTime;
-
-    /**
-     * 皮重时间(TAR_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="皮重时间",required=false)
-    private Date tarTime;
-
-    /**
-     * 二次计量时间(NET_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="二次计量时间",required=false)
-    private Date netTime;
-
-    /**
-     * 毛重班次(GRS_WRK_ORD,VARCHAR,10)
-     */
-    @ApiModelProperty(value="毛重班次",required=false)
-    private String grsWrkOrd;
-
-    /**
-     * 皮重班次(TAR_WRK_ORD,VARCHAR,10)
-     */
-    @ApiModelProperty(value="皮重班次",required=false)
-    private String tarWrkOrd;
-
-    /**
-     * 净重班次(NET_WRK_ORD,VARCHAR,10)
-     */
-    @ApiModelProperty(value="净重班次",required=false)
-    private String netWrkOrd;
-
-    /**
-     * 毛重班别(GRS_WRK_GRP,VARCHAR,10)
-     */
-    @ApiModelProperty(value="毛重班别",required=false)
-    private String grsWrkGrp;
-
-    /**
-     * 皮重班别(TAR_WRK_GRP,VARCHAR,10)
-     */
-    @ApiModelProperty(value="皮重班别",required=false)
-    private String tarWrkGrp;
-
-    /**
-     * 净重班别(NET_WRK_GRP,VARCHAR,10)
-     */
-    @ApiModelProperty(value="净重班别",required=false)
-    private String netWrkGrp;
-
-    /**
-     * 毛重计量员(GRS_OPR,VARCHAR,10)
-     */
-    @ApiModelProperty(value="毛重计量员",required=false)
-    private String grsOpr;
-
-    /**
-     * 皮重计量员(TAR_OPR,VARCHAR,10)
-     */
-    @ApiModelProperty(value="皮重计量员",required=false)
-    private String tarOpr;
-
-    /**
-     * 净重计量员(NET_OPR,VARCHAR,10)
-     */
-    @ApiModelProperty(value="净重计量员",required=false)
-    private String netOpr;
-
-    /**
-     * 毛重计量点(GRS_PNT_NAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="毛重计量点",required=false)
-    private String grsPntName;
-
-    /**
-     * 皮重计量点(TAR_PNT_NAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="皮重计量点",required=false)
-    private String tarPntName;
-
-    /**
-     * 净重计量点(NET_PNT_NAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="净重计量点",required=false)
-    private String netPntName;
-
-    /**
-     * 毛重计量点编号(GRS_PNT_NO,VARCHAR,10)
-     */
-    @ApiModelProperty(value="毛重计量点编号",required=false)
-    private String grsPntNo;
-
-    /**
-     * 皮重计量点编号(TAR_PNT_NO,VARCHAR,10)
-     */
-    @ApiModelProperty(value="皮重计量点编号",required=false)
-    private String tarPntNo;
-
-    /**
-     * 净重计量点编号(NET_PNT_NO,VARCHAR,10)
-     */
-    @ApiModelProperty(value="净重计量点编号",required=false)
-    private String netPntNo;
-
-    /**
-     * 备注(NOTE,VARCHAR,100)
-     */
-    @ApiModelProperty(value="备注",required=false)
-    private String note;
-
-    /**
-     * 发货点类型(SDR_TYPE,VARCHAR,20)
-     */
-    @ApiModelProperty(value="发货点类型",required=false)
-    private String sdrType;
-
-    /**
-     * 发货单位(SDR_NAME,VARCHAR,100)
-     */
-    @ApiModelProperty(value="发货单位",required=false)
-    private String sdrName;
-
-    /**
-     * 发货单位编码(SENDER,VARCHAR,20)
-     */
-    @ApiModelProperty(value="发货单位编码",required=false)
-    private String sender;
-
-    /**
-     * 发货点备注(即货源)(SDR_NOTE,VARCHAR,100)
-     */
-    @ApiModelProperty(value="发货点备注(即货源)",required=false)
-    private String sdrNote;
-
-    /**
-     * 收货点类型(RCV_TYPE,VARCHAR,20)
-     */
-    @ApiModelProperty(value="收货点类型",required=false)
-    private String rcvType;
-
-    /**
-     * 收货单位(RCV_NAME,VARCHAR,100)
-     */
-    @ApiModelProperty(value="收货单位",required=false)
-    private String rcvName;
-
-    /**
-     * 收货单位编码(RECEIVER,VARCHAR,20)
-     */
-    @ApiModelProperty(value="收货单位编码",required=false)
-    private String receiver;
-
-    /**
-     * 收货点备注(RCV_NOTE,VARCHAR,100)
-     */
-    @ApiModelProperty(value="收货点备注",required=false)
-    private String rcvNote;
-
-    /**
-     * 物料名称(MAT_NAME,VARCHAR,50)
-     */
-    @ApiModelProperty(value="物料名称",required=false)
-    private String matName;
-
-    /**
-     * 物料编码(MAT_CODE,VARCHAR,20)
-     */
-    @ApiModelProperty(value="物料编码",required=false)
-    private String matCode;
-
-    /**
-     * 小票打印次数(B1_PRN_NUM,DECIMAL,3)
-     */
-    @ApiModelProperty(value="小票打印次数",required=false)
-    private Short b1PrnNum;
-
-    /**
-     * 大票打印次数(B2_PRN_NUM,DECIMAL,3)
-     */
-    @ApiModelProperty(value="大票打印次数",required=false)
-    private Short b2PrnNum;
-
-    /**
-     * 小票2打印次数(B1_PRN_NUM_2,DECIMAL,3)
-     */
-    @ApiModelProperty(value="小票2打印次数",required=false)
-    private Short b1PrnNum2;
-
-    /**
-     * MES上传标志 0：未上传，1：上传成功，2：撤销成功，3：撤销失败，4：上传失败(UPL_FLG,VARCHAR,1)
-     */
-    @ApiModelProperty(value="MES上传标志 0：未上传，1：上传成功，2：撤销成功，3：撤销失败，4：上传失败",required=false)
-    private String uplFlg;
-
-    /**
-     * mes上传时间(UPL_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="mes上传时间",required=false)
-    private Date uplTime;
-
-    /**
-     * 是否删除：0=有效，1=无效，2=删除(DEL_FLG,VARCHAR,1)
-     */
-    @ApiModelProperty(value="是否删除：0=有效，1=无效，2=删除",required=false)
-    private String delFlg;
-
-    /**
-     * 是否换长数据(用在轨道衡)0=未换长，1=换长(EXT_BOX,CHAR,1)
-     */
-    @ApiModelProperty(value="是否换长数据(用在轨道衡)0=未换长，1=换长",required=false)
-    private String extBox;
-
-    /**
-     * 预报总重(对方毛重)(SDR_GRS_WGT,DECIMAL,12)
-     */
-    @ApiModelProperty(value="预报总重(对方毛重)",required=false)
-    private BigDecimal sdrGrsWgt;
-
-    /**
-     * 预报皮重(对方皮重)(SDR_TAR_WGT,DECIMAL,12)
-     */
-    @ApiModelProperty(value="预报皮重(对方皮重)",required=false)
-    private BigDecimal sdrTarWgt;
-
-    /**
-     * 预报净重(对方净重)(SDR_NET_WGT,DECIMAL,12)
-     */
-    @ApiModelProperty(value="预报净重(对方净重)",required=false)
-    private BigDecimal sdrNetWgt;
-
-    /**
-     * 应扣除重量(KG)(DIS_WGT,DECIMAL,12)
-     */
-    @ApiModelProperty(value="应扣除重量(KG)",required=false)
-    private BigDecimal disWgt;
-
-    /**
-     * 应扣比率%(DIS_RATIO,DECIMAL,4)
-     */
-    @ApiModelProperty(value="应扣比率%",required=false)
-    private BigDecimal disRatio;
-
-    /**
-     * 最终净重（扣水扣渣后净重）(NET_END,DECIMAL,12)
-     */
-    @ApiModelProperty(value="最终净重（扣水扣渣后净重）",required=false)
-    private BigDecimal netEnd;
-
-    /**
-     * 一次计量方式(NO1_WGT_MODE,VARCHAR,10)
-     */
-    @ApiModelProperty(value="一次计量方式",required=false)
-    private String no1WgtMode;
-
-    /**
-     * 二次次计量方式(NO2_WGT_MODE,VARCHAR,10)
-     */
-    @ApiModelProperty(value="二次次计量方式",required=false)
-    private String no2WgtMode;
-
-    /**
-     * rfid号(RFID_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="rfid号",required=false)
-    private String rfidNo;
-
-    /**
-     * 审核标记；0=未审核，1=审核(CHK_FLG,VARCHAR,1)
-     */
-    @ApiModelProperty(value="审核标记；0=未审核，1=审核",required=false)
-    private String chkFlg;
-
-    /**
-     * 审核人(CHECKER,VARCHAR,20)
-     */
-    @ApiModelProperty(value="审核人",required=false)
-    private String checker;
-
-    /**
-     * 审核时间(CHK_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="审核时间",required=false)
-    private Date chkTime;
-
-    /**
-     * 修改操作人(CHM_PER,VARCHAR,20)
-     */
-    @ApiModelProperty(value="修改操作人",required=false)
-    private String chmPer;
-
-    /**
-     * 修改时间(CHM_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="修改时间",required=false)
-    private Date chmTime;
-
-    /**
-     * 修改类型(CHM_TYPE,VARCHAR,20)
-     */
-    @ApiModelProperty(value="修改类型",required=false)
-    private String chmType;
-
-    /**
-     * 运输单位编码(TRANSPORT,VARCHAR,20)
-     */
-    @ApiModelProperty(value="运输单位编码",required=false)
-    private String transport;
-
-    /**
-     * 运输单位(TRANS_NAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="运输单位",required=false)
-    private String transName;
-
-    /**
-     * 毛重曲线(GRS_WGT_CURVE,VARCHAR,2000)
-     */
-    @ApiModelProperty(value="毛重曲线",required=false)
-    private String grsWgtCurve;
-
-    /**
-     * 皮重曲线(TAR_WGT_CURVE,VARCHAR,2000)
-     */
-    @ApiModelProperty(value="皮重曲线",required=false)
-    private String tarWgtCurve;
-
-    /**
-     * 扣渣人(DIS_OPR,VARCHAR,20)
-     */
-    @ApiModelProperty(value="扣渣人",required=false)
-    private String disOpr;
-
-    /**
-     * 扣渣时间(DIS_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="扣渣时间",required=false)
-    private Date disTime;
-
-    /**
-     * 方大上传标志，0没上传，1已上传(FD_UPFLG,VARCHAR,1)
-     */
-    @ApiModelProperty(value="方大上传标志，0没上传，1已上传",required=false)
-    private String fdUpflg;
-
-    /**
-     * 船转汽标志(CH_UP,VARCHAR,1)
-     */
-    @ApiModelProperty(value="船转汽标志",required=false)
-    private String chUp;
-
-    /**
-     * 船转汽操作人(CH_OPR,VARCHAR,20)
-     */
-    @ApiModelProperty(value="船转汽操作人",required=false)
-    private String chOpr;
-
-    /**
-     * 船转汽操作时间(CH_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="船转汽操作时间",required=false)
-    private Date chTime;
-
-    /**
-     * 提单号(TD_NO,VARCHAR,40)
-     */
-    @ApiModelProperty(value="提单号",required=false)
-    private String tdNo;
-
-    /**
-     * 提单量(TD_WGT,DECIMAL,16)
-     */
-    @ApiModelProperty(value="提单量",required=false)
-    private BigDecimal tdWgt;
-
-    /**
-     * 订单号(DD_NO,VARCHAR,40)
-     */
-    @ApiModelProperty(value="订单号",required=false)
-    private String ddNo;
-
-    private static final long serialVersionUID = 1L;
-
-    @Override
-    public String getId() {
-        return this.wgtNo;
-    }
-
-    @Override
-    public void setId(String wgtNo) {
-        this.wgtNo = wgtNo == null ? null : wgtNo.trim();
-    }
-
-    public String getWgtNo() {
-        return wgtNo;
-    }
-
-    public void setWgtNo(String wgtNo) {
-        this.wgtNo = wgtNo == null ? null : wgtNo.trim();
-    }
-
-    public String getBillno() {
-        return billno;
-    }
-
-    public void setBillno(String billno) {
-        this.billno = billno == null ? null : billno.trim();
-    }
-
-    public String getTruNo() {
-        return truNo;
-    }
-
-    public void setTruNo(String truNo) {
-        this.truNo = truNo == null ? null : truNo.trim();
-    }
-
-    public String getLgsNo() {
-        return lgsNo;
-    }
-
-    public void setLgsNo(String lgsNo) {
-        this.lgsNo = lgsNo == null ? null : lgsNo.trim();
-    }
-
-    public String getCarNo() {
-        return carNo;
-    }
-
-    public void setCarNo(String carNo) {
-        this.carNo = carNo == null ? null : carNo.trim();
-    }
-
-    public String getIcdNo() {
-        return icdNo;
-    }
-
-    public void setIcdNo(String icdNo) {
-        this.icdNo = icdNo == null ? null : icdNo.trim();
-    }
-
-    public Short getGrsBoxNo() {
-        return grsBoxNo;
-    }
-
-    public void setGrsBoxNo(Short grsBoxNo) {
-        this.grsBoxNo = grsBoxNo;
-    }
-
-    public Short getTarBoxNo() {
-        return tarBoxNo;
-    }
-
-    public void setTarBoxNo(Short tarBoxNo) {
-        this.tarBoxNo = tarBoxNo;
-    }
-
-    public BigDecimal getGrsSpd() {
-        return grsSpd;
-    }
-
-    public void setGrsSpd(BigDecimal grsSpd) {
-        this.grsSpd = grsSpd;
-    }
-
-    public BigDecimal getTarSpd() {
-        return tarSpd;
-    }
-
-    public void setTarSpd(BigDecimal tarSpd) {
-        this.tarSpd = tarSpd;
-    }
-
-    public String getTrnType() {
-        return trnType;
-    }
-
-    public void setTrnType(String trnType) {
-        this.trnType = trnType == null ? null : trnType.trim();
-    }
-
-    public String getGrsVdoFile() {
-        return grsVdoFile;
-    }
-
-    public void setGrsVdoFile(String grsVdoFile) {
-        this.grsVdoFile = grsVdoFile == null ? null : grsVdoFile.trim();
-    }
-
-    public String getTarVdoFile() {
-        return tarVdoFile;
-    }
-
-    public void setTarVdoFile(String tarVdoFile) {
-        this.tarVdoFile = tarVdoFile == null ? null : tarVdoFile.trim();
-    }
-
-    public String getGrsTrnNo() {
-        return grsTrnNo;
-    }
-
-    public void setGrsTrnNo(String grsTrnNo) {
-        this.grsTrnNo = grsTrnNo == null ? null : grsTrnNo.trim();
-    }
-
-    public String getTarTrnNo() {
-        return tarTrnNo;
-    }
-
-    public void setTarTrnNo(String tarTrnNo) {
-        this.tarTrnNo = tarTrnNo == null ? null : tarTrnNo.trim();
-    }
-
-    public String getWgtType() {
-        return wgtType;
-    }
-
-    public void setWgtType(String wgtType) {
-        this.wgtType = wgtType == null ? null : wgtType.trim();
-    }
-
-    public BigDecimal getGrsWgt() {
-        return grsWgt;
-    }
-
-    public void setGrsWgt(BigDecimal grsWgt) {
-        this.grsWgt = grsWgt;
-    }
-
-    public BigDecimal getTarWgt() {
-        return tarWgt;
-    }
-
-    public void setTarWgt(BigDecimal tarWgt) {
-        this.tarWgt = tarWgt;
-    }
-
-    public BigDecimal getNetWgt() {
-        return netWgt;
-    }
-
-    public void setNetWgt(BigDecimal netWgt) {
-        this.netWgt = netWgt;
-    }
-
-    public BigDecimal getNo2Wgt() {
-        return no2Wgt;
-    }
-
-    public void setNo2Wgt(BigDecimal no2Wgt) {
-        this.no2Wgt = no2Wgt;
-    }
-
-    public String getGrsWgtNo() {
-        return grsWgtNo;
-    }
-
-    public void setGrsWgtNo(String grsWgtNo) {
-        this.grsWgtNo = grsWgtNo == null ? null : grsWgtNo.trim();
-    }
-
-    public String getTarWgtNo() {
-        return tarWgtNo;
-    }
-
-    public void setTarWgtNo(String tarWgtNo) {
-        this.tarWgtNo = tarWgtNo == null ? null : tarWgtNo.trim();
-    }
-
-    public String getTarType() {
-        return tarType;
-    }
-
-    public void setTarType(String tarType) {
-        this.tarType = tarType == null ? null : tarType.trim();
-    }
-
-    public String getTarInfMode() {
-        return tarInfMode;
-    }
-
-    public void setTarInfMode(String tarInfMode) {
-        this.tarInfMode = tarInfMode == null ? null : tarInfMode.trim();
-    }
-
-    public String getGrsInfMode() {
-        return grsInfMode;
-    }
-
-    public void setGrsInfMode(String grsInfMode) {
-        this.grsInfMode = grsInfMode == null ? null : grsInfMode.trim();
-    }
-
-    public String getNetInfMode() {
-        return netInfMode;
-    }
-
-    public void setNetInfMode(String netInfMode) {
-        this.netInfMode = netInfMode == null ? null : netInfMode.trim();
-    }
-
-    public Date getGrsTime() {
-        return grsTime;
-    }
-
-    public void setGrsTime(Date grsTime) {
-        this.grsTime = grsTime;
-    }
-
-    public Date getTarTime() {
-        return tarTime;
-    }
-
-    public void setTarTime(Date tarTime) {
-        this.tarTime = tarTime;
-    }
-
-    public Date getNetTime() {
-        return netTime;
-    }
-
-    public void setNetTime(Date netTime) {
-        this.netTime = netTime;
-    }
-
-    public String getGrsWrkOrd() {
-        return grsWrkOrd;
-    }
-
-    public void setGrsWrkOrd(String grsWrkOrd) {
-        this.grsWrkOrd = grsWrkOrd == null ? null : grsWrkOrd.trim();
-    }
-
-    public String getTarWrkOrd() {
-        return tarWrkOrd;
-    }
-
-    public void setTarWrkOrd(String tarWrkOrd) {
-        this.tarWrkOrd = tarWrkOrd == null ? null : tarWrkOrd.trim();
-    }
-
-    public String getNetWrkOrd() {
-        return netWrkOrd;
-    }
-
-    public void setNetWrkOrd(String netWrkOrd) {
-        this.netWrkOrd = netWrkOrd == null ? null : netWrkOrd.trim();
-    }
-
-    public String getGrsWrkGrp() {
-        return grsWrkGrp;
-    }
-
-    public void setGrsWrkGrp(String grsWrkGrp) {
-        this.grsWrkGrp = grsWrkGrp == null ? null : grsWrkGrp.trim();
-    }
-
-    public String getTarWrkGrp() {
-        return tarWrkGrp;
-    }
-
-    public void setTarWrkGrp(String tarWrkGrp) {
-        this.tarWrkGrp = tarWrkGrp == null ? null : tarWrkGrp.trim();
-    }
-
-    public String getNetWrkGrp() {
-        return netWrkGrp;
-    }
-
-    public void setNetWrkGrp(String netWrkGrp) {
-        this.netWrkGrp = netWrkGrp == null ? null : netWrkGrp.trim();
-    }
-
-    public String getGrsOpr() {
-        return grsOpr;
-    }
-
-    public void setGrsOpr(String grsOpr) {
-        this.grsOpr = grsOpr == null ? null : grsOpr.trim();
-    }
-
-    public String getTarOpr() {
-        return tarOpr;
-    }
-
-    public void setTarOpr(String tarOpr) {
-        this.tarOpr = tarOpr == null ? null : tarOpr.trim();
-    }
-
-    public String getNetOpr() {
-        return netOpr;
-    }
-
-    public void setNetOpr(String netOpr) {
-        this.netOpr = netOpr == null ? null : netOpr.trim();
-    }
-
-    public String getGrsPntName() {
-        return grsPntName;
-    }
-
-    public void setGrsPntName(String grsPntName) {
-        this.grsPntName = grsPntName == null ? null : grsPntName.trim();
-    }
-
-    public String getTarPntName() {
-        return tarPntName;
-    }
-
-    public void setTarPntName(String tarPntName) {
-        this.tarPntName = tarPntName == null ? null : tarPntName.trim();
-    }
-
-    public String getNetPntName() {
-        return netPntName;
-    }
-
-    public void setNetPntName(String netPntName) {
-        this.netPntName = netPntName == null ? null : netPntName.trim();
-    }
-
-    public String getGrsPntNo() {
-        return grsPntNo;
-    }
-
-    public void setGrsPntNo(String grsPntNo) {
-        this.grsPntNo = grsPntNo == null ? null : grsPntNo.trim();
-    }
-
-    public String getTarPntNo() {
-        return tarPntNo;
-    }
-
-    public void setTarPntNo(String tarPntNo) {
-        this.tarPntNo = tarPntNo == null ? null : tarPntNo.trim();
-    }
-
-    public String getNetPntNo() {
-        return netPntNo;
-    }
-
-    public void setNetPntNo(String netPntNo) {
-        this.netPntNo = netPntNo == null ? null : netPntNo.trim();
-    }
-
-    public String getNote() {
-        return note;
-    }
-
-    public void setNote(String note) {
-        this.note = note == null ? null : note.trim();
-    }
-
-    public String getSdrType() {
-        return sdrType;
-    }
-
-    public void setSdrType(String sdrType) {
-        this.sdrType = sdrType == null ? null : sdrType.trim();
-    }
-
-    public String getSdrName() {
-        return sdrName;
-    }
-
-    public void setSdrName(String sdrName) {
-        this.sdrName = sdrName == null ? null : sdrName.trim();
-    }
-
-    public String getSender() {
-        return sender;
-    }
-
-    public void setSender(String sender) {
-        this.sender = sender == null ? null : sender.trim();
-    }
-
-    public String getSdrNote() {
-        return sdrNote;
-    }
-
-    public void setSdrNote(String sdrNote) {
-        this.sdrNote = sdrNote == null ? null : sdrNote.trim();
-    }
-
-    public String getRcvType() {
-        return rcvType;
-    }
-
-    public void setRcvType(String rcvType) {
-        this.rcvType = rcvType == null ? null : rcvType.trim();
-    }
-
-    public String getRcvName() {
-        return rcvName;
-    }
-
-    public void setRcvName(String rcvName) {
-        this.rcvName = rcvName == null ? null : rcvName.trim();
-    }
-
-    public String getReceiver() {
-        return receiver;
-    }
-
-    public void setReceiver(String receiver) {
-        this.receiver = receiver == null ? null : receiver.trim();
-    }
-
-    public String getRcvNote() {
-        return rcvNote;
-    }
-
-    public void setRcvNote(String rcvNote) {
-        this.rcvNote = rcvNote == null ? null : rcvNote.trim();
-    }
-
-    public String getMatName() {
-        return matName;
-    }
-
-    public void setMatName(String matName) {
-        this.matName = matName == null ? null : matName.trim();
-    }
-
-    public String getMatCode() {
-        return matCode;
-    }
-
-    public void setMatCode(String matCode) {
-        this.matCode = matCode == null ? null : matCode.trim();
-    }
-
-    public Short getB1PrnNum() {
-        return b1PrnNum;
-    }
-
-    public void setB1PrnNum(Short b1PrnNum) {
-        this.b1PrnNum = b1PrnNum;
-    }
-
-    public Short getB2PrnNum() {
-        return b2PrnNum;
-    }
-
-    public void setB2PrnNum(Short b2PrnNum) {
-        this.b2PrnNum = b2PrnNum;
-    }
-
-    public Short getB1PrnNum2() {
-        return b1PrnNum2;
-    }
-
-    public void setB1PrnNum2(Short b1PrnNum2) {
-        this.b1PrnNum2 = b1PrnNum2;
-    }
-
-    public String getUplFlg() {
-        return uplFlg;
-    }
-
-    public void setUplFlg(String uplFlg) {
-        this.uplFlg = uplFlg == null ? null : uplFlg.trim();
-    }
-
-    public Date getUplTime() {
-        return uplTime;
-    }
-
-    public void setUplTime(Date uplTime) {
-        this.uplTime = uplTime;
-    }
-
-    public String getDelFlg() {
-        return delFlg;
-    }
-
-    public void setDelFlg(String delFlg) {
-        this.delFlg = delFlg == null ? null : delFlg.trim();
-    }
-
-    public String getExtBox() {
-        return extBox;
-    }
-
-    public void setExtBox(String extBox) {
-        this.extBox = extBox == null ? null : extBox.trim();
-    }
-
-    public BigDecimal getSdrGrsWgt() {
-        return sdrGrsWgt;
-    }
-
-    public void setSdrGrsWgt(BigDecimal sdrGrsWgt) {
-        this.sdrGrsWgt = sdrGrsWgt;
-    }
-
-    public BigDecimal getSdrTarWgt() {
-        return sdrTarWgt;
-    }
-
-    public void setSdrTarWgt(BigDecimal sdrTarWgt) {
-        this.sdrTarWgt = sdrTarWgt;
-    }
-
-    public BigDecimal getSdrNetWgt() {
-        return sdrNetWgt;
-    }
-
-    public void setSdrNetWgt(BigDecimal sdrNetWgt) {
-        this.sdrNetWgt = sdrNetWgt;
-    }
-
-    public BigDecimal getDisWgt() {
-        return disWgt;
-    }
-
-    public void setDisWgt(BigDecimal disWgt) {
-        this.disWgt = disWgt;
-    }
-
-    public BigDecimal getDisRatio() {
-        return disRatio;
-    }
-
-    public void setDisRatio(BigDecimal disRatio) {
-        this.disRatio = disRatio;
-    }
-
-    public BigDecimal getNetEnd() {
-        return netEnd;
-    }
-
-    public void setNetEnd(BigDecimal netEnd) {
-        this.netEnd = netEnd;
-    }
-
-    public String getNo1WgtMode() {
-        return no1WgtMode;
-    }
-
-    public void setNo1WgtMode(String no1WgtMode) {
-        this.no1WgtMode = no1WgtMode == null ? null : no1WgtMode.trim();
-    }
-
-    public String getNo2WgtMode() {
-        return no2WgtMode;
-    }
-
-    public void setNo2WgtMode(String no2WgtMode) {
-        this.no2WgtMode = no2WgtMode == null ? null : no2WgtMode.trim();
-    }
-
-    public String getRfidNo() {
-        return rfidNo;
-    }
-
-    public void setRfidNo(String rfidNo) {
-        this.rfidNo = rfidNo == null ? null : rfidNo.trim();
-    }
-
-    public String getChkFlg() {
-        return chkFlg;
-    }
-
-    public void setChkFlg(String chkFlg) {
-        this.chkFlg = chkFlg == null ? null : chkFlg.trim();
-    }
-
-    public String getChecker() {
-        return checker;
-    }
-
-    public void setChecker(String checker) {
-        this.checker = checker == null ? null : checker.trim();
-    }
-
-    public Date getChkTime() {
-        return chkTime;
-    }
-
-    public void setChkTime(Date chkTime) {
-        this.chkTime = chkTime;
-    }
-
-    public String getChmPer() {
-        return chmPer;
-    }
-
-    public void setChmPer(String chmPer) {
-        this.chmPer = chmPer == null ? null : chmPer.trim();
-    }
-
-    public Date getChmTime() {
-        return chmTime;
-    }
-
-    public void setChmTime(Date chmTime) {
-        this.chmTime = chmTime;
-    }
-
-    public String getChmType() {
-        return chmType;
-    }
-
-    public void setChmType(String chmType) {
-        this.chmType = chmType == null ? null : chmType.trim();
-    }
-
-    public String getTransport() {
-        return transport;
-    }
-
-    public void setTransport(String transport) {
-        this.transport = transport == null ? null : transport.trim();
-    }
-
-    public String getTransName() {
-        return transName;
-    }
-
-    public void setTransName(String transName) {
-        this.transName = transName == null ? null : transName.trim();
-    }
-
-    public String getGrsWgtCurve() {
-        return grsWgtCurve;
-    }
-
-    public void setGrsWgtCurve(String grsWgtCurve) {
-        this.grsWgtCurve = grsWgtCurve == null ? null : grsWgtCurve.trim();
-    }
-
-    public String getTarWgtCurve() {
-        return tarWgtCurve;
-    }
-
-    public void setTarWgtCurve(String tarWgtCurve) {
-        this.tarWgtCurve = tarWgtCurve == null ? null : tarWgtCurve.trim();
-    }
-
-    public String getDisOpr() {
-        return disOpr;
-    }
-
-    public void setDisOpr(String disOpr) {
-        this.disOpr = disOpr == null ? null : disOpr.trim();
-    }
-
-    public Date getDisTime() {
-        return disTime;
-    }
-
-    public void setDisTime(Date disTime) {
-        this.disTime = disTime;
-    }
-
-    public String getFdUpflg() {
-        return fdUpflg;
-    }
-
-    public void setFdUpflg(String fdUpflg) {
-        this.fdUpflg = fdUpflg == null ? null : fdUpflg.trim();
-    }
-
-    public String getChUp() {
-        return chUp;
-    }
-
-    public void setChUp(String chUp) {
-        this.chUp = chUp == null ? null : chUp.trim();
-    }
-
-    public String getChOpr() {
-        return chOpr;
-    }
-
-    public void setChOpr(String chOpr) {
-        this.chOpr = chOpr == null ? null : chOpr.trim();
-    }
-
-    public Date getChTime() {
-        return chTime;
-    }
-
-    public void setChTime(Date chTime) {
-        this.chTime = chTime;
-    }
-
-    public String getTdNo() {
-        return tdNo;
-    }
-
-    public void setTdNo(String tdNo) {
-        this.tdNo = tdNo == null ? null : tdNo.trim();
-    }
-
-    public BigDecimal getTdWgt() {
-        return tdWgt;
-    }
-
-    public void setTdWgt(BigDecimal tdWgt) {
-        this.tdWgt = tdWgt;
-    }
-
-    public String getDdNo() {
-        return ddNo;
-    }
-
-    public void setDdNo(String ddNo) {
-        this.ddNo = ddNo == null ? null : ddNo.trim();
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", wgtNo=").append(wgtNo);
-        sb.append(", billno=").append(billno);
-        sb.append(", truNo=").append(truNo);
-        sb.append(", lgsNo=").append(lgsNo);
-        sb.append(", carNo=").append(carNo);
-        sb.append(", icdNo=").append(icdNo);
-        sb.append(", grsBoxNo=").append(grsBoxNo);
-        sb.append(", tarBoxNo=").append(tarBoxNo);
-        sb.append(", grsSpd=").append(grsSpd);
-        sb.append(", tarSpd=").append(tarSpd);
-        sb.append(", trnType=").append(trnType);
-        sb.append(", grsVdoFile=").append(grsVdoFile);
-        sb.append(", tarVdoFile=").append(tarVdoFile);
-        sb.append(", grsTrnNo=").append(grsTrnNo);
-        sb.append(", tarTrnNo=").append(tarTrnNo);
-        sb.append(", wgtType=").append(wgtType);
-        sb.append(", grsWgt=").append(grsWgt);
-        sb.append(", tarWgt=").append(tarWgt);
-        sb.append(", netWgt=").append(netWgt);
-        sb.append(", no2Wgt=").append(no2Wgt);
-        sb.append(", grsWgtNo=").append(grsWgtNo);
-        sb.append(", tarWgtNo=").append(tarWgtNo);
-        sb.append(", tarType=").append(tarType);
-        sb.append(", tarInfMode=").append(tarInfMode);
-        sb.append(", grsInfMode=").append(grsInfMode);
-        sb.append(", netInfMode=").append(netInfMode);
-        sb.append(", grsTime=").append(grsTime);
-        sb.append(", tarTime=").append(tarTime);
-        sb.append(", netTime=").append(netTime);
-        sb.append(", grsWrkOrd=").append(grsWrkOrd);
-        sb.append(", tarWrkOrd=").append(tarWrkOrd);
-        sb.append(", netWrkOrd=").append(netWrkOrd);
-        sb.append(", grsWrkGrp=").append(grsWrkGrp);
-        sb.append(", tarWrkGrp=").append(tarWrkGrp);
-        sb.append(", netWrkGrp=").append(netWrkGrp);
-        sb.append(", grsOpr=").append(grsOpr);
-        sb.append(", tarOpr=").append(tarOpr);
-        sb.append(", netOpr=").append(netOpr);
-        sb.append(", grsPntName=").append(grsPntName);
-        sb.append(", tarPntName=").append(tarPntName);
-        sb.append(", netPntName=").append(netPntName);
-        sb.append(", grsPntNo=").append(grsPntNo);
-        sb.append(", tarPntNo=").append(tarPntNo);
-        sb.append(", netPntNo=").append(netPntNo);
-        sb.append(", note=").append(note);
-        sb.append(", sdrType=").append(sdrType);
-        sb.append(", sdrName=").append(sdrName);
-        sb.append(", sender=").append(sender);
-        sb.append(", sdrNote=").append(sdrNote);
-        sb.append(", rcvType=").append(rcvType);
-        sb.append(", rcvName=").append(rcvName);
-        sb.append(", receiver=").append(receiver);
-        sb.append(", rcvNote=").append(rcvNote);
-        sb.append(", matName=").append(matName);
-        sb.append(", matCode=").append(matCode);
-        sb.append(", b1PrnNum=").append(b1PrnNum);
-        sb.append(", b2PrnNum=").append(b2PrnNum);
-        sb.append(", b1PrnNum2=").append(b1PrnNum2);
-        sb.append(", uplFlg=").append(uplFlg);
-        sb.append(", uplTime=").append(uplTime);
-        sb.append(", delFlg=").append(delFlg);
-        sb.append(", extBox=").append(extBox);
-        sb.append(", sdrGrsWgt=").append(sdrGrsWgt);
-        sb.append(", sdrTarWgt=").append(sdrTarWgt);
-        sb.append(", sdrNetWgt=").append(sdrNetWgt);
-        sb.append(", disWgt=").append(disWgt);
-        sb.append(", disRatio=").append(disRatio);
-        sb.append(", netEnd=").append(netEnd);
-        sb.append(", no1WgtMode=").append(no1WgtMode);
-        sb.append(", no2WgtMode=").append(no2WgtMode);
-        sb.append(", rfidNo=").append(rfidNo);
-        sb.append(", chkFlg=").append(chkFlg);
-        sb.append(", checker=").append(checker);
-        sb.append(", chkTime=").append(chkTime);
-        sb.append(", chmPer=").append(chmPer);
-        sb.append(", chmTime=").append(chmTime);
-        sb.append(", chmType=").append(chmType);
-        sb.append(", transport=").append(transport);
-        sb.append(", transName=").append(transName);
-        sb.append(", grsWgtCurve=").append(grsWgtCurve);
-        sb.append(", tarWgtCurve=").append(tarWgtCurve);
-        sb.append(", disOpr=").append(disOpr);
-        sb.append(", disTime=").append(disTime);
-        sb.append(", fdUpflg=").append(fdUpflg);
-        sb.append(", chUp=").append(chUp);
-        sb.append(", chOpr=").append(chOpr);
-        sb.append(", chTime=").append(chTime);
-        sb.append(", tdNo=").append(tdNo);
-        sb.append(", tdWgt=").append(tdWgt);
-        sb.append(", ddNo=").append(ddNo);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}

src/main/java/com/steerinfo/appservice/appcmmcarweightresults/service/IAppCmmCarweightresultsService.java

@@ -1,41 +0,0 @@
-package com.steerinfo.appservice.appcmmcarweightresults.service;
-
-import com.steerinfo.framework.service.IBaseService;
-import com.steerinfo.appservice.appcmmcarweightresults.model.AppCmmCarweightresults;
-import com.steerinfo.framework.service.pagehelper.PageList;
-
-import java.util.HashMap;
-
-/**
- * AppCmmCarweightresults服务接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-11-05 11:06
- * 类描述
- * 修订历史：
- * 日期：2021-11-05
- * 作者：generator
- * 参考：
- * 描述：AppCmmCarweightresults服务接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-public interface IAppCmmCarweightresultsService extends IBaseService<AppCmmCarweightresults, String>{
-
-    /**
-     * 车辆管理-计量实绩-明细查询（新系统）
-     * @param parmas
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    PageList<AppCmmCarweightresults> selectNetByCarOld(HashMap parmas, Integer pageNum, Integer pageSize);
-
-    /**
-     * 车辆管理-计量实绩-分类查询汇总（旧系统）
-     * @param parmas
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    PageList<AppCmmCarweightresults> selectSumForAppByCarOld(HashMap parmas, Integer pageNum, Integer pageSize);
-}

src/main/java/com/steerinfo/appservice/appcmmcarweightresults/service/impl/AppCmmCarweightresultsServiceImpl.java

@@ -1,93 +0,0 @@
-package com.steerinfo.appservice.appcmmcarweightresults.service.impl;
-
-import com.steerinfo.appservice.appmeterworkcaractual.model.AppMeterWorkCarActual;
-import com.steerinfo.appservice.dto.AppMeterWorkCarActualDemo;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
-import com.steerinfo.appservice.appcmmcarweightresults.model.AppCmmCarweightresults;
-import com.steerinfo.appservice.appcmmcarweightresults.mapper.AppCmmCarweightresultsMapper;
-import com.steerinfo.appservice.appcmmcarweightresults.service.IAppCmmCarweightresultsService;
-import com.steerinfo.framework.service.pagehelper.PageHelper;
-import com.steerinfo.framework.service.pagehelper.PageList;
-import com.steerinfo.meterwork.except.MarkerMetException;
-import com.steerinfo.util.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * AppCmmCarweightresults服务实现：
- *
- * @author generator
- * @version 1.0-SNAPSHORT 2021-11-05 11:06
- * 类描述
- * 修订历史：
- * 日期：2021-11-05
- * 作者：generator
- * 参考：
- * 描述：AppCmmCarweightresults服务实现
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- * @see null
- */
-@Service(value = "appCmmCarweightresultsService")
-public class AppCmmCarweightresultsServiceImpl extends BaseServiceImpl<AppCmmCarweightresults, String> implements IAppCmmCarweightresultsService {
-
-    @Autowired
-    private AppCmmCarweightresultsMapper appCmmCarweightresultsMapper;
-
-    @Override
-    protected IBaseMapper<AppCmmCarweightresults, String> getMapper() {
-        return appCmmCarweightresultsMapper;
-    }
-
-    /**
-     * params
-     *
-     * @param params
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @Override
-    public PageList<AppCmmCarweightresults> selectNetByCarOld(HashMap params, Integer pageNum, Integer pageSize) {
-        //是否删除：0=有效，1=无效，2=删除
-        params.put("delFlg", "0");
-        if (params.get("startTime") == null) {
-            throw new MarkerMetException(500, "开始时间不允许为空！！");
-        }
-        if (params.get("endTime") == null) {
-            throw new MarkerMetException(500, "结束时间不允许为空！！");
-        }
-        PageHelper.startPage(pageNum, pageSize);
-        List<AppCmmCarweightresults> list = appCmmCarweightresultsMapper.selectByParameters(params);
-        PageList pageInfo = new PageList(list);
-        return pageInfo;
-    }
-
-    /**
-     * 车辆管理-计量实绩-分类查询汇总（旧系统）
-     *
-     * @param params
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @Override
-    public PageList<AppCmmCarweightresults> selectSumForAppByCarOld(HashMap params, Integer pageNum, Integer pageSize) {
-        //是否删除：0=有效，1=无效，2=删除
-        params.put("delFlg", "0");
-        if (params.get("startTime") == null) {
-            throw new MarkerMetException(500, "开始时间不允许为空！！");
-        }
-        if (params.get("endTime") == null) {
-            throw new MarkerMetException(500, "结束时间不允许为空！！");
-        }
-        PageHelper.startPage(pageNum, pageSize);
-        List<AppCmmCarweightresults> list = appCmmCarweightresultsMapper.selectSumForAppByCarOld(params);
-        PageList pageInfo = new PageList(list);
-        return pageInfo;
-    }
-
-}

src/main/java/com/steerinfo/appservice/appmeterbasecarlogin/controller/AppMeterBaseCarLoginController.java

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

src/main/java/com/steerinfo/appservice/appmeterbasecarlogin/mapper/AppMeterBaseCarLoginMapper.java

@@ -1,9 +0,0 @@
-package com.steerinfo.appservice.appmeterbasecarlogin.mapper;
-
-import com.steerinfo.appservice.appmeterbasecarlogin.model.AppMeterBaseCarLogin;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface AppMeterBaseCarLoginMapper extends IBaseMapper<AppMeterBaseCarLogin, String> {
-}

src/main/java/com/steerinfo/appservice/appmeterbasecarlogin/mapper/AppMeterBaseCarLoginMapper.xml

@@ -1,316 +0,0 @@
-<?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.appservice.appmeterbasecarlogin.mapper.AppMeterBaseCarLoginMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.appservice.appmeterbasecarlogin.model.AppMeterBaseCarLogin">
-    <id column="CAR_NO" jdbcType="VARCHAR" property="carNo" />
-    <result column="PASS_WORD" jdbcType="VARCHAR" property="passWord" />
-    <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">
-    CAR_NO, PASS_WORD, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, 
-    UPDATE_TIME, MEMO
-  </sql>
-  <sql id="columns_alias">
-    t.CAR_NO, t.PASS_WORD, 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_BASE_CAR_LOGIN
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM METER_BASE_CAR_LOGIN t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="carNo != null and carNo != ''">
-        and CAR_NO = #{carNo}
-      </if>
-      <if test="passWord != null and passWord != ''">
-        and PASS_WORD = #{passWord}
-      </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="carNo != null and carNo != ''">
-        and CAR_NO LIKE '%${carNo}%'
-      </if>
-      <if test="passWord != null and passWord != ''">
-        and PASS_WORD LIKE '%${passWord}%'
-      </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_BASE_CAR_LOGIN
-    where CAR_NO = #{carNo,jdbcType=VARCHAR}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from METER_BASE_CAR_LOGIN
-    where 1!=1 
-      <if test="passWord != null and passWord != ''">
-        or PASS_WORD = #{passWord}
-      </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.appservice.appmeterbasecarlogin.model.AppMeterBaseCarLogin">
-    insert into METER_BASE_CAR_LOGIN (CAR_NO, PASS_WORD, CREATE_MAN_NO, 
-      CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, 
-      UPDATE_MAN_NAME, UPDATE_TIME, MEMO
-      )
-    values (#{carNo,jdbcType=VARCHAR}, #{passWord,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.appservice.appmeterbasecarlogin.model.AppMeterBaseCarLogin">
-    insert into METER_BASE_CAR_LOGIN
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="carNo != null">
-        CAR_NO,
-      </if>
-      <if test="passWord != null">
-        PASS_WORD,
-      </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="carNo != null">
-        #{carNo,jdbcType=VARCHAR},
-      </if>
-      <if test="passWord != null">
-        #{passWord,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.appservice.appmeterbasecarlogin.model.AppMeterBaseCarLogin">
-    update METER_BASE_CAR_LOGIN
-    set PASS_WORD = #{passWord,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 CAR_NO = #{carNo,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.appservice.appmeterbasecarlogin.model.AppMeterBaseCarLogin">
-    update METER_BASE_CAR_LOGIN
-    <set>
-      <if test="passWord != null">
-        PASS_WORD = #{passWord,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 CAR_NO = #{carNo,jdbcType=VARCHAR}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where CAR_NO = #{carNo,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_CAR_LOGIN 
-      (CAR_NO, 
-      PASS_WORD, 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.carNo,jdbcType=VARCHAR}, 
-      #{item.passWord,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_BASE_CAR_LOGIN
-     set
-       CAR_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case CAR_NO" close="end">
-          when #{item.carNo,jdbcType=VARCHAR} then #{item.carNo,jdbcType=VARCHAR}
-       </foreach>
-       ,PASS_WORD=
-       <foreach collection="list" item="item" index="index" separator=" " open="case CAR_NO" close="end">
-          when #{item.carNo,jdbcType=VARCHAR} then #{item.passWord,jdbcType=VARCHAR}
-       </foreach>
-       ,CREATE_MAN_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case CAR_NO" close="end">
-          when #{item.carNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
-       </foreach>
-       ,CREATE_MAN_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case CAR_NO" close="end">
-          when #{item.carNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
-       </foreach>
-       ,CREATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case CAR_NO" close="end">
-          when #{item.carNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_MAN_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case CAR_NO" close="end">
-          when #{item.carNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_MAN_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case CAR_NO" close="end">
-          when #{item.carNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case CAR_NO" close="end">
-          when #{item.carNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,MEMO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case CAR_NO" close="end">
-          when #{item.carNo,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
-       </foreach>
-     where CAR_NO in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-    #{item.carNo,jdbcType=VARCHAR}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from METER_BASE_CAR_LOGIN
-    where CAR_NO in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  
-</mapper>

src/main/java/com/steerinfo/appservice/appmeterbasecarlogin/model/AppMeterBaseCarLogin.java

@@ -1,167 +0,0 @@
-package com.steerinfo.appservice.appmeterbasecarlogin.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 AppMeterBaseCarLogin implements IBasePO<String> {
-    /**
-     * 车号(CAR_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="车号",required=true)
-    private String carNo;
-
-    /**
-     * 密码(PASS_WORD,VARCHAR,1)
-     */
-    @ApiModelProperty(value="密码",required=true)
-    private String passWord;
-
-    /**
-     * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="创建人编号",required=true)
-    private String createManNo;
-
-    /**
-     * 创建人姓名(CREATE_MAN_NAME,VARCHAR,30)
-     */
-    @ApiModelProperty(value="创建人姓名",required=true)
-    private String createManName;
-
-    /**
-     * 创建时间（YYYY-MM-DD HH:mm:SS）(CREATE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="创建时间（YYYY-MM-DD HH:mm:SS）",required=true)
-    private Date createTime;
-
-    /**
-     * 修改人编号(UPDATE_MAN_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="修改人编号",required=false)
-    private String updateManNo;
-
-    /**
-     * 修改人姓名(UPDATE_MAN_NAME,VARCHAR,30)
-     */
-    @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,200)
-     */
-    @ApiModelProperty(value="备注",required=false)
-    private String memo;
-
-    private static final long serialVersionUID = 1L;
-
-    @Override
-    public String getId() {
-        return this.carNo;
-    }
-
-    @Override
-    public void setId(String carNo) {
-        this.carNo = carNo == null ? null : carNo.trim();
-    }
-
-    public String getCarNo() {
-        return carNo;
-    }
-
-    public void setCarNo(String carNo) {
-        this.carNo = carNo == null ? null : carNo.trim();
-    }
-
-    public String getPassWord() {
-        return passWord;
-    }
-
-    public void setPassWord(String passWord) {
-        this.passWord = passWord == null ? null : passWord.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(", carNo=").append(carNo);
-        sb.append(", passWord=").append(passWord);
-        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();
-    }
-}

src/main/java/com/steerinfo/appservice/appmeterbasecarlogin/service/IAppMeterBaseCarLoginService.java

@@ -1,21 +0,0 @@
-package com.steerinfo.appservice.appmeterbasecarlogin.service;
-
-import com.steerinfo.framework.service.IBaseService;
-import com.steerinfo.appservice.appmeterbasecarlogin.model.AppMeterBaseCarLogin;
-
-/**
- * AppMeterBaseCarLogin服务接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-11-10 09:06
- * 类描述
- * 修订历史：
- * 日期：2021-11-10
- * 作者：generator
- * 参考：
- * 描述：AppMeterBaseCarLogin服务接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-public interface IAppMeterBaseCarLoginService extends IBaseService<AppMeterBaseCarLogin, String>{
-
-}

src/main/java/com/steerinfo/appservice/appmeterbasecarlogin/service/impl/AppMeterBaseCarLoginServiceImpl.java

@@ -1,34 +0,0 @@
-package com.steerinfo.appservice.appmeterbasecarlogin.service.impl;
-
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
-import com.steerinfo.appservice.appmeterbasecarlogin.model.AppMeterBaseCarLogin;
-import com.steerinfo.appservice.appmeterbasecarlogin.mapper.AppMeterBaseCarLoginMapper;
-import com.steerinfo.appservice.appmeterbasecarlogin.service.IAppMeterBaseCarLoginService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * AppMeterBaseCarLogin服务实现：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-11-10 09:06
- * 类描述
- * 修订历史：
- * 日期：2021-11-10
- * 作者：generator
- * 参考：
- * 描述：AppMeterBaseCarLogin服务实现
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@Service(value = "appMeterBaseCarLoginService")
-public class AppMeterBaseCarLoginServiceImpl extends BaseServiceImpl<AppMeterBaseCarLogin, String> implements IAppMeterBaseCarLoginService {
-
-    @Autowired
-    private AppMeterBaseCarLoginMapper appMeterBaseCarLoginMapper;
-
-    @Override
-    protected IBaseMapper<AppMeterBaseCarLogin, String> getMapper() {
-        return appMeterBaseCarLoginMapper;
-    }
-}

src/main/java/com/steerinfo/appservice/appmeterbasecussupcar/controller/AppMeterBaseCusSupCarController.java

@@ -1,111 +0,0 @@
-package com.steerinfo.appservice.appmeterbasecussupcar.controller;
-
-import com.steerinfo.appservice.appmeterbasecussupcar.model.AppMeterBaseCusSupCar;
-import com.steerinfo.appservice.appmeterbasecussupcar.service.IAppMeterBaseCusSupCarService;
-import com.steerinfo.framework.controller.BaseRESTfulController;
-import com.steerinfo.framework.controller.RESTfulResult;
-import com.steerinfo.framework.service.pagehelper.PageList;
-import com.steerinfo.meterwork.except.MarkerMetException;
-import com.steerinfo.util.StringUtils;
-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.HashMap;
-import java.util.List;
-
-/**
- * MeterBaseCusSupCar RESTful接口：
- *
- * @author generator
- * @version 1.0-SNAPSHORT 2020-06-15 11:47
- * 类描述
- * 修订历史：
- * 日期：2020-06-15
- * 作者：generator
- * 参考：
- * 描述：MeterBaseCusSupCar RESTful接口
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- * @see null
- */
-@RestController
-@RequestMapping("/${api.version}/appservice/meterbasecussupcars")
-public class AppMeterBaseCusSupCarController extends BaseRESTfulController {
-
-    @Autowired
-    IAppMeterBaseCusSupCarService appMeterBaseCusSupCarService;
-
-    @ApiOperation(value = "获取列表", notes = "分页查询")
-    @GetMapping(value = "/")
-    public RESTfulResult list(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
-        try {
-            PageList<AppMeterBaseCusSupCar> list = appMeterBaseCusSupCarService.queryForPage(parmas, pageNum, pageSize);
-            return success(list);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new MarkerMetException(500, "操作异常！！");
-        }
-    }
-
-    @ApiOperation(value = "创建", notes = "根据MeterBaseCusSupCar对象创建")
-    @Transactional
-    @PostMapping(value = "/")
-    public RESTfulResult add(@RequestBody AppMeterBaseCusSupCar model) {
-        try {
-            String msg = appMeterBaseCusSupCarService.checkandadd(model);
-            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来指定更新对象，并根据传过来的meterBaseCusSupCar信息来更新详细信息")
-    @Transactional
-    @PutMapping(value = "/{id}", produces = "application/json;charset=UTF-8")
-    public RESTfulResult update(@PathVariable String id, @RequestBody AppMeterBaseCusSupCar model) {
-        try {
-            String msg = appMeterBaseCusSupCarService.checkandupdate(id, model);
-            if (StringUtils.isNotEmpty(msg)) {
-                return failed(null, msg);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return failed(null, "操作异常，请确认！");
-        }
-        return success();
-    }
-
-    @ApiOperation(value = "App端获取有效车辆列表", notes = "分页查询")
-    @GetMapping(value = "/selectCar")
-    public RESTfulResult selectCar(@RequestParam HashMap parmas) {
-        try {
-            List<AppMeterBaseCusSupCar> list = appMeterBaseCusSupCarService.selectCar(parmas);
-            return success(list);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new MarkerMetException(500, "操作异常！！");
-        }
-    }
-
-    @ApiOperation(value = "App端获取所有车辆列表", notes = "分页查询")
-    @GetMapping(value = "/selectAllCar")
-    public RESTfulResult selectAllCar(@RequestParam HashMap parmas) {
-        try {
-            List<AppMeterBaseCusSupCar> list = appMeterBaseCusSupCarService.selectAllCar(parmas);
-            return success(list);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new MarkerMetException(500, "操作异常！！");
-        }
-    }
-
-}

src/main/java/com/steerinfo/appservice/appmeterbasecussupcar/mapper/AppMeterBaseCusSupCarMapper.java

@@ -1,19 +0,0 @@
-package com.steerinfo.appservice.appmeterbasecussupcar.mapper;
-
-import com.steerinfo.appservice.appmeterbasecussupcar.model.AppMeterBaseCusSupCar;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-import java.util.Map;
-
-@Mapper
-public interface AppMeterBaseCusSupCarMapper extends IBaseMapper<AppMeterBaseCusSupCar, String> {
-     String GetNewID();
-
-     List<AppMeterBaseCusSupCar> selectForUpdate(Map<String, Object> parameters);
-
-     List<AppMeterBaseCusSupCar> selectList(List<String> ids);
-
-     List<AppMeterBaseCusSupCar> selectAllCar(List<String> ids);
-}

src/main/java/com/steerinfo/appservice/appmeterbasecussupcar/mapper/AppMeterBaseCusSupCarMapper.xml

@@ -1,611 +0,0 @@
-<?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.appservice.appmeterbasecussupcar.mapper.AppMeterBaseCusSupCarMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.appservice.appmeterbasecussupcar.model.AppMeterBaseCusSupCar">
-    <id column="PK_NO" jdbcType="VARCHAR" property="pkNo" />
-    <result column="CUS_SUP_CAR_NO" jdbcType="VARCHAR" property="cusSupCarNo" />
-    <result column="MNEMONIC_CODE" jdbcType="VARCHAR" property="mnemonicCode" />
-    <result column="DRIVER_NAME" jdbcType="VARCHAR" property="driverName" />
-    <result column="ID_NUM" jdbcType="VARCHAR" property="idNum" />
-    <result column="TEL_NUM" jdbcType="VARCHAR" property="telNum" />
-    <result column="CUSTOMER_SUPPLIER_NO" jdbcType="VARCHAR" property="customerSupplierNo" />
-    <result column="CUSTOMER_SUPPLIER_NAME" jdbcType="VARCHAR" property="customerSupplierName" />
-    <result column="MEMO" jdbcType="VARCHAR" property="memo" />
-    <result column="VALID_FLAG" jdbcType="VARCHAR" property="validFlag" />
-    <result column="CREATE_MAN_NO" jdbcType="VARCHAR" property="createManNo" />
-    <result column="CREATE_MAN_NAME" jdbcType="VARCHAR" property="createManName" />
-    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="UPDATE_MAN_NO" jdbcType="VARCHAR" property="updateManNo" />
-    <result column="UPDATE_MAN_NAME" jdbcType="VARCHAR" property="updateManName" />
-    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="DELETE_MAN_NO" jdbcType="VARCHAR" property="deleteManNo" />
-    <result column="DELETE_MAN_NAME" jdbcType="VARCHAR" property="deleteManName" />
-    <result column="DELETE_TIME" jdbcType="TIMESTAMP" property="deleteTime" />
-  </resultMap>
-  <sql id="columns">
-    PK_NO, CUS_SUP_CAR_NO, MNEMONIC_CODE, DRIVER_NAME, ID_NUM, TEL_NUM, CUSTOMER_SUPPLIER_NO, 
-    CUSTOMER_SUPPLIER_NAME, MEMO, VALID_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
-    UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME
-  </sql>
-  <sql id="columns_alias">
-    t.PK_NO, t.CUS_SUP_CAR_NO, t.MNEMONIC_CODE, t.DRIVER_NAME, t.ID_NUM, t.TEL_NUM, t.CUSTOMER_SUPPLIER_NO, 
-    t.CUSTOMER_SUPPLIER_NAME, t.MEMO, t.VALID_FLAG, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, 
-    t.CREATE_TIME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME, t.DELETE_MAN_NO, 
-    t.DELETE_MAN_NAME, t.DELETE_TIME
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns"/> FROM METER_BASE_CUS_SUP_CAR
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM METER_BASE_CUS_SUP_CAR t
-  </sql>
-  <sql id="where">
-    <where>
-      <if test="pkNo != null and pkNo != ''">
-        and PK_NO = #{pkNo}
-      </if>
-      <if test="cusSupCarNo != null and cusSupCarNo != ''">
-        and CUS_SUP_CAR_NO = #{cusSupCarNo}
-      </if>
-      <if test="mnemonicCode != null and mnemonicCode != ''">
-        and MNEMONIC_CODE = #{mnemonicCode}
-      </if>
-      <if test="driverName != null and driverName != ''">
-        and DRIVER_NAME = #{driverName}
-      </if>
-      <if test="idNum != null and idNum != ''">
-        and ID_NUM = #{idNum}
-      </if>
-      <if test="telNum != null and telNum != ''">
-        and TEL_NUM = #{telNum}
-      </if>
-      <if test="customerSupplierNo != null and customerSupplierNo != ''">
-        and CUSTOMER_SUPPLIER_NO = #{customerSupplierNo}
-      </if>
-      <if test="customerSupplierName != null and customerSupplierName != ''">
-        and CUSTOMER_SUPPLIER_NAME = #{customerSupplierName}
-      </if>
-      <if test="memo != null and memo != ''">
-        and MEMO = #{memo}
-      </if>
-      <if test="validFlag != null and validFlag != ''">
-        and VALID_FLAG = #{validFlag}
-      </if>
-      <if test="createManNo != null and createManNo != ''">
-        and CREATE_MAN_NO = #{createManNo}
-      </if>
-      <if test="createManName != null and createManName != ''">
-        and CREATE_MAN_NAME = #{createManName}
-      </if>
-      <if test="createTime != null">
-        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
-      </if>
-      <if test="updateManNo != null and updateManNo != ''">
-        and UPDATE_MAN_NO = #{updateManNo}
-      </if>
-      <if test="updateManName != null and updateManName != ''">
-        and UPDATE_MAN_NAME = #{updateManName}
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="deleteManNo != null and deleteManNo != ''">
-        and DELETE_MAN_NO = #{deleteManNo}
-      </if>
-      <if test="deleteManName != null and deleteManName != ''">
-        and DELETE_MAN_NAME = #{deleteManName}
-      </if>
-      <if test="deleteTime != null">
-        and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where>
-      <if test="pkNo != null and pkNo != ''">
-        and PK_NO LIKE '%${pkNo}%'
-      </if>
-      <if test="cusSupCarNo != null and cusSupCarNo != ''">
-        and CUS_SUP_CAR_NO LIKE '%${cusSupCarNo}%'
-      </if>
-      <if test="mnemonicCode != null and mnemonicCode != ''">
-        and MNEMONIC_CODE LIKE '%${mnemonicCode}%'
-      </if>
-      <if test="driverName != null and driverName != ''">
-        and DRIVER_NAME LIKE '%${driverName}%'
-      </if>
-      <if test="idNum != null and idNum != ''">
-        and ID_NUM LIKE '%${idNum}%'
-      </if>
-      <if test="telNum != null and telNum != ''">
-        and TEL_NUM LIKE '%${telNum}%'
-      </if>
-      <if test="customerSupplierNo != null and customerSupplierNo != ''">
-        and CUSTOMER_SUPPLIER_NO LIKE '%${customerSupplierNo}%'
-      </if>
-      <if test="customerSupplierName != null and customerSupplierName != ''">
-        and CUSTOMER_SUPPLIER_NAME LIKE '%${customerSupplierName}%'
-      </if>
-      <if test="memo != null and memo != ''">
-        and MEMO LIKE '%${memo}%'
-      </if>
-      <if test="validFlag != null and validFlag != ''">
-        and VALID_FLAG LIKE '%${validFlag}%'
-      </if>
-      <if test="createManNo != null and createManNo != ''">
-        and CREATE_MAN_NO LIKE '%${createManNo}%'
-      </if>
-      <if test="createManName != null and createManName != ''">
-        and CREATE_MAN_NAME LIKE '%${createManName}%'
-      </if>
-      <if test="createTime != null">
-        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
-      </if>
-      <if test="updateManNo != null and updateManNo != ''">
-        and UPDATE_MAN_NO LIKE '%${updateManNo}%'
-      </if>
-      <if test="updateManName != null and updateManName != ''">
-        and UPDATE_MAN_NAME LIKE '%${updateManName}%'
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="deleteManNo != null and deleteManNo != ''">
-        and DELETE_MAN_NO LIKE '%${deleteManNo}%'
-      </if>
-      <if test="deleteManName != null and deleteManName != ''">
-        and DELETE_MAN_NAME LIKE '%${deleteManName}%'
-      </if>
-      <if test="deleteTime != null">
-        and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from METER_BASE_CUS_SUP_CAR
-    where PK_NO = #{pkNo,jdbcType=VARCHAR}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from METER_BASE_CUS_SUP_CAR
-    where 1!=1 
-      <if test="cusSupCarNo != null and cusSupCarNo != ''">
-        or CUS_SUP_CAR_NO = #{cusSupCarNo}
-      </if>
-      <if test="mnemonicCode != null and mnemonicCode != ''">
-        or MNEMONIC_CODE = #{mnemonicCode}
-      </if>
-      <if test="driverName != null and driverName != ''">
-        or DRIVER_NAME = #{driverName}
-      </if>
-      <if test="idNum != null and idNum != ''">
-        or ID_NUM = #{idNum}
-      </if>
-      <if test="telNum != null and telNum != ''">
-        or TEL_NUM = #{telNum}
-      </if>
-      <if test="customerSupplierNo != null and customerSupplierNo != ''">
-        or CUSTOMER_SUPPLIER_NO = #{customerSupplierNo}
-      </if>
-      <if test="customerSupplierName != null and customerSupplierName != ''">
-        or CUSTOMER_SUPPLIER_NAME = #{customerSupplierName}
-      </if>
-      <if test="memo != null and memo != ''">
-        or MEMO = #{memo}
-      </if>
-      <if test="validFlag != null and validFlag != ''">
-        or VALID_FLAG = #{validFlag}
-      </if>
-      <if test="createManNo != null and createManNo != ''">
-        or CREATE_MAN_NO = #{createManNo}
-      </if>
-      <if test="createManName != null and createManName != ''">
-        or CREATE_MAN_NAME = #{createManName}
-      </if>
-      <if test="createTime != null">
-        or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
-      </if>
-      <if test="updateManNo != null and updateManNo != ''">
-        or UPDATE_MAN_NO = #{updateManNo}
-      </if>
-      <if test="updateManName != null and updateManName != ''">
-        or UPDATE_MAN_NAME = #{updateManName}
-      </if>
-      <if test="updateTime != null">
-        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-      </if>
-      <if test="deleteManNo != null and deleteManNo != ''">
-        or DELETE_MAN_NO = #{deleteManNo}
-      </if>
-      <if test="deleteManName != null and deleteManName != ''">
-        or DELETE_MAN_NAME = #{deleteManName}
-      </if>
-      <if test="deleteTime != null">
-        or TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = '#{deleteTime}'
-      </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.appservice.appmeterbasecussupcar.model.AppMeterBaseCusSupCar">
-    insert into METER_BASE_CUS_SUP_CAR (PK_NO, CUS_SUP_CAR_NO, MNEMONIC_CODE, 
-      DRIVER_NAME, ID_NUM, TEL_NUM, 
-      CUSTOMER_SUPPLIER_NO, CUSTOMER_SUPPLIER_NAME, 
-      MEMO, VALID_FLAG, CREATE_MAN_NO, 
-      CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, 
-      UPDATE_MAN_NAME, UPDATE_TIME, DELETE_MAN_NO, 
-      DELETE_MAN_NAME, DELETE_TIME)
-    values (#{pkNo,jdbcType=VARCHAR}, #{cusSupCarNo,jdbcType=VARCHAR}, #{mnemonicCode,jdbcType=VARCHAR}, 
-      #{driverName,jdbcType=VARCHAR}, #{idNum,jdbcType=VARCHAR}, #{telNum,jdbcType=VARCHAR}, 
-      #{customerSupplierNo,jdbcType=VARCHAR}, #{customerSupplierName,jdbcType=VARCHAR}, 
-      #{memo,jdbcType=VARCHAR}, #{validFlag,jdbcType=VARCHAR}, #{createManNo,jdbcType=VARCHAR}, 
-      #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateManNo,jdbcType=VARCHAR}, 
-      #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{deleteManNo,jdbcType=VARCHAR}, 
-      #{deleteManName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.appservice.appmeterbasecussupcar.model.AppMeterBaseCusSupCar">
-    insert into METER_BASE_CUS_SUP_CAR
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="pkNo != null">
-        PK_NO,
-      </if>
-      <if test="cusSupCarNo != null">
-        CUS_SUP_CAR_NO,
-      </if>
-      <if test="mnemonicCode != null">
-        MNEMONIC_CODE,
-      </if>
-      <if test="driverName != null">
-        DRIVER_NAME,
-      </if>
-      <if test="idNum != null">
-        ID_NUM,
-      </if>
-      <if test="telNum != null">
-        TEL_NUM,
-      </if>
-      <if test="customerSupplierNo != null">
-        CUSTOMER_SUPPLIER_NO,
-      </if>
-      <if test="customerSupplierName != null">
-        CUSTOMER_SUPPLIER_NAME,
-      </if>
-      <if test="memo != null">
-        MEMO,
-      </if>
-      <if test="validFlag != null">
-        VALID_FLAG,
-      </if>
-      <if test="createManNo != null">
-        CREATE_MAN_NO,
-      </if>
-      <if test="createManName != null">
-        CREATE_MAN_NAME,
-      </if>
-      <if test="createTime != null">
-        CREATE_TIME,
-      </if>
-      <if test="updateManNo != null">
-        UPDATE_MAN_NO,
-      </if>
-      <if test="updateManName != null">
-        UPDATE_MAN_NAME,
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME,
-      </if>
-      <if test="deleteManNo != null">
-        DELETE_MAN_NO,
-      </if>
-      <if test="deleteManName != null">
-        DELETE_MAN_NAME,
-      </if>
-      <if test="deleteTime != null">
-        DELETE_TIME,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="pkNo != null">
-        #{pkNo,jdbcType=VARCHAR},
-      </if>
-      <if test="cusSupCarNo != null">
-        #{cusSupCarNo,jdbcType=VARCHAR},
-      </if>
-      <if test="mnemonicCode != null">
-        #{mnemonicCode,jdbcType=VARCHAR},
-      </if>
-      <if test="driverName != null">
-        #{driverName,jdbcType=VARCHAR},
-      </if>
-      <if test="idNum != null">
-        #{idNum,jdbcType=VARCHAR},
-      </if>
-      <if test="telNum != null">
-        #{telNum,jdbcType=VARCHAR},
-      </if>
-      <if test="customerSupplierNo != null">
-        #{customerSupplierNo,jdbcType=VARCHAR},
-      </if>
-      <if test="customerSupplierName != null">
-        #{customerSupplierName,jdbcType=VARCHAR},
-      </if>
-      <if test="memo != null">
-        #{memo,jdbcType=VARCHAR},
-      </if>
-      <if test="validFlag != null">
-        #{validFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="createManNo != null">
-        #{createManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="createManName != null">
-        #{createManName,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateManNo != null">
-        #{updateManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="updateManName != null">
-        #{updateManName,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="deleteManNo != null">
-        #{deleteManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteManName != null">
-        #{deleteManName,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteTime != null">
-        #{deleteTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.appservice.appmeterbasecussupcar.model.AppMeterBaseCusSupCar">
-    update METER_BASE_CUS_SUP_CAR
-    set CUS_SUP_CAR_NO = #{cusSupCarNo,jdbcType=VARCHAR},
-      MNEMONIC_CODE = #{mnemonicCode,jdbcType=VARCHAR},
-      DRIVER_NAME = #{driverName,jdbcType=VARCHAR},
-      ID_NUM = #{idNum,jdbcType=VARCHAR},
-      TEL_NUM = #{telNum,jdbcType=VARCHAR},
-      CUSTOMER_SUPPLIER_NO = #{customerSupplierNo,jdbcType=VARCHAR},
-      CUSTOMER_SUPPLIER_NAME = #{customerSupplierName,jdbcType=VARCHAR},
-      MEMO = #{memo,jdbcType=VARCHAR},
-      VALID_FLAG = #{validFlag,jdbcType=VARCHAR},
-      CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
-      CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
-      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
-      UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
-      UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
-      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      DELETE_MAN_NO = #{deleteManNo,jdbcType=VARCHAR},
-      DELETE_MAN_NAME = #{deleteManName,jdbcType=VARCHAR},
-      DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP}
-    where PK_NO = #{pkNo,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.appservice.appmeterbasecussupcar.model.AppMeterBaseCusSupCar">
-    update METER_BASE_CUS_SUP_CAR
-    <set>
-      <if test="cusSupCarNo != null">
-        CUS_SUP_CAR_NO = #{cusSupCarNo,jdbcType=VARCHAR},
-      </if>
-      <if test="mnemonicCode != null">
-        MNEMONIC_CODE = #{mnemonicCode,jdbcType=VARCHAR},
-      </if>
-      <if test="driverName != null">
-        DRIVER_NAME = #{driverName,jdbcType=VARCHAR},
-      </if>
-      <if test="idNum != null">
-        ID_NUM = #{idNum,jdbcType=VARCHAR},
-      </if>
-      <if test="telNum != null">
-        TEL_NUM = #{telNum,jdbcType=VARCHAR},
-      </if>
-      <if test="customerSupplierNo != null">
-        CUSTOMER_SUPPLIER_NO = #{customerSupplierNo,jdbcType=VARCHAR},
-      </if>
-      <if test="customerSupplierName != null">
-        CUSTOMER_SUPPLIER_NAME = #{customerSupplierName,jdbcType=VARCHAR},
-      </if>
-      <if test="memo != null">
-        MEMO = #{memo,jdbcType=VARCHAR},
-      </if>
-      <if test="validFlag != null">
-        VALID_FLAG = #{validFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="createManNo != null">
-        CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="createManName != null">
-        CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateManNo != null">
-        UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="updateManName != null">
-        UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="deleteManNo != null">
-        DELETE_MAN_NO = #{deleteManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteManName != null">
-        DELETE_MAN_NAME = #{deleteManName,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteTime != null">
-        DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where PK_NO = #{pkNo,jdbcType=VARCHAR}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where PK_NO = #{pkNo,jdbcType=VARCHAR}
-  </select>
-  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="where"/>
-    order by  CREATE_TIME desc
-  </select>
-  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="whereLike"/>
-    order by  CREATE_TIME desc
-  </select>
-  <insert id="batchInsert" parameterType="java.util.List">
-    insert into METER_BASE_CUS_SUP_CAR 
-      (PK_NO, 
-      CUS_SUP_CAR_NO, MNEMONIC_CODE, DRIVER_NAME, 
-      ID_NUM, TEL_NUM, CUSTOMER_SUPPLIER_NO, 
-      CUSTOMER_SUPPLIER_NAME, MEMO, VALID_FLAG, 
-      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
-      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
-      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME
-      )
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.pkNo,jdbcType=VARCHAR}, 
-      #{item.cusSupCarNo,jdbcType=VARCHAR}, #{item.mnemonicCode,jdbcType=VARCHAR}, #{item.driverName,jdbcType=VARCHAR}, 
-      #{item.idNum,jdbcType=VARCHAR}, #{item.telNum,jdbcType=VARCHAR}, #{item.customerSupplierNo,jdbcType=VARCHAR}, 
-      #{item.customerSupplierName,jdbcType=VARCHAR}, #{item.memo,jdbcType=VARCHAR}, #{item.validFlag,jdbcType=VARCHAR}, 
-      #{item.createManNo,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
-      #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
-      #{item.deleteManNo,jdbcType=VARCHAR}, #{item.deleteManName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=TIMESTAMP}
-       from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update METER_BASE_CUS_SUP_CAR
-     set
-       PK_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
-          when #{item.pkNo,jdbcType=VARCHAR} then #{item.pkNo,jdbcType=VARCHAR}
-       </foreach>
-       ,CUS_SUP_CAR_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
-          when #{item.pkNo,jdbcType=VARCHAR} then #{item.cusSupCarNo,jdbcType=VARCHAR}
-       </foreach>
-       ,MNEMONIC_CODE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
-          when #{item.pkNo,jdbcType=VARCHAR} then #{item.mnemonicCode,jdbcType=VARCHAR}
-       </foreach>
-       ,DRIVER_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
-          when #{item.pkNo,jdbcType=VARCHAR} then #{item.driverName,jdbcType=VARCHAR}
-       </foreach>
-       ,ID_NUM=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
-          when #{item.pkNo,jdbcType=VARCHAR} then #{item.idNum,jdbcType=VARCHAR}
-       </foreach>
-       ,TEL_NUM=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
-          when #{item.pkNo,jdbcType=VARCHAR} then #{item.telNum,jdbcType=VARCHAR}
-       </foreach>
-       ,CUSTOMER_SUPPLIER_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
-          when #{item.pkNo,jdbcType=VARCHAR} then #{item.customerSupplierNo,jdbcType=VARCHAR}
-       </foreach>
-       ,CUSTOMER_SUPPLIER_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
-          when #{item.pkNo,jdbcType=VARCHAR} then #{item.customerSupplierName,jdbcType=VARCHAR}
-       </foreach>
-       ,MEMO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
-          when #{item.pkNo,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
-       </foreach>
-       ,VALID_FLAG=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
-          when #{item.pkNo,jdbcType=VARCHAR} then #{item.validFlag,jdbcType=VARCHAR}
-       </foreach>
-       ,CREATE_MAN_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
-          when #{item.pkNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
-       </foreach>
-       ,CREATE_MAN_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
-          when #{item.pkNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
-       </foreach>
-       ,CREATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
-          when #{item.pkNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_MAN_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
-          when #{item.pkNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_MAN_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
-          when #{item.pkNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
-          when #{item.pkNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,DELETE_MAN_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
-          when #{item.pkNo,jdbcType=VARCHAR} then #{item.deleteManNo,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETE_MAN_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
-          when #{item.pkNo,jdbcType=VARCHAR} then #{item.deleteManName,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case PK_NO" close="end">
-          when #{item.pkNo,jdbcType=VARCHAR} then #{item.deleteTime,jdbcType=TIMESTAMP}
-       </foreach>
-     where PK_NO in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-    #{item.pkNo,jdbcType=VARCHAR}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from METER_BASE_CUS_SUP_CAR
-    where PK_NO in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  <select id="GetNewID" parameterType="java.lang.String" resultType="java.lang.String">
-    SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(PK_NO, LENGTH(PK_NO) -3))),0) + 1,4,'0') PK_NO
-    FROM METER_BASE_CUS_SUP_CAR where instr(PK_NO,to_char(sysdate,'yyyyMMdd'))>0
-  </select>
-
-  <select id="selectForUpdate" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <where>
-      <if test="pkNo != null and pkNo != ''">
-        and PK_NO != #{pkNo}
-      </if>
-      <if test="cusSupCarNo != null and cusSupCarNo != ''">
-        and CUS_SUP_CAR_NO = #{cusSupCarNo}
-      </if>
-    </where>
-  </select>
-
-  <select id="selectList" parameterType="java.util.List" resultMap="BaseResultMap">
-    select *
-    from METER_BASE_CUS_SUP_CAR
-    where VALID_FLAG = '0' and
-    customer_supplier_no in
-    <foreach collection="list" item="item" open="(" close=")" separator=",">
-      #{item}
-    </foreach>
-  </select>
-
-  <select id="selectAllCar" parameterType="java.util.List" resultMap="BaseResultMap">
-    select *
-    from METER_BASE_CUS_SUP_CAR
-    where
-    customer_supplier_no in
-    <foreach collection="list" item="item" open="(" close=")" separator=",">
-      #{item}
-    </foreach>
-  </select>
-
-</mapper>

src/main/java/com/steerinfo/appservice/appmeterbasecussupcar/model/AppMeterBaseCusSupCar.java

@@ -1,316 +0,0 @@
-package com.steerinfo.appservice.appmeterbasecussupcar.model;
-
-import com.steerinfo.framework.model.IBasePO;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-
-public class AppMeterBaseCusSupCar implements IBasePO<String> {
-    /**
-     * 主键编号(PK_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="主键编号",required=true)
-    private String pkNo;
-
-    /**
-     * 车号(CUS_SUP_CAR_NO,VARCHAR,10)
-     */
-    @ApiModelProperty(value="车号",required=true)
-    private String cusSupCarNo;
-
-    /**
-     * 挂号(MNEMONIC_CODE,VARCHAR,10)
-     */
-    @ApiModelProperty(value="挂号",required=false)
-    private String mnemonicCode;
-
-    /**
-     * 司机姓名(DRIVER_NAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="司机姓名",required=true)
-    private String driverName;
-
-    /**
-     * 身份证号(ID_NUM,VARCHAR,40)
-     */
-    @ApiModelProperty(value="身份证号",required=true)
-    private String idNum;
-
-    /**
-     * 联系电话(TEL_NUM,VARCHAR,20)
-     */
-    @ApiModelProperty(value="联系电话",required=false)
-    private String telNum;
-
-    /**
-     * 客商编号(CUSTOMER_SUPPLIER_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="客商编号",required=true)
-    private String customerSupplierNo;
-
-    /**
-     * 客商名称(CUSTOMER_SUPPLIER_NAME,VARCHAR,100)
-     */
-    @ApiModelProperty(value="客商名称",required=true)
-    private String customerSupplierName;
-
-    /**
-     * 备注(MEMO,VARCHAR,200)
-     */
-    @ApiModelProperty(value="备注",required=false)
-    private String memo;
-
-    /**
-     * 状态(VALID_FLAG,VARCHAR,1)
-     */
-    @ApiModelProperty(value="状态",required=true)
-    private String validFlag;
-
-    /**
-     * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="创建人编号",required=true)
-    private String createManNo;
-
-    /**
-     * 创建人姓名(CREATE_MAN_NAME,VARCHAR,30)
-     */
-    @ApiModelProperty(value="创建人姓名",required=true)
-    private String createManName;
-
-    /**
-     * 创建时间(CREATE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="创建时间",required=true)
-    private Date createTime;
-
-    /**
-     * 修改人编号(UPDATE_MAN_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="修改人编号",required=false)
-    private String updateManNo;
-
-    /**
-     * 修改人姓名(UPDATE_MAN_NAME,VARCHAR,30)
-     */
-    @ApiModelProperty(value="修改人姓名",required=false)
-    private String updateManName;
-
-    /**
-     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="修改时间",required=false)
-    private Date updateTime;
-
-    /**
-     * 删除人编号(DELETE_MAN_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="删除人编号",required=false)
-    private String deleteManNo;
-
-    /**
-     * 删除人姓名(DELETE_MAN_NAME,VARCHAR,30)
-     */
-    @ApiModelProperty(value="删除人姓名",required=false)
-    private String deleteManName;
-
-    /**
-     * 删除时间(DELETE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="删除时间",required=false)
-    private Date deleteTime;
-
-    private static final long serialVersionUID = 1L;
-
-    @Override
-    public String getId() {
-        return this.pkNo;
-    }
-
-    @Override
-    public void setId(String pkNo) {
-        this.pkNo = pkNo == null ? null : pkNo.trim();
-    }
-
-    public String getPkNo() {
-        return pkNo;
-    }
-
-    public void setPkNo(String pkNo) {
-        this.pkNo = pkNo == null ? null : pkNo.trim();
-    }
-
-    public String getCusSupCarNo() {
-        return cusSupCarNo;
-    }
-
-    public void setCusSupCarNo(String cusSupCarNo) {
-        this.cusSupCarNo = cusSupCarNo == null ? null : cusSupCarNo.trim();
-    }
-
-    public String getMnemonicCode() {
-        return mnemonicCode;
-    }
-
-    public void setMnemonicCode(String mnemonicCode) {
-        this.mnemonicCode = mnemonicCode == null ? null : mnemonicCode.trim();
-    }
-
-    public String getDriverName() {
-        return driverName;
-    }
-
-    public void setDriverName(String driverName) {
-        this.driverName = driverName == null ? null : driverName.trim();
-    }
-
-    public String getIdNum() {
-        return idNum;
-    }
-
-    public void setIdNum(String idNum) {
-        this.idNum = idNum == null ? null : idNum.trim();
-    }
-
-    public String getTelNum() {
-        return telNum;
-    }
-
-    public void setTelNum(String telNum) {
-        this.telNum = telNum == null ? null : telNum.trim();
-    }
-
-    public String getCustomerSupplierNo() {
-        return customerSupplierNo;
-    }
-
-    public void setCustomerSupplierNo(String customerSupplierNo) {
-        this.customerSupplierNo = customerSupplierNo == null ? null : customerSupplierNo.trim();
-    }
-
-    public String getCustomerSupplierName() {
-        return customerSupplierName;
-    }
-
-    public void setCustomerSupplierName(String customerSupplierName) {
-        this.customerSupplierName = customerSupplierName == null ? null : customerSupplierName.trim();
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo == null ? null : memo.trim();
-    }
-
-    public String getValidFlag() {
-        return validFlag;
-    }
-
-    public void setValidFlag(String validFlag) {
-        this.validFlag = validFlag == null ? null : validFlag.trim();
-    }
-
-    public String getCreateManNo() {
-        return createManNo;
-    }
-
-    public void setCreateManNo(String createManNo) {
-        this.createManNo = createManNo == null ? null : createManNo.trim();
-    }
-
-    public String getCreateManName() {
-        return createManName;
-    }
-
-    public void setCreateManName(String createManName) {
-        this.createManName = createManName == null ? null : createManName.trim();
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getUpdateManNo() {
-        return updateManNo;
-    }
-
-    public void setUpdateManNo(String updateManNo) {
-        this.updateManNo = updateManNo == null ? null : updateManNo.trim();
-    }
-
-    public String getUpdateManName() {
-        return updateManName;
-    }
-
-    public void setUpdateManName(String updateManName) {
-        this.updateManName = updateManName == null ? null : updateManName.trim();
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getDeleteManNo() {
-        return deleteManNo;
-    }
-
-    public void setDeleteManNo(String deleteManNo) {
-        this.deleteManNo = deleteManNo == null ? null : deleteManNo.trim();
-    }
-
-    public String getDeleteManName() {
-        return deleteManName;
-    }
-
-    public void setDeleteManName(String deleteManName) {
-        this.deleteManName = deleteManName == null ? null : deleteManName.trim();
-    }
-
-    public Date getDeleteTime() {
-        return deleteTime;
-    }
-
-    public void setDeleteTime(Date deleteTime) {
-        this.deleteTime = deleteTime;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", pkNo=").append(pkNo);
-        sb.append(", cusSupCarNo=").append(cusSupCarNo);
-        sb.append(", mnemonicCode=").append(mnemonicCode);
-        sb.append(", driverName=").append(driverName);
-        sb.append(", idNum=").append(idNum);
-        sb.append(", telNum=").append(telNum);
-        sb.append(", customerSupplierNo=").append(customerSupplierNo);
-        sb.append(", customerSupplierName=").append(customerSupplierName);
-        sb.append(", memo=").append(memo);
-        sb.append(", validFlag=").append(validFlag);
-        sb.append(", createManNo=").append(createManNo);
-        sb.append(", createManName=").append(createManName);
-        sb.append(", createTime=").append(createTime);
-        sb.append(", updateManNo=").append(updateManNo);
-        sb.append(", updateManName=").append(updateManName);
-        sb.append(", updateTime=").append(updateTime);
-        sb.append(", deleteManNo=").append(deleteManNo);
-        sb.append(", deleteManName=").append(deleteManName);
-        sb.append(", deleteTime=").append(deleteTime);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}

src/main/java/com/steerinfo/appservice/appmeterbasecussupcar/service/IAppMeterBaseCusSupCarService.java

@@ -1,30 +0,0 @@
-package com.steerinfo.appservice.appmeterbasecussupcar.service;
-
-import com.steerinfo.appservice.appmeterbasecussupcar.model.AppMeterBaseCusSupCar;
-import com.steerinfo.framework.service.IBaseService;
-
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * MeterBaseCusSupCar服务接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2020-06-15 11:47
- * 类描述
- * 修订历史：
- * 日期：2020-06-15
- * 作者：generator
- * 参考：
- * 描述：MeterBaseCusSupCar服务接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-public interface IAppMeterBaseCusSupCarService extends IBaseService<AppMeterBaseCusSupCar, String>{
-     String checkandadd(AppMeterBaseCusSupCar model);
-
-     String checkandupdate(String id, AppMeterBaseCusSupCar model);
-
-     List<AppMeterBaseCusSupCar> selectCar(HashMap parmas);
-
-     List<AppMeterBaseCusSupCar> selectAllCar(HashMap parmas);
-}

src/main/java/com/steerinfo/appservice/appmeterbasecussupcar/service/impl/AppMeterBaseCusSupCarServiceImpl.java

@@ -1,167 +0,0 @@
-package com.steerinfo.appservice.appmeterbasecussupcar.service.impl;
-
-import com.steerinfo.appservice.appmeterbasecussupcar.mapper.AppMeterBaseCusSupCarMapper;
-import com.steerinfo.appservice.appmeterbasecussupcar.model.AppMeterBaseCusSupCar;
-import com.steerinfo.appservice.appmeterbasecussupcar.service.IAppMeterBaseCusSupCarService;
-import com.steerinfo.baseinfo.meterbasecarblacelist.mapper.MeterBaseCarBlacelistMapper;
-import com.steerinfo.baseinfo.meterbasecarblacelist.model.MeterBaseCarBlacelist;
-import com.steerinfo.baseinfo.meterbasecarriercustomer.mapper.MeterBaseCarrierCustomerMapper;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
-import com.steerinfo.util.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Primary;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * MeterBaseCusSupCar服务实现：
- *
- * @author generator
- * @version 1.0-SNAPSHORT 2020-06-15 11:47
- * 类描述
- * 修订历史：
- * 日期：2020-06-15
- * 作者：generator
- * 参考：
- * 描述：MeterBaseCusSupCar服务实现
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- * @see null
- */
-@Service(value = "appServiceMeterBaseCusSupCarService")
-@Primary
-public class AppMeterBaseCusSupCarServiceImpl extends BaseServiceImpl<AppMeterBaseCusSupCar, String> implements IAppMeterBaseCusSupCarService {
-
-    @Resource
-    private AppMeterBaseCusSupCarMapper appMeterBaseCusSupCarMapper;
-
-    @Resource
-    private MeterBaseCarBlacelistMapper meterBaseCarBlacelistMapper;
-
-    @Autowired
-    private MeterBaseCarrierCustomerMapper meterBaseCarrierCustomerMapper;
-
-
-    @Override
-    protected IBaseMapper<AppMeterBaseCusSupCar, String> getMapper() {
-        return appMeterBaseCusSupCarMapper;
-    }
-
-    @Override
-    public String checkandadd(AppMeterBaseCusSupCar model) {
-        String msg = check(model);
-        if (StringUtils.isNotEmpty(msg)) {
-            return msg;
-        }
-        msg = checkCarNo(model.getCusSupCarNo());
-        if (StringUtils.isNotEmpty(msg)) {
-            return msg;
-        }
-        //2021年2月28日 测试GIT代码提交1234
-        HashMap<String, Object> obj = new HashMap<>();
-        obj.put("cusSupCarNo", model.getCusSupCarNo());
-        obj.put("customerSupplierNo", model.getCustomerSupplierNo()); //2021年2月24日，杨秀东新增【客商编号】用于车辆信息重复判断
-        List<AppMeterBaseCusSupCar> com = appMeterBaseCusSupCarMapper.selectByParameters(obj);
-        if (!com.isEmpty()) {
-            return "该车号已存在！";
-        }
-        String no = appMeterBaseCusSupCarMapper.GetNewID();
-        model.setId(new SimpleDateFormat("yyyyMMdd").format(new Date())+no);
-        appMeterBaseCusSupCarMapper.insert(model);
-        return "";
-    }
-
-    @Override
-    public String checkandupdate(String id, AppMeterBaseCusSupCar model) {
-        String msg = check(model);
-        if (StringUtils.isNotEmpty(msg)) {
-            return msg;
-        }
-        msg = checkCarNo(model.getCusSupCarNo());
-        if (StringUtils.isNotEmpty(msg)) {
-            return msg;
-        }
-        //2021年6月23日 注释
-        /*HashMap<String, Object> obj = new HashMap<>();
-        obj.put("cusSupCarNo", model.getCusSupCarNo());
-        obj.put("pkNo", id);
-        List<AppMeterBaseCusSupCar> com =appMeterBaseCusSupCarMapper.selectForUpdate(obj);
-        if(!com.isEmpty()){
-            return "该车号已存在！";
-        }*/
-        appMeterBaseCusSupCarMapper.updateByPrimaryKeySelective(model);
-        return "";
-    }
-
-    private String check(AppMeterBaseCusSupCar model) {
-        if (model == null) {
-            return "参数不能为空！！";
-        }
-        if (StringUtils.isEmpty(model.getCusSupCarNo())) {
-            return "车号不能为空！！";
-        }
-        if (StringUtils.isEmpty(model.getDriverName())) {
-            return "司机姓名不能为空！！";
-        }
-        if (StringUtils.isEmpty(model.getIdNum())) {
-            return "身份证号不能为空！！";
-        }
-        if (StringUtils.isEmpty(model.getCustomerSupplierNo())) {
-            return "客商编号不能为空！！";
-        }
-        if (StringUtils.isEmpty(model.getCustomerSupplierName())) {
-            return "客商名称不能为空！！";
-        }
-        if (StringUtils.isEmpty(model.getPkNo())) {
-            model.setCreateTime(new Date());
-            model.setValidFlag("0");//服役
-        } else {
-            model.setUpdateTime(new Date());
-        }
-        return "";
-    }
-
-    //判断车号是否为黑名单
-    private String checkCarNo(String carNo) {
-        HashMap<String, Object> obj = new HashMap<>();
-        obj.put("carNo", carNo);
-        obj.put("valueFlag", "0");
-        List<MeterBaseCarBlacelist> list = meterBaseCarBlacelistMapper.selectByParameters(obj);
-        if (list.size() > 1) {
-            return "该车在黑名单中，不允许新增或修改!!";
-        }
-        return "";
-    }
-
-    @Override
-    public List<AppMeterBaseCusSupCar> selectCar(HashMap parmas) {
-        Object customerSupplierNoObj = parmas.get("customerSupplierNo");
-        if (customerSupplierNoObj == null) {
-            return null;
-        }
-        String no = customerSupplierNoObj.toString();
-        List<String> ids = meterBaseCarrierCustomerMapper.selectHD(no);
-        ids.add(no);
-        List<AppMeterBaseCusSupCar> list = appMeterBaseCusSupCarMapper.selectList(ids);
-        return list;
-    }
-
-    @Override
-    public List<AppMeterBaseCusSupCar> selectAllCar(HashMap parmas) {
-        Object customerSupplierNoObj = parmas.get("customerSupplierNo");
-        if (customerSupplierNoObj == null) {
-            return null;
-        }
-        String no = customerSupplierNoObj.toString();
-        List<String> ids = meterBaseCarrierCustomerMapper.selectHD(no);
-        ids.add(no);
-        List<AppMeterBaseCusSupCar> list = appMeterBaseCusSupCarMapper.selectAllCar(ids);
-        return list;
-    }
-
-}

src/main/java/com/steerinfo/appservice/appmeterbasecustomersupplier/controller/AppMeterBaseCustomerSupplierController.java

@@ -1,62 +0,0 @@
-package com.steerinfo.appservice.appmeterbasecustomersupplier.controller;
-
-import com.steerinfo.appservice.appmeterbasecustomersupplier.model.AppMeterBaseCustomerSupplier;
-import com.steerinfo.appservice.appmeterbasecustomersupplier.service.IAppMeterBaseCustomerSupplierService;
-import com.steerinfo.framework.controller.BaseRESTfulController;
-import com.steerinfo.framework.controller.RESTfulResult;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * MeterBaseCustomerSupplier RESTful接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2020-06-15 11:14
- * 类描述
- * 修订历史：
- * 日期：2020-06-15
- * 作者：generator
- * 参考：
- * 描述：MeterBaseCustomerSupplier RESTful接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@RestController
-@RequestMapping("/${api.version}/appservice/meterbasecustomersuppliers")
-public class AppMeterBaseCustomerSupplierController extends BaseRESTfulController {
-
-    @Autowired
-    IAppMeterBaseCustomerSupplierService appMeterBaseCustomerSupplierService;
-
-
-    @ApiOperation(value = "供应商App登录", notes = "根据传过来的参数判断登录是否成功")
-    @PostMapping(value = "/login")
-    public RESTfulResult login(@RequestBody AppMeterBaseCustomerSupplier model) {
-        try {
-            RESTfulResult rm = appMeterBaseCustomerSupplierService.login(model);
-            return rm;
-        } catch (Exception e) {
-            e.printStackTrace();
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return failed(null, "操作异常，请确认！");
-        }
-    }
-
-    @ApiOperation(value = "供应商App修改密码", notes = "根据传过来的参数判断")
-    @PostMapping(value = "/modifyPassword")
-    public RESTfulResult modifyPassword(@RequestBody AppMeterBaseCustomerSupplier model) {
-        try {
-            RESTfulResult rm = appMeterBaseCustomerSupplierService.modifyPassword(model);
-            return rm;
-        } catch (Exception e) {
-            e.printStackTrace();
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return failed(null, "操作异常，请确认！");
-        }
-    }
-
-}

src/main/java/com/steerinfo/appservice/appmeterbasecustomersupplier/mapper/AppMeterBaseCustomerSupplierMapper.java

@@ -1,17 +0,0 @@
-package com.steerinfo.appservice.appmeterbasecustomersupplier.mapper;
-
-import com.steerinfo.appservice.appmeterbasecustomersupplier.model.AppMeterBaseCustomerSupplier;
-import com.steerinfo.baseinfo.dto.MeterBaseCustomerSupplierDto;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import feign.Param;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-import java.util.Map;
-
-@Mapper
-public interface AppMeterBaseCustomerSupplierMapper extends IBaseMapper<AppMeterBaseCustomerSupplier, String> {
-   String GetNewID();
-
-    List<AppMeterBaseCustomerSupplier> selectForUpdate(Map<String, Object> parameters);
-}

src/main/java/com/steerinfo/appservice/appmeterbasecustomersupplier/mapper/AppMeterBaseCustomerSupplierMapper.xml

@@ -1,565 +0,0 @@
-<?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.appservice.appmeterbasecustomersupplier.mapper.AppMeterBaseCustomerSupplierMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.appservice.appmeterbasecustomersupplier.model.AppMeterBaseCustomerSupplier">
-    <id column="CUSTOMER_SUPPLIER_NO" jdbcType="VARCHAR" property="customerSupplierNo" />
-    <result column="CUSTOMER_SUPPLIER_NAME" jdbcType="VARCHAR" property="customerSupplierName" />
-    <result column="MNEMONIC_CODE" jdbcType="VARCHAR" property="mnemonicCode" />
-    <result column="CUSTOMER_SUPPLIER_TYPE" jdbcType="VARCHAR" property="customerSupplierType" />
-    <result column="CUSTOMER_SUPPLIER_PASSWORD" jdbcType="VARCHAR" property="customerSupplierPassword" />
-    <result column="VALID_FLAG" jdbcType="VARCHAR" property="validFlag" />
-    <result column="CREATE_MAN_NO" jdbcType="VARCHAR" property="createManNo" />
-    <result column="CREATE_MAN_NAME" jdbcType="VARCHAR" property="createManName" />
-    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="UPDATE_MAN_NO" jdbcType="VARCHAR" property="updateManNo" />
-    <result column="UPDATE_MAN_NAME" jdbcType="VARCHAR" property="updateManName" />
-    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="DELETE_MAN_NO" jdbcType="VARCHAR" property="deleteManNo" />
-    <result column="DELETE_MAN_NAME" jdbcType="VARCHAR" property="deleteManName" />
-    <result column="DELETE_TIME" jdbcType="TIMESTAMP" property="deleteTime" />
-    <result column="CUSTOMER_SUPPLIER_LOGIN" jdbcType="VARCHAR" property="customerSupplierLogin" />
-    <result column="CHECK_FLAG" jdbcType="VARCHAR" property="checkFlag" />
-  </resultMap>
-  <sql id="columns">
-    CUSTOMER_SUPPLIER_NO, CUSTOMER_SUPPLIER_NAME, MNEMONIC_CODE, CUSTOMER_SUPPLIER_TYPE,
-    CUSTOMER_SUPPLIER_PASSWORD, VALID_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME,
-    UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME,
-    CUSTOMER_SUPPLIER_LOGIN, CHECK_FLAG
-  </sql>
-  <sql id="columns_alias">
-    t.CUSTOMER_SUPPLIER_NO, t.CUSTOMER_SUPPLIER_NAME, t.MNEMONIC_CODE, t.CUSTOMER_SUPPLIER_TYPE,
-    t.CUSTOMER_SUPPLIER_PASSWORD, t.VALID_FLAG, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME,
-    t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME, t.DELETE_MAN_NO, t.DELETE_MAN_NAME,
-    t.DELETE_TIME, t.CUSTOMER_SUPPLIER_LOGIN, t.CHECK_FLAG
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns"/> FROM METER_BASE_CUSTOMER_SUPPLIER
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM METER_BASE_CUSTOMER_SUPPLIER t
-  </sql>
-  <sql id="where">
-    <where>
-      <if test="customerSupplierNo != null and customerSupplierNo != ''">
-        and CUSTOMER_SUPPLIER_NO = #{customerSupplierNo}
-      </if>
-      <if test="customerSupplierName != null and customerSupplierName != ''">
-        and CUSTOMER_SUPPLIER_NAME = #{customerSupplierName}
-      </if>
-      <if test="mnemonicCode != null and mnemonicCode != ''">
-        and MNEMONIC_CODE = #{mnemonicCode}
-      </if>
-      <if test="customerSupplierType != null and customerSupplierType != ''">
-        and CUSTOMER_SUPPLIER_TYPE = #{customerSupplierType}
-      </if>
-      <if test="customerSupplierPassword != null and customerSupplierPassword != ''">
-        and CUSTOMER_SUPPLIER_PASSWORD = #{customerSupplierPassword}
-      </if>
-      <if test="validFlag != null and validFlag != ''">
-        and VALID_FLAG = #{validFlag}
-      </if>
-      <if test="createManNo != null and createManNo != ''">
-        and CREATE_MAN_NO = #{createManNo}
-      </if>
-      <if test="createManName != null and createManName != ''">
-        and CREATE_MAN_NAME = #{createManName}
-      </if>
-      <if test="createTime != null">
-        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
-      </if>
-      <if test="updateManNo != null and updateManNo != ''">
-        and UPDATE_MAN_NO = #{updateManNo}
-      </if>
-      <if test="updateManName != null and updateManName != ''">
-        and UPDATE_MAN_NAME = #{updateManName}
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="deleteManNo != null and deleteManNo != ''">
-        and DELETE_MAN_NO = #{deleteManNo}
-      </if>
-      <if test="deleteManName != null and deleteManName != ''">
-        and DELETE_MAN_NAME = #{deleteManName}
-      </if>
-      <if test="deleteTime != null">
-        and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
-      </if>
-      <if test="customerSupplierLogin != null and customerSupplierLogin != ''">
-        and CUSTOMER_SUPPLIER_LOGIN = #{customerSupplierLogin}
-      </if>
-      <if test="checkFlag != null and checkFlag != ''">
-        and CHECK_FLAG = #{checkFlag}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where>
-      <if test="customerSupplierNo != null and customerSupplierNo != ''">
-        and CUSTOMER_SUPPLIER_NO LIKE '%${customerSupplierNo}%'
-      </if>
-      <if test="customerSupplierName != null and customerSupplierName != ''">
-        and CUSTOMER_SUPPLIER_NAME LIKE '%${customerSupplierName}%'
-      </if>
-      <if test="mnemonicCode != null and mnemonicCode != ''">
-        and MNEMONIC_CODE LIKE '%${mnemonicCode}%'
-      </if>
-      <if test="customerSupplierType != null and customerSupplierType != ''">
-        and CUSTOMER_SUPPLIER_TYPE LIKE '%${customerSupplierType}%'
-      </if>
-      <if test="customerSupplierPassword != null and customerSupplierPassword != ''">
-        and CUSTOMER_SUPPLIER_PASSWORD LIKE '%${customerSupplierPassword}%'
-      </if>
-      <if test="validFlag != null and validFlag != ''">
-        and VALID_FLAG LIKE '%${validFlag}%'
-      </if>
-      <if test="createManNo != null and createManNo != ''">
-        and CREATE_MAN_NO LIKE '%${createManNo}%'
-      </if>
-      <if test="createManName != null and createManName != ''">
-        and CREATE_MAN_NAME LIKE '%${createManName}%'
-      </if>
-      <if test="createTime != null">
-        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
-      </if>
-      <if test="updateManNo != null and updateManNo != ''">
-        and UPDATE_MAN_NO LIKE '%${updateManNo}%'
-      </if>
-      <if test="updateManName != null and updateManName != ''">
-        and UPDATE_MAN_NAME LIKE '%${updateManName}%'
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="deleteManNo != null and deleteManNo != ''">
-        and DELETE_MAN_NO LIKE '%${deleteManNo}%'
-      </if>
-      <if test="deleteManName != null and deleteManName != ''">
-        and DELETE_MAN_NAME LIKE '%${deleteManName}%'
-      </if>
-      <if test="deleteTime != null">
-        and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
-      </if>
-      <if test="customerSupplierLogin != null and customerSupplierLogin != ''">
-        and CUSTOMER_SUPPLIER_LOGIN LIKE '%${customerSupplierLogin}%'
-      </if>
-      <if test="checkFlag != null and checkFlag != ''">
-        and CHECK_FLAG LIKE '%${checkFlag}%'
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from METER_BASE_CUSTOMER_SUPPLIER
-    where CUSTOMER_SUPPLIER_NO = #{customerSupplierNo,jdbcType=VARCHAR}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from METER_BASE_CUSTOMER_SUPPLIER
-    where 1!=1
-    <if test="customerSupplierName != null and customerSupplierName != ''">
-      or CUSTOMER_SUPPLIER_NAME = #{customerSupplierName}
-    </if>
-    <if test="mnemonicCode != null and mnemonicCode != ''">
-      or MNEMONIC_CODE = #{mnemonicCode}
-    </if>
-    <if test="customerSupplierType != null and customerSupplierType != ''">
-      or CUSTOMER_SUPPLIER_TYPE = #{customerSupplierType}
-    </if>
-    <if test="customerSupplierPassword != null and customerSupplierPassword != ''">
-      or CUSTOMER_SUPPLIER_PASSWORD = #{customerSupplierPassword}
-    </if>
-    <if test="validFlag != null and validFlag != ''">
-      or VALID_FLAG = #{validFlag}
-    </if>
-    <if test="createManNo != null and createManNo != ''">
-      or CREATE_MAN_NO = #{createManNo}
-    </if>
-    <if test="createManName != null and createManName != ''">
-      or CREATE_MAN_NAME = #{createManName}
-    </if>
-    <if test="createTime != null">
-      or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
-    </if>
-    <if test="updateManNo != null and updateManNo != ''">
-      or UPDATE_MAN_NO = #{updateManNo}
-    </if>
-    <if test="updateManName != null and updateManName != ''">
-      or UPDATE_MAN_NAME = #{updateManName}
-    </if>
-    <if test="updateTime != null">
-      or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-    </if>
-    <if test="deleteManNo != null and deleteManNo != ''">
-      or DELETE_MAN_NO = #{deleteManNo}
-    </if>
-    <if test="deleteManName != null and deleteManName != ''">
-      or DELETE_MAN_NAME = #{deleteManName}
-    </if>
-    <if test="deleteTime != null">
-      or TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = '#{deleteTime}'
-    </if>
-    <if test="customerSupplierLogin != null and customerSupplierLogin != ''">
-      or CUSTOMER_SUPPLIER_LOGIN = #{customerSupplierLogin}
-    </if>
-    <if test="checkFlag != null and checkFlag != ''">
-      or CHECK_FLAG = #{checkFlag}
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.appservice.appmeterbasecustomersupplier.model.AppMeterBaseCustomerSupplier">
-    insert into METER_BASE_CUSTOMER_SUPPLIER (CUSTOMER_SUPPLIER_NO, CUSTOMER_SUPPLIER_NAME,
-      MNEMONIC_CODE, CUSTOMER_SUPPLIER_TYPE, CUSTOMER_SUPPLIER_PASSWORD,
-      VALID_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME,
-      CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME,
-      UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME,
-      DELETE_TIME, CUSTOMER_SUPPLIER_LOGIN, CHECK_FLAG
-      )
-    values (#{customerSupplierNo,jdbcType=VARCHAR}, #{customerSupplierName,jdbcType=VARCHAR},
-      #{mnemonicCode,jdbcType=VARCHAR}, #{customerSupplierType,jdbcType=VARCHAR}, #{customerSupplierPassword,jdbcType=VARCHAR},
-      #{validFlag,jdbcType=VARCHAR}, #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR},
-      #{createTime,jdbcType=TIMESTAMP}, #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR},
-      #{updateTime,jdbcType=TIMESTAMP}, #{deleteManNo,jdbcType=VARCHAR}, #{deleteManName,jdbcType=VARCHAR},
-      #{deleteTime,jdbcType=TIMESTAMP}, #{customerSupplierLogin,jdbcType=VARCHAR}, #{checkFlag,jdbcType=VARCHAR}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.appservice.appmeterbasecustomersupplier.model.AppMeterBaseCustomerSupplier">
-    insert into METER_BASE_CUSTOMER_SUPPLIER
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="customerSupplierNo != null">
-        CUSTOMER_SUPPLIER_NO,
-      </if>
-      <if test="customerSupplierName != null">
-        CUSTOMER_SUPPLIER_NAME,
-      </if>
-      <if test="mnemonicCode != null">
-        MNEMONIC_CODE,
-      </if>
-      <if test="customerSupplierType != null">
-        CUSTOMER_SUPPLIER_TYPE,
-      </if>
-      <if test="customerSupplierPassword != null">
-        CUSTOMER_SUPPLIER_PASSWORD,
-      </if>
-      <if test="validFlag != null">
-        VALID_FLAG,
-      </if>
-      <if test="createManNo != null">
-        CREATE_MAN_NO,
-      </if>
-      <if test="createManName != null">
-        CREATE_MAN_NAME,
-      </if>
-      <if test="createTime != null">
-        CREATE_TIME,
-      </if>
-      <if test="updateManNo != null">
-        UPDATE_MAN_NO,
-      </if>
-      <if test="updateManName != null">
-        UPDATE_MAN_NAME,
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME,
-      </if>
-      <if test="deleteManNo != null">
-        DELETE_MAN_NO,
-      </if>
-      <if test="deleteManName != null">
-        DELETE_MAN_NAME,
-      </if>
-      <if test="deleteTime != null">
-        DELETE_TIME,
-      </if>
-      <if test="customerSupplierLogin != null">
-        CUSTOMER_SUPPLIER_LOGIN,
-      </if>
-      <if test="checkFlag != null">
-        CHECK_FLAG,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="customerSupplierNo != null">
-        #{customerSupplierNo,jdbcType=VARCHAR},
-      </if>
-      <if test="customerSupplierName != null">
-        #{customerSupplierName,jdbcType=VARCHAR},
-      </if>
-      <if test="mnemonicCode != null">
-        #{mnemonicCode,jdbcType=VARCHAR},
-      </if>
-      <if test="customerSupplierType != null">
-        #{customerSupplierType,jdbcType=VARCHAR},
-      </if>
-      <if test="customerSupplierPassword != null">
-        #{customerSupplierPassword,jdbcType=VARCHAR},
-      </if>
-      <if test="validFlag != null">
-        #{validFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="createManNo != null">
-        #{createManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="createManName != null">
-        #{createManName,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateManNo != null">
-        #{updateManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="updateManName != null">
-        #{updateManName,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="deleteManNo != null">
-        #{deleteManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteManName != null">
-        #{deleteManName,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteTime != null">
-        #{deleteTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="customerSupplierLogin != null">
-        #{customerSupplierLogin,jdbcType=VARCHAR},
-      </if>
-      <if test="checkFlag != null">
-        #{checkFlag,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.appservice.appmeterbasecustomersupplier.model.AppMeterBaseCustomerSupplier">
-    update METER_BASE_CUSTOMER_SUPPLIER
-    set CUSTOMER_SUPPLIER_NAME = #{customerSupplierName,jdbcType=VARCHAR},
-      MNEMONIC_CODE = #{mnemonicCode,jdbcType=VARCHAR},
-      CUSTOMER_SUPPLIER_TYPE = #{customerSupplierType,jdbcType=VARCHAR},
-      CUSTOMER_SUPPLIER_PASSWORD = #{customerSupplierPassword,jdbcType=VARCHAR},
-      VALID_FLAG = #{validFlag,jdbcType=VARCHAR},
-      CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
-      CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
-      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
-      UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
-      UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
-      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      DELETE_MAN_NO = #{deleteManNo,jdbcType=VARCHAR},
-      DELETE_MAN_NAME = #{deleteManName,jdbcType=VARCHAR},
-      DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
-      CUSTOMER_SUPPLIER_LOGIN = #{customerSupplierLogin,jdbcType=VARCHAR},
-      CHECK_FLAG = #{checkFlag,jdbcType=VARCHAR}
-    where CUSTOMER_SUPPLIER_NO = #{customerSupplierNo,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.appservice.appmeterbasecustomersupplier.model.AppMeterBaseCustomerSupplier">
-    update METER_BASE_CUSTOMER_SUPPLIER
-    <set>
-      <if test="customerSupplierName != null">
-        CUSTOMER_SUPPLIER_NAME = #{customerSupplierName,jdbcType=VARCHAR},
-      </if>
-      <if test="mnemonicCode != null">
-        MNEMONIC_CODE = #{mnemonicCode,jdbcType=VARCHAR},
-      </if>
-      <if test="customerSupplierType != null">
-        CUSTOMER_SUPPLIER_TYPE = #{customerSupplierType,jdbcType=VARCHAR},
-      </if>
-      <if test="customerSupplierPassword != null">
-        CUSTOMER_SUPPLIER_PASSWORD = #{customerSupplierPassword,jdbcType=VARCHAR},
-      </if>
-      <if test="validFlag != null">
-        VALID_FLAG = #{validFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="createManNo != null">
-        CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="createManName != null">
-        CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateManNo != null">
-        UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="updateManName != null">
-        UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="deleteManNo != null">
-        DELETE_MAN_NO = #{deleteManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteManName != null">
-        DELETE_MAN_NAME = #{deleteManName,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteTime != null">
-        DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="customerSupplierLogin != null">
-        CUSTOMER_SUPPLIER_LOGIN = #{customerSupplierLogin,jdbcType=VARCHAR},
-      </if>
-      <if test="checkFlag != null">
-        CHECK_FLAG = #{checkFlag,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where CUSTOMER_SUPPLIER_NO = #{customerSupplierNo,jdbcType=VARCHAR}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where CUSTOMER_SUPPLIER_NO = #{customerSupplierNo,jdbcType=VARCHAR}
-  </select>
-  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="where"/>
-    order by  CREATE_TIME desc
-  </select>
-  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="whereLike"/>
-    order by  CREATE_TIME desc
-  </select>
-  <insert id="batchInsert" parameterType="java.util.List">
-    insert into METER_BASE_CUSTOMER_SUPPLIER
-    (CUSTOMER_SUPPLIER_NO,
-    CUSTOMER_SUPPLIER_NAME, MNEMONIC_CODE,
-    CUSTOMER_SUPPLIER_TYPE, CUSTOMER_SUPPLIER_PASSWORD,
-    VALID_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME,
-    CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME,
-    UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME,
-    DELETE_TIME, CUSTOMER_SUPPLIER_LOGIN,
-    CHECK_FLAG)
-    ( <foreach collection="list" item="item" separator="union all">
-    select
-    #{item.customerSupplierNo,jdbcType=VARCHAR},
-    #{item.customerSupplierName,jdbcType=VARCHAR}, #{item.mnemonicCode,jdbcType=VARCHAR},
-    #{item.customerSupplierType,jdbcType=VARCHAR}, #{item.customerSupplierPassword,jdbcType=VARCHAR},
-    #{item.validFlag,jdbcType=VARCHAR}, #{item.createManNo,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR},
-    #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR},
-    #{item.updateTime,jdbcType=TIMESTAMP}, #{item.deleteManNo,jdbcType=VARCHAR}, #{item.deleteManName,jdbcType=VARCHAR},
-    #{item.deleteTime,jdbcType=TIMESTAMP}, #{item.customerSupplierLogin,jdbcType=VARCHAR},
-    #{item.checkFlag,jdbcType=VARCHAR} from dual
-  </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-    update METER_BASE_CUSTOMER_SUPPLIER
-    set
-    CUSTOMER_SUPPLIER_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case CUSTOMER_SUPPLIER_NO" close="end">
-      when #{item.customerSupplierNo,jdbcType=VARCHAR} then #{item.customerSupplierNo,jdbcType=VARCHAR}
-    </foreach>
-    ,CUSTOMER_SUPPLIER_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case CUSTOMER_SUPPLIER_NO" close="end">
-      when #{item.customerSupplierNo,jdbcType=VARCHAR} then #{item.customerSupplierName,jdbcType=VARCHAR}
-    </foreach>
-    ,MNEMONIC_CODE=
-    <foreach collection="list" item="item" index="index" separator=" " open="case CUSTOMER_SUPPLIER_NO" close="end">
-      when #{item.customerSupplierNo,jdbcType=VARCHAR} then #{item.mnemonicCode,jdbcType=VARCHAR}
-    </foreach>
-    ,CUSTOMER_SUPPLIER_TYPE=
-    <foreach collection="list" item="item" index="index" separator=" " open="case CUSTOMER_SUPPLIER_NO" close="end">
-      when #{item.customerSupplierNo,jdbcType=VARCHAR} then #{item.customerSupplierType,jdbcType=VARCHAR}
-    </foreach>
-    ,CUSTOMER_SUPPLIER_PASSWORD=
-    <foreach collection="list" item="item" index="index" separator=" " open="case CUSTOMER_SUPPLIER_NO" close="end">
-      when #{item.customerSupplierNo,jdbcType=VARCHAR} then #{item.customerSupplierPassword,jdbcType=VARCHAR}
-    </foreach>
-    ,VALID_FLAG=
-    <foreach collection="list" item="item" index="index" separator=" " open="case CUSTOMER_SUPPLIER_NO" close="end">
-      when #{item.customerSupplierNo,jdbcType=VARCHAR} then #{item.validFlag,jdbcType=VARCHAR}
-    </foreach>
-    ,CREATE_MAN_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case CUSTOMER_SUPPLIER_NO" close="end">
-      when #{item.customerSupplierNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
-    </foreach>
-    ,CREATE_MAN_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case CUSTOMER_SUPPLIER_NO" close="end">
-      when #{item.customerSupplierNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
-    </foreach>
-    ,CREATE_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case CUSTOMER_SUPPLIER_NO" close="end">
-      when #{item.customerSupplierNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,UPDATE_MAN_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case CUSTOMER_SUPPLIER_NO" close="end">
-      when #{item.customerSupplierNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
-    </foreach>
-    ,UPDATE_MAN_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case CUSTOMER_SUPPLIER_NO" close="end">
-      when #{item.customerSupplierNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
-    </foreach>
-    ,UPDATE_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case CUSTOMER_SUPPLIER_NO" close="end">
-      when #{item.customerSupplierNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,DELETE_MAN_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case CUSTOMER_SUPPLIER_NO" close="end">
-      when #{item.customerSupplierNo,jdbcType=VARCHAR} then #{item.deleteManNo,jdbcType=VARCHAR}
-    </foreach>
-    ,DELETE_MAN_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case CUSTOMER_SUPPLIER_NO" close="end">
-      when #{item.customerSupplierNo,jdbcType=VARCHAR} then #{item.deleteManName,jdbcType=VARCHAR}
-    </foreach>
-    ,DELETE_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case CUSTOMER_SUPPLIER_NO" close="end">
-      when #{item.customerSupplierNo,jdbcType=VARCHAR} then #{item.deleteTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,CUSTOMER_SUPPLIER_LOGIN=
-    <foreach collection="list" item="item" index="index" separator=" " open="case CUSTOMER_SUPPLIER_NO" close="end">
-      when #{item.customerSupplierNo,jdbcType=VARCHAR} then #{item.customerSupplierLogin,jdbcType=VARCHAR}
-    </foreach>
-    ,CHECK_FLAG=
-    <foreach collection="list" item="item" index="index" separator=" " open="case CUSTOMER_SUPPLIER_NO" close="end">
-      when #{item.customerSupplierNo,jdbcType=VARCHAR} then #{item.checkFlag,jdbcType=VARCHAR}
-    </foreach>
-    where CUSTOMER_SUPPLIER_NO in
-    <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-      #{item.customerSupplierNo,jdbcType=VARCHAR}
-    </foreach>
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from METER_BASE_CUSTOMER_SUPPLIER
-    where CUSTOMER_SUPPLIER_NO in
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  <select id="GetNewID" parameterType="java.lang.String" resultType="java.lang.String">
-    SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(CUSTOMER_SUPPLIER_NO, LENGTH(CUSTOMER_SUPPLIER_NO) -3))),0) + 1,4,'0') CUSTOMER_SUPPLIER_NO
-    FROM METER_BASE_CUSTOMER_SUPPLIER
-  </select>
-
-
-  <resultMap id="BaseResultMapDto" type="com.steerinfo.baseinfo.dto.MeterBaseCustomerSupplierDto" extends="BaseResultMap">
-    <result column="COMPANY_NO" jdbcType="VARCHAR" property="companyNo" />
-    <result column="COMPANY_NAME" jdbcType="VARCHAR" property="companyName" />
-  </resultMap>
-
-
-  <select id="selectComp1" parameterType="java.lang.String" resultMap="BaseResultMapDto">
-    SELECT  t.CUSTOMER_SUPPLIER_NO COMPANY_NO, t.CUSTOMER_SUPPLIER_NAME COMPANY_NAME
-    from METER_BASE_CUSTOMER_SUPPLIER t
-    where (t.customer_supplier_type='2' or t.customer_supplier_type=#{customerSupplierType,jdbcType=VARCHAR}) and  t.valid_flag='1'
-  </select>
-
-  <select id="selectComp2" parameterType="java.lang.String" resultMap="BaseResultMapDto">
-    SELECT   t.LOAD_POINT_NO COMPANY_NO, t.LOAD_POINT_NAME COMPANY_NAME
-    from METER_BASE_LOAD_POINT t
-    where t.valid_flag='1'
-  </select>
-
-  <select id="selectForUpdate" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <where>
-      <if test="customerSupplierNo != null and customerSupplierNo != ''">
-        and CUSTOMER_SUPPLIER_NO != #{customerSupplierNo}
-      </if>
-      <if test="customerSupplierName != null and customerSupplierName != ''">
-        and CUSTOMER_SUPPLIER_NAME = #{customerSupplierName}
-      </if>
-      <if test="customerSupplierLogin != null and customerSupplierLogin != ''">
-        and CUSTOMER_SUPPLIER_LOGIN = #{customerSupplierLogin}
-      </if>
-    </where>
-  </select>
-</mapper>

src/main/java/com/steerinfo/appservice/appmeterbasecustomersupplier/model/AppMeterBaseCustomerSupplier.java

@@ -1,294 +0,0 @@
-package com.steerinfo.appservice.appmeterbasecustomersupplier.model;
-
-import com.steerinfo.framework.model.IBasePO;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class AppMeterBaseCustomerSupplier implements IBasePO<String> {
-    /**
-     * 客商编号(CUSTOMER_SUPPLIER_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="客商编号",required=true)
-    private String customerSupplierNo;
-
-    /**
-     * 客商名称(CUSTOMER_SUPPLIER_NAME,VARCHAR,100)
-     */
-    @ApiModelProperty(value="客商名称",required=true)
-    private String customerSupplierName;
-
-    /**
-     * 助记码(MNEMONIC_CODE,VARCHAR,20)
-     */
-    @ApiModelProperty(value="助记码",required=false)
-    private String mnemonicCode;
-
-    /**
-     * 客商类型(CUSTOMER_SUPPLIER_TYPE,VARCHAR,1)
-     */
-    @ApiModelProperty(value="客商类型",required=true)
-    private String customerSupplierType;
-
-    /**
-     * 密码(CUSTOMER_SUPPLIER_PASSWORD,VARCHAR,20)
-     */
-    @ApiModelProperty(value="密码",required=true)
-    private String customerSupplierPassword;
-
-    /**
-     * 状态(VALID_FLAG,VARCHAR,1)
-     */
-    @ApiModelProperty(value="状态",required=true)
-    private String validFlag;
-
-    /**
-     * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="创建人编号",required=true)
-    private String createManNo;
-
-    /**
-     * 创建人姓名(CREATE_MAN_NAME,VARCHAR,30)
-     */
-    @ApiModelProperty(value="创建人姓名",required=true)
-    private String createManName;
-
-    /**
-     * 创建时间(CREATE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="创建时间",required=true)
-    private Date createTime;
-
-    /**
-     * 修改人编号(UPDATE_MAN_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="修改人编号",required=false)
-    private String updateManNo;
-
-    /**
-     * 修改人姓名(UPDATE_MAN_NAME,VARCHAR,30)
-     */
-    @ApiModelProperty(value="修改人姓名",required=false)
-    private String updateManName;
-
-    /**
-     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="修改时间",required=false)
-    private Date updateTime;
-
-    /**
-     * 删除人编号(DELETE_MAN_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="删除人编号",required=false)
-    private String deleteManNo;
-
-    /**
-     * 删除人姓名(DELETE_MAN_NAME,VARCHAR,30)
-     */
-    @ApiModelProperty(value="删除人姓名",required=false)
-    private String deleteManName;
-
-    /**
-     * 删除时间(DELETE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="删除时间",required=false)
-    private Date deleteTime;
-
-    /**
-     * 账号(CUSTOMER_SUPPLIER_LOGIN,VARCHAR,20)
-     */
-    @ApiModelProperty(value="账号",required=false)
-    private String customerSupplierLogin;
-
-    /**
-     * 审核状态(CHECK_FLAG,VARCHAR,1)
-     */
-    @ApiModelProperty(value="审核状态",required=false)
-    private String checkFlag;
-
-    /**
-     * 密码(CUSTOMER_SUPPLIER_PASSWORD,VARCHAR,20)
-     */
-    @ApiModelProperty(value="新密码",required=true)
-    private String newCustomerSupplierPassword;
-
-    private static final long serialVersionUID = 1L;
-
-    @Override
-    public String getId() {
-        return this.customerSupplierNo;
-    }
-
-    @Override
-    public void setId(String customerSupplierNo) {
-        this.customerSupplierNo = customerSupplierNo == null ? null : customerSupplierNo.trim();
-    }
-
-    public String getCustomerSupplierNo() {
-        return customerSupplierNo;
-    }
-
-    public void setCustomerSupplierNo(String customerSupplierNo) {
-        this.customerSupplierNo = customerSupplierNo == null ? null : customerSupplierNo.trim();
-    }
-
-    public String getCustomerSupplierName() {
-        return customerSupplierName;
-    }
-
-    public void setCustomerSupplierName(String customerSupplierName) {
-        this.customerSupplierName = customerSupplierName == null ? null : customerSupplierName.trim();
-    }
-
-    public String getMnemonicCode() {
-        return mnemonicCode;
-    }
-
-    public void setMnemonicCode(String mnemonicCode) {
-        this.mnemonicCode = mnemonicCode == null ? null : mnemonicCode.trim();
-    }
-
-    public String getCustomerSupplierType() {
-        return customerSupplierType;
-    }
-
-    public void setCustomerSupplierType(String customerSupplierType) {
-        this.customerSupplierType = customerSupplierType == null ? null : customerSupplierType.trim();
-    }
-
-    public String getCustomerSupplierPassword() {
-        return customerSupplierPassword;
-    }
-
-    public void setCustomerSupplierPassword(String customerSupplierPassword) {
-        this.customerSupplierPassword = customerSupplierPassword == null ? null : customerSupplierPassword.trim();
-    }
-
-    public String getValidFlag() {
-        return validFlag;
-    }
-
-    public void setValidFlag(String validFlag) {
-        this.validFlag = validFlag == null ? null : validFlag.trim();
-    }
-
-    public String getCreateManNo() {
-        return createManNo;
-    }
-
-    public void setCreateManNo(String createManNo) {
-        this.createManNo = createManNo == null ? null : createManNo.trim();
-    }
-
-    public String getCreateManName() {
-        return createManName;
-    }
-
-    public void setCreateManName(String createManName) {
-        this.createManName = createManName == null ? null : createManName.trim();
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getUpdateManNo() {
-        return updateManNo;
-    }
-
-    public void setUpdateManNo(String updateManNo) {
-        this.updateManNo = updateManNo == null ? null : updateManNo.trim();
-    }
-
-    public String getUpdateManName() {
-        return updateManName;
-    }
-
-    public void setUpdateManName(String updateManName) {
-        this.updateManName = updateManName == null ? null : updateManName.trim();
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getDeleteManNo() {
-        return deleteManNo;
-    }
-
-    public void setDeleteManNo(String deleteManNo) {
-        this.deleteManNo = deleteManNo == null ? null : deleteManNo.trim();
-    }
-
-    public String getDeleteManName() {
-        return deleteManName;
-    }
-
-    public void setDeleteManName(String deleteManName) {
-        this.deleteManName = deleteManName == null ? null : deleteManName.trim();
-    }
-
-    public Date getDeleteTime() {
-        return deleteTime;
-    }
-
-    public void setDeleteTime(Date deleteTime) {
-        this.deleteTime = deleteTime;
-    }
-
-    public String getCustomerSupplierLogin() {
-        return customerSupplierLogin;
-    }
-
-    public void setCustomerSupplierLogin(String customerSupplierLogin) {
-        this.customerSupplierLogin = customerSupplierLogin == null ? null : customerSupplierLogin.trim();
-    }
-
-    public String getCheckFlag() {
-        return checkFlag;
-    }
-
-    public void setCheckFlag(String checkFlag) {
-        this.checkFlag = checkFlag == null ? null : checkFlag.trim();
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", customerSupplierNo=").append(customerSupplierNo);
-        sb.append(", customerSupplierName=").append(customerSupplierName);
-        sb.append(", mnemonicCode=").append(mnemonicCode);
-        sb.append(", customerSupplierType=").append(customerSupplierType);
-        sb.append(", customerSupplierPassword=").append(customerSupplierPassword);
-        sb.append(", validFlag=").append(validFlag);
-        sb.append(", createManNo=").append(createManNo);
-        sb.append(", createManName=").append(createManName);
-        sb.append(", createTime=").append(createTime);
-        sb.append(", updateManNo=").append(updateManNo);
-        sb.append(", updateManName=").append(updateManName);
-        sb.append(", updateTime=").append(updateTime);
-        sb.append(", deleteManNo=").append(deleteManNo);
-        sb.append(", deleteManName=").append(deleteManName);
-        sb.append(", deleteTime=").append(deleteTime);
-        sb.append(", customerSupplierLogin=").append(customerSupplierLogin);
-        sb.append(", checkFlag=").append(customerSupplierLogin);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}

src/main/java/com/steerinfo/appservice/appmeterbasecustomersupplier/service/IAppMeterBaseCustomerSupplierService.java

@@ -1,26 +0,0 @@
-package com.steerinfo.appservice.appmeterbasecustomersupplier.service;
-
-import com.steerinfo.appservice.appmeterbasecustomersupplier.model.AppMeterBaseCustomerSupplier;
-import com.steerinfo.framework.controller.RESTfulResult;
-import com.steerinfo.framework.service.IBaseService;
-
-
-/**
- * MeterBaseCustomerSupplier服务接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2020-06-15 11:14
- * 类描述
- * 修订历史：
- * 日期：2020-06-15
- * 作者：generator
- * 参考：
- * 描述：MeterBaseCustomerSupplier服务接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-public interface IAppMeterBaseCustomerSupplierService extends IBaseService<AppMeterBaseCustomerSupplier, String>{
-
-    RESTfulResult login(AppMeterBaseCustomerSupplier model);
-
-    RESTfulResult modifyPassword(AppMeterBaseCustomerSupplier model);
-}

src/main/java/com/steerinfo/appservice/appmeterbasecustomersupplier/service/impl/AppMeterBaseCustomerSupplierServiceImpl.java

@@ -1,91 +0,0 @@
-package com.steerinfo.appservice.appmeterbasecustomersupplier.service.impl;
-
-import com.steerinfo.appservice.appmeterbasecustomersupplier.mapper.AppMeterBaseCustomerSupplierMapper;
-import com.steerinfo.appservice.appmeterbasecustomersupplier.model.AppMeterBaseCustomerSupplier;
-import com.steerinfo.appservice.appmeterbasecustomersupplier.service.IAppMeterBaseCustomerSupplierService;
-import com.steerinfo.baseinfo.meterbasecarrierunit.mapper.MeterBaseCarrierUnitMapper;
-import com.steerinfo.framework.controller.RESTfulResult;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
-import com.steerinfo.util.StringUtils;
-import org.springframework.context.annotation.Primary;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * MeterBaseCustomerSupplier服务实现：
- *
- * @author generator
- * @version 1.0-SNAPSHORT 2020-06-15 11:14
- * 类描述
- * 修订历史：
- * 日期：2020-06-15
- * 作者：generator
- * 参考：
- * 描述：MeterBaseCustomerSupplier服务实现
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- * @see null
- */
-@Service(value = "appServiceMeterBaseCustomerSupplierService")
-@Primary
-public class AppMeterBaseCustomerSupplierServiceImpl extends BaseServiceImpl<AppMeterBaseCustomerSupplier, String> implements IAppMeterBaseCustomerSupplierService {
-
-    @Resource
-    private AppMeterBaseCustomerSupplierMapper appMeterBaseCustomerSupplierMapper;
-
-    @Resource
-    private MeterBaseCarrierUnitMapper meterBaseCarrierUnitMapper;
-
-    @Override
-    protected IBaseMapper<AppMeterBaseCustomerSupplier, String> getMapper() {
-        return appMeterBaseCustomerSupplierMapper;
-    }
-
-    @Override
-    @Transactional
-    public RESTfulResult login(AppMeterBaseCustomerSupplier model) {
-        RESTfulResult rm = new RESTfulResult();
-        HashMap<String, Object> obj = new HashMap<>();
-        obj.put("customerSupplierLogin", model.getCustomerSupplierLogin());
-        obj.put("customerSupplierPassword", model.getCustomerSupplierPassword());
-        obj.put("validFlag", "1");//有效
-        List<AppMeterBaseCustomerSupplier> mbcss = appMeterBaseCustomerSupplierMapper.selectByParameters(obj);
-        if (mbcss != null && mbcss.size() > 0) {
-            if (StringUtils.isNotEmpty(mbcss.get(0).getCheckFlag()) && "0".equals(mbcss.get(0).getCheckFlag())) {
-                rm.setMessage("账号未通过审核，不允许进行登录！");
-                rm.setCode("500");
-                return rm;
-            }
-        }
-        if (mbcss == null || mbcss.isEmpty()) {
-            rm.setMessage("账号不存在或密码错误！！");
-            rm.setCode("500");
-        } else {
-            rm.setCode("0");
-            rm.setData(mbcss.get(0));
-        }
-        return rm;
-    }
-
-    @Override
-    @Transactional
-    public RESTfulResult modifyPassword(AppMeterBaseCustomerSupplier model) {
-        RESTfulResult rm = new RESTfulResult();
-        AppMeterBaseCustomerSupplier mbcs = appMeterBaseCustomerSupplierMapper.selectByPrimaryKey(model.getCustomerSupplierNo());
-        if (!mbcs.getCustomerSupplierPassword().equals(model.getCustomerSupplierPassword())) {
-            rm.setData(null);
-            rm.setCode("500");
-            rm.setMessage("原密码错误！");
-        } else {
-            model.setCustomerSupplierPassword(model.getNewCustomerSupplierPassword());
-            appMeterBaseCustomerSupplierMapper.updateByPrimaryKeySelective(model);
-            rm.setData(model);
-        }
-        return rm;
-    }
-
-}

src/main/java/com/steerinfo/appservice/appmeterworkcaractual/controller/AppMeterWorkCarActualController.java

@@ -1,376 +0,0 @@
-package com.steerinfo.appservice.appmeterworkcaractual.controller;
-
-import com.steerinfo.appservice.appmeterworkcaractual.model.AppMeterWorkCarActual;
-import com.steerinfo.appservice.appmeterworkcaractual.service.IAppMeterWorkCarActualService;
-import com.steerinfo.appservice.dto.AppMeterWorkCarActualDemo;
-import com.steerinfo.appservice.dto.LoadLinkDemo;
-import com.steerinfo.appservice.dto.companyDemo;
-import com.steerinfo.baseinfo.combaseinfo.model.ComBaseInfo;
-import com.steerinfo.baseinfo.meterbasematterinfo.model.MeterBaseMatterInfo;
-import com.steerinfo.framework.controller.BaseRESTfulController;
-import com.steerinfo.framework.controller.RESTfulResult;
-import com.steerinfo.framework.service.pagehelper.PageList;
-import com.steerinfo.meterwork.except.MarkerMetException;
-import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
-import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
-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.interceptor.TransactionAspectSupport;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * MeterWorkCarActual RESTful接口：
- *
- * @author generator
- * @version 1.0-SNAPSHORT 2020-09-17 11:03
- * 类描述
- * 修订历史：
- * 日期：2020-09-17
- * 作者：generator
- * 参考：
- * 描述：MeterWorkCarActual RESTful接口
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- * @see null
- */
-@RestController
-@RequestMapping("/${api.version}/appservice/meterworkcaractuals")
-public class AppMeterWorkCarActualController extends BaseRESTfulController {
-
-    @Autowired
-    IAppMeterWorkCarActualService appmeterWorkCarActualService;
-
-    @ApiOperation(value = "供应商获取总数", notes = "分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
-    })
-    @GetMapping(value = "/selectSumForApp")
-    public RESTfulResult selectSumForApp(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
-        try {
-            PageList<AppMeterWorkCarActualDemo> list = appmeterWorkCarActualService.queryForApp(parmas, pageNum, pageSize);
-            return success(list);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new MarkerMetException(500, "操作异常！！");
-        }
-    }
-
-    @ApiOperation(value = "下拉框获取业务编号", notes = "")
-    @GetMapping(value = "/selectMeterType")
-    public RESTfulResult selectMeterType(@RequestParam HashMap parmas) {
-        try {
-            List<ComBaseInfo> list = appmeterWorkCarActualService.selectMeterType(parmas);
-            return success(list);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new MarkerMetException(500, "操作异常！！");
-        }
-    }
-
-    @ApiOperation(value = "下拉框获取物料", notes = "")
-    @GetMapping(value = "/selectMatter")
-    public RESTfulResult selectMatter(@RequestParam HashMap parmas) {
-        try {
-            List<MeterBaseMatterInfo> list = appmeterWorkCarActualService.selectMatter(parmas);
-            return success(list);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new MarkerMetException(500, "操作异常！！");
-        }
-    }
-
-    @ApiOperation(value = "根据供应商参数查询数据", notes = "查询明细数据")
-    @GetMapping(value = "/selectNet")
-    public RESTfulResult selectNet(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
-        try {
-            PageList<AppMeterWorkCarActual> list = appmeterWorkCarActualService.selectNet(parmas, pageNum, pageSize);
-            return success(list);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new MarkerMetException(500, "操作异常！！");
-        }
-    }
-
-    @ApiOperation(value = "通过车号获取总数", notes = "分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
-    })
-    @GetMapping(value = "/selectSumForAppByCar")
-    public RESTfulResult selectSumForAppByCar(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
-        try {
-            PageList<AppMeterWorkCarActualDemo> list = appmeterWorkCarActualService.selectSumForAppByCar(parmas, pageNum, pageSize);
-            return success(list);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new MarkerMetException(500, "操作异常！！");
-        }
-    }
-
-    @ApiOperation(value = "根据车号参数查询数据", notes = "查询明细数据")
-    @GetMapping(value = "/selectNetByCar")
-    public RESTfulResult selectNetByCar(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
-        try {
-            PageList<AppMeterWorkCarActual> list = appmeterWorkCarActualService.selectNetByCar(parmas, pageNum, pageSize);
-            return success(list);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new MarkerMetException(500, "操作异常！！");
-        }
-    }
-
-    @ApiOperation(value = "卸货确认-查询-金川", notes = "分页查询")
-    @GetMapping(value = "/selectForLoad")
-    public RESTfulResult selectForLoad(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
-        try {
-            PageList<MeterWorkCarActualFirst> list = appmeterWorkCarActualService.selectForLoad(parmas, pageNum, pageSize);
-            return success(list);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new MarkerMetException(500, "操作异常！！");
-        }
-    }
-
-    @ApiOperation(value = "卸货确认-待卸货数据查询-九钢", notes = "分页查询")
-    @GetMapping(value = "/selectToBeUnLoad")
-    public RESTfulResult selectToBeUnLoad(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
-        try {
-            parmas.put("linkCode", "001021004");
-            parmas.put("valueFlag", "0");
-            PageList<MeterWorkCarActualFirst> list = appmeterWorkCarActualService.selectToBeDidUnLoad(parmas, pageNum, pageSize);
-            return success(list);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new MarkerMetException(500, "操作异常！！");
-        }
-    }
-
-    @ApiOperation(value = "卸货确认-已卸货数据查询-九钢", notes = "分页查询")
-    @GetMapping(value = "/selectDidUnLoad")
-    public RESTfulResult selectDidUnLoad(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
-        try {
-            parmas.put("linkCode", "001021004");
-            parmas.put("valueFlag", "1");
-            PageList<MeterWorkCarActualFirst> list = appmeterWorkCarActualService.selectToBeDidUnLoad(parmas, pageNum, pageSize);
-            return success(list);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new MarkerMetException(500, "操作异常！！");
-        }
-    }
-
-
-    @ApiOperation(value = "装货确认-待装货数据查询-九钢", notes = "分页查询")
-    @GetMapping(value = "/selectToBeLoad")
-    public RESTfulResult selectToBeLoad(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
-        try {
-            parmas.put("linkCode", "001021007");
-            parmas.put("valueFlag", "0");
-            PageList<MeterWorkCarActualFirst> list = appmeterWorkCarActualService.selectToBeDidLoad(parmas, pageNum, pageSize);
-            return success(list);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new MarkerMetException(500, "操作异常！！");
-        }
-    }
-
-    @ApiOperation(value = "装货确认-已装货数据查询-九钢", notes = "分页查询")
-    @GetMapping(value = "/selectDidLoad")
-    public RESTfulResult selectDidLoad(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
-        try {
-            parmas.put("linkCode", "001021007");
-            parmas.put("valueFlag", "1");
-            PageList<MeterWorkCarActualFirst> list = appmeterWorkCarActualService.selectToBeDidLoad(parmas, pageNum, pageSize);
-            return success(list);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new MarkerMetException(500, "操作异常！！");
-        }
-    }
-
-    @ApiOperation(value = "卸货确认-确认", notes = "进行确认操作，确认人及愉快编号不允许为空")
-    @PostMapping(value = "/UpdateForUnLoad", produces = "application/json;charset=UTF-8")
-    public RESTfulResult UpdateForUnLoad(@RequestBody MeterWorkCarActualFirst model) {
-        RESTfulResult rm = failed();
-        try {
-            String no = appmeterWorkCarActualService.UpdateForUnLoad(model,"卸货");
-            return success(no);
-        } catch (MarkerMetException e) {
-            e.printStackTrace();
-            rm.setMessage(e.getMessage());
-        } catch (Exception e) {
-            e.printStackTrace();
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return failed(null, "操作异常，请确认！");
-        }
-        return rm;
-    }
-
-    @ApiOperation(value = "卸货确认-取消确认", notes = "取消卸货确认，确认人及愉快编号不允许为空")
-    @PostMapping(value = "/UpdateForUnLoadRecover", produces = "application/json;charset=UTF-8")
-    public RESTfulResult UpdateForUnLoadRecover(@RequestBody MeterWorkCarActualFirst model) {
-        RESTfulResult rm = failed();
-        try {
-            int num = appmeterWorkCarActualService.updateForUnLoadRecover(model,"卸货");
-            if (num >= 1) {
-                return success(num);
-            } else {
-                return failed("新增失败");
-            }
-        } catch (MarkerMetException e) {
-            e.printStackTrace();
-            rm.setMessage(e.getMessage());
-        } catch (Exception e) {
-            e.printStackTrace();
-            rm.setMessage("操作异常，请确认！");
-        } finally {
-
-        }
-        return rm;
-    }
-
-
-    @ApiOperation(value = "装货确认-确认", notes = "进行确认操作，确认人及愉快编号不允许为空")
-    @PostMapping(value = "/UpdateForLoad", produces = "application/json;charset=UTF-8")
-    public RESTfulResult UpdateForLoad(@RequestBody MeterWorkCarActualFirst model) {
-        RESTfulResult rm = failed();
-        try {
-            String no = appmeterWorkCarActualService.UpdateForUnLoad(model,"装货");
-            return success(no);
-        } catch (MarkerMetException e) {
-            e.printStackTrace();
-            rm.setMessage(e.getMessage());
-        } catch (Exception e) {
-            e.printStackTrace();
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return failed(null, "操作异常，请确认！");
-        }
-        return rm;
-    }
-
-    @ApiOperation(value = "装货确认-取消确认",  notes = "取消卸货确认，确认人及愉快编号不允许为空")
-    @PostMapping(value = "/UpdateForLoadRecover", produces = "application/json;charset=UTF-8")
-    public RESTfulResult UpdateForLoadRecover(@RequestBody MeterWorkCarActualFirst model) {
-        RESTfulResult rm = failed();
-        try {
-            int num = appmeterWorkCarActualService.updateForUnLoadRecover(model,"装货");
-            if (num >= 1) {
-                return success(num);
-            } else {
-                return failed("新增失败");
-            }
-        } catch (MarkerMetException e) {
-            e.printStackTrace();
-            rm.setMessage(e.getMessage());
-        } catch (Exception e) {
-            e.printStackTrace();
-            rm.setMessage("操作异常，请确认！");
-        } finally {
-
-        }
-        return rm;
-    }
-
-    @ApiOperation(value = "卸货实绩-不用了，留着过度", notes = "查询明细数据")
-    @GetMapping(value = "/selectLoadLinkDemo")
-    public RESTfulResult selectLoadLinkDemo(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
-        try {
-            PageList<LoadLinkDemo> list = appmeterWorkCarActualService.selectLoadLinkDemo(parmas, pageNum, pageSize);
-            return success(list);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new MarkerMetException(500, "操作异常！！");
-        }
-    }
-
-    @ApiOperation(value = "卸货实绩查询-查询洁净表的数据", notes = "查询明细数据")
-    @GetMapping(value = "/selectLoadLinkActual")
-    public RESTfulResult selectLoadLinkActual(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
-        try {
-            PageList<LoadLinkDemo> list = appmeterWorkCarActualService.selectLoadLinkActual(parmas, pageNum, pageSize);
-            return success(list);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new MarkerMetException(500, "操作异常！！");
-        }
-    }
-
-    @ApiOperation(value = "获取收发货单位", notes = "")
-    @GetMapping(value = "/selectReAndFo")
-    public RESTfulResult selectReAndFo(@RequestParam HashMap parmas) {
-        try {
-            List<companyDemo> list = appmeterWorkCarActualService.selectReAndFo(parmas);
-            return success(list);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new MarkerMetException(500, "操作异常！！");
-        }
-    }
-
-    @ApiOperation(value = "修改卸货点", notes = "")
-    @PostMapping(value = "/updateLoadPoint")
-    public RESTfulResult updateLoadPoint(@RequestBody MeterWorkCarActualFirst model) {
-        try {
-            String no = appmeterWorkCarActualService.updateLoadPoint(model);
-            return success(no);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new MarkerMetException(500, "操作异常！！");
-        }
-    }
-
-    @ApiOperation(value = "计量卸货时间判断", notes = "")
-    @PostMapping(value = "/judgeDuration")
-    public RESTfulResult judgeDuration(@RequestBody MeterWorkCarActualFirst model) {
-        RESTfulResult rm = failed();
-        try {
-            String no = appmeterWorkCarActualService.judgeDuration(model);
-            return success(no);
-        } catch (MarkerMetException e) {
-            e.printStackTrace();
-            rm.setMessage(e.getMessage());
-        } catch (Exception e) {
-            e.printStackTrace();
-            rm.setMessage("操作异常，请确认！");
-        } finally {
-
-        }
-        return rm;
-    }
-
-    @ApiOperation(value = "选择是将计量数据作废", notes = "")
-    @PostMapping(value = "/abolishData")
-    public RESTfulResult abolishData(@RequestBody MeterWorkCarActualFirst model) {
-        try {
-            String no = appmeterWorkCarActualService.abolishData(model);
-            return success(no);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new MarkerMetException(500, "操作异常！！");
-        }
-    }
-
-    @ApiOperation(value = "判断是否能够出厂", notes = "")
-    @PostMapping(value = "/judgeOutDoor")
-    public RESTfulResult judgeOutDoor(@RequestBody PreTrackScale model) {
-        RESTfulResult rm = failed();
-        try {
-            String str = appmeterWorkCarActualService.judgeOutDoor(model);
-            return success(str);
-        } catch (MarkerMetException e) {
-            e.printStackTrace();
-            rm.setMessage(e.getMessage());
-        } catch (Exception e) {
-            e.printStackTrace();
-            rm.setMessage("操作异常，请确认！");
-        } finally {
-
-        }
-        return rm;
-    }
-}

src/main/java/com/steerinfo/appservice/appmeterworkcaractual/mapper/AppMeterWorkCarActualMapper.java

@@ -1,58 +0,0 @@
-package com.steerinfo.appservice.appmeterworkcaractual.mapper;
-
-import com.steerinfo.appservice.appmeterworkcaractual.model.AppMeterWorkCarActual;
-import com.steerinfo.appservice.dto.AppMeterWorkCarActualDemo;
-import com.steerinfo.appservice.dto.LoadLinkDemo;
-import com.steerinfo.appservice.dto.companyDemo;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Mapper
-public interface AppMeterWorkCarActualMapper extends IBaseMapper<AppMeterWorkCarActual, String> {
-    /*     List<AppMeterWorkCarActualFirstDto> selectByCus(Map<String, Object> parameters);
-
-    List<AppMeterWorkCarActualFirstDto> selectByRec(Map<String, Object> parameters);*/
-
-    List<AppMeterWorkCarActual> selectNet (Map<String, Object> map);
-
-    List<AppMeterWorkCarActualDemo> selectSumForApp(Map<String, Object> map);
-
-    List<AppMeterWorkCarActualDemo> selectSumForAppByCar(Map<String, Object> map);
-
-    List<AppMeterWorkCarActual> selectNetByCar (Map<String, Object> map);
-
-    List<LoadLinkDemo> selectLoadLinkDemo(Map<String, Object> map);
-
-    List<companyDemo> selectReAndFo(Map<String, Object> map);
-
-    int updateForLink(Map<String, Object> map);
-
-    String selectForLinkUnLoad(Map<String, Object> map);
-
-    int abolishDataForLink(Map<String, Object> map);
-
-    List<AppMeterWorkCarActualDemo> selectSumHD(Map<String, Object> map);
-
-    List<AppMeterWorkCarActual> selectActualHD(Map<String, Object> map);
-
-    List<LoadLinkDemo> selectLoadLinkActual(Map<String, Object> map);
-
-    /**
-     * 待卸货数据及已卸货数据查询：查询已卸货的数据还是未卸货的数据，由调用的方法决定
-     * @param parmas
-     * @return
-     */
-    List<MeterWorkCarActual> selectToBeDidUnLoad(HashMap parmas);
-
-    /**
-     * 待装货数据查询与已装货数据查询
-     * @param parmas
-     * @return
-     */
-    List<MeterWorkCarActual> selectToBeDidLoad(HashMap parmas);
-}

src/main/java/com/steerinfo/appservice/appmeterworkcaractual/mapper/AppMeterWorkCarActualMapper.xml

@@ -1,2498 +0,0 @@
-<?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.appservice.appmeterworkcaractual.mapper.AppMeterWorkCarActualMapper">
-    <resultMap id="BaseResultMap" type="com.steerinfo.appservice.appmeterworkcaractual.model.AppMeterWorkCarActual">
-        <id column="ACTUAL_NO" jdbcType="VARCHAR" property="actualNo"/>
-        <result column="PREDICTION_NO" jdbcType="VARCHAR" property="predictionNo"/>
-        <result column="NOTICE_NO" jdbcType="VARCHAR" property="noticeNo"/>
-        <result column="CAR_NO" jdbcType="VARCHAR" property="carNo"/>
-        <result column="TRAILER_NO" jdbcType="VARCHAR" property="trailerNo"/>
-        <result column="MATTER_NO" jdbcType="VARCHAR" property="matterNo"/>
-        <result column="MATTER_NAME" jdbcType="VARCHAR" property="matterName"/>
-        <result column="CONTRACT_NO" jdbcType="VARCHAR" property="contractNo"/>
-        <result column="BATCH_NO" jdbcType="VARCHAR" property="batchNo"/>
-        <result column="CUSTOMER_SUPPLIER_NO" jdbcType="VARCHAR" property="customerSupplierNo"/>
-        <result column="CUSTOMER_SUPPLIER_NAME" jdbcType="VARCHAR" property="customerSupplierName"/>
-        <result column="FORWARDING_UNIT_NO" jdbcType="VARCHAR" property="forwardingUnitNo"/>
-        <result column="FORWARDING_UNIT_NAME" jdbcType="VARCHAR" property="forwardingUnitName"/>
-        <result column="RECEIVING_UINT_NO" jdbcType="VARCHAR" property="receivingUintNo"/>
-        <result column="RECEIVING_UINT_NAME" jdbcType="VARCHAR" property="receivingUintName"/>
-        <result column="MATERIAL_NO" jdbcType="VARCHAR" property="materialNo"/>
-        <result column="MATERIAL_NAME" jdbcType="VARCHAR" property="materialName"/>
-        <result column="SPEC_NO" jdbcType="VARCHAR" property="specNo"/>
-        <result column="SPEC_NAME" jdbcType="VARCHAR" property="specName"/>
-        <result column="LOAD_POINT_NO" jdbcType="VARCHAR" property="loadPointNo"/>
-        <result column="LOAD_POINT_NAME" jdbcType="VARCHAR" property="loadPointName"/>
-        <result column="SAMPLE_NO" jdbcType="VARCHAR" property="sampleNo"/>
-        <result column="SAMPLE_VOUCHER" jdbcType="VARCHAR" property="sampleVoucher"/>
-        <result column="CARRIER_UNIT_NO" jdbcType="VARCHAR" property="carrierUnitNo"/>
-        <result column="CARRIER_UNIT_NAME" jdbcType="VARCHAR" property="carrierUnitName"/>
-        <result column="METER_TYPE_NO" jdbcType="VARCHAR" property="meterTypeNo"/>
-        <result column="METER_TYPE_NAME" jdbcType="VARCHAR" property="meterTypeName"/>
-        <result column="METER_PROCESS_NO" jdbcType="VARCHAR" property="meterProcessNo"/>
-        <result column="METER_PROCESS_EDITION_NO" jdbcType="VARCHAR" property="meterProcessEditionNo"/>
-        <result column="ACTUAL_FIRST1_NO" jdbcType="VARCHAR" property="actualFirst1No"/>
-        <result column="GROSS_WEIGHT" jdbcType="DECIMAL" property="grossWeight"/>
-        <result column="GROSS_MAN_NO" jdbcType="VARCHAR" property="grossManNo"/>
-        <result column="GROSS_MAN_NAME" jdbcType="VARCHAR" property="grossManName"/>
-        <result column="GROSS_TIME" jdbcType="TIMESTAMP" property="grossTime"/>
-        <result column="BASE_SPOT1_NO" jdbcType="VARCHAR" property="baseSpot1No"/>
-        <result column="BASE_SPOT1_NAME" jdbcType="VARCHAR" property="baseSpot1Name"/>
-        <result column="GROSS_CLASS" jdbcType="VARCHAR" property="grossClass"/>
-        <result column="GROSS_GROUP" jdbcType="VARCHAR" property="grossGroup"/>
-        <result column="GROSS_MODE" jdbcType="VARCHAR" property="grossMode"/>
-        <result column="ACTUAL_FIRST2_NO" jdbcType="VARCHAR" property="actualFirst2No"/>
-        <result column="TARE_WEIGHT" jdbcType="DECIMAL" property="tareWeight"/>
-        <result column="TARE_MAN_NO" jdbcType="VARCHAR" property="tareManNo"/>
-        <result column="TARE_MAN_NAME" jdbcType="VARCHAR" property="tareManName"/>
-        <result column="TARE_TIME" jdbcType="TIMESTAMP" property="tareTime"/>
-        <result column="BASE_SPOT2_NO" jdbcType="VARCHAR" property="baseSpot2No"/>
-        <result column="BASE_SPOT2_NAME" jdbcType="VARCHAR" property="baseSpot2Name"/>
-        <result column="TARE_CLASS" jdbcType="VARCHAR" property="tareClass"/>
-        <result column="TARE_GROUP" jdbcType="VARCHAR" property="tareGroup"/>
-        <result column="TARE_MODE" jdbcType="VARCHAR" property="tareMode"/>
-        <result column="NET_WEIGHT" jdbcType="DECIMAL" property="netWeight"/>
-        <result column="METER_NUM" jdbcType="VARCHAR" property="meterNum"/>
-        <result column="NET_MAN_NO" jdbcType="VARCHAR" property="netManNo"/>
-        <result column="NET_MAN_NAME" jdbcType="VARCHAR" property="netManName"/>
-        <result column="NET_TIME" jdbcType="TIMESTAMP" property="netTime"/>
-        <result column="NET_SPOT3_NO" jdbcType="VARCHAR" property="netSpot3No"/>
-        <result column="NET_SPOT3_NAME" jdbcType="VARCHAR" property="netSpot3Name"/>
-        <result column="NET_GROUP" jdbcType="VARCHAR" property="netGroup"/>
-        <result column="NET_MODE" jdbcType="VARCHAR" property="netMode"/>
-        <result column="VALUE_FLAG" jdbcType="VARCHAR" property="valueFlag"/>
-        <result column="UPLOAD_FLAG" jdbcType="VARCHAR" property="uploadFlag"/>
-        <result column="CHECK_MAN_NO" jdbcType="VARCHAR" property="checkManNo"/>
-        <result column="CHECK_MAN_NAME" jdbcType="VARCHAR" property="checkManName"/>
-        <result column="CHECK_TIME" jdbcType="TIMESTAMP" property="checkTime"/>
-        <result column="UPLOAD_MAN_NO" jdbcType="VARCHAR" property="uploadManNo"/>
-        <result column="UPLOAD_MAN_NAME" jdbcType="VARCHAR" property="uploadManName"/>
-        <result column="UPLOAD_TIME" jdbcType="TIMESTAMP" property="uploadTime"/>
-        <result column="NET_CLASS" jdbcType="VARCHAR" property="netClass"/>
-    </resultMap>
-    <sql id="columns">
-    ACTUAL_NO, PREDICTION_NO, NOTICE_NO, CAR_NO, TRAILER_NO, MATTER_NO, MATTER_NAME,
-    CONTRACT_NO, BATCH_NO, CUSTOMER_SUPPLIER_NO, CUSTOMER_SUPPLIER_NAME, FORWARDING_UNIT_NO, 
-    FORWARDING_UNIT_NAME, RECEIVING_UINT_NO, RECEIVING_UINT_NAME, MATERIAL_NO, MATERIAL_NAME, 
-    SPEC_NO, SPEC_NAME, LOAD_POINT_NO, LOAD_POINT_NAME, SAMPLE_NO, SAMPLE_VOUCHER, CARRIER_UNIT_NO, 
-    CARRIER_UNIT_NAME, METER_TYPE_NO, METER_TYPE_NAME, METER_PROCESS_NO, METER_PROCESS_EDITION_NO, 
-    ACTUAL_FIRST1_NO, GROSS_WEIGHT, GROSS_MAN_NO, GROSS_MAN_NAME, GROSS_TIME, BASE_SPOT1_NO, 
-    BASE_SPOT1_NAME, GROSS_CLASS, GROSS_GROUP, GROSS_MODE, ACTUAL_FIRST2_NO, TARE_WEIGHT, 
-    TARE_MAN_NO, TARE_MAN_NAME, TARE_TIME, BASE_SPOT2_NO, BASE_SPOT2_NAME, TARE_CLASS, 
-    TARE_GROUP, TARE_MODE, NET_WEIGHT, METER_NUM, NET_MAN_NO, NET_MAN_NAME, NET_TIME, 
-    NET_SPOT3_NO, NET_SPOT3_NAME, NET_GROUP, NET_MODE, VALUE_FLAG, UPLOAD_FLAG, CHECK_MAN_NO, 
-    CHECK_MAN_NAME, CHECK_TIME, UPLOAD_MAN_NO, UPLOAD_MAN_NAME, UPLOAD_TIME, NET_CLASS
-  </sql>
-    <sql id="columns_alias">
-    t.ACTUAL_NO, t.PREDICTION_NO, t.NOTICE_NO, t.CAR_NO, t.TRAILER_NO, t.MATTER_NO, t.MATTER_NAME,
-    t.CONTRACT_NO, t.BATCH_NO, t.CUSTOMER_SUPPLIER_NO, t.CUSTOMER_SUPPLIER_NAME, t.FORWARDING_UNIT_NO, 
-    t.FORWARDING_UNIT_NAME, t.RECEIVING_UINT_NO, t.RECEIVING_UINT_NAME, t.MATERIAL_NO, 
-    t.MATERIAL_NAME, t.SPEC_NO, t.SPEC_NAME, t.LOAD_POINT_NO, t.LOAD_POINT_NAME, t.SAMPLE_NO, 
-    t.SAMPLE_VOUCHER, t.CARRIER_UNIT_NO, t.CARRIER_UNIT_NAME, t.METER_TYPE_NO, t.METER_TYPE_NAME, 
-    t.METER_PROCESS_NO, t.METER_PROCESS_EDITION_NO, t.ACTUAL_FIRST1_NO, t.GROSS_WEIGHT, 
-    t.GROSS_MAN_NO, t.GROSS_MAN_NAME, t.GROSS_TIME, t.BASE_SPOT1_NO, t.BASE_SPOT1_NAME, 
-    t.GROSS_CLASS, t.GROSS_GROUP, t.GROSS_MODE, t.ACTUAL_FIRST2_NO, t.TARE_WEIGHT, t.TARE_MAN_NO, 
-    t.TARE_MAN_NAME, t.TARE_TIME, t.BASE_SPOT2_NO, t.BASE_SPOT2_NAME, t.TARE_CLASS, t.TARE_GROUP, 
-    t.TARE_MODE, t.NET_WEIGHT, t.METER_NUM, t.NET_MAN_NO, t.NET_MAN_NAME, t.NET_TIME, 
-    t.NET_SPOT3_NO, t.NET_SPOT3_NAME, t.NET_GROUP, t.NET_MODE, t.VALUE_FLAG, t.UPLOAD_FLAG, 
-    t.CHECK_MAN_NO, t.CHECK_MAN_NAME, t.CHECK_TIME, t.UPLOAD_MAN_NO, t.UPLOAD_MAN_NAME, 
-    t.UPLOAD_TIME, t.NET_CLASS
-  </sql>
-    <sql id="select">
-        SELECT
-        <include refid="columns"/>
-        FROM METER_WORK_CAR_ACTUAL
-    </sql>
-    <sql id="select_alias">
-        SELECT
-        <include refid="columns_alias"/>
-        FROM METER_WORK_CAR_ACTUAL t
-    </sql>
-    <sql id="where">
-        <where>
-            <if test="predictionNo != null and predictionNo != ''">
-                and PREDICTION_NO = #{predictionNo}
-            </if>
-            <if test="noticeNo != null and noticeNo != ''">
-                and NOTICE_NO = #{noticeNo}
-            </if>
-            <if test="carNo != null and carNo != ''">
-                and CAR_NO LIKE '%${carNo}%'
-            </if>
-            <if test="trailerNo != null and trailerNo != ''">
-                and TRAILER_NO = #{trailerNo}
-            </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="contractNo != null and contractNo != ''">
-                and CONTRACT_NO = #{contractNo}
-            </if>
-            <if test="batchNo != null and batchNo != ''">
-                and BATCH_NO = #{batchNo}
-            </if>
-            <if test="customerSupplierNo != null and customerSupplierNo != ''">
-                and CUSTOMER_SUPPLIER_NO = #{customerSupplierNo}
-            </if>
-            <if test="customerSupplierName != null and customerSupplierName != ''">
-                and CUSTOMER_SUPPLIER_NAME = #{customerSupplierName}
-            </if>
-            <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
-                and FORWARDING_UNIT_NO = #{forwardingUnitNo}
-            </if>
-            <if test="forwardingUnitName != null and forwardingUnitName != ''">
-                and FORWARDING_UNIT_NAME = #{forwardingUnitName}
-            </if>
-            <if test="receivingUintNo != null and receivingUintNo != ''">
-                and RECEIVING_UINT_NO = #{receivingUintNo}
-            </if>
-            <if test="receivingUintName != null and receivingUintName != ''">
-                and RECEIVING_UINT_NAME = #{receivingUintName}
-            </if>
-            <if test="materialNo != null and materialNo != ''">
-                and MATERIAL_NO = #{materialNo}
-            </if>
-            <if test="materialName != null and materialName != ''">
-                and MATERIAL_NAME = #{materialName}
-            </if>
-            <if test="specNo != null and specNo != ''">
-                and SPEC_NO = #{specNo}
-            </if>
-            <if test="specName != null and specName != ''">
-                and SPEC_NAME = #{specName}
-            </if>
-            <if test="loadPointNo != null and loadPointNo != ''">
-                and LOAD_POINT_NO = #{loadPointNo}
-            </if>
-            <if test="loadPointName != null and loadPointName != ''">
-                and LOAD_POINT_NAME = #{loadPointName}
-            </if>
-            <if test="sampleNo != null and sampleNo != ''">
-                and SAMPLE_NO = #{sampleNo}
-            </if>
-            <if test="sampleVoucher != null and sampleVoucher != ''">
-                and SAMPLE_VOUCHER = #{sampleVoucher}
-            </if>
-            <if test="carrierUnitNo != null and carrierUnitNo != ''">
-                and CARRIER_UNIT_NO = #{carrierUnitNo}
-            </if>
-            <if test="carrierUnitName != null and carrierUnitName != ''">
-                and CARRIER_UNIT_NAME = #{carrierUnitName}
-            </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="meterProcessNo != null and meterProcessNo != ''">
-                and METER_PROCESS_NO = #{meterProcessNo}
-            </if>
-            <if test="meterProcessEditionNo != null and meterProcessEditionNo != ''">
-                and METER_PROCESS_EDITION_NO = #{meterProcessEditionNo}
-            </if>
-            <if test="actualFirst1No != null and actualFirst1No != ''">
-                and ACTUAL_FIRST1_NO = #{actualFirst1No}
-            </if>
-            <if test="grossWeight != null">
-                and GROSS_WEIGHT = #{grossWeight}
-            </if>
-            <if test="grossManNo != null and grossManNo != ''">
-                and GROSS_MAN_NO = #{grossManNo}
-            </if>
-            <if test="grossManName != null and grossManName != ''">
-                and GROSS_MAN_NAME = #{grossManName}
-            </if>
-            <if test="grossTime != null">
-                and TO_CHAR(GROSS_TIME,'yyyy-MM-dd') = #{grossTime}
-            </if>
-            <if test="baseSpot1No != null and baseSpot1No != ''">
-                and BASE_SPOT1_NO = #{baseSpot1No}
-            </if>
-            <if test="baseSpot1Name != null and baseSpot1Name != ''">
-                and BASE_SPOT1_NAME = #{baseSpot1Name}
-            </if>
-            <if test="grossClass != null and grossClass != ''">
-                and GROSS_CLASS = #{grossClass}
-            </if>
-            <if test="grossGroup != null and grossGroup != ''">
-                and GROSS_GROUP = #{grossGroup}
-            </if>
-            <if test="grossMode != null and grossMode != ''">
-                and GROSS_MODE = #{grossMode}
-            </if>
-            <if test="actualFirst2No != null and actualFirst2No != ''">
-                and ACTUAL_FIRST2_NO = #{actualFirst2No}
-            </if>
-            <if test="tareWeight != null">
-                and TARE_WEIGHT = #{tareWeight}
-            </if>
-            <if test="tareManNo != null and tareManNo != ''">
-                and TARE_MAN_NO = #{tareManNo}
-            </if>
-            <if test="tareManName != null and tareManName != ''">
-                and TARE_MAN_NAME = #{tareManName}
-            </if>
-            <if test="tareTime != null">
-                and TO_CHAR(TARE_TIME,'yyyy-MM-dd') = #{tareTime}
-            </if>
-            <if test="baseSpot2No != null and baseSpot2No != ''">
-                and BASE_SPOT2_NO = #{baseSpot2No}
-            </if>
-            <if test="baseSpot2Name != null and baseSpot2Name != ''">
-                and BASE_SPOT2_NAME = #{baseSpot2Name}
-            </if>
-            <if test="tareClass != null and tareClass != ''">
-                and TARE_CLASS = #{tareClass}
-            </if>
-            <if test="tareGroup != null and tareGroup != ''">
-                and TARE_GROUP = #{tareGroup}
-            </if>
-            <if test="tareMode != null and tareMode != ''">
-                and TARE_MODE = #{tareMode}
-            </if>
-            <if test="netWeight != null">
-                and NET_WEIGHT = #{netWeight}
-            </if>
-            <if test="meterNum != null and meterNum != ''">
-                and METER_NUM = #{meterNum}
-            </if>
-            <if test="netManNo != null and netManNo != ''">
-                and NET_MAN_NO = #{netManNo}
-            </if>
-            <if test="netManName != null and netManName != ''">
-                and NET_MAN_NAME = #{netManName}
-            </if>
-            <if test="netTime != null">
-                and TO_CHAR(NET_TIME,'yyyy-MM-dd') = #{netTime}
-            </if>
-            <if test="netSpot3No != null and netSpot3No != ''">
-                and NET_SPOT3_NO = #{netSpot3No}
-            </if>
-            <if test="netSpot3Name != null and netSpot3Name != ''">
-                and NET_SPOT3_NAME = #{netSpot3Name}
-            </if>
-            <if test="netGroup != null and netGroup != ''">
-                and NET_GROUP = #{netGroup}
-            </if>
-            <if test="netMode != null and netMode != ''">
-                and NET_MODE = #{netMode}
-            </if>
-            <if test="valueFlag != null and valueFlag != ''">
-                and VALUE_FLAG = #{valueFlag}
-            </if>
-            <if test="uploadFlag != null and uploadFlag != ''">
-                and UPLOAD_FLAG = #{uploadFlag}
-            </if>
-            <if test="checkManNo != null and checkManNo != ''">
-                and CHECK_MAN_NO = #{checkManNo}
-            </if>
-            <if test="checkManName != null and checkManName != ''">
-                and CHECK_MAN_NAME = #{checkManName}
-            </if>
-            <if test="checkTime != null">
-                and TO_CHAR(CHECK_TIME,'yyyy-MM-dd') = #{checkTime}
-            </if>
-            <if test="uploadManNo != null and uploadManNo != ''">
-                and UPLOAD_MAN_NO = #{uploadManNo}
-            </if>
-            <if test="uploadManName != null and uploadManName != ''">
-                and UPLOAD_MAN_NAME = #{uploadManName}
-            </if>
-            <if test="uploadTime != null">
-                and TO_CHAR(UPLOAD_TIME,'yyyy-MM-dd') = #{uploadTime}
-            </if>
-            <if test="netClass != null and netClass != ''">
-                and NET_CLASS = #{netClass}
-            </if>
-            <if test="createTime1 != null and createTime1 != null and createTime2 != '' and createTime2 != ''">
-                and  CREATE_TIME  >= TO_DATE(#{createTime1}, 'yyyy-MM-dd HH24:mi:ss') and CREATE_TIME  &lt;=  TO_DATE(#{createTime2}, 'yyyy-MM-dd HH24:mi:ss')
-            </if>
-        </where>
-    </sql>
-    <sql id="whereLike">
-        <where>
-            <if test="predictionNo != null and predictionNo != ''">
-                and PREDICTION_NO LIKE '%${predictionNo}%'
-            </if>
-            <if test="noticeNo != null and noticeNo != ''">
-                and NOTICE_NO LIKE '%${noticeNo}%'
-            </if>
-            <if test="carNo != null and carNo != ''">
-                and CAR_NO LIKE '%${carNo}%'
-            </if>
-            <if test="trailerNo != null and trailerNo != ''">
-                and TRAILER_NO LIKE '%${trailerNo}%'
-            </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="contractNo != null and contractNo != ''">
-                and CONTRACT_NO LIKE '%${contractNo}%'
-            </if>
-            <if test="batchNo != null and batchNo != ''">
-                and BATCH_NO LIKE '%${batchNo}%'
-            </if>
-            <if test="customerSupplierNo != null and customerSupplierNo != ''">
-                and CUSTOMER_SUPPLIER_NO LIKE '%${customerSupplierNo}%'
-            </if>
-            <if test="customerSupplierName != null and customerSupplierName != ''">
-                and CUSTOMER_SUPPLIER_NAME LIKE '%${customerSupplierName}%'
-            </if>
-            <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
-                and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
-            </if>
-            <if test="forwardingUnitName != null and forwardingUnitName != ''">
-                and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
-            </if>
-            <if test="receivingUintNo != null and receivingUintNo != ''">
-                and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
-            </if>
-            <if test="receivingUintName != null and receivingUintName != ''">
-                and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
-            </if>
-            <if test="materialNo != null and materialNo != ''">
-                and MATERIAL_NO LIKE '%${materialNo}%'
-            </if>
-            <if test="materialName != null and materialName != ''">
-                and MATERIAL_NAME LIKE '%${materialName}%'
-            </if>
-            <if test="specNo != null and specNo != ''">
-                and SPEC_NO LIKE '%${specNo}%'
-            </if>
-            <if test="specName != null and specName != ''">
-                and SPEC_NAME LIKE '%${specName}%'
-            </if>
-            <if test="loadPointNo != null and loadPointNo != ''">
-                and LOAD_POINT_NO LIKE '%${loadPointNo}%'
-            </if>
-            <if test="loadPointName != null and loadPointName != ''">
-                and LOAD_POINT_NAME LIKE '%${loadPointName}%'
-            </if>
-            <if test="sampleNo != null and sampleNo != ''">
-                and SAMPLE_NO LIKE '%${sampleNo}%'
-            </if>
-            <if test="sampleVoucher != null and sampleVoucher != ''">
-                and SAMPLE_VOUCHER LIKE '%${sampleVoucher}%'
-            </if>
-            <if test="carrierUnitNo != null and carrierUnitNo != ''">
-                and CARRIER_UNIT_NO LIKE '%${carrierUnitNo}%'
-            </if>
-            <if test="carrierUnitName != null and carrierUnitName != ''">
-                and CARRIER_UNIT_NAME LIKE '%${carrierUnitName}%'
-            </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="meterProcessNo != null and meterProcessNo != ''">
-                and METER_PROCESS_NO LIKE '%${meterProcessNo}%'
-            </if>
-            <if test="meterProcessEditionNo != null and meterProcessEditionNo != ''">
-                and METER_PROCESS_EDITION_NO LIKE '%${meterProcessEditionNo}%'
-            </if>
-            <if test="actualFirst1No != null and actualFirst1No != ''">
-                and ACTUAL_FIRST1_NO LIKE '%${actualFirst1No}%'
-            </if>
-            <if test="grossWeight != null">
-                and GROSS_WEIGHT = #{grossWeight}
-            </if>
-            <if test="grossManNo != null and grossManNo != ''">
-                and GROSS_MAN_NO LIKE '%${grossManNo}%'
-            </if>
-            <if test="grossManName != null and grossManName != ''">
-                and GROSS_MAN_NAME LIKE '%${grossManName}%'
-            </if>
-            <if test="grossTime != null">
-                and TO_CHAR(GROSS_TIME,'yyyy-MM-dd') = #{grossTime}
-            </if>
-            <if test="baseSpot1No != null and baseSpot1No != ''">
-                and BASE_SPOT1_NO LIKE '%${baseSpot1No}%'
-            </if>
-            <if test="baseSpot1Name != null and baseSpot1Name != ''">
-                and BASE_SPOT1_NAME LIKE '%${baseSpot1Name}%'
-            </if>
-            <if test="grossClass != null and grossClass != ''">
-                and GROSS_CLASS LIKE '%${grossClass}%'
-            </if>
-            <if test="grossGroup != null and grossGroup != ''">
-                and GROSS_GROUP LIKE '%${grossGroup}%'
-            </if>
-            <if test="grossMode != null and grossMode != ''">
-                and GROSS_MODE LIKE '%${grossMode}%'
-            </if>
-            <if test="actualFirst2No != null and actualFirst2No != ''">
-                and ACTUAL_FIRST2_NO LIKE '%${actualFirst2No}%'
-            </if>
-            <if test="tareWeight != null">
-                and TARE_WEIGHT = #{tareWeight}
-            </if>
-            <if test="tareManNo != null and tareManNo != ''">
-                and TARE_MAN_NO LIKE '%${tareManNo}%'
-            </if>
-            <if test="tareManName != null and tareManName != ''">
-                and TARE_MAN_NAME LIKE '%${tareManName}%'
-            </if>
-            <if test="tareTime != null">
-                and TO_CHAR(TARE_TIME,'yyyy-MM-dd') = #{tareTime}
-            </if>
-            <if test="baseSpot2No != null and baseSpot2No != ''">
-                and BASE_SPOT2_NO LIKE '%${baseSpot2No}%'
-            </if>
-            <if test="baseSpot2Name != null and baseSpot2Name != ''">
-                and BASE_SPOT2_NAME LIKE '%${baseSpot2Name}%'
-            </if>
-            <if test="tareClass != null and tareClass != ''">
-                and TARE_CLASS LIKE '%${tareClass}%'
-            </if>
-            <if test="tareGroup != null and tareGroup != ''">
-                and TARE_GROUP LIKE '%${tareGroup}%'
-            </if>
-            <if test="tareMode != null and tareMode != ''">
-                and TARE_MODE LIKE '%${tareMode}%'
-            </if>
-            <if test="netWeight != null">
-                and NET_WEIGHT = #{netWeight}
-            </if>
-            <if test="meterNum != null and meterNum != ''">
-                and METER_NUM LIKE '%${meterNum}%'
-            </if>
-            <if test="netManNo != null and netManNo != ''">
-                and NET_MAN_NO LIKE '%${netManNo}%'
-            </if>
-            <if test="netManName != null and netManName != ''">
-                and NET_MAN_NAME LIKE '%${netManName}%'
-            </if>
-            <if test="netTime != null">
-                and TO_CHAR(NET_TIME,'yyyy-MM-dd') = #{netTime}
-            </if>
-            <if test="netSpot3No != null and netSpot3No != ''">
-                and NET_SPOT3_NO LIKE '%${netSpot3No}%'
-            </if>
-            <if test="netSpot3Name != null and netSpot3Name != ''">
-                and NET_SPOT3_NAME LIKE '%${netSpot3Name}%'
-            </if>
-            <if test="netGroup != null and netGroup != ''">
-                and NET_GROUP LIKE '%${netGroup}%'
-            </if>
-            <if test="netMode != null and netMode != ''">
-                and NET_MODE LIKE '%${netMode}%'
-            </if>
-            <if test="valueFlag != null and valueFlag != ''">
-                and VALUE_FLAG LIKE '%${valueFlag}%'
-            </if>
-            <if test="uploadFlag != null and uploadFlag != ''">
-                and UPLOAD_FLAG LIKE '%${uploadFlag}%'
-            </if>
-            <if test="checkManNo != null and checkManNo != ''">
-                and CHECK_MAN_NO LIKE '%${checkManNo}%'
-            </if>
-            <if test="checkManName != null and checkManName != ''">
-                and CHECK_MAN_NAME LIKE '%${checkManName}%'
-            </if>
-            <if test="checkTime != null">
-                and TO_CHAR(CHECK_TIME,'yyyy-MM-dd') = #{checkTime}
-            </if>
-            <if test="uploadManNo != null and uploadManNo != ''">
-                and UPLOAD_MAN_NO LIKE '%${uploadManNo}%'
-            </if>
-            <if test="uploadManName != null and uploadManName != ''">
-                and UPLOAD_MAN_NAME LIKE '%${uploadManName}%'
-            </if>
-            <if test="uploadTime != null">
-                and TO_CHAR(UPLOAD_TIME,'yyyy-MM-dd') = #{uploadTime}
-            </if>
-            <if test="netClass != null and netClass != ''">
-                and NET_CLASS LIKE '%${netClass}%'
-            </if>
-        </where>
-    </sql>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from METER_WORK_CAR_ACTUAL
-    where ACTUAL_NO = #{actualNo,jdbcType=VARCHAR}
-  </delete>
-    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-        delete from METER_WORK_CAR_ACTUAL
-        where 1!=1
-        <if test="predictionNo != null and predictionNo != ''">
-            or PREDICTION_NO = #{predictionNo}
-        </if>
-        <if test="noticeNo != null and noticeNo != ''">
-            or NOTICE_NO = #{noticeNo}
-        </if>
-        <if test="carNo != null and carNo != ''">
-            or CAR_NO = #{carNo}
-        </if>
-        <if test="trailerNo != null and trailerNo != ''">
-            or TRAILER_NO = #{trailerNo}
-        </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="contractNo != null and contractNo != ''">
-            or CONTRACT_NO = #{contractNo}
-        </if>
-        <if test="batchNo != null and batchNo != ''">
-            or BATCH_NO = #{batchNo}
-        </if>
-        <if test="customerSupplierNo != null and customerSupplierNo != ''">
-            or CUSTOMER_SUPPLIER_NO = #{customerSupplierNo}
-        </if>
-        <if test="customerSupplierName != null and customerSupplierName != ''">
-            or CUSTOMER_SUPPLIER_NAME = #{customerSupplierName}
-        </if>
-        <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
-            or FORWARDING_UNIT_NO = #{forwardingUnitNo}
-        </if>
-        <if test="forwardingUnitName != null and forwardingUnitName != ''">
-            or FORWARDING_UNIT_NAME = #{forwardingUnitName}
-        </if>
-        <if test="receivingUintNo != null and receivingUintNo != ''">
-            or RECEIVING_UINT_NO = #{receivingUintNo}
-        </if>
-        <if test="receivingUintName != null and receivingUintName != ''">
-            or RECEIVING_UINT_NAME = #{receivingUintName}
-        </if>
-        <if test="materialNo != null and materialNo != ''">
-            or MATERIAL_NO = #{materialNo}
-        </if>
-        <if test="materialName != null and materialName != ''">
-            or MATERIAL_NAME = #{materialName}
-        </if>
-        <if test="specNo != null and specNo != ''">
-            or SPEC_NO = #{specNo}
-        </if>
-        <if test="specName != null and specName != ''">
-            or SPEC_NAME = #{specName}
-        </if>
-        <if test="loadPointNo != null and loadPointNo != ''">
-            or LOAD_POINT_NO = #{loadPointNo}
-        </if>
-        <if test="loadPointName != null and loadPointName != ''">
-            or LOAD_POINT_NAME = #{loadPointName}
-        </if>
-        <if test="sampleNo != null and sampleNo != ''">
-            or SAMPLE_NO = #{sampleNo}
-        </if>
-        <if test="sampleVoucher != null and sampleVoucher != ''">
-            or SAMPLE_VOUCHER = #{sampleVoucher}
-        </if>
-        <if test="carrierUnitNo != null and carrierUnitNo != ''">
-            or CARRIER_UNIT_NO = #{carrierUnitNo}
-        </if>
-        <if test="carrierUnitName != null and carrierUnitName != ''">
-            or CARRIER_UNIT_NAME = #{carrierUnitName}
-        </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="meterProcessNo != null and meterProcessNo != ''">
-            or METER_PROCESS_NO = #{meterProcessNo}
-        </if>
-        <if test="meterProcessEditionNo != null and meterProcessEditionNo != ''">
-            or METER_PROCESS_EDITION_NO = #{meterProcessEditionNo}
-        </if>
-        <if test="actualFirst1No != null and actualFirst1No != ''">
-            or ACTUAL_FIRST1_NO = #{actualFirst1No}
-        </if>
-        <if test="grossWeight != null">
-            or GROSS_WEIGHT = #{grossWeight}
-        </if>
-        <if test="grossManNo != null and grossManNo != ''">
-            or GROSS_MAN_NO = #{grossManNo}
-        </if>
-        <if test="grossManName != null and grossManName != ''">
-            or GROSS_MAN_NAME = #{grossManName}
-        </if>
-        <if test="grossTime != null">
-            or TO_CHAR(GROSS_TIME,'yyyy-MM-dd') = '#{grossTime}'
-        </if>
-        <if test="baseSpot1No != null and baseSpot1No != ''">
-            or BASE_SPOT1_NO = #{baseSpot1No}
-        </if>
-        <if test="baseSpot1Name != null and baseSpot1Name != ''">
-            or BASE_SPOT1_NAME = #{baseSpot1Name}
-        </if>
-        <if test="grossClass != null and grossClass != ''">
-            or GROSS_CLASS = #{grossClass}
-        </if>
-        <if test="grossGroup != null and grossGroup != ''">
-            or GROSS_GROUP = #{grossGroup}
-        </if>
-        <if test="grossMode != null and grossMode != ''">
-            or GROSS_MODE = #{grossMode}
-        </if>
-        <if test="actualFirst2No != null and actualFirst2No != ''">
-            or ACTUAL_FIRST2_NO = #{actualFirst2No}
-        </if>
-        <if test="tareWeight != null">
-            or TARE_WEIGHT = #{tareWeight}
-        </if>
-        <if test="tareManNo != null and tareManNo != ''">
-            or TARE_MAN_NO = #{tareManNo}
-        </if>
-        <if test="tareManName != null and tareManName != ''">
-            or TARE_MAN_NAME = #{tareManName}
-        </if>
-        <if test="tareTime != null">
-            or TO_CHAR(TARE_TIME,'yyyy-MM-dd') = '#{tareTime}'
-        </if>
-        <if test="baseSpot2No != null and baseSpot2No != ''">
-            or BASE_SPOT2_NO = #{baseSpot2No}
-        </if>
-        <if test="baseSpot2Name != null and baseSpot2Name != ''">
-            or BASE_SPOT2_NAME = #{baseSpot2Name}
-        </if>
-        <if test="tareClass != null and tareClass != ''">
-            or TARE_CLASS = #{tareClass}
-        </if>
-        <if test="tareGroup != null and tareGroup != ''">
-            or TARE_GROUP = #{tareGroup}
-        </if>
-        <if test="tareMode != null and tareMode != ''">
-            or TARE_MODE = #{tareMode}
-        </if>
-        <if test="netWeight != null">
-            or NET_WEIGHT = #{netWeight}
-        </if>
-        <if test="meterNum != null and meterNum != ''">
-            or METER_NUM = #{meterNum}
-        </if>
-        <if test="netManNo != null and netManNo != ''">
-            or NET_MAN_NO = #{netManNo}
-        </if>
-        <if test="netManName != null and netManName != ''">
-            or NET_MAN_NAME = #{netManName}
-        </if>
-        <if test="netTime != null">
-            or TO_CHAR(NET_TIME,'yyyy-MM-dd') = '#{netTime}'
-        </if>
-        <if test="netSpot3No != null and netSpot3No != ''">
-            or NET_SPOT3_NO = #{netSpot3No}
-        </if>
-        <if test="netSpot3Name != null and netSpot3Name != ''">
-            or NET_SPOT3_NAME = #{netSpot3Name}
-        </if>
-        <if test="netGroup != null and netGroup != ''">
-            or NET_GROUP = #{netGroup}
-        </if>
-        <if test="netMode != null and netMode != ''">
-            or NET_MODE = #{netMode}
-        </if>
-        <if test="valueFlag != null and valueFlag != ''">
-            or VALUE_FLAG = #{valueFlag}
-        </if>
-        <if test="uploadFlag != null and uploadFlag != ''">
-            or UPLOAD_FLAG = #{uploadFlag}
-        </if>
-        <if test="checkManNo != null and checkManNo != ''">
-            or CHECK_MAN_NO = #{checkManNo}
-        </if>
-        <if test="checkManName != null and checkManName != ''">
-            or CHECK_MAN_NAME = #{checkManName}
-        </if>
-        <if test="checkTime != null">
-            or TO_CHAR(CHECK_TIME,'yyyy-MM-dd') = '#{checkTime}'
-        </if>
-        <if test="uploadManNo != null and uploadManNo != ''">
-            or UPLOAD_MAN_NO = #{uploadManNo}
-        </if>
-        <if test="uploadManName != null and uploadManName != ''">
-            or UPLOAD_MAN_NAME = #{uploadManName}
-        </if>
-        <if test="uploadTime != null">
-            or TO_CHAR(UPLOAD_TIME,'yyyy-MM-dd') = '#{uploadTime}'
-        </if>
-        <if test="netClass != null and netClass != ''">
-            or NET_CLASS = #{netClass}
-        </if>
-    </delete>
-    <insert id="insert" parameterType="com.steerinfo.appservice.appmeterworkcaractual.model.AppMeterWorkCarActual">
-    insert into METER_WORK_CAR_ACTUAL (ACTUAL_NO, PREDICTION_NO, NOTICE_NO, 
-      CAR_NO, TRAILER_NO, MATTER_NO,
-      MATTER_NAME, CONTRACT_NO, BATCH_NO, 
-      CUSTOMER_SUPPLIER_NO, CUSTOMER_SUPPLIER_NAME, 
-      FORWARDING_UNIT_NO, FORWARDING_UNIT_NAME, RECEIVING_UINT_NO, 
-      RECEIVING_UINT_NAME, MATERIAL_NO, MATERIAL_NAME, 
-      SPEC_NO, SPEC_NAME, LOAD_POINT_NO, 
-      LOAD_POINT_NAME, SAMPLE_NO, SAMPLE_VOUCHER, 
-      CARRIER_UNIT_NO, CARRIER_UNIT_NAME, METER_TYPE_NO, 
-      METER_TYPE_NAME, METER_PROCESS_NO, METER_PROCESS_EDITION_NO, 
-      ACTUAL_FIRST1_NO, GROSS_WEIGHT, GROSS_MAN_NO, 
-      GROSS_MAN_NAME, GROSS_TIME, BASE_SPOT1_NO, 
-      BASE_SPOT1_NAME, GROSS_CLASS, GROSS_GROUP, 
-      GROSS_MODE, ACTUAL_FIRST2_NO, TARE_WEIGHT, 
-      TARE_MAN_NO, TARE_MAN_NAME, TARE_TIME, 
-      BASE_SPOT2_NO, BASE_SPOT2_NAME, TARE_CLASS, 
-      TARE_GROUP, TARE_MODE, NET_WEIGHT, 
-      METER_NUM, NET_MAN_NO, NET_MAN_NAME, 
-      NET_TIME, NET_SPOT3_NO, NET_SPOT3_NAME, 
-      NET_GROUP, NET_MODE, VALUE_FLAG, 
-      UPLOAD_FLAG, CHECK_MAN_NO, CHECK_MAN_NAME, 
-      CHECK_TIME, UPLOAD_MAN_NO, UPLOAD_MAN_NAME, 
-      UPLOAD_TIME, NET_CLASS)
-    values (#{actualNo,jdbcType=VARCHAR}, #{predictionNo,jdbcType=VARCHAR}, #{noticeNo,jdbcType=VARCHAR}, 
-      #{carNo,jdbcType=VARCHAR}, #{trailerNo,jdbcType=VARCHAR}, #{matterNo,jdbcType=VARCHAR},
-      #{matterName,jdbcType=VARCHAR}, #{contractNo,jdbcType=VARCHAR}, #{batchNo,jdbcType=VARCHAR}, 
-      #{customerSupplierNo,jdbcType=VARCHAR}, #{customerSupplierName,jdbcType=VARCHAR}, 
-      #{forwardingUnitNo,jdbcType=VARCHAR}, #{forwardingUnitName,jdbcType=VARCHAR}, #{receivingUintNo,jdbcType=VARCHAR}, 
-      #{receivingUintName,jdbcType=VARCHAR}, #{materialNo,jdbcType=VARCHAR}, #{materialName,jdbcType=VARCHAR}, 
-      #{specNo,jdbcType=VARCHAR}, #{specName,jdbcType=VARCHAR}, #{loadPointNo,jdbcType=VARCHAR}, 
-      #{loadPointName,jdbcType=VARCHAR}, #{sampleNo,jdbcType=VARCHAR}, #{sampleVoucher,jdbcType=VARCHAR}, 
-      #{carrierUnitNo,jdbcType=VARCHAR}, #{carrierUnitName,jdbcType=VARCHAR}, #{meterTypeNo,jdbcType=VARCHAR}, 
-      #{meterTypeName,jdbcType=VARCHAR}, #{meterProcessNo,jdbcType=VARCHAR}, #{meterProcessEditionNo,jdbcType=VARCHAR}, 
-      #{actualFirst1No,jdbcType=VARCHAR}, #{grossWeight,jdbcType=DECIMAL}, #{grossManNo,jdbcType=VARCHAR}, 
-      #{grossManName,jdbcType=VARCHAR}, #{grossTime,jdbcType=TIMESTAMP}, #{baseSpot1No,jdbcType=VARCHAR}, 
-      #{baseSpot1Name,jdbcType=VARCHAR}, #{grossClass,jdbcType=VARCHAR}, #{grossGroup,jdbcType=VARCHAR}, 
-      #{grossMode,jdbcType=VARCHAR}, #{actualFirst2No,jdbcType=VARCHAR}, #{tareWeight,jdbcType=DECIMAL}, 
-      #{tareManNo,jdbcType=VARCHAR}, #{tareManName,jdbcType=VARCHAR}, #{tareTime,jdbcType=TIMESTAMP}, 
-      #{baseSpot2No,jdbcType=VARCHAR}, #{baseSpot2Name,jdbcType=VARCHAR}, #{tareClass,jdbcType=VARCHAR}, 
-      #{tareGroup,jdbcType=VARCHAR}, #{tareMode,jdbcType=VARCHAR}, #{netWeight,jdbcType=DECIMAL}, 
-      #{meterNum,jdbcType=VARCHAR}, #{netManNo,jdbcType=VARCHAR}, #{netManName,jdbcType=VARCHAR}, 
-      #{netTime,jdbcType=TIMESTAMP}, #{netSpot3No,jdbcType=VARCHAR}, #{netSpot3Name,jdbcType=VARCHAR}, 
-      #{netGroup,jdbcType=VARCHAR}, #{netMode,jdbcType=VARCHAR}, #{valueFlag,jdbcType=VARCHAR}, 
-      #{uploadFlag,jdbcType=VARCHAR}, #{checkManNo,jdbcType=VARCHAR}, #{checkManName,jdbcType=VARCHAR}, 
-      #{checkTime,jdbcType=TIMESTAMP}, #{uploadManNo,jdbcType=VARCHAR}, #{uploadManName,jdbcType=VARCHAR}, 
-      #{uploadTime,jdbcType=TIMESTAMP}, #{netClass,jdbcType=VARCHAR})
-  </insert>
-    <insert id="insertSelective"
-            parameterType="com.steerinfo.appservice.appmeterworkcaractual.model.AppMeterWorkCarActual">
-        insert into METER_WORK_CAR_ACTUAL
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="actualNo != null">
-                ACTUAL_NO,
-            </if>
-            <if test="predictionNo != null">
-                PREDICTION_NO,
-            </if>
-            <if test="noticeNo != null">
-                NOTICE_NO,
-            </if>
-            <if test="carNo != null">
-                CAR_NO,
-            </if>
-            <if test="trailerNo != null">
-                TRAILER_NO,
-            </if>
-            <if test="matterNo != null">
-                MATTER_NO,
-            </if>
-            <if test="matterName != null">
-                MATTER_NAME,
-            </if>
-            <if test="contractNo != null">
-                CONTRACT_NO,
-            </if>
-            <if test="batchNo != null">
-                BATCH_NO,
-            </if>
-            <if test="customerSupplierNo != null">
-                CUSTOMER_SUPPLIER_NO,
-            </if>
-            <if test="customerSupplierName != null">
-                CUSTOMER_SUPPLIER_NAME,
-            </if>
-            <if test="forwardingUnitNo != null">
-                FORWARDING_UNIT_NO,
-            </if>
-            <if test="forwardingUnitName != null">
-                FORWARDING_UNIT_NAME,
-            </if>
-            <if test="receivingUintNo != null">
-                RECEIVING_UINT_NO,
-            </if>
-            <if test="receivingUintName != null">
-                RECEIVING_UINT_NAME,
-            </if>
-            <if test="materialNo != null">
-                MATERIAL_NO,
-            </if>
-            <if test="materialName != null">
-                MATERIAL_NAME,
-            </if>
-            <if test="specNo != null">
-                SPEC_NO,
-            </if>
-            <if test="specName != null">
-                SPEC_NAME,
-            </if>
-            <if test="loadPointNo != null">
-                LOAD_POINT_NO,
-            </if>
-            <if test="loadPointName != null">
-                LOAD_POINT_NAME,
-            </if>
-            <if test="sampleNo != null">
-                SAMPLE_NO,
-            </if>
-            <if test="sampleVoucher != null">
-                SAMPLE_VOUCHER,
-            </if>
-            <if test="carrierUnitNo != null">
-                CARRIER_UNIT_NO,
-            </if>
-            <if test="carrierUnitName != null">
-                CARRIER_UNIT_NAME,
-            </if>
-            <if test="meterTypeNo != null">
-                METER_TYPE_NO,
-            </if>
-            <if test="meterTypeName != null">
-                METER_TYPE_NAME,
-            </if>
-            <if test="meterProcessNo != null">
-                METER_PROCESS_NO,
-            </if>
-            <if test="meterProcessEditionNo != null">
-                METER_PROCESS_EDITION_NO,
-            </if>
-            <if test="actualFirst1No != null">
-                ACTUAL_FIRST1_NO,
-            </if>
-            <if test="grossWeight != null">
-                GROSS_WEIGHT,
-            </if>
-            <if test="grossManNo != null">
-                GROSS_MAN_NO,
-            </if>
-            <if test="grossManName != null">
-                GROSS_MAN_NAME,
-            </if>
-            <if test="grossTime != null">
-                GROSS_TIME,
-            </if>
-            <if test="baseSpot1No != null">
-                BASE_SPOT1_NO,
-            </if>
-            <if test="baseSpot1Name != null">
-                BASE_SPOT1_NAME,
-            </if>
-            <if test="grossClass != null">
-                GROSS_CLASS,
-            </if>
-            <if test="grossGroup != null">
-                GROSS_GROUP,
-            </if>
-            <if test="grossMode != null">
-                GROSS_MODE,
-            </if>
-            <if test="actualFirst2No != null">
-                ACTUAL_FIRST2_NO,
-            </if>
-            <if test="tareWeight != null">
-                TARE_WEIGHT,
-            </if>
-            <if test="tareManNo != null">
-                TARE_MAN_NO,
-            </if>
-            <if test="tareManName != null">
-                TARE_MAN_NAME,
-            </if>
-            <if test="tareTime != null">
-                TARE_TIME,
-            </if>
-            <if test="baseSpot2No != null">
-                BASE_SPOT2_NO,
-            </if>
-            <if test="baseSpot2Name != null">
-                BASE_SPOT2_NAME,
-            </if>
-            <if test="tareClass != null">
-                TARE_CLASS,
-            </if>
-            <if test="tareGroup != null">
-                TARE_GROUP,
-            </if>
-            <if test="tareMode != null">
-                TARE_MODE,
-            </if>
-            <if test="netWeight != null">
-                NET_WEIGHT,
-            </if>
-            <if test="meterNum != null">
-                METER_NUM,
-            </if>
-            <if test="netManNo != null">
-                NET_MAN_NO,
-            </if>
-            <if test="netManName != null">
-                NET_MAN_NAME,
-            </if>
-            <if test="netTime != null">
-                NET_TIME,
-            </if>
-            <if test="netSpot3No != null">
-                NET_SPOT3_NO,
-            </if>
-            <if test="netSpot3Name != null">
-                NET_SPOT3_NAME,
-            </if>
-            <if test="netGroup != null">
-                NET_GROUP,
-            </if>
-            <if test="netMode != null">
-                NET_MODE,
-            </if>
-            <if test="valueFlag != null">
-                VALUE_FLAG,
-            </if>
-            <if test="uploadFlag != null">
-                UPLOAD_FLAG,
-            </if>
-            <if test="checkManNo != null">
-                CHECK_MAN_NO,
-            </if>
-            <if test="checkManName != null">
-                CHECK_MAN_NAME,
-            </if>
-            <if test="checkTime != null">
-                CHECK_TIME,
-            </if>
-            <if test="uploadManNo != null">
-                UPLOAD_MAN_NO,
-            </if>
-            <if test="uploadManName != null">
-                UPLOAD_MAN_NAME,
-            </if>
-            <if test="uploadTime != null">
-                UPLOAD_TIME,
-            </if>
-            <if test="netClass != null">
-                NET_CLASS,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="actualNo != null">
-                #{actualNo,jdbcType=VARCHAR},
-            </if>
-            <if test="predictionNo != null">
-                #{predictionNo,jdbcType=VARCHAR},
-            </if>
-            <if test="noticeNo != null">
-                #{noticeNo,jdbcType=VARCHAR},
-            </if>
-            <if test="carNo != null">
-                #{carNo,jdbcType=VARCHAR},
-            </if>
-            <if test="trailerNo != null">
-                #{trailerNo,jdbcType=VARCHAR},
-            </if>
-            <if test="matterNo != null">
-                #{matterNo,jdbcType=VARCHAR},
-            </if>
-            <if test="matterName != null">
-                #{matterName,jdbcType=VARCHAR},
-            </if>
-            <if test="contractNo != null">
-                #{contractNo,jdbcType=VARCHAR},
-            </if>
-            <if test="batchNo != null">
-                #{batchNo,jdbcType=VARCHAR},
-            </if>
-            <if test="customerSupplierNo != null">
-                #{customerSupplierNo,jdbcType=VARCHAR},
-            </if>
-            <if test="customerSupplierName != null">
-                #{customerSupplierName,jdbcType=VARCHAR},
-            </if>
-            <if test="forwardingUnitNo != null">
-                #{forwardingUnitNo,jdbcType=VARCHAR},
-            </if>
-            <if test="forwardingUnitName != null">
-                #{forwardingUnitName,jdbcType=VARCHAR},
-            </if>
-            <if test="receivingUintNo != null">
-                #{receivingUintNo,jdbcType=VARCHAR},
-            </if>
-            <if test="receivingUintName != null">
-                #{receivingUintName,jdbcType=VARCHAR},
-            </if>
-            <if test="materialNo != null">
-                #{materialNo,jdbcType=VARCHAR},
-            </if>
-            <if test="materialName != null">
-                #{materialName,jdbcType=VARCHAR},
-            </if>
-            <if test="specNo != null">
-                #{specNo,jdbcType=VARCHAR},
-            </if>
-            <if test="specName != null">
-                #{specName,jdbcType=VARCHAR},
-            </if>
-            <if test="loadPointNo != null">
-                #{loadPointNo,jdbcType=VARCHAR},
-            </if>
-            <if test="loadPointName != null">
-                #{loadPointName,jdbcType=VARCHAR},
-            </if>
-            <if test="sampleNo != null">
-                #{sampleNo,jdbcType=VARCHAR},
-            </if>
-            <if test="sampleVoucher != null">
-                #{sampleVoucher,jdbcType=VARCHAR},
-            </if>
-            <if test="carrierUnitNo != null">
-                #{carrierUnitNo,jdbcType=VARCHAR},
-            </if>
-            <if test="carrierUnitName != null">
-                #{carrierUnitName,jdbcType=VARCHAR},
-            </if>
-            <if test="meterTypeNo != null">
-                #{meterTypeNo,jdbcType=VARCHAR},
-            </if>
-            <if test="meterTypeName != null">
-                #{meterTypeName,jdbcType=VARCHAR},
-            </if>
-            <if test="meterProcessNo != null">
-                #{meterProcessNo,jdbcType=VARCHAR},
-            </if>
-            <if test="meterProcessEditionNo != null">
-                #{meterProcessEditionNo,jdbcType=VARCHAR},
-            </if>
-            <if test="actualFirst1No != null">
-                #{actualFirst1No,jdbcType=VARCHAR},
-            </if>
-            <if test="grossWeight != null">
-                #{grossWeight,jdbcType=DECIMAL},
-            </if>
-            <if test="grossManNo != null">
-                #{grossManNo,jdbcType=VARCHAR},
-            </if>
-            <if test="grossManName != null">
-                #{grossManName,jdbcType=VARCHAR},
-            </if>
-            <if test="grossTime != null">
-                #{grossTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="baseSpot1No != null">
-                #{baseSpot1No,jdbcType=VARCHAR},
-            </if>
-            <if test="baseSpot1Name != null">
-                #{baseSpot1Name,jdbcType=VARCHAR},
-            </if>
-            <if test="grossClass != null">
-                #{grossClass,jdbcType=VARCHAR},
-            </if>
-            <if test="grossGroup != null">
-                #{grossGroup,jdbcType=VARCHAR},
-            </if>
-            <if test="grossMode != null">
-                #{grossMode,jdbcType=VARCHAR},
-            </if>
-            <if test="actualFirst2No != null">
-                #{actualFirst2No,jdbcType=VARCHAR},
-            </if>
-            <if test="tareWeight != null">
-                #{tareWeight,jdbcType=DECIMAL},
-            </if>
-            <if test="tareManNo != null">
-                #{tareManNo,jdbcType=VARCHAR},
-            </if>
-            <if test="tareManName != null">
-                #{tareManName,jdbcType=VARCHAR},
-            </if>
-            <if test="tareTime != null">
-                #{tareTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="baseSpot2No != null">
-                #{baseSpot2No,jdbcType=VARCHAR},
-            </if>
-            <if test="baseSpot2Name != null">
-                #{baseSpot2Name,jdbcType=VARCHAR},
-            </if>
-            <if test="tareClass != null">
-                #{tareClass,jdbcType=VARCHAR},
-            </if>
-            <if test="tareGroup != null">
-                #{tareGroup,jdbcType=VARCHAR},
-            </if>
-            <if test="tareMode != null">
-                #{tareMode,jdbcType=VARCHAR},
-            </if>
-            <if test="netWeight != null">
-                #{netWeight,jdbcType=DECIMAL},
-            </if>
-            <if test="meterNum != null">
-                #{meterNum,jdbcType=VARCHAR},
-            </if>
-            <if test="netManNo != null">
-                #{netManNo,jdbcType=VARCHAR},
-            </if>
-            <if test="netManName != null">
-                #{netManName,jdbcType=VARCHAR},
-            </if>
-            <if test="netTime != null">
-                #{netTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="netSpot3No != null">
-                #{netSpot3No,jdbcType=VARCHAR},
-            </if>
-            <if test="netSpot3Name != null">
-                #{netSpot3Name,jdbcType=VARCHAR},
-            </if>
-            <if test="netGroup != null">
-                #{netGroup,jdbcType=VARCHAR},
-            </if>
-            <if test="netMode != null">
-                #{netMode,jdbcType=VARCHAR},
-            </if>
-            <if test="valueFlag != null">
-                #{valueFlag,jdbcType=VARCHAR},
-            </if>
-            <if test="uploadFlag != null">
-                #{uploadFlag,jdbcType=VARCHAR},
-            </if>
-            <if test="checkManNo != null">
-                #{checkManNo,jdbcType=VARCHAR},
-            </if>
-            <if test="checkManName != null">
-                #{checkManName,jdbcType=VARCHAR},
-            </if>
-            <if test="checkTime != null">
-                #{checkTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="uploadManNo != null">
-                #{uploadManNo,jdbcType=VARCHAR},
-            </if>
-            <if test="uploadManName != null">
-                #{uploadManName,jdbcType=VARCHAR},
-            </if>
-            <if test="uploadTime != null">
-                #{uploadTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="netClass != null">
-                #{netClass,jdbcType=VARCHAR},
-            </if>
-        </trim>
-    </insert>
-    <update id="updateByPrimaryKey"
-            parameterType="com.steerinfo.appservice.appmeterworkcaractual.model.AppMeterWorkCarActual">
-    update METER_WORK_CAR_ACTUAL
-    set PREDICTION_NO = #{predictionNo,jdbcType=VARCHAR},
-      NOTICE_NO = #{noticeNo,jdbcType=VARCHAR},
-      CAR_NO = #{carNo,jdbcType=VARCHAR},
-      TRAILER_NO = #{trailerNo,jdbcType=VARCHAR},
-      MATTER_NO = #{matterNo,jdbcType=VARCHAR},
-      MATTER_NAME = #{matterName,jdbcType=VARCHAR},
-      CONTRACT_NO = #{contractNo,jdbcType=VARCHAR},
-      BATCH_NO = #{batchNo,jdbcType=VARCHAR},
-      CUSTOMER_SUPPLIER_NO = #{customerSupplierNo,jdbcType=VARCHAR},
-      CUSTOMER_SUPPLIER_NAME = #{customerSupplierName,jdbcType=VARCHAR},
-      FORWARDING_UNIT_NO = #{forwardingUnitNo,jdbcType=VARCHAR},
-      FORWARDING_UNIT_NAME = #{forwardingUnitName,jdbcType=VARCHAR},
-      RECEIVING_UINT_NO = #{receivingUintNo,jdbcType=VARCHAR},
-      RECEIVING_UINT_NAME = #{receivingUintName,jdbcType=VARCHAR},
-      MATERIAL_NO = #{materialNo,jdbcType=VARCHAR},
-      MATERIAL_NAME = #{materialName,jdbcType=VARCHAR},
-      SPEC_NO = #{specNo,jdbcType=VARCHAR},
-      SPEC_NAME = #{specName,jdbcType=VARCHAR},
-      LOAD_POINT_NO = #{loadPointNo,jdbcType=VARCHAR},
-      LOAD_POINT_NAME = #{loadPointName,jdbcType=VARCHAR},
-      SAMPLE_NO = #{sampleNo,jdbcType=VARCHAR},
-      SAMPLE_VOUCHER = #{sampleVoucher,jdbcType=VARCHAR},
-      CARRIER_UNIT_NO = #{carrierUnitNo,jdbcType=VARCHAR},
-      CARRIER_UNIT_NAME = #{carrierUnitName,jdbcType=VARCHAR},
-      METER_TYPE_NO = #{meterTypeNo,jdbcType=VARCHAR},
-      METER_TYPE_NAME = #{meterTypeName,jdbcType=VARCHAR},
-      METER_PROCESS_NO = #{meterProcessNo,jdbcType=VARCHAR},
-      METER_PROCESS_EDITION_NO = #{meterProcessEditionNo,jdbcType=VARCHAR},
-      ACTUAL_FIRST1_NO = #{actualFirst1No,jdbcType=VARCHAR},
-      GROSS_WEIGHT = #{grossWeight,jdbcType=DECIMAL},
-      GROSS_MAN_NO = #{grossManNo,jdbcType=VARCHAR},
-      GROSS_MAN_NAME = #{grossManName,jdbcType=VARCHAR},
-      GROSS_TIME = #{grossTime,jdbcType=TIMESTAMP},
-      BASE_SPOT1_NO = #{baseSpot1No,jdbcType=VARCHAR},
-      BASE_SPOT1_NAME = #{baseSpot1Name,jdbcType=VARCHAR},
-      GROSS_CLASS = #{grossClass,jdbcType=VARCHAR},
-      GROSS_GROUP = #{grossGroup,jdbcType=VARCHAR},
-      GROSS_MODE = #{grossMode,jdbcType=VARCHAR},
-      ACTUAL_FIRST2_NO = #{actualFirst2No,jdbcType=VARCHAR},
-      TARE_WEIGHT = #{tareWeight,jdbcType=DECIMAL},
-      TARE_MAN_NO = #{tareManNo,jdbcType=VARCHAR},
-      TARE_MAN_NAME = #{tareManName,jdbcType=VARCHAR},
-      TARE_TIME = #{tareTime,jdbcType=TIMESTAMP},
-      BASE_SPOT2_NO = #{baseSpot2No,jdbcType=VARCHAR},
-      BASE_SPOT2_NAME = #{baseSpot2Name,jdbcType=VARCHAR},
-      TARE_CLASS = #{tareClass,jdbcType=VARCHAR},
-      TARE_GROUP = #{tareGroup,jdbcType=VARCHAR},
-      TARE_MODE = #{tareMode,jdbcType=VARCHAR},
-      NET_WEIGHT = #{netWeight,jdbcType=DECIMAL},
-      METER_NUM = #{meterNum,jdbcType=VARCHAR},
-      NET_MAN_NO = #{netManNo,jdbcType=VARCHAR},
-      NET_MAN_NAME = #{netManName,jdbcType=VARCHAR},
-      NET_TIME = #{netTime,jdbcType=TIMESTAMP},
-      NET_SPOT3_NO = #{netSpot3No,jdbcType=VARCHAR},
-      NET_SPOT3_NAME = #{netSpot3Name,jdbcType=VARCHAR},
-      NET_GROUP = #{netGroup,jdbcType=VARCHAR},
-      NET_MODE = #{netMode,jdbcType=VARCHAR},
-      VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
-      UPLOAD_FLAG = #{uploadFlag,jdbcType=VARCHAR},
-      CHECK_MAN_NO = #{checkManNo,jdbcType=VARCHAR},
-      CHECK_MAN_NAME = #{checkManName,jdbcType=VARCHAR},
-      CHECK_TIME = #{checkTime,jdbcType=TIMESTAMP},
-      UPLOAD_MAN_NO = #{uploadManNo,jdbcType=VARCHAR},
-      UPLOAD_MAN_NAME = #{uploadManName,jdbcType=VARCHAR},
-      UPLOAD_TIME = #{uploadTime,jdbcType=TIMESTAMP},
-      NET_CLASS = #{netClass,jdbcType=VARCHAR}
-    where ACTUAL_NO = #{actualNo,jdbcType=VARCHAR}
-  </update>
-    <update id="updateByPrimaryKeySelective"
-            parameterType="com.steerinfo.appservice.appmeterworkcaractual.model.AppMeterWorkCarActual">
-        update METER_WORK_CAR_ACTUAL
-        <set>
-            <if test="predictionNo != null">
-                PREDICTION_NO = #{predictionNo,jdbcType=VARCHAR},
-            </if>
-            <if test="noticeNo != null">
-                NOTICE_NO = #{noticeNo,jdbcType=VARCHAR},
-            </if>
-            <if test="carNo != null">
-                CAR_NO = #{carNo,jdbcType=VARCHAR},
-            </if>
-            <if test="trailerNo != null">
-                TRAILER_NO = #{trailerNo,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="contractNo != null">
-                CONTRACT_NO = #{contractNo,jdbcType=VARCHAR},
-            </if>
-            <if test="batchNo != null">
-                BATCH_NO = #{batchNo,jdbcType=VARCHAR},
-            </if>
-            <if test="customerSupplierNo != null">
-                CUSTOMER_SUPPLIER_NO = #{customerSupplierNo,jdbcType=VARCHAR},
-            </if>
-            <if test="customerSupplierName != null">
-                CUSTOMER_SUPPLIER_NAME = #{customerSupplierName,jdbcType=VARCHAR},
-            </if>
-            <if test="forwardingUnitNo != null">
-                FORWARDING_UNIT_NO = #{forwardingUnitNo,jdbcType=VARCHAR},
-            </if>
-            <if test="forwardingUnitName != null">
-                FORWARDING_UNIT_NAME = #{forwardingUnitName,jdbcType=VARCHAR},
-            </if>
-            <if test="receivingUintNo != null">
-                RECEIVING_UINT_NO = #{receivingUintNo,jdbcType=VARCHAR},
-            </if>
-            <if test="receivingUintName != null">
-                RECEIVING_UINT_NAME = #{receivingUintName,jdbcType=VARCHAR},
-            </if>
-            <if test="materialNo != null">
-                MATERIAL_NO = #{materialNo,jdbcType=VARCHAR},
-            </if>
-            <if test="materialName != null">
-                MATERIAL_NAME = #{materialName,jdbcType=VARCHAR},
-            </if>
-            <if test="specNo != null">
-                SPEC_NO = #{specNo,jdbcType=VARCHAR},
-            </if>
-            <if test="specName != null">
-                SPEC_NAME = #{specName,jdbcType=VARCHAR},
-            </if>
-            <if test="loadPointNo != null">
-                LOAD_POINT_NO = #{loadPointNo,jdbcType=VARCHAR},
-            </if>
-            <if test="loadPointName != null">
-                LOAD_POINT_NAME = #{loadPointName,jdbcType=VARCHAR},
-            </if>
-            <if test="sampleNo != null">
-                SAMPLE_NO = #{sampleNo,jdbcType=VARCHAR},
-            </if>
-            <if test="sampleVoucher != null">
-                SAMPLE_VOUCHER = #{sampleVoucher,jdbcType=VARCHAR},
-            </if>
-            <if test="carrierUnitNo != null">
-                CARRIER_UNIT_NO = #{carrierUnitNo,jdbcType=VARCHAR},
-            </if>
-            <if test="carrierUnitName != null">
-                CARRIER_UNIT_NAME = #{carrierUnitName,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="meterProcessNo != null">
-                METER_PROCESS_NO = #{meterProcessNo,jdbcType=VARCHAR},
-            </if>
-            <if test="meterProcessEditionNo != null">
-                METER_PROCESS_EDITION_NO = #{meterProcessEditionNo,jdbcType=VARCHAR},
-            </if>
-            <if test="actualFirst1No != null">
-                ACTUAL_FIRST1_NO = #{actualFirst1No,jdbcType=VARCHAR},
-            </if>
-            <if test="grossWeight != null">
-                GROSS_WEIGHT = #{grossWeight,jdbcType=DECIMAL},
-            </if>
-            <if test="grossManNo != null">
-                GROSS_MAN_NO = #{grossManNo,jdbcType=VARCHAR},
-            </if>
-            <if test="grossManName != null">
-                GROSS_MAN_NAME = #{grossManName,jdbcType=VARCHAR},
-            </if>
-            <if test="grossTime != null">
-                GROSS_TIME = #{grossTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="baseSpot1No != null">
-                BASE_SPOT1_NO = #{baseSpot1No,jdbcType=VARCHAR},
-            </if>
-            <if test="baseSpot1Name != null">
-                BASE_SPOT1_NAME = #{baseSpot1Name,jdbcType=VARCHAR},
-            </if>
-            <if test="grossClass != null">
-                GROSS_CLASS = #{grossClass,jdbcType=VARCHAR},
-            </if>
-            <if test="grossGroup != null">
-                GROSS_GROUP = #{grossGroup,jdbcType=VARCHAR},
-            </if>
-            <if test="grossMode != null">
-                GROSS_MODE = #{grossMode,jdbcType=VARCHAR},
-            </if>
-            <if test="actualFirst2No != null">
-                ACTUAL_FIRST2_NO = #{actualFirst2No,jdbcType=VARCHAR},
-            </if>
-            <if test="tareWeight != null">
-                TARE_WEIGHT = #{tareWeight,jdbcType=DECIMAL},
-            </if>
-            <if test="tareManNo != null">
-                TARE_MAN_NO = #{tareManNo,jdbcType=VARCHAR},
-            </if>
-            <if test="tareManName != null">
-                TARE_MAN_NAME = #{tareManName,jdbcType=VARCHAR},
-            </if>
-            <if test="tareTime != null">
-                TARE_TIME = #{tareTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="baseSpot2No != null">
-                BASE_SPOT2_NO = #{baseSpot2No,jdbcType=VARCHAR},
-            </if>
-            <if test="baseSpot2Name != null">
-                BASE_SPOT2_NAME = #{baseSpot2Name,jdbcType=VARCHAR},
-            </if>
-            <if test="tareClass != null">
-                TARE_CLASS = #{tareClass,jdbcType=VARCHAR},
-            </if>
-            <if test="tareGroup != null">
-                TARE_GROUP = #{tareGroup,jdbcType=VARCHAR},
-            </if>
-            <if test="tareMode != null">
-                TARE_MODE = #{tareMode,jdbcType=VARCHAR},
-            </if>
-            <if test="netWeight != null">
-                NET_WEIGHT = #{netWeight,jdbcType=DECIMAL},
-            </if>
-            <if test="meterNum != null">
-                METER_NUM = #{meterNum,jdbcType=VARCHAR},
-            </if>
-            <if test="netManNo != null">
-                NET_MAN_NO = #{netManNo,jdbcType=VARCHAR},
-            </if>
-            <if test="netManName != null">
-                NET_MAN_NAME = #{netManName,jdbcType=VARCHAR},
-            </if>
-            <if test="netTime != null">
-                NET_TIME = #{netTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="netSpot3No != null">
-                NET_SPOT3_NO = #{netSpot3No,jdbcType=VARCHAR},
-            </if>
-            <if test="netSpot3Name != null">
-                NET_SPOT3_NAME = #{netSpot3Name,jdbcType=VARCHAR},
-            </if>
-            <if test="netGroup != null">
-                NET_GROUP = #{netGroup,jdbcType=VARCHAR},
-            </if>
-            <if test="netMode != null">
-                NET_MODE = #{netMode,jdbcType=VARCHAR},
-            </if>
-            <if test="valueFlag != null">
-                VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
-            </if>
-            <if test="uploadFlag != null">
-                UPLOAD_FLAG = #{uploadFlag,jdbcType=VARCHAR},
-            </if>
-            <if test="checkManNo != null">
-                CHECK_MAN_NO = #{checkManNo,jdbcType=VARCHAR},
-            </if>
-            <if test="checkManName != null">
-                CHECK_MAN_NAME = #{checkManName,jdbcType=VARCHAR},
-            </if>
-            <if test="checkTime != null">
-                CHECK_TIME = #{checkTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="uploadManNo != null">
-                UPLOAD_MAN_NO = #{uploadManNo,jdbcType=VARCHAR},
-            </if>
-            <if test="uploadManName != null">
-                UPLOAD_MAN_NAME = #{uploadManName,jdbcType=VARCHAR},
-            </if>
-            <if test="uploadTime != null">
-                UPLOAD_TIME = #{uploadTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="netClass != null">
-                NET_CLASS = #{netClass,jdbcType=VARCHAR},
-            </if>
-        </set>
-        where ACTUAL_NO = #{actualNo,jdbcType=VARCHAR}
-    </update>
-    <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-        <include refid="select"/>
-        where ACTUAL_NO = #{actualNo,jdbcType=VARCHAR}
-    </select>
-    <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-        <include refid="select"/>
-        <include refid="where"/>
-        order by NET_TIME desc
-    </select>
-    <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-        <include refid="select"/>
-        <include refid="whereLike"/>
-        order by NET_TIME desc
-    </select>
-    <insert id="batchInsert" parameterType="java.util.List">
-        insert into METER_WORK_CAR_ACTUAL
-        (ACTUAL_NO,
-        PREDICTION_NO, NOTICE_NO, CAR_NO,
-        TRAILER_NO, MATTER_NO, MATTER_NAME,
-        CONTRACT_NO, BATCH_NO, CUSTOMER_SUPPLIER_NO,
-        CUSTOMER_SUPPLIER_NAME, FORWARDING_UNIT_NO,
-        FORWARDING_UNIT_NAME, RECEIVING_UINT_NO,
-        RECEIVING_UINT_NAME, MATERIAL_NO,
-        MATERIAL_NAME, SPEC_NO, SPEC_NAME,
-        LOAD_POINT_NO, LOAD_POINT_NAME, SAMPLE_NO,
-        SAMPLE_VOUCHER, CARRIER_UNIT_NO,
-        CARRIER_UNIT_NAME, METER_TYPE_NO,
-        METER_TYPE_NAME, METER_PROCESS_NO,
-        METER_PROCESS_EDITION_NO, ACTUAL_FIRST1_NO,
-        GROSS_WEIGHT, GROSS_MAN_NO, GROSS_MAN_NAME,
-        GROSS_TIME, BASE_SPOT1_NO, BASE_SPOT1_NAME,
-        GROSS_CLASS, GROSS_GROUP, GROSS_MODE,
-        ACTUAL_FIRST2_NO, TARE_WEIGHT, TARE_MAN_NO,
-        TARE_MAN_NAME, TARE_TIME, BASE_SPOT2_NO,
-        BASE_SPOT2_NAME, TARE_CLASS, TARE_GROUP,
-        TARE_MODE, NET_WEIGHT, METER_NUM,
-        NET_MAN_NO, NET_MAN_NAME, NET_TIME,
-        NET_SPOT3_NO, NET_SPOT3_NAME, NET_GROUP,
-        NET_MODE, VALUE_FLAG, UPLOAD_FLAG,
-        CHECK_MAN_NO, CHECK_MAN_NAME, CHECK_TIME,
-        UPLOAD_MAN_NO, UPLOAD_MAN_NAME, UPLOAD_TIME,
-        NET_CLASS)
-        ( <foreach collection="list" item="item" separator="union all">
-        select
-        #{item.actualNo,jdbcType=VARCHAR},
-        #{item.predictionNo,jdbcType=VARCHAR}, #{item.noticeNo,jdbcType=VARCHAR}, #{item.carNo,jdbcType=VARCHAR},
-        #{item.trailerNo,jdbcType=VARCHAR}, #{item.matterNo,jdbcType=VARCHAR}, #{item.matterName,jdbcType=VARCHAR},
-        #{item.contractNo,jdbcType=VARCHAR}, #{item.batchNo,jdbcType=VARCHAR},
-        #{item.customerSupplierNo,jdbcType=VARCHAR},
-        #{item.customerSupplierName,jdbcType=VARCHAR}, #{item.forwardingUnitNo,jdbcType=VARCHAR},
-        #{item.forwardingUnitName,jdbcType=VARCHAR}, #{item.receivingUintNo,jdbcType=VARCHAR},
-        #{item.receivingUintName,jdbcType=VARCHAR}, #{item.materialNo,jdbcType=VARCHAR},
-        #{item.materialName,jdbcType=VARCHAR}, #{item.specNo,jdbcType=VARCHAR}, #{item.specName,jdbcType=VARCHAR},
-        #{item.loadPointNo,jdbcType=VARCHAR}, #{item.loadPointName,jdbcType=VARCHAR}, #{item.sampleNo,jdbcType=VARCHAR},
-        #{item.sampleVoucher,jdbcType=VARCHAR}, #{item.carrierUnitNo,jdbcType=VARCHAR},
-        #{item.carrierUnitName,jdbcType=VARCHAR}, #{item.meterTypeNo,jdbcType=VARCHAR},
-        #{item.meterTypeName,jdbcType=VARCHAR}, #{item.meterProcessNo,jdbcType=VARCHAR},
-        #{item.meterProcessEditionNo,jdbcType=VARCHAR}, #{item.actualFirst1No,jdbcType=VARCHAR},
-        #{item.grossWeight,jdbcType=DECIMAL}, #{item.grossManNo,jdbcType=VARCHAR},
-        #{item.grossManName,jdbcType=VARCHAR},
-        #{item.grossTime,jdbcType=TIMESTAMP}, #{item.baseSpot1No,jdbcType=VARCHAR},
-        #{item.baseSpot1Name,jdbcType=VARCHAR},
-        #{item.grossClass,jdbcType=VARCHAR}, #{item.grossGroup,jdbcType=VARCHAR}, #{item.grossMode,jdbcType=VARCHAR},
-        #{item.actualFirst2No,jdbcType=VARCHAR}, #{item.tareWeight,jdbcType=DECIMAL},
-        #{item.tareManNo,jdbcType=VARCHAR},
-        #{item.tareManName,jdbcType=VARCHAR}, #{item.tareTime,jdbcType=TIMESTAMP}, #{item.baseSpot2No,jdbcType=VARCHAR},
-        #{item.baseSpot2Name,jdbcType=VARCHAR}, #{item.tareClass,jdbcType=VARCHAR}, #{item.tareGroup,jdbcType=VARCHAR},
-        #{item.tareMode,jdbcType=VARCHAR}, #{item.netWeight,jdbcType=DECIMAL}, #{item.meterNum,jdbcType=VARCHAR},
-        #{item.netManNo,jdbcType=VARCHAR}, #{item.netManName,jdbcType=VARCHAR}, #{item.netTime,jdbcType=TIMESTAMP},
-        #{item.netSpot3No,jdbcType=VARCHAR}, #{item.netSpot3Name,jdbcType=VARCHAR}, #{item.netGroup,jdbcType=VARCHAR},
-        #{item.netMode,jdbcType=VARCHAR}, #{item.valueFlag,jdbcType=VARCHAR}, #{item.uploadFlag,jdbcType=VARCHAR},
-        #{item.checkManNo,jdbcType=VARCHAR}, #{item.checkManName,jdbcType=VARCHAR},
-        #{item.checkTime,jdbcType=TIMESTAMP},
-        #{item.uploadManNo,jdbcType=VARCHAR}, #{item.uploadManName,jdbcType=VARCHAR},
-        #{item.uploadTime,jdbcType=TIMESTAMP},
-        #{item.netClass,jdbcType=VARCHAR} from dual
-    </foreach> )
-    </insert>
-    <update id="batchUpdate" parameterType="java.util.List">
-        update METER_WORK_CAR_ACTUAL
-        set
-        ACTUAL_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.actualNo,jdbcType=VARCHAR}
-        </foreach>
-        ,PREDICTION_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.predictionNo,jdbcType=VARCHAR}
-        </foreach>
-        ,NOTICE_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.noticeNo,jdbcType=VARCHAR}
-        </foreach>
-        ,CAR_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.carNo,jdbcType=VARCHAR}
-        </foreach>
-        ,TRAILER_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.trailerNo,jdbcType=VARCHAR}
-        </foreach>
-        ,MATTER_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.matterNo,jdbcType=VARCHAR}
-        </foreach>
-        ,MATTER_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.matterName,jdbcType=VARCHAR}
-        </foreach>
-        ,CONTRACT_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.contractNo,jdbcType=VARCHAR}
-        </foreach>
-        ,BATCH_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.batchNo,jdbcType=VARCHAR}
-        </foreach>
-        ,CUSTOMER_SUPPLIER_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.customerSupplierNo,jdbcType=VARCHAR}
-        </foreach>
-        ,CUSTOMER_SUPPLIER_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.customerSupplierName,jdbcType=VARCHAR}
-        </foreach>
-        ,FORWARDING_UNIT_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.forwardingUnitNo,jdbcType=VARCHAR}
-        </foreach>
-        ,FORWARDING_UNIT_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.forwardingUnitName,jdbcType=VARCHAR}
-        </foreach>
-        ,RECEIVING_UINT_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.receivingUintNo,jdbcType=VARCHAR}
-        </foreach>
-        ,RECEIVING_UINT_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.receivingUintName,jdbcType=VARCHAR}
-        </foreach>
-        ,MATERIAL_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.materialNo,jdbcType=VARCHAR}
-        </foreach>
-        ,MATERIAL_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.materialName,jdbcType=VARCHAR}
-        </foreach>
-        ,SPEC_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.specNo,jdbcType=VARCHAR}
-        </foreach>
-        ,SPEC_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.specName,jdbcType=VARCHAR}
-        </foreach>
-        ,LOAD_POINT_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.loadPointNo,jdbcType=VARCHAR}
-        </foreach>
-        ,LOAD_POINT_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.loadPointName,jdbcType=VARCHAR}
-        </foreach>
-        ,SAMPLE_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.sampleNo,jdbcType=VARCHAR}
-        </foreach>
-        ,SAMPLE_VOUCHER=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.sampleVoucher,jdbcType=VARCHAR}
-        </foreach>
-        ,CARRIER_UNIT_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.carrierUnitNo,jdbcType=VARCHAR}
-        </foreach>
-        ,CARRIER_UNIT_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.carrierUnitName,jdbcType=VARCHAR}
-        </foreach>
-        ,METER_TYPE_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.meterTypeNo,jdbcType=VARCHAR}
-        </foreach>
-        ,METER_TYPE_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.meterTypeName,jdbcType=VARCHAR}
-        </foreach>
-        ,METER_PROCESS_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.meterProcessNo,jdbcType=VARCHAR}
-        </foreach>
-        ,METER_PROCESS_EDITION_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.meterProcessEditionNo,jdbcType=VARCHAR}
-        </foreach>
-        ,ACTUAL_FIRST1_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.actualFirst1No,jdbcType=VARCHAR}
-        </foreach>
-        ,GROSS_WEIGHT=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.grossWeight,jdbcType=DECIMAL}
-        </foreach>
-        ,GROSS_MAN_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.grossManNo,jdbcType=VARCHAR}
-        </foreach>
-        ,GROSS_MAN_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.grossManName,jdbcType=VARCHAR}
-        </foreach>
-        ,GROSS_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.grossTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,BASE_SPOT1_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.baseSpot1No,jdbcType=VARCHAR}
-        </foreach>
-        ,BASE_SPOT1_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.baseSpot1Name,jdbcType=VARCHAR}
-        </foreach>
-        ,GROSS_CLASS=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.grossClass,jdbcType=VARCHAR}
-        </foreach>
-        ,GROSS_GROUP=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.grossGroup,jdbcType=VARCHAR}
-        </foreach>
-        ,GROSS_MODE=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.grossMode,jdbcType=VARCHAR}
-        </foreach>
-        ,ACTUAL_FIRST2_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.actualFirst2No,jdbcType=VARCHAR}
-        </foreach>
-        ,TARE_WEIGHT=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.tareWeight,jdbcType=DECIMAL}
-        </foreach>
-        ,TARE_MAN_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.tareManNo,jdbcType=VARCHAR}
-        </foreach>
-        ,TARE_MAN_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.tareManName,jdbcType=VARCHAR}
-        </foreach>
-        ,TARE_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.tareTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,BASE_SPOT2_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.baseSpot2No,jdbcType=VARCHAR}
-        </foreach>
-        ,BASE_SPOT2_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.baseSpot2Name,jdbcType=VARCHAR}
-        </foreach>
-        ,TARE_CLASS=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.tareClass,jdbcType=VARCHAR}
-        </foreach>
-        ,TARE_GROUP=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.tareGroup,jdbcType=VARCHAR}
-        </foreach>
-        ,TARE_MODE=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.tareMode,jdbcType=VARCHAR}
-        </foreach>
-        ,NET_WEIGHT=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.netWeight,jdbcType=DECIMAL}
-        </foreach>
-        ,METER_NUM=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.meterNum,jdbcType=VARCHAR}
-        </foreach>
-        ,NET_MAN_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.netManNo,jdbcType=VARCHAR}
-        </foreach>
-        ,NET_MAN_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.netManName,jdbcType=VARCHAR}
-        </foreach>
-        ,NET_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.netTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,NET_SPOT3_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.netSpot3No,jdbcType=VARCHAR}
-        </foreach>
-        ,NET_SPOT3_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.netSpot3Name,jdbcType=VARCHAR}
-        </foreach>
-        ,NET_GROUP=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.netGroup,jdbcType=VARCHAR}
-        </foreach>
-        ,NET_MODE=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.netMode,jdbcType=VARCHAR}
-        </foreach>
-        ,VALUE_FLAG=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.valueFlag,jdbcType=VARCHAR}
-        </foreach>
-        ,UPLOAD_FLAG=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.uploadFlag,jdbcType=VARCHAR}
-        </foreach>
-        ,CHECK_MAN_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.checkManNo,jdbcType=VARCHAR}
-        </foreach>
-        ,CHECK_MAN_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.checkManName,jdbcType=VARCHAR}
-        </foreach>
-        ,CHECK_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.checkTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,UPLOAD_MAN_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.uploadManNo,jdbcType=VARCHAR}
-        </foreach>
-        ,UPLOAD_MAN_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.uploadManName,jdbcType=VARCHAR}
-        </foreach>
-        ,UPLOAD_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.uploadTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,NET_CLASS=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
-            when #{item.actualNo,jdbcType=VARCHAR} then #{item.netClass,jdbcType=VARCHAR}
-        </foreach>
-        where ACTUAL_NO in
-        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-            #{item.actualNo,jdbcType=VARCHAR}
-        </foreach>
-    </update>
-    <delete id="batchDelete" parameterType="java.util.List">
-        delete from METER_WORK_CAR_ACTUAL
-        where ACTUAL_NO in
-        <foreach collection="list" item="id" open="(" close=")" separator=",">
-            #{id}
-        </foreach>
-    </delete>
-    <!-- 友情提示！！！-->
-    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-    <select id="selectNet" parameterType="map" resultMap="BaseResultMap">
-        SELECT
-        <include refid="columns"/>
-        from METER_WORK_CAR_ACTUAL t
-        <where>
-            t.value_flag = '0'
-            <if test="forwardingUnitName != null and  forwardingUnitName != '' ">
-                and t.forwarding_Unit_Name = #{forwardingUnitName}
-            </if>
-            <if test="receivingUintName != null and  receivingUintName != '' ">
-                and t.receiving_Uint_Name = #{receivingUintName}
-            </if>
-            <if test="loadPointName != null and  loadPointName != '' ">
-                and t.load_Point_Name = #{loadPointName}
-            </if>
-            <if test="receivingUintNo != null and  customerSupplierNo == null ">
-                and t.Receiving_Uint_No = #{receivingUintNo}
-            </if>
-            <if test="customerSupplierNo != null and receivingUintNo == null ">
-                and t.customer_supplier_no = #{customerSupplierNo}
-            </if>
-            <if test="customerSupplierNo != null and receivingUintNo != null ">
-                and (t.customer_supplier_no = #{customerSupplierNo} or t.Receiving_Uint_No = #{receivingUintNo})
-            </if>
-            <if test="meterTypeNos != null and meterTypeNos.size()>0">
-                and t.meter_type_no in
-                <foreach collection="meterTypeNos" index="index" item="item" separator="," open="(" close=")">
-                    #{item}
-                </foreach>
-            </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="startTime != null and endTime != null and startTime != '' and endTime != ''">
-                and TO_CHAR(NET_TIME,'yyyy-MM-dd') >= #{startTime} and TO_CHAR(NET_TIME,'yyyy-MM-dd') &lt;= #{endTime}
-            </if>
-        </where>
-        order by  NET_TIME desc
-    </select>
-
-    <select id="selectNetByCar" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-        SELECT
-        <include refid="columns"/>
-        from METER_WORK_CAR_ACTUAL t
-        <where>
-            t.value_flag = '0'
-            <if test="forwardingUnitName != null and  forwardingUnitName != '' ">
-                and t.forwarding_Unit_Name = #{forwardingUnitName}
-            </if>
-            <if test="receivingUintName != null and  receivingUintName != '' ">
-                and t.receiving_Uint_Name = #{receivingUintName}
-            </if>
-            <if test="loadPointName != null and  loadPointName != '' ">
-                and t.load_Point_Name = #{loadPointName}
-            </if>
-            <if test="carNo != null and carNo != ''">
-                and CAR_NO = #{carNo}
-            </if>
-            <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
-                and TO_CHAR(NET_TIME,'yyyy-MM-dd') >= #{startTime} and TO_CHAR(NET_TIME,'yyyy-MM-dd') &lt;= #{endTime}
-            </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>
-        </where>
-    order by NET_TIME desc
-    </select>
-
-    <resultMap id="AppMeterWorkCarActualDemo" type="com.steerinfo.appservice.dto.AppMeterWorkCarActualDemo"
-               extends="BaseResultMap">
-        <result column="ACTUAL_NO" jdbcType="VARCHAR" property="actualNo"/>
-        <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="SUM_WEIGHT" jdbcType="VARCHAR" property="sumWeight"/>
-        <result column="CAR_NUM" jdbcType="VARCHAR" property="carNum"/>
-    </resultMap>
-
-    <select id="selectSumForApp" parameterType="map" resultMap="AppMeterWorkCarActualDemo">
-        select t.matter_no MATTER_NO,
-        t.matter_name MATTER_NAME,
-        t.meter_type_no METER_TYPE_NO,
-        t.meter_type_name METER_TYPE_NAME,
-        sum(t.net_weight) SUM_WEIGHT,
-        count (1) CAR_NUM
-        from METER_WORK_CAR_ACTUAL t
-        <where>
-            t.value_flag = '0'
-            <if test="forwardingUnitName != null and  forwardingUnitName != '' ">
-                and t.forwarding_Unit_Name = #{forwardingUnitName}
-            </if>
-            <if test="receivingUintName != null and  receivingUintName != '' ">
-                and t.receiving_Uint_Name = #{receivingUintName}
-            </if>
-            <if test="loadPointName != null and  loadPointName != '' ">
-                and t.load_Point_Name = #{loadPointName}
-            </if>
-            <if test="receivingUintNo != null and  customerSupplierNo == null ">
-                and t.Receiving_Uint_No = #{receivingUintNo}
-            </if>
-            <if test="customerSupplierNo != null and receivingUintNo == null ">
-                and t.customer_supplier_no = #{customerSupplierNo}
-            </if>
-            <if test="customerSupplierNo != null and receivingUintNo != null ">
-                and (t.customer_supplier_no = #{customerSupplierNo} or t.Receiving_Uint_No = #{receivingUintNo})
-            </if>
-            <if test="meterTypeNos != null and meterTypeNos.size()>0">
-                and t.meter_type_no in
-                <foreach collection="meterTypeNos" index="index" item="item" separator="," open="(" close=")">
-                    #{item}
-                </foreach>
-            </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="forwardingUnitName != null and forwardingUnitName != ''">
-                and forwarding_unit_name = #{forwardingUnitName}
-            </if>
-            <if test="receivingUintName != null and receivingUintName != ''">
-                and receiving_uint_name = #{receivingUintName}
-            </if>
-            <if test="loadPointName != null and loadPointName != ''">
-                and load_point_name = #{loadPointName}
-            </if>
-            <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
-                and TO_CHAR(NET_TIME,'yyyy-MM-dd') >= #{startTime} and TO_CHAR(NET_TIME,'yyyy-MM-dd') &lt;= #{endTime}
-            </if>
-
-        </where>
-        group by t.matter_no,t.matter_name,t.meter_type_no,t.meter_type_name
-    </select>
-
-    <select id="selectSumHD" parameterType="map" resultMap="AppMeterWorkCarActualDemo">
-        select t.matter_no MATTER_NO,
-        t.matter_name MATTER_NAME,
-        t.meter_type_no METER_TYPE_NO,
-        t.meter_type_name METER_TYPE_NAME,
-        sum(t.net_weight) SUM_WEIGHT,
-        count (1) CAR_NUM
-        from METER_WORK_CAR_ACTUAL t
-        <where>
-            t.value_flag = '0'
-            <if test="ids != null and ids.size()>0">
-                and t.customer_supplier_no in
-                <foreach collection="ids" index="index" item="item" separator="," open="(" close=")">
-                    #{item}
-                </foreach>
-            </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="forwardingUnitName != null and  forwardingUnitName != '' ">
-                and t.forwarding_Unit_Name = #{forwardingUnitName}
-            </if>
-            <if test="receivingUintName != null and  receivingUintName != '' ">
-                and t.receiving_Uint_Name = #{receivingUintName}
-            </if>
-            <if test="loadPointName != null and  loadPointName != '' ">
-                and t.load_Point_Name = #{loadPointName}
-            </if>
-            <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
-                and TO_CHAR(NET_TIME,'yyyy-MM-dd') >= #{startTime} and TO_CHAR(NET_TIME,'yyyy-MM-dd') &lt;= #{endTime}
-            </if>
-        </where>
-        group by t.matter_no,t.matter_name,t.meter_type_no,t.meter_type_name
-    </select>
-
-
-    <select id="selectActualHD" parameterType="map" resultMap="BaseResultMap">
-        select t.*
-        from METER_WORK_CAR_ACTUAL t
-        <where>
-            t.value_flag = '0'
-            <if test="ids != null and ids.size()>0">
-                and t.customer_supplier_no in
-                <foreach collection="ids" index="index" item="item" separator="," open="(" close=")">
-                    #{item}
-                </foreach>
-            </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="forwardingUnitName != null and  forwardingUnitName != '' ">
-                and t.forwarding_Unit_Name = #{forwardingUnitName}
-            </if>
-            <if test="receivingUintName != null and  receivingUintName != '' ">
-                and t.receiving_Uint_Name = #{receivingUintName}
-            </if>
-            <if test="loadPointName != null and  loadPointName != '' ">
-                and t.load_Point_Name = #{loadPointName}
-            </if>
-            <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
-                and TO_CHAR(NET_TIME,'yyyy-MM-dd') >= #{startTime} and TO_CHAR(NET_TIME,'yyyy-MM-dd') &lt;= #{endTime}
-            </if>
-        </where>
-        order by  NET_TIME desc
-    </select>
-
-
-    <select id="selectSumForAppByCar" parameterType="java.util.HashMap" resultMap="AppMeterWorkCarActualDemo">
-        select t.matter_no MATTER_NO,
-        t.matter_name MATTER_NAME,
-        t.meter_type_no METER_TYPE_NO,
-        t.meter_type_name METER_TYPE_NAME,
-        sum(t.net_weight) SUM_WEIGHT,
-        count (1) CAR_NUM
-        from METER_WORK_CAR_ACTUAL t
-        <where>
-            t.value_flag = '0'
-            <if test="carNo != null and carNo != ''">
-                and CAR_NO = #{carNo}
-            </if>
-            <if test="predictionNo != null and predictionNo != ''">
-                and PREDICTION_NO = #{predictionNo}
-            </if>
-            <if test="noticeNo != null and noticeNo != ''">
-                and NOTICE_NO = #{noticeNo}
-            </if>
-            <if test="trailerNo != null and trailerNo != ''">
-                and TRAILER_NO = #{trailerNo}
-            </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="contractNo != null and contractNo != ''">
-                and CONTRACT_NO = #{contractNo}
-            </if>
-            <if test="batchNo != null and batchNo != ''">
-                and BATCH_NO = #{batchNo}
-            </if>
-            <if test="customerSupplierNo != null and customerSupplierNo != ''">
-                and CUSTOMER_SUPPLIER_NO = #{customerSupplierNo}
-            </if>
-            <if test="customerSupplierName != null and customerSupplierName != ''">
-                and CUSTOMER_SUPPLIER_NAME = #{customerSupplierName}
-            </if>
-            <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
-                and FORWARDING_UNIT_NO = #{forwardingUnitNo}
-            </if>
-            <if test="forwardingUnitName != null and forwardingUnitName != ''">
-                and FORWARDING_UNIT_NAME = #{forwardingUnitName}
-            </if>
-            <if test="receivingUintNo != null and receivingUintNo != ''">
-                and RECEIVING_UINT_NO = #{receivingUintNo}
-            </if>
-            <if test="receivingUintName != null and receivingUintName != ''">
-                and RECEIVING_UINT_NAME = #{receivingUintName}
-            </if>
-            <if test="materialNo != null and materialNo != ''">
-                and MATERIAL_NO = #{materialNo}
-            </if>
-            <if test="materialName != null and materialName != ''">
-                and MATERIAL_NAME = #{materialName}
-            </if>
-            <if test="specNo != null and specNo != ''">
-                and SPEC_NO = #{specNo}
-            </if>
-            <if test="specName != null and specName != ''">
-                and SPEC_NAME = #{specName}
-            </if>
-            <if test="loadPointNo != null and loadPointNo != ''">
-                and LOAD_POINT_NO = #{loadPointNo}
-            </if>
-            <if test="loadPointName != null and loadPointName != ''">
-                and LOAD_POINT_NAME = #{loadPointName}
-            </if>
-            <if test="sampleNo != null and sampleNo != ''">
-                and SAMPLE_NO = #{sampleNo}
-            </if>
-            <if test="sampleVoucher != null and sampleVoucher != ''">
-                and SAMPLE_VOUCHER = #{sampleVoucher}
-            </if>
-            <if test="carrierUnitNo != null and carrierUnitNo != ''">
-                and CARRIER_UNIT_NO = #{carrierUnitNo}
-            </if>
-            <if test="carrierUnitName != null and carrierUnitName != ''">
-                and CARRIER_UNIT_NAME = #{carrierUnitName}
-            </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="meterProcessNo != null and meterProcessNo != ''">
-                and METER_PROCESS_NO = #{meterProcessNo}
-            </if>
-            <if test="meterProcessEditionNo != null and meterProcessEditionNo != ''">
-                and METER_PROCESS_EDITION_NO = #{meterProcessEditionNo}
-            </if>
-            <if test="actualFirst1No != null and actualFirst1No != ''">
-                and ACTUAL_FIRST1_NO = #{actualFirst1No}
-            </if>
-            <if test="grossWeight != null">
-                and GROSS_WEIGHT = #{grossWeight}
-            </if>
-            <if test="grossManNo != null and grossManNo != ''">
-                and GROSS_MAN_NO = #{grossManNo}
-            </if>
-            <if test="grossManName != null and grossManName != ''">
-                and GROSS_MAN_NAME = #{grossManName}
-            </if>
-            <if test="baseSpot1No != null and baseSpot1No != ''">
-                and BASE_SPOT1_NO = #{baseSpot1No}
-            </if>
-            <if test="baseSpot1Name != null and baseSpot1Name != ''">
-                and BASE_SPOT1_NAME = #{baseSpot1Name}
-            </if>
-            <if test="grossClass != null and grossClass != ''">
-                and GROSS_CLASS = #{grossClass}
-            </if>
-            <if test="grossGroup != null and grossGroup != ''">
-                and GROSS_GROUP = #{grossGroup}
-            </if>
-            <if test="grossMode != null and grossMode != ''">
-                and GROSS_MODE = #{grossMode}
-            </if>
-            <if test="actualFirst2No != null and actualFirst2No != ''">
-                and ACTUAL_FIRST2_NO = #{actualFirst2No}
-            </if>
-            <if test="tareWeight != null">
-                and TARE_WEIGHT = #{tareWeight}
-            </if>
-            <if test="tareManNo != null and tareManNo != ''">
-                and TARE_MAN_NO = #{tareManNo}
-            </if>
-            <if test="tareManName != null and tareManName != ''">
-                and TARE_MAN_NAME = #{tareManName}
-            </if>
-            <if test="tareTime != null">
-                and TO_CHAR(TARE_TIME,'yyyy-MM-dd') = #{tareTime}
-            </if>
-            <if test="baseSpot2No != null and baseSpot2No != ''">
-                and BASE_SPOT2_NO = #{baseSpot2No}
-            </if>
-            <if test="baseSpot2Name != null and baseSpot2Name != ''">
-                and BASE_SPOT2_NAME = #{baseSpot2Name}
-            </if>
-            <if test="tareClass != null and tareClass != ''">
-                and TARE_CLASS = #{tareClass}
-            </if>
-            <if test="tareGroup != null and tareGroup != ''">
-                and TARE_GROUP = #{tareGroup}
-            </if>
-            <if test="tareMode != null and tareMode != ''">
-                and TARE_MODE = #{tareMode}
-            </if>
-            <if test="netWeight != null">
-                and NET_WEIGHT = #{netWeight}
-            </if>
-            <if test="meterNum != null and meterNum != ''">
-                and METER_NUM = #{meterNum}
-            </if>
-            <if test="netManNo != null and netManNo != ''">
-                and NET_MAN_NO = #{netManNo}
-            </if>
-            <if test="netManName != null and netManName != ''">
-                and NET_MAN_NAME = #{netManName}
-            </if>
-            <if test="netSpot3No != null and netSpot3No != ''">
-                and NET_SPOT3_NO = #{netSpot3No}
-            </if>
-            <if test="netSpot3Name != null and netSpot3Name != ''">
-                and NET_SPOT3_NAME = #{netSpot3Name}
-            </if>
-            <if test="netGroup != null and netGroup != ''">
-                and NET_GROUP = #{netGroup}
-            </if>
-            <if test="netMode != null and netMode != ''">
-                and NET_MODE = #{netMode}
-            </if>
-            <if test="valueFlag != null and valueFlag != ''">
-                and VALUE_FLAG = #{valueFlag}
-            </if>
-            <if test="uploadFlag != null and uploadFlag != ''">
-                and UPLOAD_FLAG = #{uploadFlag}
-            </if>
-            <if test="checkManNo != null and checkManNo != ''">
-                and CHECK_MAN_NO = #{checkManNo}
-            </if>
-            <if test="checkManName != null and checkManName != ''">
-                and CHECK_MAN_NAME = #{checkManName}
-            </if>
-            <if test="uploadManNo != null and uploadManNo != ''">
-                and UPLOAD_MAN_NO = #{uploadManNo}
-            </if>
-            <if test="uploadManName != null and uploadManName != ''">
-                and UPLOAD_MAN_NAME = #{uploadManName}
-            </if>
-            <if test="netClass != null and netClass != ''">
-                and NET_CLASS = #{netClass}
-            </if>
-            <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
-                and TO_CHAR(NET_TIME,'yyyy-MM-dd') >= #{startTime} and TO_CHAR(NET_TIME,'yyyy-MM-dd') &lt;= #{endTime}
-            </if>
-        </where>
-        group by t.matter_no,t.matter_name,t.meter_type_no,t.meter_type_name
-    </select>
-
-
-    <resultMap id="LoadLinkDemo" type="com.steerinfo.appservice.dto.LoadLinkDemo" extends="BaseResultMap">
-        <result column="CAR_NO" jdbcType="VARCHAR" property="carNo"/>
-        <result column="MATTER_NO" jdbcType="VARCHAR" property="matterNo"/>
-        <result column="MATTER_NAME" jdbcType="VARCHAR" property="matterName"/>
-        <result column="LOAD_TIME" jdbcType="TIMESTAMP" property="loadTime"/>
-        <result column="LOAD_MAN_NAME" jdbcType="VARCHAR" property="loadManName"/>
-        <result column="CAR_NUM" jdbcType="DECIMAL" property="carNum"/>
-        <result column="COUNT_WEIGHT" jdbcType="DECIMAL" property="countWeight"/>
-        <result column="METER_WEIGHT" jdbcType="DECIMAL" property="meterWeight"/>
-        <!--2021年3月19日 添加毛重、皮重、净重及相关的时间-->
-        <result column="GROSS_WEIGHT" jdbcType="DECIMAL" property="grossWeight"/>
-        <result column="GROSS_TIME" jdbcType="VARCHAR" property="grossTime"/>
-        <result column="TARE_WEIGHT" jdbcType="DECIMAL" property="tareWeight"/>
-        <result column="TARE_TIME" jdbcType="VARCHAR" property="tareTime"/>
-        <result column="NET_WEIGHT" jdbcType="DECIMAL" property="netWeight"/>
-        <result column="NET_TIME" jdbcType="VARCHAR" property="netTime"/>
-
-        <result column="CONTRACT_NO" jdbcType="VARCHAR" property="contractNo"/>
-        <result column="BATCH_NO" jdbcType="VARCHAR" property="batchNo"/>
-        <result column="FORWARDING_UNIT_NAME" jdbcType="VARCHAR" property="forwardingUnitName"/>
-        <result column="RECEIVING_UINT_NAME" jdbcType="VARCHAR" property="receivingUintName"/>
-        <result column="SPEC_NAME" jdbcType="VARCHAR" property="specName"/>
-    </resultMap>
-    <select id="selectLoadLinkDemo" parameterType="java.util.HashMap" resultMap="LoadLinkDemo">
-        select t1.car_no CAR_NO,
-        t1.Matter_No MATTER_NO,
-        t1.matter_name MATTER_NAME,
-        t2.UPDATE_TIME LOAD_TIME,
-        t2.UPDATE_MAN_NAME LOAD_MAN_NAME,
-        t1.Meter_Weight COUNT_WEIGHT,
-        t1.Meter_Weight METER_WEIGHT,
-        t1.CONTRACT_NO CONTRACT_NO,
-        t1.BATCH_NO BATCH_NO,
-        t1.RECEIVING_UINT_NAME RECEIVING_UINT_NAME,
-        t1.SPEC_NAME SPEC_NAME,
-        t1.FORWARDING_UNIT_NAME FORWARDING_UNIT_NAME
-        from meter_work_car_actual_first t1,
-        (select t.*
-        from meter_work_pre_link t
-        <where>
-            t.link_code = '001021004' and t.value_flag = '1'
-            <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
-                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') >= #{startTime} and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') &lt;=
-                #{endTime}
-            </if>
-        </where>
-        ) t2
-        <where>
-            (t1.value_flag = '1' or t1.value_flag = '2') and t1.weight_type = '0' and
-            t1.load_point_no in (select s.load_point_no from meter_base_load_userloadinfo s where s.user_code =
-            #{createManNo})
-            and t1.prediction_no(+) = t2.prediction_no
-            <if test="carNo != null and carNo != ''">
-                and CAR_NO = #{carNo}
-            </if>
-            <if test="matterNo != null and matterNo != ''">
-                and MATTER_NO = #{matterNo}
-            </if>
-            <if test="matterName != null and matterName != ''">
-                and MATTER_NAME = #{matterName}
-            </if>
-            <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
-                and FORWARDING_UNIT_NO = #{forwardingUnitNo}
-            </if>
-            <if test="forwardingUnitName != null and forwardingUnitName != ''">
-                and FORWARDING_UNIT_NAME = #{forwardingUnitName}
-            </if>
-            <if test="receivingUintNo != null and receivingUintNo != ''">
-                and RECEIVING_UINT_NO = #{receivingUintNo}
-            </if>
-            <if test="receivingUintName != null and receivingUintName != ''">
-                and RECEIVING_UINT_NAME = #{receivingUintName}
-            </if>
-            <if test="loadPointName != null and loadPointName != ''">
-                and load_point_name = #{loadPointName}
-            </if>
-        </where>
-    </select>
-
-    <!--卸货实绩查询，即出了净重的卸货数据-->
-    <select id="selectLoadLinkActual" parameterType="map" resultMap="LoadLinkDemo">
-        select t1.car_no CAR_NO,
-        t1.Matter_No MATTER_NO,
-        t1.matter_name MATTER_NAME,
-        t2.UPDATE_TIME LOAD_TIME,
-        t2.UPDATE_MAN_NAME LOAD_MAN_NAME,
-        t1.NET_WEIGHT COUNT_WEIGHT,
-        t1.GROSS_WEIGHT GROSS_WEIGHT,
-        t1.GROSS_TIME GROSS_TIME,
-        t1.TARE_WEIGHT TARE_WEIGHT,
-        t1.TARE_TIME TARE_TIME,
-        t1.NET_WEIGHT NET_WEIGHT,
-        t1.NET_TIME NET_TIME,
-        t1.CONTRACT_NO CONTRACT_NO,
-        t1.BATCH_NO BATCH_NO,
-        t1.RECEIVING_UINT_NAME RECEIVING_UINT_NAME,
-        t1.SPEC_NAME SPEC_NAME,
-        t1.FORWARDING_UNIT_NAME FORWARDING_UNIT_NAME
-        from meter_work_car_actual t1,
-        (select t.*
-        from meter_work_pre_link t
-        <where>
-            t.link_code = '001021004' and t.value_flag = '1'
-            <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
-                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') >= #{startTime} and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') &lt;=
-                #{endTime}
-            </if>
-        </where>
-        ) t2
-        <where>
-            t1.value_flag = '0' and
-            t1.load_point_no in (select s.load_point_no from meter_base_load_userloadinfo s where s.user_code =
-            #{createManNo})
-            and t1.prediction_no(+) = t2.prediction_no
-            <if test="carNo != null and carNo != ''">
-                and CAR_NO = #{carNo}
-            </if>
-            <if test="matterNo != null and matterNo != ''">
-                and MATTER_NO = #{matterNo}
-            </if>
-            <if test="matterName != null and matterName != ''">
-                and MATTER_NAME = #{matterName}
-            </if>
-            <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
-                and FORWARDING_UNIT_NO = #{forwardingUnitNo}
-            </if>
-            <if test="forwardingUnitName != null and forwardingUnitName != ''">
-                and FORWARDING_UNIT_NAME = #{forwardingUnitName}
-            </if>
-            <if test="receivingUintNo != null and receivingUintNo != ''">
-                and RECEIVING_UINT_NO = #{receivingUintNo}
-            </if>
-            <if test="receivingUintName != null and receivingUintName != ''">
-                and RECEIVING_UINT_NAME = #{receivingUintName}
-            </if>
-            <if test="loadPointName != null and loadPointName != ''">
-                and load_point_name = #{loadPointName}
-            </if>
-        </where>
-    </select>
-
-    <resultMap id="companyDemo" type="com.steerinfo.appservice.dto.companyDemo">
-        <result column="COMPANY_NO" jdbcType="VARCHAR" property="companyNo"/>
-        <result column="COMPANY_NAME" jdbcType="VARCHAR" property="companyName"/>
-    </resultMap>
-
-    <select id="selectReAndFo" parameterType="map" resultMap="companyDemo">
-    select t.${no} COMPANY_NO,t.${name} COMPANY_NAME
-    from meter_work_car_actual_first t
-    where t.value_flag != '0' and t.${no} is not null
-    group by t.${no},t.${name}
-  </select>
-
-
-    <!--更新预报的预环节表-->
-    <update id="updateForLink" parameterType="java.util.HashMap">
-        update METER_WORK_PRE_LINK
-        set VALUE_FLAG = '1'
-        <if test="updateManNo != null and updateManNo != ''">
-            ,UPDATE_MAN_NO= #{updateManNo}
-        </if>
-        <if test="updateManName != null and updateManName != ''">
-            , UPDATE_MAN_NAME= #{updateManName}
-        </if>
-        ,UPDATE_TIME=sysdate
-        where PREDICTION_NO = #{predictionNo}
-        and LINK_CODE = #{linkCode} and VALUE_FLAG = #{valueFlag}
-    </update>
-
-    <select id="selectForLinkUnLoad" parameterType="java.util.HashMap" resultType="java.lang.String">
-    select PRE_LINK_NO from METER_WORK_PRE_LINK
-     where PREDICTION_NO = #{predictionNo}
-       and LINK_CODE = #{linkCode} and VALUE_FLAG = #{valueFlag} and rownum = 1
-    order by create_time
-  </select>
-
-    <update id="abolishDataForLink" parameterType="java.util.HashMap">
-    update METER_WORK_PRE_LINK t
-       set t.VALUE_FLAG = '0'
-     where t.pre_link_no = (select t1.pre_link_no
-                              from (select a.*
-                                      from METER_WORK_PRE_LINK a
-                                     where a.PREDICTION_NO = #{predictionNo}
-                                       and a.LINK_CODE = #{linkCode}
-                                       and a.VALUE_FLAG = #{valueFlag}
-                                     order by a.create_time desc) t1
-                             where rownum = 1)
-  </update>
-
-    <!-- 卸货数据及已卸货数据查询：查询已卸货的数据还是未卸货的数据，由调用的方法决定-->
-    <select id="selectToBeDidUnLoad" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-        select T.LINK_CODE, T.VALUE_FLAG, T.UPDATE_MAN_NO UPLOAD_MAN_NO, T.UPDATE_MAN_NAME UPLOAD_MAN_NAME, T.UPDATE_TIME UPLOAD_TIME,  t.PREDICTION_NO, t.NOTICE_NO,
-               t.CAR_NO, t.TRAILER_NO, t.MATTER_NO, t.MATTER_NAME, t.CONTRACT_NO, t.BATCH_NO, t.CUSTOMER_SUPPLIER_NO,
-               t.CUSTOMER_SUPPLIER_NAME, t.FORWARDING_UNIT_NO, t.FORWARDING_UNIT_NAME, t.RECEIVING_UINT_NO,
-               t.RECEIVING_UINT_NAME, t.MATERIAL_NO, t.MATERIAL_NAME, t.SPEC_NO, t.SPEC_NAME, t.SHIPMENT_GROSS_WEIGHT,
-               t.SHIPMENT_NET_WEIGHT, t.SHIPMENT_NUM, t.LOAD_POINT_NO, t.LOAD_POINT_NAME, t.METER_TYPE_NO, t.METER_TYPE_NAME,
-               t.METER_PIER_NAME, t.METER_PIER_No, t.gross_weight, t.tare_weight, t.net_weight
-        from TOBE_DID_UNLOAD_INFO t where
-            t.LINK_CODE = #{linkCode}
-            and t.VALUE_FLAG = #{valueFlag}
-        <if test="loadPointNos != null and loadPointNos.size()>0">
-            and t.LOAD_POINT_NO in
-            <foreach collection="loadPointNos" index="index" item="item" separator="," open="(" close=")">
-                #{item}
-            </foreach>
-        </if>
-        order by t.PREDICTION_NO desc
-    </select>
-
-    <!-- 待装货数据查询与已装货数据查询：查询已装货的数据还是未装货的数据，由调用的方法决定-->
-    <select id="selectToBeDidLoad" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-        select T.LINK_CODE, T.VALUE_FLAG, T.UPDATE_MAN_NO UPLOAD_MAN_NO, T.UPDATE_MAN_NAME UPLOAD_MAN_NAME, T.UPDATE_TIME UPLOAD_TIME, t.PREDICTION_NO, t.NOTICE_NO,
-        t.CAR_NO, t.TRAILER_NO, t.MATTER_NO, t.MATTER_NAME, t.CONTRACT_NO, t.BATCH_NO, t.CUSTOMER_SUPPLIER_NO,
-        t.CUSTOMER_SUPPLIER_NAME, t.FORWARDING_UNIT_NO, t.FORWARDING_UNIT_NAME, t.RECEIVING_UINT_NO,
-        t.RECEIVING_UINT_NAME, t.MATERIAL_NO, t.MATERIAL_NAME, t.SPEC_NO, t.SPEC_NAME, t.SHIPMENT_GROSS_WEIGHT,
-        t.SHIPMENT_NET_WEIGHT, t.SHIPMENT_NUM, t.LOAD_POINT_NO, t.LOAD_POINT_NAME, t.METER_TYPE_NO, t.METER_TYPE_NAME,
-        t.METER_PIER_NAME, t.METER_PIER_No, t.gross_weight, t.tare_weight, t.net_weight
-        from TOBE_DID_LOAD_INFO t where
-        t.LINK_CODE = #{linkCode}
-        and t.VALUE_FLAG = #{valueFlag}
-        <if test="loadPointNos != null and loadPointNos.size()>0">
-            and t.LOAD_POINT_NO in
-            <foreach collection="loadPointNos" index="index" item="item" separator="," open="(" close=")">
-                #{item}
-            </foreach>
-        </if>
-        order by t.PREDICTION_NO desc
-    </select>
-</mapper>

src/main/java/com/steerinfo/appservice/appmeterworkcaractual/model/AppMeterWorkCarActual.java

@@ -1,1037 +0,0 @@
-package com.steerinfo.appservice.appmeterworkcaractual.model;
-
-import com.steerinfo.framework.model.IBasePO;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class AppMeterWorkCarActual implements IBasePO<String> {
-    /**
-     * 结净编号(ACTUAL_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="结净编号",required=true)
-    private String actualNo;
-
-    /**
-     * 预报编号(PREDICTION_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="预报编号",required=true)
-    private String predictionNo;
-
-    /**
-     * 通知单号(NOTICE_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="通知单号",required=true)
-    private String noticeNo;
-
-    /**
-     * 车号(CAR_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="车号",required=false)
-    private String carNo;
-
-    /**
-     * 挂号(TRAILER_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="挂号",required=false)
-    private String trailerNo;
-
-    /**
-     * 物料编号(MATTER_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="物料编号",required=false)
-    private String matterNo;
-
-    /**
-     * 物料名称(MATTER_NAME,VARCHAR,60)
-     */
-    @ApiModelProperty(value="物料名称",required=false)
-    private String matterName;
-
-    /**
-     * 合同号(CONTRACT_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="合同号",required=false)
-    private String contractNo;
-
-    /**
-     * 批次号(BATCH_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="批次号",required=false)
-    private String batchNo;
-
-    /**
-     * 供应商编号(CUSTOMER_SUPPLIER_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="供应商编号",required=false)
-    private String customerSupplierNo;
-
-    /**
-     * 供应商名称(CUSTOMER_SUPPLIER_NAME,VARCHAR,100)
-     */
-    @ApiModelProperty(value="供应商名称",required=false)
-    private String customerSupplierName;
-
-    /**
-     * 发货单位编号(FORWARDING_UNIT_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="发货单位编号",required=false)
-    private String forwardingUnitNo;
-
-    /**
-     * 发货单位名称(FORWARDING_UNIT_NAME,VARCHAR,100)
-     */
-    @ApiModelProperty(value="发货单位名称",required=false)
-    private String forwardingUnitName;
-
-    /**
-     * 收货单位编号(RECEIVING_UINT_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="收货单位编号",required=false)
-    private String receivingUintNo;
-
-    /**
-     * 收货单位名称(RECEIVING_UINT_NAME,VARCHAR,100)
-     */
-    @ApiModelProperty(value="收货单位名称",required=false)
-    private String receivingUintName;
-
-    /**
-     * 材质编号(MATERIAL_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="材质编号",required=false)
-    private String materialNo;
-
-    /**
-     * 材质名称(MATERIAL_NAME,VARCHAR,100)
-     */
-    @ApiModelProperty(value="材质名称",required=false)
-    private String materialName;
-
-    /**
-     * 规格编号(SPEC_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="规格编号",required=false)
-    private String specNo;
-
-    /**
-     * 规格名称(SPEC_NAME,VARCHAR,100)
-     */
-    @ApiModelProperty(value="规格名称",required=false)
-    private String specName;
-
-    /**
-     * 卸货地点编号(LOAD_POINT_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="卸货地点编号",required=false)
-    private String loadPointNo;
-
-    /**
-     * 卸货地点名称(LOAD_POINT_NAME,VARCHAR,60)
-     */
-    @ApiModelProperty(value="卸货地点名称",required=false)
-    private String loadPointName;
-
-    /**
-     * 取样编号(SAMPLE_NO,VARCHAR,40)
-     */
-    @ApiModelProperty(value="取样编号",required=false)
-    private String sampleNo;
-
-    /**
-     * 取样凭证(SAMPLE_VOUCHER,VARCHAR,40)
-     */
-    @ApiModelProperty(value="取样凭证",required=false)
-    private String sampleVoucher;
-
-    /**
-     * 承运单位编号(CARRIER_UNIT_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="承运单位编号",required=false)
-    private String carrierUnitNo;
-
-    /**
-     * 承运单位名称(CARRIER_UNIT_NAME,VARCHAR,100)
-     */
-    @ApiModelProperty(value="承运单位名称",required=false)
-    private String carrierUnitName;
-
-    /**
-     * 计量类型编号(METER_TYPE_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="计量类型编号",required=false)
-    private String meterTypeNo;
-
-    /**
-     * 计量类型名称(METER_TYPE_NAME,VARCHAR,30)
-     */
-    @ApiModelProperty(value="计量类型名称",required=false)
-    private String meterTypeName;
-
-    /**
-     * 计量流程编号(METER_PROCESS_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="计量流程编号",required=false)
-    private String meterProcessNo;
-
-    /**
-     * 计量流程版本号(METER_PROCESS_EDITION_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="计量流程版本号",required=false)
-    private String meterProcessEditionNo;
-
-    /**
-     * 毛重计量作业编号(ACTUAL_FIRST1_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="毛重计量作业编号",required=false)
-    private String actualFirst1No;
-
-    /**
-     * 毛重(GROSS_WEIGHT,DECIMAL,10)
-     */
-    @ApiModelProperty(value="毛重",required=false)
-    private BigDecimal grossWeight;
-
-    /**
-     * 毛重计量员编号(GROSS_MAN_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="毛重计量员编号",required=false)
-    private String grossManNo;
-
-    /**
-     * 毛重计量员姓名(GROSS_MAN_NAME,VARCHAR,30)
-     */
-    @ApiModelProperty(value="毛重计量员姓名",required=false)
-    private String grossManName;
-
-    /**
-     * 毛重计量时间(GROSS_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="毛重计量时间",required=false)
-    private Date grossTime;
-
-    /**
-     * 毛重计量点编号(BASE_SPOT1_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="毛重计量点编号",required=false)
-    private String baseSpot1No;
-
-    /**
-     * 毛重计量点名称(BASE_SPOT1_NAME,VARCHAR,40)
-     */
-    @ApiModelProperty(value="毛重计量点名称",required=false)
-    private String baseSpot1Name;
-
-    /**
-     * 毛重班次(GROSS_CLASS,VARCHAR,20)
-     */
-    @ApiModelProperty(value="毛重班次",required=false)
-    private String grossClass;
-
-    /**
-     * 毛重班组(GROSS_GROUP,VARCHAR,20)
-     */
-    @ApiModelProperty(value="毛重班组",required=false)
-    private String grossGroup;
-
-    /**
-     * 毛重计量方式(GROSS_MODE,VARCHAR,1)
-     */
-    @ApiModelProperty(value="毛重计量方式",required=false)
-    private String grossMode;
-
-    /**
-     * 皮重计量作业编号(ACTUAL_FIRST2_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="皮重计量作业编号",required=false)
-    private String actualFirst2No;
-
-    /**
-     * 皮重(TARE_WEIGHT,DECIMAL,10)
-     */
-    @ApiModelProperty(value="皮重",required=false)
-    private BigDecimal tareWeight;
-
-    /**
-     * 皮重计量员编号(TARE_MAN_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="皮重计量员编号",required=false)
-    private String tareManNo;
-
-    /**
-     * 皮重计量员姓名(TARE_MAN_NAME,VARCHAR,30)
-     */
-    @ApiModelProperty(value="皮重计量员姓名",required=false)
-    private String tareManName;
-
-    /**
-     * 皮重计量时间(TARE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="皮重计量时间",required=false)
-    private Date tareTime;
-
-    /**
-     * 皮重计量点编号(BASE_SPOT2_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="皮重计量点编号",required=false)
-    private String baseSpot2No;
-
-    /**
-     * 皮重计量点名称(BASE_SPOT2_NAME,VARCHAR,40)
-     */
-    @ApiModelProperty(value="皮重计量点名称",required=false)
-    private String baseSpot2Name;
-
-    /**
-     * 皮重班次(TARE_CLASS,VARCHAR,20)
-     */
-    @ApiModelProperty(value="皮重班次",required=false)
-    private String tareClass;
-
-    /**
-     * 皮重班组(TARE_GROUP,VARCHAR,20)
-     */
-    @ApiModelProperty(value="皮重班组",required=false)
-    private String tareGroup;
-
-    /**
-     * 皮重计量方式(TARE_MODE,VARCHAR,1)
-     */
-    @ApiModelProperty(value="皮重计量方式",required=false)
-    private String tareMode;
-
-    /**
-     * 净重(NET_WEIGHT,DECIMAL,10)
-     */
-    @ApiModelProperty(value="净重",required=false)
-    private BigDecimal netWeight;
-
-    /**
-     * 计量数量(METER_NUM,VARCHAR,10)
-     */
-    @ApiModelProperty(value="计量数量",required=false)
-    private String meterNum;
-
-    /**
-     * 净重计量员编号(NET_MAN_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="净重计量员编号",required=false)
-    private String netManNo;
-
-    /**
-     * 净重计量员姓名(NET_MAN_NAME,VARCHAR,30)
-     */
-    @ApiModelProperty(value="净重计量员姓名",required=false)
-    private String netManName;
-
-    /**
-     * 净重计量时间(NET_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="净重计量时间",required=false)
-    private Date netTime;
-
-    /**
-     * 净重计量点编号(NET_SPOT3_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="净重计量点编号",required=false)
-    private String netSpot3No;
-
-    /**
-     * 净重计量点名称(NET_SPOT3_NAME,VARCHAR,40)
-     */
-    @ApiModelProperty(value="净重计量点名称",required=false)
-    private String netSpot3Name;
-
-    /**
-     * 净重班组(NET_GROUP,VARCHAR,20)
-     */
-    @ApiModelProperty(value="净重班组",required=false)
-    private String netGroup;
-
-    /**
-     * 结净方式(NET_MODE,VARCHAR,1)
-     */
-    @ApiModelProperty(value="结净方式",required=false)
-    private String netMode;
-
-    /**
-     * 状态(VALUE_FLAG,VARCHAR,1)
-     */
-    @ApiModelProperty(value="状态",required=false)
-    private String valueFlag;
-
-    /**
-     * 上传状态(UPLOAD_FLAG,VARCHAR,1)
-     */
-    @ApiModelProperty(value="上传状态",required=false)
-    private String uploadFlag;
-
-    /**
-     * 审核人编号(CHECK_MAN_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="审核人编号",required=false)
-    private String checkManNo;
-
-    /**
-     * 审核人姓名(CHECK_MAN_NAME,VARCHAR,30)
-     */
-    @ApiModelProperty(value="审核人姓名",required=false)
-    private String checkManName;
-
-    /**
-     * 审核时间(CHECK_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="审核时间",required=false)
-    private Date checkTime;
-
-    /**
-     * 上传人编号(UPLOAD_MAN_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="上传人编号",required=false)
-    private String uploadManNo;
-
-    /**
-     * 上传人姓名(UPLOAD_MAN_NAME,VARCHAR,30)
-     */
-    @ApiModelProperty(value="上传人姓名",required=false)
-    private String uploadManName;
-
-    /**
-     * 上传时间(UPLOAD_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="上传时间",required=false)
-    private Date uploadTime;
-
-    /**
-     * 净重班次(NET_CLASS,VARCHAR,20)
-     */
-    @ApiModelProperty(value="净重班次",required=false)
-    private String netClass;
-
-    private static final long serialVersionUID = 1L;
-
-    @Override
-    public String getId() {
-        return this.actualNo;
-    }
-
-    @Override
-    public void setId(String actualNo) {
-        this.actualNo = actualNo == null ? null : actualNo.trim();
-    }
-
-    public String getActualNo() {
-        return actualNo;
-    }
-
-    public void setActualNo(String actualNo) {
-        this.actualNo = actualNo == null ? null : actualNo.trim();
-    }
-
-    public String getPredictionNo() {
-        return predictionNo;
-    }
-
-    public void setPredictionNo(String predictionNo) {
-        this.predictionNo = predictionNo == null ? null : predictionNo.trim();
-    }
-
-    public String getNoticeNo() {
-        return noticeNo;
-    }
-
-    public void setNoticeNo(String noticeNo) {
-        this.noticeNo = noticeNo == null ? null : noticeNo.trim();
-    }
-
-    public String getCarNo() {
-        return carNo;
-    }
-
-    public void setCarNo(String carNo) {
-        this.carNo = carNo == null ? null : carNo.trim();
-    }
-
-    public String getTrailerNo() {
-        return trailerNo;
-    }
-
-    public void setTrailerNo(String trailerNo) {
-        this.trailerNo = trailerNo == null ? null : trailerNo.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 getContractNo() {
-        return contractNo;
-    }
-
-    public void setContractNo(String contractNo) {
-        this.contractNo = contractNo == null ? null : contractNo.trim();
-    }
-
-    public String getBatchNo() {
-        return batchNo;
-    }
-
-    public void setBatchNo(String batchNo) {
-        this.batchNo = batchNo == null ? null : batchNo.trim();
-    }
-
-    public String getCustomerSupplierNo() {
-        return customerSupplierNo;
-    }
-
-    public void setCustomerSupplierNo(String customerSupplierNo) {
-        this.customerSupplierNo = customerSupplierNo == null ? null : customerSupplierNo.trim();
-    }
-
-    public String getCustomerSupplierName() {
-        return customerSupplierName;
-    }
-
-    public void setCustomerSupplierName(String customerSupplierName) {
-        this.customerSupplierName = customerSupplierName == null ? null : customerSupplierName.trim();
-    }
-
-    public String getForwardingUnitNo() {
-        return forwardingUnitNo;
-    }
-
-    public void setForwardingUnitNo(String forwardingUnitNo) {
-        this.forwardingUnitNo = forwardingUnitNo == null ? null : forwardingUnitNo.trim();
-    }
-
-    public String getForwardingUnitName() {
-        return forwardingUnitName;
-    }
-
-    public void setForwardingUnitName(String forwardingUnitName) {
-        this.forwardingUnitName = forwardingUnitName == null ? null : forwardingUnitName.trim();
-    }
-
-    public String getReceivingUintNo() {
-        return receivingUintNo;
-    }
-
-    public void setReceivingUintNo(String receivingUintNo) {
-        this.receivingUintNo = receivingUintNo == null ? null : receivingUintNo.trim();
-    }
-
-    public String getReceivingUintName() {
-        return receivingUintName;
-    }
-
-    public void setReceivingUintName(String receivingUintName) {
-        this.receivingUintName = receivingUintName == null ? null : receivingUintName.trim();
-    }
-
-    public String getMaterialNo() {
-        return materialNo;
-    }
-
-    public void setMaterialNo(String materialNo) {
-        this.materialNo = materialNo == null ? null : materialNo.trim();
-    }
-
-    public String getMaterialName() {
-        return materialName;
-    }
-
-    public void setMaterialName(String materialName) {
-        this.materialName = materialName == null ? null : materialName.trim();
-    }
-
-    public String getSpecNo() {
-        return specNo;
-    }
-
-    public void setSpecNo(String specNo) {
-        this.specNo = specNo == null ? null : specNo.trim();
-    }
-
-    public String getSpecName() {
-        return specName;
-    }
-
-    public void setSpecName(String specName) {
-        this.specName = specName == null ? null : specName.trim();
-    }
-
-    public String getLoadPointNo() {
-        return loadPointNo;
-    }
-
-    public void setLoadPointNo(String loadPointNo) {
-        this.loadPointNo = loadPointNo == null ? null : loadPointNo.trim();
-    }
-
-    public String getLoadPointName() {
-        return loadPointName;
-    }
-
-    public void setLoadPointName(String loadPointName) {
-        this.loadPointName = loadPointName == null ? null : loadPointName.trim();
-    }
-
-    public String getSampleNo() {
-        return sampleNo;
-    }
-
-    public void setSampleNo(String sampleNo) {
-        this.sampleNo = sampleNo == null ? null : sampleNo.trim();
-    }
-
-    public String getSampleVoucher() {
-        return sampleVoucher;
-    }
-
-    public void setSampleVoucher(String sampleVoucher) {
-        this.sampleVoucher = sampleVoucher == null ? null : sampleVoucher.trim();
-    }
-
-    public String getCarrierUnitNo() {
-        return carrierUnitNo;
-    }
-
-    public void setCarrierUnitNo(String carrierUnitNo) {
-        this.carrierUnitNo = carrierUnitNo == null ? null : carrierUnitNo.trim();
-    }
-
-    public String getCarrierUnitName() {
-        return carrierUnitName;
-    }
-
-    public void setCarrierUnitName(String carrierUnitName) {
-        this.carrierUnitName = carrierUnitName == null ? null : carrierUnitName.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 getMeterProcessNo() {
-        return meterProcessNo;
-    }
-
-    public void setMeterProcessNo(String meterProcessNo) {
-        this.meterProcessNo = meterProcessNo == null ? null : meterProcessNo.trim();
-    }
-
-    public String getMeterProcessEditionNo() {
-        return meterProcessEditionNo;
-    }
-
-    public void setMeterProcessEditionNo(String meterProcessEditionNo) {
-        this.meterProcessEditionNo = meterProcessEditionNo == null ? null : meterProcessEditionNo.trim();
-    }
-
-    public String getActualFirst1No() {
-        return actualFirst1No;
-    }
-
-    public void setActualFirst1No(String actualFirst1No) {
-        this.actualFirst1No = actualFirst1No == null ? null : actualFirst1No.trim();
-    }
-
-    public BigDecimal getGrossWeight() {
-        return grossWeight;
-    }
-
-    public void setGrossWeight(BigDecimal grossWeight) {
-        this.grossWeight = grossWeight;
-    }
-
-    public String getGrossManNo() {
-        return grossManNo;
-    }
-
-    public void setGrossManNo(String grossManNo) {
-        this.grossManNo = grossManNo == null ? null : grossManNo.trim();
-    }
-
-    public String getGrossManName() {
-        return grossManName;
-    }
-
-    public void setGrossManName(String grossManName) {
-        this.grossManName = grossManName == null ? null : grossManName.trim();
-    }
-
-    public Date getGrossTime() {
-        return grossTime;
-    }
-
-    public void setGrossTime(Date grossTime) {
-        this.grossTime = grossTime;
-    }
-
-    public String getBaseSpot1No() {
-        return baseSpot1No;
-    }
-
-    public void setBaseSpot1No(String baseSpot1No) {
-        this.baseSpot1No = baseSpot1No == null ? null : baseSpot1No.trim();
-    }
-
-    public String getBaseSpot1Name() {
-        return baseSpot1Name;
-    }
-
-    public void setBaseSpot1Name(String baseSpot1Name) {
-        this.baseSpot1Name = baseSpot1Name == null ? null : baseSpot1Name.trim();
-    }
-
-    public String getGrossClass() {
-        return grossClass;
-    }
-
-    public void setGrossClass(String grossClass) {
-        this.grossClass = grossClass == null ? null : grossClass.trim();
-    }
-
-    public String getGrossGroup() {
-        return grossGroup;
-    }
-
-    public void setGrossGroup(String grossGroup) {
-        this.grossGroup = grossGroup == null ? null : grossGroup.trim();
-    }
-
-    public String getGrossMode() {
-        return grossMode;
-    }
-
-    public void setGrossMode(String grossMode) {
-        this.grossMode = grossMode == null ? null : grossMode.trim();
-    }
-
-    public String getActualFirst2No() {
-        return actualFirst2No;
-    }
-
-    public void setActualFirst2No(String actualFirst2No) {
-        this.actualFirst2No = actualFirst2No == null ? null : actualFirst2No.trim();
-    }
-
-    public BigDecimal getTareWeight() {
-        return tareWeight;
-    }
-
-    public void setTareWeight(BigDecimal tareWeight) {
-        this.tareWeight = tareWeight;
-    }
-
-    public String getTareManNo() {
-        return tareManNo;
-    }
-
-    public void setTareManNo(String tareManNo) {
-        this.tareManNo = tareManNo == null ? null : tareManNo.trim();
-    }
-
-    public String getTareManName() {
-        return tareManName;
-    }
-
-    public void setTareManName(String tareManName) {
-        this.tareManName = tareManName == null ? null : tareManName.trim();
-    }
-
-    public Date getTareTime() {
-        return tareTime;
-    }
-
-    public void setTareTime(Date tareTime) {
-        this.tareTime = tareTime;
-    }
-
-    public String getBaseSpot2No() {
-        return baseSpot2No;
-    }
-
-    public void setBaseSpot2No(String baseSpot2No) {
-        this.baseSpot2No = baseSpot2No == null ? null : baseSpot2No.trim();
-    }
-
-    public String getBaseSpot2Name() {
-        return baseSpot2Name;
-    }
-
-    public void setBaseSpot2Name(String baseSpot2Name) {
-        this.baseSpot2Name = baseSpot2Name == null ? null : baseSpot2Name.trim();
-    }
-
-    public String getTareClass() {
-        return tareClass;
-    }
-
-    public void setTareClass(String tareClass) {
-        this.tareClass = tareClass == null ? null : tareClass.trim();
-    }
-
-    public String getTareGroup() {
-        return tareGroup;
-    }
-
-    public void setTareGroup(String tareGroup) {
-        this.tareGroup = tareGroup == null ? null : tareGroup.trim();
-    }
-
-    public String getTareMode() {
-        return tareMode;
-    }
-
-    public void setTareMode(String tareMode) {
-        this.tareMode = tareMode == null ? null : tareMode.trim();
-    }
-
-    public BigDecimal getNetWeight() {
-        return netWeight;
-    }
-
-    public void setNetWeight(BigDecimal netWeight) {
-        this.netWeight = netWeight;
-    }
-
-    public String getMeterNum() {
-        return meterNum;
-    }
-
-    public void setMeterNum(String meterNum) {
-        this.meterNum = meterNum == null ? null : meterNum.trim();
-    }
-
-    public String getNetManNo() {
-        return netManNo;
-    }
-
-    public void setNetManNo(String netManNo) {
-        this.netManNo = netManNo == null ? null : netManNo.trim();
-    }
-
-    public String getNetManName() {
-        return netManName;
-    }
-
-    public void setNetManName(String netManName) {
-        this.netManName = netManName == null ? null : netManName.trim();
-    }
-
-    public Date getNetTime() {
-        return netTime;
-    }
-
-    public void setNetTime(Date netTime) {
-        this.netTime = netTime;
-    }
-
-    public String getNetSpot3No() {
-        return netSpot3No;
-    }
-
-    public void setNetSpot3No(String netSpot3No) {
-        this.netSpot3No = netSpot3No == null ? null : netSpot3No.trim();
-    }
-
-    public String getNetSpot3Name() {
-        return netSpot3Name;
-    }
-
-    public void setNetSpot3Name(String netSpot3Name) {
-        this.netSpot3Name = netSpot3Name == null ? null : netSpot3Name.trim();
-    }
-
-    public String getNetGroup() {
-        return netGroup;
-    }
-
-    public void setNetGroup(String netGroup) {
-        this.netGroup = netGroup == null ? null : netGroup.trim();
-    }
-
-    public String getNetMode() {
-        return netMode;
-    }
-
-    public void setNetMode(String netMode) {
-        this.netMode = netMode == null ? null : netMode.trim();
-    }
-
-    public String getValueFlag() {
-        return valueFlag;
-    }
-
-    public void setValueFlag(String valueFlag) {
-        this.valueFlag = valueFlag == null ? null : valueFlag.trim();
-    }
-
-    public String getUploadFlag() {
-        return uploadFlag;
-    }
-
-    public void setUploadFlag(String uploadFlag) {
-        this.uploadFlag = uploadFlag == null ? null : uploadFlag.trim();
-    }
-
-    public String getCheckManNo() {
-        return checkManNo;
-    }
-
-    public void setCheckManNo(String checkManNo) {
-        this.checkManNo = checkManNo == null ? null : checkManNo.trim();
-    }
-
-    public String getCheckManName() {
-        return checkManName;
-    }
-
-    public void setCheckManName(String checkManName) {
-        this.checkManName = checkManName == null ? null : checkManName.trim();
-    }
-
-    public Date getCheckTime() {
-        return checkTime;
-    }
-
-    public void setCheckTime(Date checkTime) {
-        this.checkTime = checkTime;
-    }
-
-    public String getUploadManNo() {
-        return uploadManNo;
-    }
-
-    public void setUploadManNo(String uploadManNo) {
-        this.uploadManNo = uploadManNo == null ? null : uploadManNo.trim();
-    }
-
-    public String getUploadManName() {
-        return uploadManName;
-    }
-
-    public void setUploadManName(String uploadManName) {
-        this.uploadManName = uploadManName == null ? null : uploadManName.trim();
-    }
-
-    public Date getUploadTime() {
-        return uploadTime;
-    }
-
-    public void setUploadTime(Date uploadTime) {
-        this.uploadTime = uploadTime;
-    }
-
-    public String getNetClass() {
-        return netClass;
-    }
-
-    public void setNetClass(String netClass) {
-        this.netClass = netClass == null ? null : netClass.trim();
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", actualNo=").append(actualNo);
-        sb.append(", predictionNo=").append(predictionNo);
-        sb.append(", noticeNo=").append(noticeNo);
-        sb.append(", carNo=").append(carNo);
-        sb.append(", trailerNo=").append(trailerNo);
-        sb.append(", matterNo=").append(matterNo);
-        sb.append(", matterName=").append(matterName);
-        sb.append(", contractNo=").append(contractNo);
-        sb.append(", batchNo=").append(batchNo);
-        sb.append(", customerSupplierNo=").append(customerSupplierNo);
-        sb.append(", customerSupplierName=").append(customerSupplierName);
-        sb.append(", forwardingUnitNo=").append(forwardingUnitNo);
-        sb.append(", forwardingUnitName=").append(forwardingUnitName);
-        sb.append(", receivingUintNo=").append(receivingUintNo);
-        sb.append(", receivingUintName=").append(receivingUintName);
-        sb.append(", materialNo=").append(materialNo);
-        sb.append(", materialName=").append(materialName);
-        sb.append(", specNo=").append(specNo);
-        sb.append(", specName=").append(specName);
-        sb.append(", loadPointNo=").append(loadPointNo);
-        sb.append(", loadPointName=").append(loadPointName);
-        sb.append(", sampleNo=").append(sampleNo);
-        sb.append(", sampleVoucher=").append(sampleVoucher);
-        sb.append(", carrierUnitNo=").append(carrierUnitNo);
-        sb.append(", carrierUnitName=").append(carrierUnitName);
-        sb.append(", meterTypeNo=").append(meterTypeNo);
-        sb.append(", meterTypeName=").append(meterTypeName);
-        sb.append(", meterProcessNo=").append(meterProcessNo);
-        sb.append(", meterProcessEditionNo=").append(meterProcessEditionNo);
-        sb.append(", actualFirst1No=").append(actualFirst1No);
-        sb.append(", grossWeight=").append(grossWeight);
-        sb.append(", grossManNo=").append(grossManNo);
-        sb.append(", grossManName=").append(grossManName);
-        sb.append(", grossTime=").append(grossTime);
-        sb.append(", baseSpot1No=").append(baseSpot1No);
-        sb.append(", baseSpot1Name=").append(baseSpot1Name);
-        sb.append(", grossClass=").append(grossClass);
-        sb.append(", grossGroup=").append(grossGroup);
-        sb.append(", grossMode=").append(grossMode);
-        sb.append(", actualFirst2No=").append(actualFirst2No);
-        sb.append(", tareWeight=").append(tareWeight);
-        sb.append(", tareManNo=").append(tareManNo);
-        sb.append(", tareManName=").append(tareManName);
-        sb.append(", tareTime=").append(tareTime);
-        sb.append(", baseSpot2No=").append(baseSpot2No);
-        sb.append(", baseSpot2Name=").append(baseSpot2Name);
-        sb.append(", tareClass=").append(tareClass);
-        sb.append(", tareGroup=").append(tareGroup);
-        sb.append(", tareMode=").append(tareMode);
-        sb.append(", netWeight=").append(netWeight);
-        sb.append(", meterNum=").append(meterNum);
-        sb.append(", netManNo=").append(netManNo);
-        sb.append(", netManName=").append(netManName);
-        sb.append(", netTime=").append(netTime);
-        sb.append(", netSpot3No=").append(netSpot3No);
-        sb.append(", netSpot3Name=").append(netSpot3Name);
-        sb.append(", netGroup=").append(netGroup);
-        sb.append(", netMode=").append(netMode);
-        sb.append(", valueFlag=").append(valueFlag);
-        sb.append(", uploadFlag=").append(uploadFlag);
-        sb.append(", checkManNo=").append(checkManNo);
-        sb.append(", checkManName=").append(checkManName);
-        sb.append(", checkTime=").append(checkTime);
-        sb.append(", uploadManNo=").append(uploadManNo);
-        sb.append(", uploadManName=").append(uploadManName);
-        sb.append(", uploadTime=").append(uploadTime);
-        sb.append(", netClass=").append(netClass);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}

src/main/java/com/steerinfo/appservice/appmeterworkcaractual/service/IAppMeterWorkCarActualService.java

@@ -1,98 +0,0 @@
-package com.steerinfo.appservice.appmeterworkcaractual.service;
-
-import com.steerinfo.appservice.appmeterworkcaractual.model.AppMeterWorkCarActual;
-import com.steerinfo.appservice.dto.AppMeterWorkCarActualDemo;
-import com.steerinfo.appservice.dto.LoadLinkDemo;
-import com.steerinfo.appservice.dto.companyDemo;
-import com.steerinfo.baseinfo.combaseinfo.model.ComBaseInfo;
-import com.steerinfo.baseinfo.meterbasematterinfo.model.MeterBaseMatterInfo;
-import com.steerinfo.framework.service.IBaseService;
-import com.steerinfo.framework.service.pagehelper.PageList;
-import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
-import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * MeterWorkCarActual服务接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2020-09-17 11:03
- * 类描述
- * 修订历史：
- * 日期：2020-09-17
- * 作者：generator
- * 参考：
- * 描述：MeterWorkCarActual服务接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-public interface IAppMeterWorkCarActualService extends IBaseService<AppMeterWorkCarActual, String>{
-    PageList<AppMeterWorkCarActualDemo> queryForApp(Map<String, Object> parameters, Integer pageNum, Integer pageSize);
-
-    List<ComBaseInfo> selectMeterType(HashMap parmas);
-
-    List<MeterBaseMatterInfo> selectMatter(HashMap parmas);
-
-    PageList<AppMeterWorkCarActual> selectNet(Map<String, Object> parameters,Integer pageNum, Integer pageSize);
-
-    PageList<AppMeterWorkCarActualDemo> selectSumForAppByCar(HashMap parmas, Integer pageNum, Integer pageSize);
-
-    PageList<AppMeterWorkCarActual> selectNetByCar(HashMap parmas, Integer pageNum, Integer pageSize);
-
-    PageList<MeterWorkCarActualFirst> selectForLoad(HashMap parmas, Integer pageNum, Integer pageSize);
-
-    PageList<LoadLinkDemo> selectLoadLinkDemo(HashMap parmas, Integer pageNum, Integer pageSize);
-
-    List<companyDemo> selectReAndFo(HashMap parmas);
-
-
-    String updateLoadPoint(MeterWorkCarActualFirst model);
-
-    String judgeDuration(MeterWorkCarActualFirst model);
-
-    String abolishData(MeterWorkCarActualFirst model);
-
-    PageList<LoadLinkDemo> selectLoadLinkActual(HashMap parmas, Integer pageNum, Integer pageSize);
-
-    /**
-     * 装卸货确认 - 确认
-     * @param model
-     * @return
-     */
-    String UpdateForUnLoad(MeterWorkCarActualFirst model,String type);
-
-    /**
-     * 装卸货确认  - 取消卸货确认
-     * @param model
-     * @return
-     */
-    int updateForUnLoadRecover(MeterWorkCarActualFirst model,String type);
-
-
-    /**
-     * 待卸货数据查询与已卸货数据查询
-     * @param parmas
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    PageList<MeterWorkCarActualFirst> selectToBeDidUnLoad(HashMap parmas, Integer pageNum, Integer pageSize);
-
-    /**
-     * 待装货数据查询与已装货数据查询
-     * @param parmas
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    PageList<MeterWorkCarActualFirst> selectToBeDidLoad(HashMap parmas, Integer pageNum, Integer pageSize);
-
-    /**
-     * 能否进行出厂
-     * @param model
-     * @return
-     */
-    String judgeOutDoor(PreTrackScale model);
-}

src/main/java/com/steerinfo/appservice/appmeterworkcaractual/service/impl/AppMeterWorkCarActualServiceImpl.java

@@ -1,827 +0,0 @@
-package com.steerinfo.appservice.appmeterworkcaractual.service.impl;
-
-import com.steerinfo.appservice.appmeterbasecustomersupplier.mapper.AppMeterBaseCustomerSupplierMapper;
-import com.steerinfo.appservice.appmeterbasecustomersupplier.model.AppMeterBaseCustomerSupplier;
-import com.steerinfo.appservice.appmeterworkcaractual.mapper.AppMeterWorkCarActualMapper;
-import com.steerinfo.appservice.appmeterworkcaractual.model.AppMeterWorkCarActual;
-import com.steerinfo.appservice.appmeterworkcaractual.service.IAppMeterWorkCarActualService;
-import com.steerinfo.appservice.dto.AppMeterWorkCarActualDemo;
-import com.steerinfo.appservice.dto.LoadLinkDemo;
-import com.steerinfo.appservice.dto.companyDemo;
-import com.steerinfo.baseinfo.combaseinfo.mapper.ComBaseInfoMapper;
-import com.steerinfo.baseinfo.combaseinfo.model.ComBaseInfo;
-import com.steerinfo.baseinfo.meterbasecarriercustomer.mapper.MeterBaseCarrierCustomerMapper;
-import com.steerinfo.baseinfo.meterbasematterinfo.mapper.MeterBaseMatterInfoMapper;
-import com.steerinfo.baseinfo.meterbasematterinfo.model.MeterBaseMatterInfo;
-import com.steerinfo.baseinfo.meterbaseunloadtime.mapper.MeterBaseUnloadTimeMapper;
-import com.steerinfo.baseinfo.meterbaseunloadtime.model.MeterBaseUnloadTime;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
-import com.steerinfo.framework.service.pagehelper.PageHelper;
-import com.steerinfo.framework.service.pagehelper.PageList;
-import com.steerinfo.framework.utils.collection.ListUtils;
-import com.steerinfo.meterwork.except.MarkerMetException;
-import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
-import com.steerinfo.meterwork.meterworkcaractualfirst.mapper.MeterWorkCarActualFirstMapper;
-import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
-import com.steerinfo.meterwork.meterworkprelink.mapper.MeterWorkPreLinkMapper;
-import com.steerinfo.meterwork.meterworkprelink.model.MeterWorkPreLink;
-import com.steerinfo.meterwork.meterworkprelink.service.IMeterWorkPreLinkService;
-import com.steerinfo.pretrack.constants.DbConstants;
-import com.steerinfo.pretrack.pretrackscale.mapper.PreTrackScaleMapper;
-import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
-import com.steerinfo.pretrack.pretrackscale.service.IPreTrackScaleService;
-import com.steerinfo.util.FieldsCollector;
-import com.steerinfo.util.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Primary;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.*;
-
-/**
- * MeterWorkCarActual服务实现：
- *
- * @author generator
- * @version 1.0-SNAPSHORT 2020-09-17 11:03
- * 类描述
- * 修订历史：
- * 日期：2020-09-17
- * 作者：generator
- * 参考：
- * 描述：MeterWorkCarActual服务实现
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- * @see null
- */
-@Service(value = "AppMeterWorkCarActualService")
-@Primary
-public class AppMeterWorkCarActualServiceImpl extends BaseServiceImpl<AppMeterWorkCarActual, String> implements IAppMeterWorkCarActualService {
-
-
-    @Autowired
-    IMeterWorkPreLinkService meterWorkPreLinkService;
-
-    @Autowired
-    IPreTrackScaleService preTrackScaleService;
-
-    @Resource
-    private PreTrackScaleMapper preTrackScaleMapper;
-
-    @Resource
-    private MeterWorkCarActualFirstMapper meterWorkCarActualFirstMapper;
-
-    @Resource
-    private AppMeterWorkCarActualMapper appMeterWorkCarActualMapper;
-
-    @Resource
-    private AppMeterBaseCustomerSupplierMapper appMeterBaseCustomerSupplierMapper;
-
-    @Resource
-    private ComBaseInfoMapper comBaseInfoMapper;
-
-    @Resource
-    private MeterBaseMatterInfoMapper meterBaseMatterInfoMapper;
-
-    @Resource
-    private MeterWorkPreLinkMapper meterWorkPreLinkMapper;
-
-    @Resource
-    private MeterBaseUnloadTimeMapper meterBaseUnloadTimeMapper;
-
-    @Resource
-    private MeterBaseCarrierCustomerMapper meterBaseCarrierCustomerMapper;
-
-    @Override
-    protected IBaseMapper<AppMeterWorkCarActual, String> getMapper() {
-        return appMeterWorkCarActualMapper;
-    }
-
-    @Override
-    public PageList<AppMeterWorkCarActualDemo> queryForApp(Map<String, Object> parameters, Integer pageNum, Integer pageSize) {
-        if (parameters == null || parameters.size() < 1) {
-            return null;
-        }
-        Object customerSupplierNoObj = parameters.get("customerSupplierNo");
-        if (customerSupplierNoObj == null) {
-            return null;
-        }
-        String no = customerSupplierNoObj.toString();
-        AppMeterBaseCustomerSupplier mbcs = appMeterBaseCustomerSupplierMapper.selectByPrimaryKey(no);
-        List<String> meterTypeNos = new ArrayList<>();
-        String customerSupplierNo = null;
-        String receivingUintNo = null;
-
-        String matterNo = "";
-        String meterTypeNo = "";
-        String startTime = "";
-        String endTime = "";
-        String forwardingUnitName = "";
-        String receivingUintName = "";
-        String loadPointName = "";
-        Object matterNoObj = parameters.get("matterNo");
-        if (matterNoObj != null) {
-            matterNo = matterNoObj.toString();
-        }
-
-        Object meterTypeNoObj = parameters.get("meterTypeNo");
-        if (meterTypeNoObj != null) {
-            meterTypeNo = meterTypeNoObj.toString();
-        }
-
-        Object startTimeObj = parameters.get("startTime");
-        if (startTimeObj != null) {
-            startTime = startTimeObj.toString();
-        }
-
-        Object endTimeObj = parameters.get("endTime");
-        if (endTimeObj != null) {
-            endTime = endTimeObj.toString();
-        }
-        Object forwardingUnitNameObj = parameters.get("forwardingUnitName");
-        if (forwardingUnitNameObj != null) {
-            forwardingUnitName = forwardingUnitNameObj.toString();
-        }
-        Object receivingUintNameObj = parameters.get("receivingUintName");
-        if (receivingUintNameObj != null) {
-            receivingUintName = receivingUintNameObj.toString();
-        }
-        Object loadPointNameObj = parameters.get("loadPointName");
-        if (loadPointNameObj != null) {
-            loadPointName = loadPointNameObj.toString();
-        }
-        switch (mbcs.getCustomerSupplierType()) {
-            case "0": //客户
-                meterTypeNos.add("001006002");
-                receivingUintNo = no;
-                break;
-            case "1": //供应商
-                meterTypeNos.add("001006001");
-                customerSupplierNo = no;
-                break;
-            case "2": //客户&供应商
-                meterTypeNos.add("001006001");
-                customerSupplierNo = no;
-                meterTypeNos.add("001006002");
-                receivingUintNo = no;
-                break;
-            case "3"://货代
-                return selectSumHD(no, matterNo, meterTypeNo, startTime, endTime, pageNum, pageSize, forwardingUnitName, receivingUintName, loadPointName);
-            default:
-                return null;
-        }
-
-        PageHelper.startPage(pageNum, pageSize);
-        List<AppMeterWorkCarActualDemo> list = selectSumForApp(meterTypeNos, customerSupplierNo, receivingUintNo, matterNo, meterTypeNo, startTime, endTime, forwardingUnitName, receivingUintName, loadPointName);
-        PageList pageInfo = new PageList(list);
-        return pageInfo;
-    }
-
-    private PageList<AppMeterWorkCarActualDemo> selectSumHD(String no, String matterNo, String meterTypeNo, String startTime, String endTime
-            , Integer pageNum, Integer pageSize, String forwardingUnitName, String receivingUintName, String loadPointName) {
-        //获取货代对应的供应商
-        List<String> ids = meterBaseCarrierCustomerMapper.selectHD(no);
-
-        Map<String, Object> map = new HashMap<>();
-        if (StringUtils.isNotEmpty(matterNo)) {
-            map.put("matterNo", matterNo);
-        }
-        if (StringUtils.isNotEmpty(startTime)) {
-            map.put("startTime", startTime);
-        }
-        if (StringUtils.isNotEmpty(endTime)) {
-            map.put("endTime", endTime);
-        }
-        if (StringUtils.isNotEmpty(meterTypeNo)) {
-            map.put("meterTypeNo", meterTypeNo);
-        }
-        if (StringUtils.isNotEmpty(forwardingUnitName)) {
-            map.put("forwardingUnitName", forwardingUnitName);
-        }
-        if (StringUtils.isNotEmpty(receivingUintName)) {
-            map.put("receivingUintName", receivingUintName);
-        }
-        if (StringUtils.isNotEmpty(loadPointName)) {
-            map.put("loadPointName", loadPointName);
-        }
-        if (ids.size() > 0) {
-            map.put("ids", ids);
-        }
-        PageHelper.startPage(pageNum, pageSize);
-        List<AppMeterWorkCarActualDemo> rows = appMeterWorkCarActualMapper.selectSumHD(map);
-        PageList pageInfo = new PageList(rows);
-        return pageInfo;
-    }
-
-    private PageList<AppMeterWorkCarActual> selectActualHD(String forwardingUnitName, String receivingUintName, String loadPointName, String no, String matterNo
-            , String meterTypeNo, String startTime, String endTime, Integer pageNum, Integer pageSize) {
-        //获取货代对应的供应商
-        List<String> ids = meterBaseCarrierCustomerMapper.selectHD(no);
-
-        Map<String, Object> map = new HashMap<>();
-        if (StringUtils.isNotEmpty(forwardingUnitName)) {
-            map.put("forwardingUnitName", forwardingUnitName);
-        }
-        if (StringUtils.isNotEmpty(receivingUintName)) {
-            map.put("receivingUintName", receivingUintName);
-        }
-        if (StringUtils.isNotEmpty(loadPointName)) {
-            map.put("loadPointName", loadPointName);
-        }
-        if (StringUtils.isNotEmpty(matterNo)) {
-            map.put("matterNo", matterNo);
-        }
-        if (StringUtils.isNotEmpty(startTime)) {
-            map.put("startTime", startTime);
-        }
-        if (StringUtils.isNotEmpty(endTime)) {
-            map.put("endTime", endTime);
-        }
-        if (StringUtils.isNotEmpty(meterTypeNo)) {
-            map.put("meterTypeNo", meterTypeNo);
-        }
-        if (ids.size() > 0) {
-            map.put("ids", ids);
-        }
-        PageHelper.startPage(pageNum, pageSize);
-        List<AppMeterWorkCarActual> rows = appMeterWorkCarActualMapper.selectActualHD(map);
-        PageList pageInfo = new PageList(rows);
-        return pageInfo;
-    }
-
-
-
-/*  //供应商
-    public List<AppMeterWorkCarActualFirstDto> getPer1(String customerSupplierNo){
-        HashMap<String, Object> obj = new HashMap<>();
-        obj.put("meterTypeNo", "001006001");//采购进厂
-        obj.put("customerSupplierNo", customerSupplierNo);
-        List<AppMeterWorkCarActualFirstDto> rows = appMeterWorkCarActualFirstMapper.selectByCus(obj);
-        return rows;
-    }
-
-    //客户
-    public List<AppMeterWorkCarActualFirstDto> getPer2(String customerSupplierNo){
-        HashMap<String, Object> obj = new HashMap<>();
-        obj.put("meterTypeNo", "001006002");//销售出厂
-        obj.put("receivingUintNo", customerSupplierNo );
-        List<AppMeterWorkCarActualFirstDto> rows = appMeterWorkCarActualFirstMapper.selectByRec(obj);
-        return rows;
-    }*/
-
-    private List<AppMeterWorkCarActualDemo> selectSumForApp(List<String> meterTypeNos, String customerSupplierNo,
-                                                            String receivingUintNo, String matterNo, String meterTypeNo,
-                                                            String startTime, String endTime, String forwardingUnitName,
-                                                            String receivingUintName, String loadPointName) {
-        Map<String, Object> map = new HashMap<>();
-        if (StringUtils.isNotEmpty(meterTypeNo)) {
-            List<String> meterTypeNoES = new ArrayList<>();
-            meterTypeNoES.add(meterTypeNo);
-            map.put("meterTypeNos", meterTypeNoES);
-        } else {
-            if (meterTypeNos != null || meterTypeNos.size() > 0) {
-                map.put("meterTypeNos", meterTypeNos);
-            } else {
-                return null;
-            }
-        }
-        if (StringUtils.isNotEmpty(customerSupplierNo)) {
-            map.put("customerSupplierNo", customerSupplierNo);
-        }
-        if (StringUtils.isNotEmpty(receivingUintNo)) {
-            map.put("receivingUintNo", receivingUintNo);
-        }
-        if (StringUtils.isNotEmpty(matterNo)) {
-            map.put("matterNo", matterNo);
-        }
-
-        if (StringUtils.isNotEmpty(startTime)) {
-            map.put("startTime", startTime);
-        }
-        if (StringUtils.isNotEmpty(endTime)) {
-            map.put("endTime", endTime);
-        }
-        if (StringUtils.isNotEmpty(forwardingUnitName)) {
-            map.put("forwardingUnitName", forwardingUnitName);
-        }
-        if (StringUtils.isNotEmpty(receivingUintName)) {
-            map.put("receivingUintName", receivingUintName);
-        }
-        if (StringUtils.isNotEmpty(loadPointName)) {
-            map.put("loadPointName", loadPointName);
-        }
-        return appMeterWorkCarActualMapper.selectSumForApp(map);
-    }
-
-
-    //获取计量类型
-    @Override
-    public List<ComBaseInfo> selectMeterType(HashMap parmas) {
-        HashMap<String, Object> obj = new HashMap<>();
-        obj.put("pBaseCode", "001006");//计量类型
-        obj.put("validFlag", "1");//有效
-        List<ComBaseInfo> list = comBaseInfoMapper.selectByParameters(obj);
-        return list;
-    }
-
-    //获取物料
-    @Override
-    public List<MeterBaseMatterInfo> selectMatter(HashMap parmas) {
-        HashMap<String, Object> obj = new HashMap<>();
-        obj.put("validFlag", "1");//有效
-        List<MeterBaseMatterInfo> list = meterBaseMatterInfoMapper.selectByParameters(obj);
-        return list;
-    }
-
-
-    @Override
-    public PageList<AppMeterWorkCarActual> selectNet(Map<String, Object> parameters, Integer pageNum, Integer pageSize) {
-        if (parameters == null || parameters.size() < 1) {
-            return null;
-        }
-        Object customerSupplierNoObj = parameters.get("customerSupplierNo");
-        if (customerSupplierNoObj == null) {
-            return null;
-        }
-        String no = customerSupplierNoObj.toString();
-        AppMeterBaseCustomerSupplier mbcs = appMeterBaseCustomerSupplierMapper.selectByPrimaryKey(no);
-        List<String> meterTypeNos = new ArrayList<>();
-        String customerSupplierNo = null;
-        String receivingUintNo = null;
-
-        String matterNo = "";
-        String meterTypeNo = "";
-        String startTime = "";
-        String endTime = "";
-        String forwardingUnitName = "";
-        String receivingUintName = "";
-        String loadPointName = "";
-
-        Object matterNoObj = parameters.get("matterNo");
-        if (matterNoObj != null) {
-            matterNo = matterNoObj.toString();
-        }
-
-        Object meterTypeNoObj = parameters.get("meterTypeNo");
-        if (meterTypeNoObj != null) {
-            meterTypeNo = meterTypeNoObj.toString();
-        }
-
-        Object startTimeObj = parameters.get("startTime");
-        if (startTimeObj != null) {
-            startTime = startTimeObj.toString();
-        }
-
-        Object endTimeObj = parameters.get("endTime");
-        if (endTimeObj != null) {
-            endTime = endTimeObj.toString();
-        }
-
-        Object forwardingUnitNameObj = parameters.get("forwardingUnitName");
-        if (forwardingUnitNameObj != null) {
-            forwardingUnitName = forwardingUnitNameObj.toString();
-        }
-
-        Object receivingUintNameObj = parameters.get("receivingUintName");
-        if (receivingUintNameObj != null) {
-            receivingUintName = receivingUintNameObj.toString();
-        }
-
-        Object loadPointNameObj = parameters.get("loadPointName");
-        if (loadPointNameObj != null) {
-            loadPointName = loadPointNameObj.toString();
-        }
-
-        switch (mbcs.getCustomerSupplierType()) {
-            case "0": //客户
-                meterTypeNos.add("001006002");
-                receivingUintNo = no;
-                break;
-            case "1": //供应商
-                meterTypeNos.add("001006001");
-                customerSupplierNo = no;
-                break;
-            case "2": //客户&供应商
-                meterTypeNos.add("001006001");
-                customerSupplierNo = no;
-                meterTypeNos.add("001006002");
-                receivingUintNo = no;
-                break;
-            case "3"://货代
-                return selectActualHD(forwardingUnitName, receivingUintName, loadPointName, no, matterNo, meterTypeNo, startTime, endTime, pageNum, pageSize);
-            default:
-                return null;
-        }
-
-        PageHelper.startPage(pageNum, pageSize);
-        List<AppMeterWorkCarActual> list = selectTime(meterTypeNos, forwardingUnitName, receivingUintName, loadPointName, customerSupplierNo, receivingUintNo, matterNo, meterTypeNo, startTime, endTime);
-        PageList pageInfo = new PageList(list);
-        return pageInfo;
-    }
-
-    private List<AppMeterWorkCarActual> selectTime(List<String> meterTypeNos, String forwardingUnitName, String receivingUintName, String loadPointName
-            , String customerSupplierNo, String receivingUintNo, String matterNo, String meterTypeNo, String startTime, String endTime) {
-        Map<String, Object> map = new HashMap<>();
-        if (StringUtils.isNotEmpty(meterTypeNo)) {
-            List<String> meterTypeNoES = new ArrayList<>();
-            meterTypeNoES.add(meterTypeNo);
-            map.put("meterTypeNos", meterTypeNoES);
-        } else {
-            if (meterTypeNos != null || meterTypeNos.size() > 0) {
-                map.put("meterTypeNos", meterTypeNos);
-            } else {
-                return null;
-            }
-        }
-        if (StringUtils.isNotEmpty(forwardingUnitName)) {
-            map.put("forwardingUnitName", forwardingUnitName);
-        }
-        if (StringUtils.isNotEmpty(receivingUintName)) {
-            map.put("receivingUintName", receivingUintName);
-        }
-        if (StringUtils.isNotEmpty(loadPointName)) {
-            map.put("loadPointName", loadPointName);
-        }
-        if (StringUtils.isNotEmpty(customerSupplierNo)) {
-            map.put("customerSupplierNo", customerSupplierNo);
-        }
-        if (StringUtils.isNotEmpty(receivingUintNo)) {
-            map.put("receivingUintNo", receivingUintNo);
-        }
-        if (StringUtils.isNotEmpty(matterNo)) {
-            map.put("matterNo", matterNo);
-        }
-        if (StringUtils.isNotEmpty(startTime)) {
-            map.put("startTime", startTime);
-        }
-        if (StringUtils.isNotEmpty(endTime)) {
-            map.put("endTime", endTime);
-        }
-        return appMeterWorkCarActualMapper.selectNet(map);
-    }
-
-    @Override
-    public PageList<AppMeterWorkCarActualDemo> selectSumForAppByCar(HashMap parmas, Integer pageNum, Integer pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        List<AppMeterWorkCarActualDemo> list = appMeterWorkCarActualMapper.selectSumForAppByCar(parmas);
-        PageList pageInfo = new PageList(list);
-        return pageInfo;
-    }
-
-    @Override
-    public PageList<AppMeterWorkCarActual> selectNetByCar(HashMap parmas, Integer pageNum, Integer pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        List<AppMeterWorkCarActual> list = appMeterWorkCarActualMapper.selectNetByCar(parmas);
-        PageList pageInfo = new PageList(list);
-        return pageInfo;
-    }
-
-
-    /**
-     * 待卸货数据查询
-     *
-     * @param parmas
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @Override
-    public PageList<MeterWorkCarActualFirst> selectForLoad(HashMap parmas, Integer pageNum, Integer pageSize) {
-        Map<String, Object> map = new HashMap<>();
-        map.put("linkCode", "001021004");//卸货确认
-        map.put("valueFlag", parmas.get("valueFlag").toString());
-        List<MeterWorkPreLink> mwpls = meterWorkPreLinkMapper.selectByParameters(map);
-        map.put("createManNo", parmas.get("createManNo").toString());
-        if (mwpls.size() <= 0) {
-            PageList pageInfo = new PageList();
-            return pageInfo;
-        }
-        ArrayList<String> ids = new ArrayList<>();
-        for (MeterWorkPreLink mwpl : mwpls) {
-            ids.add(mwpl.getPredictionNo());
-        }
-        //2021年3月1日 杨秀东修改为1个sql;2021年3月8日杨秀东对状态为进行区分
-        if ("1".equals(parmas.get("valueFlag").toString())) {
-            PageHelper.startPage(pageNum, pageSize);
-            List<MeterWorkCarActualFirst> list = meterWorkCarActualFirstMapper.selectForAppLoadFirst(map);
-            PageList pageInfo = new PageList(list);
-            return pageInfo;
-        }
-        PageHelper.startPage(pageNum, pageSize);
-        List<MeterWorkCarActualFirst> list = meterWorkCarActualFirstMapper.selectForAppLoad(map);
-        PageList pageInfo = new PageList(list);
-        return pageInfo;
-    }
-
-    @Override
-    public PageList<LoadLinkDemo> selectLoadLinkDemo(HashMap parmas, Integer pageNum, Integer pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        List<LoadLinkDemo> list = appMeterWorkCarActualMapper.selectLoadLinkDemo(parmas);
-        PageList pageInfo = new PageList(list);
-        Double sum = 0.0;
-        if (list.size() > 0) {
-            for (LoadLinkDemo list1 : list) {
-                sum = sum + list1.getCountWeight();
-            }
-            for (LoadLinkDemo list1 : list) {
-                list1.setCountWeight(sum);
-                list1.setCarNum(pageInfo.getTotal());
-            }
-        }
-        return pageInfo;
-    }
-
-    @Override
-    public List<companyDemo> selectReAndFo(HashMap parmas) {
-        Object flagObj = parmas.get("flag");
-        if (flagObj == null) {
-            return null;
-        }
-        String flag = flagObj.toString();
-        List<companyDemo> list = new ArrayList<>();
-        //发货单位
-        if (flag.equals("1")) {
-            Map<String, Object> map = new HashMap<>();
-            map.put("no", "FORWARDING_UNIT_NO");
-            map.put("name", "FORWARDING_UNIT_NAME");
-            list = appMeterWorkCarActualMapper.selectReAndFo(map);
-        }
-        //收货单位
-        if (flag.equals("0")) {
-            Map<String, Object> map = new HashMap<>();
-            map.put("no", "RECEIVING_UINT_NO");
-            map.put("name", "RECEIVING_UINT_NAME");
-            list = appMeterWorkCarActualMapper.selectReAndFo(map);
-        }
-        return list;
-    }
-
-    /**
-     * 装卸货确认
-     *
-     * @param model
-     * @param type
-     * @return
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public String UpdateForUnLoad(MeterWorkCarActualFirst model, String type) {
-        if (StringUtils.isEmpty(model.getUpdateManNo()) || StringUtils.isEmpty(model.getUpdateManName())) {
-            throw new MarkerMetException(500, "操作人及操作人编码不能为空！");
-        }
-        if (StringUtils.isEmpty(model.getPredictionNo())) {
-            throw new MarkerMetException(500, "预报编号不允许为空！");
-        }
-        Map<String, Object> map = new HashMap<>();
-        map.put("predictionNo", model.getPredictionNo());
-        if ("卸货".equals(type)) {
-            map.put("linkCode", "001021004");
-        } else {
-            map.put("linkCode", "001021007");
-        }
-        map.put("valueFlag", "0");
-        if (StringUtils.isNotEmpty(model.getUpdateManNo())) {
-            map.put("updateManNo", model.getUpdateManNo());
-        }
-        if (StringUtils.isNotEmpty(model.getUpdateManName())) {
-            map.put("updateManName", model.getUpdateManName());
-        }
-        appMeterWorkCarActualMapper.updateForLink(map);
-        return model.getActualFirstNo();
-    }
-
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public int updateForUnLoadRecover(MeterWorkCarActualFirst model, String type) {
-        if (StringUtils.isEmpty(model.getUpdateManNo()) || StringUtils.isEmpty(model.getUpdateManName())) {
-            throw new MarkerMetException(500, "操作人及操作人编码不能为空！");
-        }
-        if (StringUtils.isEmpty(model.getPredictionNo())) {
-            throw new MarkerMetException(500, "预报编号不允许为空！");
-        }
-        List<MeterWorkPreLink> mwpls = meterWorkPreLinkService.getNextFlag(
-                model.getPredictionNo(), type.equals("卸货") ? "001021004" : "001021007");
-        if (ListUtils.isNotEmpty(mwpls) && mwpls.get(0).getValueFlag().equals("1")) {
-            throw new MarkerMetException(500, "下一管环节" + mwpls.get(0).getLinkName() + "已完成，无法撤销");
-        }
-        Map<String, Object> map = new HashMap<>();
-        map.put("predictionNo", model.getPredictionNo());
-        if ("卸货".equals(type)) {
-            map.put("linkCode", "001021004");
-        } else {
-            map.put("linkCode", "001021007");
-        }
-        map.put("valueFlag", "1");
-
-        String no = appMeterWorkCarActualMapper.selectForLinkUnLoad(map);
-        MeterWorkPreLink meterWorkPreLink = meterWorkPreLinkMapper.selectByPrimaryKey(no);
-        meterWorkPreLink.setValueFlag("0");
-        meterWorkPreLink.setUpdateManName(model.getUpdateManName());
-        meterWorkPreLink.setUpdateManNo(model.getUpdateManNo());
-        meterWorkPreLink.setUpdateTime(new Date());
-        int num = meterWorkPreLinkMapper.updateByPrimaryKeySelective(meterWorkPreLink);
-        return num;
-    }
-
-    /**
-     * 待卸货数据查询与已卸货数据查询
-     *
-     * @param parmas
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @Override
-    public PageList<MeterWorkCarActualFirst> selectToBeDidUnLoad(HashMap parmas, Integer pageNum, Integer pageSize) {
-        Object loadPointNo = parmas.get("loadPointNo");
-        if (loadPointNo != null && StringUtils.isNotEmpty(loadPointNo.toString())) {
-            List<String> loadPointNos;
-            loadPointNos = Arrays.asList(loadPointNo.toString().replace("，", ",").split(","));
-            parmas.put("loadPointNos", loadPointNos);
-        }
-        PageHelper.startPage(pageNum, pageSize);
-        List<MeterWorkCarActual> list = appMeterWorkCarActualMapper.selectToBeDidUnLoad(parmas);
-        PageList pageInfo = new PageList(list);
-        return pageInfo;
-    }
-
-    /**
-     * 待装货数据查询与已装货数据查询
-     *
-     * @param parmas
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @Override
-    public PageList<MeterWorkCarActualFirst> selectToBeDidLoad(HashMap parmas, Integer pageNum, Integer pageSize) {
-        Object loadPointNo = parmas.get("loadPointNo");
-        if (loadPointNo != null && StringUtils.isNotEmpty(loadPointNo.toString())) {
-            List<String> loadPointNos;
-            loadPointNos = Arrays.asList(loadPointNo.toString().replace("，", ",").split(","));
-            parmas.put("loadPointNos", loadPointNos);
-        }
-        PageHelper.startPage(pageNum, pageSize);
-        List<MeterWorkCarActual> list = appMeterWorkCarActualMapper.selectToBeDidLoad(parmas);
-        PageList pageInfo = new PageList(list);
-        return pageInfo;
-    }
-
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public String updateLoadPoint(MeterWorkCarActualFirst model) {
-        if (model.getLoadPointNo() == null || model.getLoadPointNo().equals("")) {
-            throw new MarkerMetException(500, "卸货点不能为空");
-        }
-        MeterWorkCarActualFirst meterWorkCarActualFirst = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getActualFirstNo());
-        meterWorkCarActualFirst.setLoadPointNo(model.getLoadPointNo());
-        meterWorkCarActualFirst.setLoadPointName(model.getLoadPointName());
-        meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(meterWorkCarActualFirst);
-        return model.getActualFirstNo();
-    }
-
-    @Override
-    @Transactional
-    public String judgeDuration(MeterWorkCarActualFirst model) {
-        Map<String, Object> map = new HashMap<>();
-        map.put("baseSpotNo", model.getBaseSpotNo());
-        map.put("loadPointNo", model.getLoadPointNo());
-        List<MeterBaseUnloadTime> meterBaseUnloadTimes = meterBaseUnloadTimeMapper.selectByParameters(map);
-        if (meterBaseUnloadTimes.size() > 0) {
-            long lDate1 = model.getCreateTime().getTime() / 1000;
-            long lDate2 = System.currentTimeMillis() / 1000;
-            long times = Math.round(lDate2 - lDate1);
-            if (times / 60 > meterBaseUnloadTimes.get(0).getLoadTime()) {
-                throw new MarkerMetException(500, "计量与卸货间隔时间超过最大值，是否重新计量");
-            }
-        }
-        return model.getActualFirstNo();
-    }
-
-    @Override
-    @Transactional
-    public String abolishData(MeterWorkCarActualFirst model) {
-        //修改预环节的数据(将一次计量修改为未使用)
-        Map<String, Object> map = new HashMap<>();
-        map.put("predictionNo", model.getPredictionNo());
-        map.put("linkCode", "001021003");
-        map.put("valueFlag", "1");
-        int num = appMeterWorkCarActualMapper.abolishDataForLink(map);
-        //将计量数据作废
-        model.setValueFlag("0");
-        meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(model);
-        return model.getActualFirstNo();
-    }
-
-    /**
-     * 卸货实绩查询-查询洁净表的数据
-     *
-     * @param parmas
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @Override
-    public PageList<LoadLinkDemo> selectLoadLinkActual(HashMap parmas, Integer pageNum, Integer pageSize) {
-        String carNo = "";
-        String startTime = "";
-        String endTime = "";
-        String matterNo = "";
-        String forwardingUnitNo = "";
-        String receivingUintNo = "";
-        String loadPointName = "";
-        String createManNo = "";
-
-
-        Object createManNoObj = parmas.get("createManNo");
-        if (createManNoObj != null) {
-            createManNo = createManNoObj.toString();
-        }
-        Object matterNoObj = parmas.get("matterNo");
-        if (matterNoObj != null) {
-            matterNo = matterNoObj.toString();
-        }
-        Object receivingUintNoObj = parmas.get("receivingUintNo");
-        if (receivingUintNoObj != null) {
-            receivingUintNo = receivingUintNoObj.toString();
-        }
-        Object forwardingUnitNoObj = parmas.get("forwardingUnitNo");
-        if (forwardingUnitNoObj != null) {
-            forwardingUnitNo = forwardingUnitNoObj.toString();
-        }
-        Object carNoObj = parmas.get("carNo");
-        if (carNoObj != null) {
-            carNo = carNoObj.toString();
-        }
-        Object startTimeObj = parmas.get("startTime");
-        if (startTimeObj != null) {
-            startTime = startTimeObj.toString();
-        }
-        Object endTimeObj = parmas.get("endTime");
-        if (endTimeObj != null) {
-            endTime = endTimeObj.toString();
-        }
-
-        Object loadPointNameObj = parmas.get("loadPointName");
-        if (loadPointNameObj != null) {
-            loadPointName = loadPointNameObj.toString();
-        }
-
-        Map<String, Object> map = new HashMap<>();
-        map.put("carNo", carNo);
-        map.put("startTime", startTime);
-        map.put("endTime", endTime);
-        map.put("matterNo", matterNo);
-        map.put("forwardingUnitNo", forwardingUnitNo);
-        map.put("receivingUintNo", receivingUintNo);
-        map.put("loadPointName", loadPointName);
-        map.put("createManNo", createManNo);
-
-        PageHelper.startPage(pageNum, pageSize);
-        List<LoadLinkDemo> list = appMeterWorkCarActualMapper.selectLoadLinkActual(map);
-        PageList pageInfo = new PageList(list);
-        Double sum = 0.0;
-        if (list.size() > 0) {
-            for (LoadLinkDemo list1 : list) {
-                sum = sum + list1.getCountWeight();
-            }
-            for (LoadLinkDemo list1 : list) {
-                list1.setCountWeight(sum);
-                list1.setCarNum(pageInfo.getTotal());
-            }
-        }
-        return pageInfo;
-    }
-
-    /**
-     * 能否进行出厂
-     *
-     * @param model
-     * @return
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public String judgeOutDoor(PreTrackScale model) {
-        if (model == null || StringUtils.isEmpty(model.getPredictionNo()) || StringUtils.isEmpty(model.getCarNo())) {
-            return "禁止出厂！预报编号及车号不允许为空！";
-        }
-        PreTrackScale scale = preTrackScaleMapper.selectByPrimaryKey(model.getPredictionNo());
-        if (scale == null || StringUtils.isEmpty(scale.getPredictionNo())) {
-            return "禁止出厂！预报中的车号与传入车号不一致！";
-        }
-        if (DbConstants.NOT.equals(scale.getValueFlag())) {
-            return "禁止出厂！预报未进行计量操作且不是作废的状态不允许出厂！";
-        }
-        MeterWorkCarActualFirst actualFirst = new MeterWorkCarActualFirst();
-        actualFirst.setCarNo(model.getCarNo());
-        actualFirst.setValueFlag("1");
-        List<MeterWorkCarActualFirst> firstList = meterWorkCarActualFirstMapper.selectByParameters(FieldsCollector.beanToMap(actualFirst));
-        if (ListUtils.isNotEmpty(firstList)) {
-            return "禁止出厂！车号存在【 "+firstList.size()+" 】条有效计量数据，请先完成计量流程或者作废计量数据再出厂！";
-        }
-        return "允许出厂！";
-    }
-}

src/main/java/com/steerinfo/appservice/appprerailwayscale/controller/AppPreRailwayScaleController.java

@@ -1,150 +0,0 @@
-package com.steerinfo.appservice.appprerailwayscale.controller;
-
-import com.steerinfo.appservice.appprerailwayscale.model.AppPreRailwayScale;
-import com.steerinfo.appservice.appprerailwayscale.service.IAppPreRailwayScaleService;
-import com.steerinfo.framework.controller.BaseRESTfulController;
-import com.steerinfo.framework.controller.RESTfulResult;
-import com.steerinfo.framework.service.pagehelper.PageList;
-import com.steerinfo.meterwork.except.MarkerMetException;
-import com.steerinfo.util.StringUtils;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * PreRailwayScale RESTful接口：
- *
- * @author generator
- * @version 1.0-SNAPSHORT 2020-10-21 09:55
- * 类描述
- * 修订历史：
- * 日期：2020-10-21
- * 作者：generator
- * 参考：
- * 描述：PreRailwayScale RESTful接口
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- * @see null
- */
-@RestController
-@RequestMapping("/${api.version}/appservice/prerailwayscales")
-public class AppPreRailwayScaleController extends BaseRESTfulController {
-
-    @Autowired
-    IAppPreRailwayScaleService appPreRailwayScaleService;
-
-    @ApiOperation(value = "查询", notes = "分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
-    })
-    //@RequiresPermissions("prerailwayscale:view")
-    @GetMapping(value = "/queryForApp")
-    public RESTfulResult queryForApp(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
-        try {
-            PageList<AppPreRailwayScale> list = appPreRailwayScaleService.queryForApp(parmas, pageNum, pageSize);
-            return success(list);
-        } 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("prerailwayscale:delete")
-    @PostMapping(value = "/delete")//String
-    public RESTfulResult delete(@RequestBody AppPreRailwayScale model) {
-        try {
-            List<String> ids = new ArrayList<>();
-            ids.add(model.getPredictionNo());
-            if (ids.size() >= 0) {
-                appPreRailwayScaleService.delete(ids);
-            } else {
-
-            }
-            return success();
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new MarkerMetException(500, "操作异常！！");
-        }
-    }
-
-    @ApiOperation(value = "新增数据", notes = "根据PreRailwayScale对象创建")
-    @ApiImplicitParam(name = "model", value = "详细实体PreRailwayScale", required = true, dataType = "PreRailwayScale")
-    @PostMapping(value = "/add")
-    public RESTfulResult chechandadd(@RequestBody AppPreRailwayScale model) {
-        RESTfulResult rm = failed();
-        try {
-            String id = appPreRailwayScaleService.checkandadd(model);
-            if (StringUtils.isNotEmpty(id)) {
-                return success(id);
-            } else {
-                return failed("新增失败");
-            }
-        } catch (MarkerMetException e) {
-            e.printStackTrace();
-            rm.setMessage(e.getMessage());
-        } catch (Exception e) {
-            e.printStackTrace();
-            rm.setMessage("操作异常，请确认！");
-        } finally {
-
-        }
-        return rm;
-    }
-
-    @ApiOperation(value = "审核数据", notes = "将数据改为未使用（1），重置时间")
-    @ApiImplicitParam(name = "model", value = "详细实体PreRailwayScale", required = true, dataType = "PreRailwayScale")
-    @PostMapping(value = "/check")
-    public RESTfulResult approval(@RequestBody AppPreRailwayScale model) {
-        RESTfulResult rm = failed();
-        try {
-            String no = appPreRailwayScaleService.approval(model);
-            if (StringUtils.isNotEmpty(no)) {
-                return success(no);
-            } else {
-                return failed("新增失败");
-            }
-        } catch (MarkerMetException e) {
-            e.printStackTrace();
-            rm.setMessage(e.getMessage());
-        } catch (Exception e) {
-            e.printStackTrace();
-            rm.setMessage("操作异常，请确认！");
-        } finally {
-
-        }
-        return rm;
-    }
-
-    @ApiOperation(value = "反审数据", notes = "将数据改为未配车（0），重置时间")
-    @ApiImplicitParam(name = "model", value = "详细实体PreRailwayScale", required = true, dataType = "PreRailwayScale")
-    @PostMapping(value = "/uncheck")
-    public RESTfulResult uncheck(@RequestBody AppPreRailwayScale model) {
-        RESTfulResult rm = failed();
-        try {
-            String no = appPreRailwayScaleService.uncheck(model);
-            if (StringUtils.isNotEmpty(no)) {
-                return success(no);
-            } else {
-                return failed("新增失败");
-            }
-        } catch (MarkerMetException e) {
-            e.printStackTrace();
-            rm.setMessage(e.getMessage());
-        } catch (Exception e) {
-            e.printStackTrace();
-            rm.setMessage("操作异常，请确认！");
-        } finally {
-
-        }
-        return rm;
-    }
-
-}

src/main/java/com/steerinfo/appservice/appprerailwayscale/mapper/AppPreRailwayScaleMapper.java

@@ -1,16 +0,0 @@
-package com.steerinfo.appservice.appprerailwayscale.mapper;
-
-import com.steerinfo.appservice.appprerailwayscale.model.AppPreRailwayScale;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import feign.Param;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.HashMap;
-import java.util.List;
-
-@Mapper
-public interface AppPreRailwayScaleMapper extends IBaseMapper<AppPreRailwayScale, String> {
-    String getNewID(@Param(value="afl")String afl);
-
-    List<AppPreRailwayScale> selectForApp(HashMap parmas);
-}

src/main/java/com/steerinfo/appservice/appprerailwayscale/mapper/AppPreRailwayScaleMapper.xml

@@ -1,1821 +0,0 @@
-<?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.appservice.appprerailwayscale.mapper.AppPreRailwayScaleMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.appservice.appprerailwayscale.model.AppPreRailwayScale">
-    <id column="PREDICTION_NO" jdbcType="VARCHAR" property="predictionNo" />
-    <result column="NOTICE_NO" jdbcType="VARCHAR" property="noticeNo" />
-    <result column="RAILWAY_NO" jdbcType="VARCHAR" property="railwayNo" />
-    <result column="RAILWAY_CARRIAGE_NO" jdbcType="VARCHAR" property="railwayCarriageNo" />
-    <result column="MATTER_NO" jdbcType="VARCHAR" property="matterNo" />
-    <result column="MATTER_NAME" jdbcType="VARCHAR" property="matterName" />
-    <result column="CONTRACT_NO" jdbcType="VARCHAR" property="contractNo" />
-    <result column="BATCH_NO" jdbcType="VARCHAR" property="batchNo" />
-    <result column="CUSTOMER_SUPPLIER_NO" jdbcType="VARCHAR" property="customerSupplierNo" />
-    <result column="CUSTOMER_SUPPLIER_NAME" jdbcType="VARCHAR" property="customerSupplierName" />
-    <result column="SOURCE_AREA" jdbcType="VARCHAR" property="sourceArea" />
-    <result column="FORWARDING_UNIT_NO" jdbcType="VARCHAR" property="forwardingUnitNo" />
-    <result column="FORWARDING_UNIT_NAME" jdbcType="VARCHAR" property="forwardingUnitName" />
-    <result column="RECEIVING_UINT_NO" jdbcType="VARCHAR" property="receivingUintNo" />
-    <result column="RECEIVING_UINT_NAME" jdbcType="VARCHAR" property="receivingUintName" />
-    <result column="MATERIAL_NO" jdbcType="VARCHAR" property="materialNo" />
-    <result column="MATERIAL_NAME" jdbcType="VARCHAR" property="materialName" />
-    <result column="SPEC_NO" jdbcType="VARCHAR" property="specNo" />
-    <result column="SPEC_NAME" jdbcType="VARCHAR" property="specName" />
-    <result column="SHIPMENT_GROSS_WEIGHT" jdbcType="DECIMAL" property="shipmentGrossWeight" />
-    <result column="SHIPMENT_NET_WEIGHT" jdbcType="DECIMAL" property="shipmentNetWeight" />
-    <result column="SHIPMENT_NUM" jdbcType="DECIMAL" property="shipmentNum" />
-    <result column="LOAD_POINT_NO" jdbcType="VARCHAR" property="loadPointNo" />
-    <result column="LOAD_POINT_NAME" jdbcType="VARCHAR" property="loadPointName" />
-    <result column="SAMPLE_NO" jdbcType="VARCHAR" property="sampleNo" />
-    <result column="SAMPLE_VOUCHER" jdbcType="VARCHAR" property="sampleVoucher" />
-    <result column="CARRIER_UNIT_NO" jdbcType="VARCHAR" property="carrierUnitNo" />
-    <result column="CARRIER_UNIT_NAME" jdbcType="VARCHAR" property="carrierUnitName" />
-    <result column="PREDICTION_TYPE" jdbcType="VARCHAR" property="predictionType" />
-    <result column="PREDICTION_COMBINATION" jdbcType="VARCHAR" property="predictionCombination" />
-    <result column="METER_TYPE_NO" jdbcType="VARCHAR" property="meterTypeNo" />
-    <result column="METER_TYPE_NAME" jdbcType="VARCHAR" property="meterTypeName" />
-    <result column="EFFECTIVE_START_TIME" jdbcType="TIMESTAMP" property="effectiveStartTime" />
-    <result column="EFFECTIVE_END_TIME" jdbcType="TIMESTAMP" property="effectiveEndTime" />
-    <result column="RAILWAY_TYPE_NO" jdbcType="VARCHAR" property="railwayTypeNo" />
-    <result column="RAILWAY_TYPE_NAME" jdbcType="VARCHAR" property="railwayTypeName" />
-    <result column="MEMO" jdbcType="VARCHAR" property="memo" />
-    <result column="VALUE_FLAG" jdbcType="VARCHAR" property="valueFlag" />
-    <result column="USED_TIME" jdbcType="TIMESTAMP" property="usedTime" />
-    <result column="CREATE_MAN_NO" jdbcType="VARCHAR" property="createManNo" />
-    <result column="CREATE_MAN_NAME" jdbcType="VARCHAR" property="createManName" />
-    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="UPDATE_MAN_NO" jdbcType="VARCHAR" property="updateManNo" />
-    <result column="UPDATE_MAN_NAME" jdbcType="VARCHAR" property="updateManName" />
-    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="DELETE_MAN_NO" jdbcType="VARCHAR" property="deleteManNo" />
-    <result column="DELETE_MAN_NAME" jdbcType="VARCHAR" property="deleteManName" />
-    <result column="DELETE_TIME" jdbcType="TIMESTAMP" property="deleteTime" />
-    <result column="P_VALUE_FLAG" jdbcType="VARCHAR" property="pValueFlag" />
-    <result column="IS_CHEMICAL" jdbcType="VARCHAR" property="isChemical" />
-    <result column="LIMIT_WEIGHT" jdbcType="DECIMAL" property="limitWeight" />
-    <result column="RAILWAY_MODEL_NO" jdbcType="VARCHAR" property="railwayModelNo" />
-    <result column="RAILWAY_MODEL_NAME" jdbcType="VARCHAR" property="railwayModelName" />
-  </resultMap>
-  <sql id="columns">
-    PREDICTION_NO, NOTICE_NO, RAILWAY_NO, RAILWAY_CARRIAGE_NO, MATTER_NO, MATTER_NAME,
-    CONTRACT_NO, BATCH_NO, CUSTOMER_SUPPLIER_NO, CUSTOMER_SUPPLIER_NAME, SOURCE_AREA,
-    FORWARDING_UNIT_NO, FORWARDING_UNIT_NAME, RECEIVING_UINT_NO, RECEIVING_UINT_NAME,
-    MATERIAL_NO, MATERIAL_NAME, SPEC_NO, SPEC_NAME, SHIPMENT_GROSS_WEIGHT, SHIPMENT_NET_WEIGHT,
-    SHIPMENT_NUM, LOAD_POINT_NO, LOAD_POINT_NAME, SAMPLE_NO, SAMPLE_VOUCHER, CARRIER_UNIT_NO,
-    CARRIER_UNIT_NAME, PREDICTION_TYPE, PREDICTION_COMBINATION, METER_TYPE_NO, METER_TYPE_NAME,
-    EFFECTIVE_START_TIME, EFFECTIVE_END_TIME, RAILWAY_TYPE_NO, RAILWAY_TYPE_NAME, MEMO,
-    VALUE_FLAG, USED_TIME, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO,
-    UPDATE_MAN_NAME, UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, P_VALUE_FLAG,
-    IS_CHEMICAL, LIMIT_WEIGHT, RAILWAY_MODEL_NO, RAILWAY_MODEL_NAME
-  </sql>
-  <sql id="columns_alias">
-    t.PREDICTION_NO, t.NOTICE_NO, t.RAILWAY_NO, t.RAILWAY_CARRIAGE_NO, t.MATTER_NO, t.MATTER_NAME,
-    t.CONTRACT_NO, t.BATCH_NO, t.CUSTOMER_SUPPLIER_NO, t.CUSTOMER_SUPPLIER_NAME, t.SOURCE_AREA,
-    t.FORWARDING_UNIT_NO, t.FORWARDING_UNIT_NAME, t.RECEIVING_UINT_NO, t.RECEIVING_UINT_NAME,
-    t.MATERIAL_NO, t.MATERIAL_NAME, t.SPEC_NO, t.SPEC_NAME, t.SHIPMENT_GROSS_WEIGHT,
-    t.SHIPMENT_NET_WEIGHT, t.SHIPMENT_NUM, t.LOAD_POINT_NO, t.LOAD_POINT_NAME, t.SAMPLE_NO,
-    t.SAMPLE_VOUCHER, t.CARRIER_UNIT_NO, t.CARRIER_UNIT_NAME, t.PREDICTION_TYPE, t.PREDICTION_COMBINATION,
-    t.METER_TYPE_NO, t.METER_TYPE_NAME, t.EFFECTIVE_START_TIME, t.EFFECTIVE_END_TIME,
-    t.RAILWAY_TYPE_NO, t.RAILWAY_TYPE_NAME, t.MEMO, t.VALUE_FLAG, t.USED_TIME, t.CREATE_MAN_NO,
-    t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME,
-    t.DELETE_MAN_NO, t.DELETE_MAN_NAME, t.DELETE_TIME, t.P_VALUE_FLAG, t.IS_CHEMICAL,
-    t.LIMIT_WEIGHT, t.RAILWAY_MODEL_NO, t.RAILWAY_MODEL_NAME
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns"/> FROM PRE_RAILWAY_SCALE
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM PRE_RAILWAY_SCALE t
-  </sql>
-  <sql id="where">
-    <where>
-      <if test="predictionNo != null and predictionNo != ''">
-        and PREDICTION_NO = #{predictionNo}
-      </if>
-      <if test="noticeNo != null and noticeNo != ''">
-        and NOTICE_NO = #{noticeNo}
-      </if>
-      <if test="railwayNo != null and railwayNo != ''">
-        and RAILWAY_NO = #{railwayNo}
-      </if>
-      <if test="railwayCarriageNo != null and railwayCarriageNo != ''">
-        and RAILWAY_CARRIAGE_NO = #{railwayCarriageNo}
-      </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="contractNo != null and contractNo != ''">
-        and CONTRACT_NO = #{contractNo}
-      </if>
-      <if test="batchNo != null and batchNo != ''">
-        and BATCH_NO = #{batchNo}
-      </if>
-      <if test="customerSupplierNo != null and customerSupplierNo != ''">
-        and CUSTOMER_SUPPLIER_NO = #{customerSupplierNo}
-      </if>
-      <if test="customerSupplierName != null and customerSupplierName != ''">
-        and CUSTOMER_SUPPLIER_NAME = #{customerSupplierName}
-      </if>
-      <if test="sourceArea != null and sourceArea != ''">
-        and SOURCE_AREA = #{sourceArea}
-      </if>
-      <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
-        and FORWARDING_UNIT_NO = #{forwardingUnitNo}
-      </if>
-      <if test="forwardingUnitName != null and forwardingUnitName != ''">
-        and FORWARDING_UNIT_NAME = #{forwardingUnitName}
-      </if>
-      <if test="receivingUintNo != null and receivingUintNo != ''">
-        and RECEIVING_UINT_NO = #{receivingUintNo}
-      </if>
-      <if test="receivingUintName != null and receivingUintName != ''">
-        and RECEIVING_UINT_NAME = #{receivingUintName}
-      </if>
-      <if test="materialNo != null and materialNo != ''">
-        and MATERIAL_NO = #{materialNo}
-      </if>
-      <if test="materialName != null and materialName != ''">
-        and MATERIAL_NAME = #{materialName}
-      </if>
-      <if test="specNo != null and specNo != ''">
-        and SPEC_NO = #{specNo}
-      </if>
-      <if test="specName != null and specName != ''">
-        and SPEC_NAME = #{specName}
-      </if>
-      <if test="shipmentGrossWeight != null">
-        and SHIPMENT_GROSS_WEIGHT = #{shipmentGrossWeight}
-      </if>
-      <if test="shipmentNetWeight != null">
-        and SHIPMENT_NET_WEIGHT = #{shipmentNetWeight}
-      </if>
-      <if test="shipmentNum != null">
-        and SHIPMENT_NUM = #{shipmentNum}
-      </if>
-      <if test="loadPointNo != null and loadPointNo != ''">
-        and LOAD_POINT_NO = #{loadPointNo}
-      </if>
-      <if test="loadPointName != null and loadPointName != ''">
-        and LOAD_POINT_NAME = #{loadPointName}
-      </if>
-      <if test="sampleNo != null and sampleNo != ''">
-        and SAMPLE_NO = #{sampleNo}
-      </if>
-      <if test="sampleVoucher != null and sampleVoucher != ''">
-        and SAMPLE_VOUCHER = #{sampleVoucher}
-      </if>
-      <if test="carrierUnitNo != null and carrierUnitNo != ''">
-        and CARRIER_UNIT_NO = #{carrierUnitNo}
-      </if>
-      <if test="carrierUnitName != null and carrierUnitName != ''">
-        and CARRIER_UNIT_NAME = #{carrierUnitName}
-      </if>
-      <if test="predictionType != null and predictionType != ''">
-        and PREDICTION_TYPE = #{predictionType}
-      </if>
-      <if test="predictionCombination != null and predictionCombination != ''">
-        and PREDICTION_COMBINATION = #{predictionCombination}
-      </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="effectiveStartTime != null">
-        and TO_CHAR(EFFECTIVE_START_TIME,'yyyy-MM-dd') = #{effectiveStartTime}
-      </if>
-      <if test="effectiveEndTime != null">
-        and TO_CHAR(EFFECTIVE_END_TIME,'yyyy-MM-dd') = #{effectiveEndTime}
-      </if>
-      <if test="railwayTypeNo != null and railwayTypeNo != ''">
-        and RAILWAY_TYPE_NO = #{railwayTypeNo}
-      </if>
-      <if test="railwayTypeName != null and railwayTypeName != ''">
-        and RAILWAY_TYPE_NAME = #{railwayTypeName}
-      </if>
-      <if test="memo != null and memo != ''">
-        and MEMO = #{memo}
-      </if>
-      <if test="valueFlag != null and valueFlag != ''">
-        and VALUE_FLAG = #{valueFlag}
-      </if>
-      <if test="usedTime != null">
-        and TO_CHAR(USED_TIME,'yyyy-MM-dd') = #{usedTime}
-      </if>
-      <if test="createManNo != null and createManNo != ''">
-        and CREATE_MAN_NO = #{createManNo}
-      </if>
-      <if test="createManName != null and createManName != ''">
-        and CREATE_MAN_NAME = #{createManName}
-      </if>
-      <if test="createTime != null">
-        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
-      </if>
-      <if test="updateManNo != null and updateManNo != ''">
-        and UPDATE_MAN_NO = #{updateManNo}
-      </if>
-      <if test="updateManName != null and updateManName != ''">
-        and UPDATE_MAN_NAME = #{updateManName}
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="deleteManNo != null and deleteManNo != ''">
-        and DELETE_MAN_NO = #{deleteManNo}
-      </if>
-      <if test="deleteManName != null and deleteManName != ''">
-        and DELETE_MAN_NAME = #{deleteManName}
-      </if>
-      <if test="deleteTime != null">
-        and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
-      </if>
-      <if test="pValueFlag != null and pValueFlag != ''">
-        and P_VALUE_FLAG = #{pValueFlag}
-      </if>
-      <if test="isChemical != null and isChemical != ''">
-        and IS_CHEMICAL = #{isChemical}
-      </if>
-      <if test="limitWeight != null">
-        and LIMIT_WEIGHT = #{limitWeight}
-      </if>
-      <if test="railwayModelNo != null and railwayModelNo != ''">
-        and RAILWAY_MODEL_NO = #{railwayModelNo}
-      </if>
-      <if test="railwayModelName != null and railwayModelName != ''">
-        and RAILWAY_MODEL_NAME = #{railwayModelName}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where>
-      <if test="predictionNo != null and predictionNo != ''">
-        and PREDICTION_NO LIKE '%${predictionNo}%'
-      </if>
-      <if test="noticeNo != null and noticeNo != ''">
-        and NOTICE_NO LIKE '%${noticeNo}%'
-      </if>
-      <if test="railwayNo != null and railwayNo != ''">
-        and RAILWAY_NO LIKE '%${railwayNo}%'
-      </if>
-      <if test="railwayCarriageNo != null and railwayCarriageNo != ''">
-        and RAILWAY_CARRIAGE_NO LIKE '%${railwayCarriageNo}%'
-      </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="contractNo != null and contractNo != ''">
-        and CONTRACT_NO LIKE '%${contractNo}%'
-      </if>
-      <if test="batchNo != null and batchNo != ''">
-        and BATCH_NO LIKE '%${batchNo}%'
-      </if>
-      <if test="customerSupplierNo != null and customerSupplierNo != ''">
-        and CUSTOMER_SUPPLIER_NO LIKE '%${customerSupplierNo}%'
-      </if>
-      <if test="customerSupplierName != null and customerSupplierName != ''">
-        and CUSTOMER_SUPPLIER_NAME LIKE '%${customerSupplierName}%'
-      </if>
-      <if test="sourceArea != null and sourceArea != ''">
-        and SOURCE_AREA LIKE '%${sourceArea}%'
-      </if>
-      <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
-        and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
-      </if>
-      <if test="forwardingUnitName != null and forwardingUnitName != ''">
-        and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
-      </if>
-      <if test="receivingUintNo != null and receivingUintNo != ''">
-        and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
-      </if>
-      <if test="receivingUintName != null and receivingUintName != ''">
-        and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
-      </if>
-      <if test="materialNo != null and materialNo != ''">
-        and MATERIAL_NO LIKE '%${materialNo}%'
-      </if>
-      <if test="materialName != null and materialName != ''">
-        and MATERIAL_NAME LIKE '%${materialName}%'
-      </if>
-      <if test="specNo != null and specNo != ''">
-        and SPEC_NO LIKE '%${specNo}%'
-      </if>
-      <if test="specName != null and specName != ''">
-        and SPEC_NAME LIKE '%${specName}%'
-      </if>
-      <if test="shipmentGrossWeight != null">
-        and SHIPMENT_GROSS_WEIGHT = #{shipmentGrossWeight}
-      </if>
-      <if test="shipmentNetWeight != null">
-        and SHIPMENT_NET_WEIGHT = #{shipmentNetWeight}
-      </if>
-      <if test="shipmentNum != null">
-        and SHIPMENT_NUM = #{shipmentNum}
-      </if>
-      <if test="loadPointNo != null and loadPointNo != ''">
-        and LOAD_POINT_NO LIKE '%${loadPointNo}%'
-      </if>
-      <if test="loadPointName != null and loadPointName != ''">
-        and LOAD_POINT_NAME LIKE '%${loadPointName}%'
-      </if>
-      <if test="sampleNo != null and sampleNo != ''">
-        and SAMPLE_NO LIKE '%${sampleNo}%'
-      </if>
-      <if test="sampleVoucher != null and sampleVoucher != ''">
-        and SAMPLE_VOUCHER LIKE '%${sampleVoucher}%'
-      </if>
-      <if test="carrierUnitNo != null and carrierUnitNo != ''">
-        and CARRIER_UNIT_NO LIKE '%${carrierUnitNo}%'
-      </if>
-      <if test="carrierUnitName != null and carrierUnitName != ''">
-        and CARRIER_UNIT_NAME LIKE '%${carrierUnitName}%'
-      </if>
-      <if test="predictionType != null and predictionType != ''">
-        and PREDICTION_TYPE LIKE '%${predictionType}%'
-      </if>
-      <if test="predictionCombination != null and predictionCombination != ''">
-        and PREDICTION_COMBINATION LIKE '%${predictionCombination}%'
-      </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="effectiveStartTime != null">
-        and TO_CHAR(EFFECTIVE_START_TIME,'yyyy-MM-dd') = #{effectiveStartTime}
-      </if>
-      <if test="effectiveEndTime != null">
-        and TO_CHAR(EFFECTIVE_END_TIME,'yyyy-MM-dd') = #{effectiveEndTime}
-      </if>
-      <if test="railwayTypeNo != null and railwayTypeNo != ''">
-        and RAILWAY_TYPE_NO LIKE '%${railwayTypeNo}%'
-      </if>
-      <if test="railwayTypeName != null and railwayTypeName != ''">
-        and RAILWAY_TYPE_NAME LIKE '%${railwayTypeName}%'
-      </if>
-      <if test="memo != null and memo != ''">
-        and MEMO LIKE '%${memo}%'
-      </if>
-      <if test="valueFlag != null and valueFlag != ''">
-        and VALUE_FLAG LIKE '%${valueFlag}%'
-      </if>
-      <if test="usedTime != null">
-        and TO_CHAR(USED_TIME,'yyyy-MM-dd') = #{usedTime}
-      </if>
-      <if test="createManNo != null and createManNo != ''">
-        and CREATE_MAN_NO LIKE '%${createManNo}%'
-      </if>
-      <if test="createManName != null and createManName != ''">
-        and CREATE_MAN_NAME LIKE '%${createManName}%'
-      </if>
-      <if test="createTime != null">
-        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
-      </if>
-      <if test="updateManNo != null and updateManNo != ''">
-        and UPDATE_MAN_NO LIKE '%${updateManNo}%'
-      </if>
-      <if test="updateManName != null and updateManName != ''">
-        and UPDATE_MAN_NAME LIKE '%${updateManName}%'
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="deleteManNo != null and deleteManNo != ''">
-        and DELETE_MAN_NO LIKE '%${deleteManNo}%'
-      </if>
-      <if test="deleteManName != null and deleteManName != ''">
-        and DELETE_MAN_NAME LIKE '%${deleteManName}%'
-      </if>
-      <if test="deleteTime != null">
-        and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
-      </if>
-      <if test="pValueFlag != null and pValueFlag != ''">
-        and P_VALUE_FLAG LIKE '%${pValueFlag}%'
-      </if>
-      <if test="isChemical != null and isChemical != ''">
-        and IS_CHEMICAL LIKE '%${isChemical}%'
-      </if>
-      <if test="limitWeight != null">
-        and LIMIT_WEIGHT = #{limitWeight}
-      </if>
-      <if test="railwayModelNo != null and railwayModelNo != ''">
-        and RAILWAY_MODEL_NO LIKE '%${railwayModelNo}%'
-      </if>
-      <if test="railwayModelName != null and railwayModelName != ''">
-        and RAILWAY_MODEL_NAME LIKE '%${railwayModelName}%'
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from PRE_RAILWAY_SCALE
-    where PREDICTION_NO = #{predictionNo,jdbcType=VARCHAR}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from PRE_RAILWAY_SCALE
-    where 1!=1
-    <if test="noticeNo != null and noticeNo != ''">
-      or NOTICE_NO = #{noticeNo}
-    </if>
-    <if test="railwayNo != null and railwayNo != ''">
-      or RAILWAY_NO = #{railwayNo}
-    </if>
-    <if test="railwayCarriageNo != null and railwayCarriageNo != ''">
-      or RAILWAY_CARRIAGE_NO = #{railwayCarriageNo}
-    </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="contractNo != null and contractNo != ''">
-      or CONTRACT_NO = #{contractNo}
-    </if>
-    <if test="batchNo != null and batchNo != ''">
-      or BATCH_NO = #{batchNo}
-    </if>
-    <if test="customerSupplierNo != null and customerSupplierNo != ''">
-      or CUSTOMER_SUPPLIER_NO = #{customerSupplierNo}
-    </if>
-    <if test="customerSupplierName != null and customerSupplierName != ''">
-      or CUSTOMER_SUPPLIER_NAME = #{customerSupplierName}
-    </if>
-    <if test="sourceArea != null and sourceArea != ''">
-      or SOURCE_AREA = #{sourceArea}
-    </if>
-    <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
-      or FORWARDING_UNIT_NO = #{forwardingUnitNo}
-    </if>
-    <if test="forwardingUnitName != null and forwardingUnitName != ''">
-      or FORWARDING_UNIT_NAME = #{forwardingUnitName}
-    </if>
-    <if test="receivingUintNo != null and receivingUintNo != ''">
-      or RECEIVING_UINT_NO = #{receivingUintNo}
-    </if>
-    <if test="receivingUintName != null and receivingUintName != ''">
-      or RECEIVING_UINT_NAME = #{receivingUintName}
-    </if>
-    <if test="materialNo != null and materialNo != ''">
-      or MATERIAL_NO = #{materialNo}
-    </if>
-    <if test="materialName != null and materialName != ''">
-      or MATERIAL_NAME = #{materialName}
-    </if>
-    <if test="specNo != null and specNo != ''">
-      or SPEC_NO = #{specNo}
-    </if>
-    <if test="specName != null and specName != ''">
-      or SPEC_NAME = #{specName}
-    </if>
-    <if test="shipmentGrossWeight != null">
-      or SHIPMENT_GROSS_WEIGHT = #{shipmentGrossWeight}
-    </if>
-    <if test="shipmentNetWeight != null">
-      or SHIPMENT_NET_WEIGHT = #{shipmentNetWeight}
-    </if>
-    <if test="shipmentNum != null">
-      or SHIPMENT_NUM = #{shipmentNum}
-    </if>
-    <if test="loadPointNo != null and loadPointNo != ''">
-      or LOAD_POINT_NO = #{loadPointNo}
-    </if>
-    <if test="loadPointName != null and loadPointName != ''">
-      or LOAD_POINT_NAME = #{loadPointName}
-    </if>
-    <if test="sampleNo != null and sampleNo != ''">
-      or SAMPLE_NO = #{sampleNo}
-    </if>
-    <if test="sampleVoucher != null and sampleVoucher != ''">
-      or SAMPLE_VOUCHER = #{sampleVoucher}
-    </if>
-    <if test="carrierUnitNo != null and carrierUnitNo != ''">
-      or CARRIER_UNIT_NO = #{carrierUnitNo}
-    </if>
-    <if test="carrierUnitName != null and carrierUnitName != ''">
-      or CARRIER_UNIT_NAME = #{carrierUnitName}
-    </if>
-    <if test="predictionType != null and predictionType != ''">
-      or PREDICTION_TYPE = #{predictionType}
-    </if>
-    <if test="predictionCombination != null and predictionCombination != ''">
-      or PREDICTION_COMBINATION = #{predictionCombination}
-    </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="effectiveStartTime != null">
-      or TO_CHAR(EFFECTIVE_START_TIME,'yyyy-MM-dd') = '#{effectiveStartTime}'
-    </if>
-    <if test="effectiveEndTime != null">
-      or TO_CHAR(EFFECTIVE_END_TIME,'yyyy-MM-dd') = '#{effectiveEndTime}'
-    </if>
-    <if test="railwayTypeNo != null and railwayTypeNo != ''">
-      or RAILWAY_TYPE_NO = #{railwayTypeNo}
-    </if>
-    <if test="railwayTypeName != null and railwayTypeName != ''">
-      or RAILWAY_TYPE_NAME = #{railwayTypeName}
-    </if>
-    <if test="memo != null and memo != ''">
-      or MEMO = #{memo}
-    </if>
-    <if test="valueFlag != null and valueFlag != ''">
-      or VALUE_FLAG = #{valueFlag}
-    </if>
-    <if test="usedTime != null">
-      or TO_CHAR(USED_TIME,'yyyy-MM-dd') = '#{usedTime}'
-    </if>
-    <if test="createManNo != null and createManNo != ''">
-      or CREATE_MAN_NO = #{createManNo}
-    </if>
-    <if test="createManName != null and createManName != ''">
-      or CREATE_MAN_NAME = #{createManName}
-    </if>
-    <if test="createTime != null">
-      or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
-    </if>
-    <if test="updateManNo != null and updateManNo != ''">
-      or UPDATE_MAN_NO = #{updateManNo}
-    </if>
-    <if test="updateManName != null and updateManName != ''">
-      or UPDATE_MAN_NAME = #{updateManName}
-    </if>
-    <if test="updateTime != null">
-      or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-    </if>
-    <if test="deleteManNo != null and deleteManNo != ''">
-      or DELETE_MAN_NO = #{deleteManNo}
-    </if>
-    <if test="deleteManName != null and deleteManName != ''">
-      or DELETE_MAN_NAME = #{deleteManName}
-    </if>
-    <if test="deleteTime != null">
-      or TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = '#{deleteTime}'
-    </if>
-    <if test="pValueFlag != null and pValueFlag != ''">
-      or P_VALUE_FLAG = #{pValueFlag}
-    </if>
-    <if test="isChemical != null and isChemical != ''">
-      or IS_CHEMICAL = #{isChemical}
-    </if>
-    <if test="limitWeight != null">
-      or LIMIT_WEIGHT = #{limitWeight}
-    </if>
-    <if test="railwayModelNo != null and railwayModelNo != ''">
-      or RAILWAY_MODEL_NO = #{railwayModelNo}
-    </if>
-    <if test="railwayModelName != null and railwayModelName != ''">
-      or RAILWAY_MODEL_NAME = #{railwayModelName}
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.appservice.appprerailwayscale.model.AppPreRailwayScale">
-    insert into PRE_RAILWAY_SCALE (PREDICTION_NO, NOTICE_NO, RAILWAY_NO,
-      RAILWAY_CARRIAGE_NO, MATTER_NO, MATTER_NAME,
-      CONTRACT_NO, BATCH_NO, CUSTOMER_SUPPLIER_NO,
-      CUSTOMER_SUPPLIER_NAME, SOURCE_AREA, FORWARDING_UNIT_NO,
-      FORWARDING_UNIT_NAME, RECEIVING_UINT_NO, RECEIVING_UINT_NAME,
-      MATERIAL_NO, MATERIAL_NAME, SPEC_NO,
-      SPEC_NAME, SHIPMENT_GROSS_WEIGHT, SHIPMENT_NET_WEIGHT,
-      SHIPMENT_NUM, LOAD_POINT_NO, LOAD_POINT_NAME,
-      SAMPLE_NO, SAMPLE_VOUCHER, CARRIER_UNIT_NO,
-      CARRIER_UNIT_NAME, PREDICTION_TYPE, PREDICTION_COMBINATION,
-      METER_TYPE_NO, METER_TYPE_NAME, EFFECTIVE_START_TIME,
-      EFFECTIVE_END_TIME, RAILWAY_TYPE_NO, RAILWAY_TYPE_NAME,
-      MEMO, VALUE_FLAG, USED_TIME,
-      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME,
-      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME,
-      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME,
-      P_VALUE_FLAG, IS_CHEMICAL, LIMIT_WEIGHT,
-      RAILWAY_MODEL_NO, RAILWAY_MODEL_NAME)
-    values (#{predictionNo,jdbcType=VARCHAR}, #{noticeNo,jdbcType=VARCHAR}, #{railwayNo,jdbcType=VARCHAR},
-      #{railwayCarriageNo,jdbcType=VARCHAR}, #{matterNo,jdbcType=VARCHAR}, #{matterName,jdbcType=VARCHAR},
-      #{contractNo,jdbcType=VARCHAR}, #{batchNo,jdbcType=VARCHAR}, #{customerSupplierNo,jdbcType=VARCHAR},
-      #{customerSupplierName,jdbcType=VARCHAR}, #{sourceArea,jdbcType=VARCHAR}, #{forwardingUnitNo,jdbcType=VARCHAR},
-      #{forwardingUnitName,jdbcType=VARCHAR}, #{receivingUintNo,jdbcType=VARCHAR}, #{receivingUintName,jdbcType=VARCHAR},
-      #{materialNo,jdbcType=VARCHAR}, #{materialName,jdbcType=VARCHAR}, #{specNo,jdbcType=VARCHAR},
-      #{specName,jdbcType=VARCHAR}, #{shipmentGrossWeight,jdbcType=DECIMAL}, #{shipmentNetWeight,jdbcType=DECIMAL},
-      #{shipmentNum,jdbcType=DECIMAL}, #{loadPointNo,jdbcType=VARCHAR}, #{loadPointName,jdbcType=VARCHAR},
-      #{sampleNo,jdbcType=VARCHAR}, #{sampleVoucher,jdbcType=VARCHAR}, #{carrierUnitNo,jdbcType=VARCHAR},
-      #{carrierUnitName,jdbcType=VARCHAR}, #{predictionType,jdbcType=VARCHAR}, #{predictionCombination,jdbcType=VARCHAR},
-      #{meterTypeNo,jdbcType=VARCHAR}, #{meterTypeName,jdbcType=VARCHAR}, #{effectiveStartTime,jdbcType=TIMESTAMP},
-      #{effectiveEndTime,jdbcType=TIMESTAMP}, #{railwayTypeNo,jdbcType=VARCHAR}, #{railwayTypeName,jdbcType=VARCHAR},
-      #{memo,jdbcType=VARCHAR}, #{valueFlag,jdbcType=VARCHAR}, #{usedTime,jdbcType=TIMESTAMP},
-      #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
-      #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
-      #{deleteManNo,jdbcType=VARCHAR}, #{deleteManName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP},
-      #{pValueFlag,jdbcType=VARCHAR}, #{isChemical,jdbcType=VARCHAR}, #{limitWeight,jdbcType=DECIMAL},
-      #{railwayModelNo,jdbcType=VARCHAR}, #{railwayModelName,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.appservice.appprerailwayscale.model.AppPreRailwayScale">
-    insert into PRE_RAILWAY_SCALE
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="predictionNo != null">
-        PREDICTION_NO,
-      </if>
-      <if test="noticeNo != null">
-        NOTICE_NO,
-      </if>
-      <if test="railwayNo != null">
-        RAILWAY_NO,
-      </if>
-      <if test="railwayCarriageNo != null">
-        RAILWAY_CARRIAGE_NO,
-      </if>
-      <if test="matterNo != null">
-        MATTER_NO,
-      </if>
-      <if test="matterName != null">
-        MATTER_NAME,
-      </if>
-      <if test="contractNo != null">
-        CONTRACT_NO,
-      </if>
-      <if test="batchNo != null">
-        BATCH_NO,
-      </if>
-      <if test="customerSupplierNo != null">
-        CUSTOMER_SUPPLIER_NO,
-      </if>
-      <if test="customerSupplierName != null">
-        CUSTOMER_SUPPLIER_NAME,
-      </if>
-      <if test="sourceArea != null">
-        SOURCE_AREA,
-      </if>
-      <if test="forwardingUnitNo != null">
-        FORWARDING_UNIT_NO,
-      </if>
-      <if test="forwardingUnitName != null">
-        FORWARDING_UNIT_NAME,
-      </if>
-      <if test="receivingUintNo != null">
-        RECEIVING_UINT_NO,
-      </if>
-      <if test="receivingUintName != null">
-        RECEIVING_UINT_NAME,
-      </if>
-      <if test="materialNo != null">
-        MATERIAL_NO,
-      </if>
-      <if test="materialName != null">
-        MATERIAL_NAME,
-      </if>
-      <if test="specNo != null">
-        SPEC_NO,
-      </if>
-      <if test="specName != null">
-        SPEC_NAME,
-      </if>
-      <if test="shipmentGrossWeight != null">
-        SHIPMENT_GROSS_WEIGHT,
-      </if>
-      <if test="shipmentNetWeight != null">
-        SHIPMENT_NET_WEIGHT,
-      </if>
-      <if test="shipmentNum != null">
-        SHIPMENT_NUM,
-      </if>
-      <if test="loadPointNo != null">
-        LOAD_POINT_NO,
-      </if>
-      <if test="loadPointName != null">
-        LOAD_POINT_NAME,
-      </if>
-      <if test="sampleNo != null">
-        SAMPLE_NO,
-      </if>
-      <if test="sampleVoucher != null">
-        SAMPLE_VOUCHER,
-      </if>
-      <if test="carrierUnitNo != null">
-        CARRIER_UNIT_NO,
-      </if>
-      <if test="carrierUnitName != null">
-        CARRIER_UNIT_NAME,
-      </if>
-      <if test="predictionType != null">
-        PREDICTION_TYPE,
-      </if>
-      <if test="predictionCombination != null">
-        PREDICTION_COMBINATION,
-      </if>
-      <if test="meterTypeNo != null">
-        METER_TYPE_NO,
-      </if>
-      <if test="meterTypeName != null">
-        METER_TYPE_NAME,
-      </if>
-      <if test="effectiveStartTime != null">
-        EFFECTIVE_START_TIME,
-      </if>
-      <if test="effectiveEndTime != null">
-        EFFECTIVE_END_TIME,
-      </if>
-      <if test="railwayTypeNo != null">
-        RAILWAY_TYPE_NO,
-      </if>
-      <if test="railwayTypeName != null">
-        RAILWAY_TYPE_NAME,
-      </if>
-      <if test="memo != null">
-        MEMO,
-      </if>
-      <if test="valueFlag != null">
-        VALUE_FLAG,
-      </if>
-      <if test="usedTime != null">
-        USED_TIME,
-      </if>
-      <if test="createManNo != null">
-        CREATE_MAN_NO,
-      </if>
-      <if test="createManName != null">
-        CREATE_MAN_NAME,
-      </if>
-      <if test="createTime != null">
-        CREATE_TIME,
-      </if>
-      <if test="updateManNo != null">
-        UPDATE_MAN_NO,
-      </if>
-      <if test="updateManName != null">
-        UPDATE_MAN_NAME,
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME,
-      </if>
-      <if test="deleteManNo != null">
-        DELETE_MAN_NO,
-      </if>
-      <if test="deleteManName != null">
-        DELETE_MAN_NAME,
-      </if>
-      <if test="deleteTime != null">
-        DELETE_TIME,
-      </if>
-      <if test="pValueFlag != null">
-        P_VALUE_FLAG,
-      </if>
-      <if test="isChemical != null">
-        IS_CHEMICAL,
-      </if>
-      <if test="limitWeight != null">
-        LIMIT_WEIGHT,
-      </if>
-      <if test="railwayModelNo != null">
-        RAILWAY_MODEL_NO,
-      </if>
-      <if test="railwayModelName != null">
-        RAILWAY_MODEL_NAME,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="predictionNo != null">
-        #{predictionNo,jdbcType=VARCHAR},
-      </if>
-      <if test="noticeNo != null">
-        #{noticeNo,jdbcType=VARCHAR},
-      </if>
-      <if test="railwayNo != null">
-        #{railwayNo,jdbcType=VARCHAR},
-      </if>
-      <if test="railwayCarriageNo != null">
-        #{railwayCarriageNo,jdbcType=VARCHAR},
-      </if>
-      <if test="matterNo != null">
-        #{matterNo,jdbcType=VARCHAR},
-      </if>
-      <if test="matterName != null">
-        #{matterName,jdbcType=VARCHAR},
-      </if>
-      <if test="contractNo != null">
-        #{contractNo,jdbcType=VARCHAR},
-      </if>
-      <if test="batchNo != null">
-        #{batchNo,jdbcType=VARCHAR},
-      </if>
-      <if test="customerSupplierNo != null">
-        #{customerSupplierNo,jdbcType=VARCHAR},
-      </if>
-      <if test="customerSupplierName != null">
-        #{customerSupplierName,jdbcType=VARCHAR},
-      </if>
-      <if test="sourceArea != null">
-        #{sourceArea,jdbcType=VARCHAR},
-      </if>
-      <if test="forwardingUnitNo != null">
-        #{forwardingUnitNo,jdbcType=VARCHAR},
-      </if>
-      <if test="forwardingUnitName != null">
-        #{forwardingUnitName,jdbcType=VARCHAR},
-      </if>
-      <if test="receivingUintNo != null">
-        #{receivingUintNo,jdbcType=VARCHAR},
-      </if>
-      <if test="receivingUintName != null">
-        #{receivingUintName,jdbcType=VARCHAR},
-      </if>
-      <if test="materialNo != null">
-        #{materialNo,jdbcType=VARCHAR},
-      </if>
-      <if test="materialName != null">
-        #{materialName,jdbcType=VARCHAR},
-      </if>
-      <if test="specNo != null">
-        #{specNo,jdbcType=VARCHAR},
-      </if>
-      <if test="specName != null">
-        #{specName,jdbcType=VARCHAR},
-      </if>
-      <if test="shipmentGrossWeight != null">
-        #{shipmentGrossWeight,jdbcType=DECIMAL},
-      </if>
-      <if test="shipmentNetWeight != null">
-        #{shipmentNetWeight,jdbcType=DECIMAL},
-      </if>
-      <if test="shipmentNum != null">
-        #{shipmentNum,jdbcType=DECIMAL},
-      </if>
-      <if test="loadPointNo != null">
-        #{loadPointNo,jdbcType=VARCHAR},
-      </if>
-      <if test="loadPointName != null">
-        #{loadPointName,jdbcType=VARCHAR},
-      </if>
-      <if test="sampleNo != null">
-        #{sampleNo,jdbcType=VARCHAR},
-      </if>
-      <if test="sampleVoucher != null">
-        #{sampleVoucher,jdbcType=VARCHAR},
-      </if>
-      <if test="carrierUnitNo != null">
-        #{carrierUnitNo,jdbcType=VARCHAR},
-      </if>
-      <if test="carrierUnitName != null">
-        #{carrierUnitName,jdbcType=VARCHAR},
-      </if>
-      <if test="predictionType != null">
-        #{predictionType,jdbcType=VARCHAR},
-      </if>
-      <if test="predictionCombination != null">
-        #{predictionCombination,jdbcType=VARCHAR},
-      </if>
-      <if test="meterTypeNo != null">
-        #{meterTypeNo,jdbcType=VARCHAR},
-      </if>
-      <if test="meterTypeName != null">
-        #{meterTypeName,jdbcType=VARCHAR},
-      </if>
-      <if test="effectiveStartTime != null">
-        #{effectiveStartTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="effectiveEndTime != null">
-        #{effectiveEndTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="railwayTypeNo != null">
-        #{railwayTypeNo,jdbcType=VARCHAR},
-      </if>
-      <if test="railwayTypeName != null">
-        #{railwayTypeName,jdbcType=VARCHAR},
-      </if>
-      <if test="memo != null">
-        #{memo,jdbcType=VARCHAR},
-      </if>
-      <if test="valueFlag != null">
-        #{valueFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="usedTime != null">
-        #{usedTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="createManNo != null">
-        #{createManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="createManName != null">
-        #{createManName,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateManNo != null">
-        #{updateManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="updateManName != null">
-        #{updateManName,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="deleteManNo != null">
-        #{deleteManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteManName != null">
-        #{deleteManName,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteTime != null">
-        #{deleteTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="pValueFlag != null">
-        #{pValueFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="isChemical != null">
-        #{isChemical,jdbcType=VARCHAR},
-      </if>
-      <if test="limitWeight != null">
-        #{limitWeight,jdbcType=DECIMAL},
-      </if>
-      <if test="railwayModelNo != null">
-        #{railwayModelNo,jdbcType=VARCHAR},
-      </if>
-      <if test="railwayModelName != null">
-        #{railwayModelName,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.appservice.appprerailwayscale.model.AppPreRailwayScale">
-    update PRE_RAILWAY_SCALE
-    set NOTICE_NO = #{noticeNo,jdbcType=VARCHAR},
-      RAILWAY_NO = #{railwayNo,jdbcType=VARCHAR},
-      RAILWAY_CARRIAGE_NO = #{railwayCarriageNo,jdbcType=VARCHAR},
-      MATTER_NO = #{matterNo,jdbcType=VARCHAR},
-      MATTER_NAME = #{matterName,jdbcType=VARCHAR},
-      CONTRACT_NO = #{contractNo,jdbcType=VARCHAR},
-      BATCH_NO = #{batchNo,jdbcType=VARCHAR},
-      CUSTOMER_SUPPLIER_NO = #{customerSupplierNo,jdbcType=VARCHAR},
-      CUSTOMER_SUPPLIER_NAME = #{customerSupplierName,jdbcType=VARCHAR},
-      SOURCE_AREA = #{sourceArea,jdbcType=VARCHAR},
-      FORWARDING_UNIT_NO = #{forwardingUnitNo,jdbcType=VARCHAR},
-      FORWARDING_UNIT_NAME = #{forwardingUnitName,jdbcType=VARCHAR},
-      RECEIVING_UINT_NO = #{receivingUintNo,jdbcType=VARCHAR},
-      RECEIVING_UINT_NAME = #{receivingUintName,jdbcType=VARCHAR},
-      MATERIAL_NO = #{materialNo,jdbcType=VARCHAR},
-      MATERIAL_NAME = #{materialName,jdbcType=VARCHAR},
-      SPEC_NO = #{specNo,jdbcType=VARCHAR},
-      SPEC_NAME = #{specName,jdbcType=VARCHAR},
-      SHIPMENT_GROSS_WEIGHT = #{shipmentGrossWeight,jdbcType=DECIMAL},
-      SHIPMENT_NET_WEIGHT = #{shipmentNetWeight,jdbcType=DECIMAL},
-      SHIPMENT_NUM = #{shipmentNum,jdbcType=DECIMAL},
-      LOAD_POINT_NO = #{loadPointNo,jdbcType=VARCHAR},
-      LOAD_POINT_NAME = #{loadPointName,jdbcType=VARCHAR},
-      SAMPLE_NO = #{sampleNo,jdbcType=VARCHAR},
-      SAMPLE_VOUCHER = #{sampleVoucher,jdbcType=VARCHAR},
-      CARRIER_UNIT_NO = #{carrierUnitNo,jdbcType=VARCHAR},
-      CARRIER_UNIT_NAME = #{carrierUnitName,jdbcType=VARCHAR},
-      PREDICTION_TYPE = #{predictionType,jdbcType=VARCHAR},
-      PREDICTION_COMBINATION = #{predictionCombination,jdbcType=VARCHAR},
-      METER_TYPE_NO = #{meterTypeNo,jdbcType=VARCHAR},
-      METER_TYPE_NAME = #{meterTypeName,jdbcType=VARCHAR},
-      EFFECTIVE_START_TIME = #{effectiveStartTime,jdbcType=TIMESTAMP},
-      EFFECTIVE_END_TIME = #{effectiveEndTime,jdbcType=TIMESTAMP},
-      RAILWAY_TYPE_NO = #{railwayTypeNo,jdbcType=VARCHAR},
-      RAILWAY_TYPE_NAME = #{railwayTypeName,jdbcType=VARCHAR},
-      MEMO = #{memo,jdbcType=VARCHAR},
-      VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
-      USED_TIME = #{usedTime,jdbcType=TIMESTAMP},
-      CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
-      CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
-      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
-      UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
-      UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
-      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      DELETE_MAN_NO = #{deleteManNo,jdbcType=VARCHAR},
-      DELETE_MAN_NAME = #{deleteManName,jdbcType=VARCHAR},
-      DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
-      P_VALUE_FLAG = #{pValueFlag,jdbcType=VARCHAR},
-      IS_CHEMICAL = #{isChemical,jdbcType=VARCHAR},
-      LIMIT_WEIGHT = #{limitWeight,jdbcType=DECIMAL},
-      RAILWAY_MODEL_NO = #{railwayModelNo,jdbcType=VARCHAR},
-      RAILWAY_MODEL_NAME = #{railwayModelName,jdbcType=VARCHAR}
-    where PREDICTION_NO = #{predictionNo,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.appservice.appprerailwayscale.model.AppPreRailwayScale">
-    update PRE_RAILWAY_SCALE
-    <set>
-      <if test="noticeNo != null">
-        NOTICE_NO = #{noticeNo,jdbcType=VARCHAR},
-      </if>
-      <if test="railwayNo != null">
-        RAILWAY_NO = #{railwayNo,jdbcType=VARCHAR},
-      </if>
-      <if test="railwayCarriageNo != null">
-        RAILWAY_CARRIAGE_NO = #{railwayCarriageNo,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="contractNo != null">
-        CONTRACT_NO = #{contractNo,jdbcType=VARCHAR},
-      </if>
-      <if test="batchNo != null">
-        BATCH_NO = #{batchNo,jdbcType=VARCHAR},
-      </if>
-      <if test="customerSupplierNo != null">
-        CUSTOMER_SUPPLIER_NO = #{customerSupplierNo,jdbcType=VARCHAR},
-      </if>
-      <if test="customerSupplierName != null">
-        CUSTOMER_SUPPLIER_NAME = #{customerSupplierName,jdbcType=VARCHAR},
-      </if>
-      <if test="sourceArea != null">
-        SOURCE_AREA = #{sourceArea,jdbcType=VARCHAR},
-      </if>
-      <if test="forwardingUnitNo != null">
-        FORWARDING_UNIT_NO = #{forwardingUnitNo,jdbcType=VARCHAR},
-      </if>
-      <if test="forwardingUnitName != null">
-        FORWARDING_UNIT_NAME = #{forwardingUnitName,jdbcType=VARCHAR},
-      </if>
-      <if test="receivingUintNo != null">
-        RECEIVING_UINT_NO = #{receivingUintNo,jdbcType=VARCHAR},
-      </if>
-      <if test="receivingUintName != null">
-        RECEIVING_UINT_NAME = #{receivingUintName,jdbcType=VARCHAR},
-      </if>
-      <if test="materialNo != null">
-        MATERIAL_NO = #{materialNo,jdbcType=VARCHAR},
-      </if>
-      <if test="materialName != null">
-        MATERIAL_NAME = #{materialName,jdbcType=VARCHAR},
-      </if>
-      <if test="specNo != null">
-        SPEC_NO = #{specNo,jdbcType=VARCHAR},
-      </if>
-      <if test="specName != null">
-        SPEC_NAME = #{specName,jdbcType=VARCHAR},
-      </if>
-      <if test="shipmentGrossWeight != null">
-        SHIPMENT_GROSS_WEIGHT = #{shipmentGrossWeight,jdbcType=DECIMAL},
-      </if>
-      <if test="shipmentNetWeight != null">
-        SHIPMENT_NET_WEIGHT = #{shipmentNetWeight,jdbcType=DECIMAL},
-      </if>
-      <if test="shipmentNum != null">
-        SHIPMENT_NUM = #{shipmentNum,jdbcType=DECIMAL},
-      </if>
-      <if test="loadPointNo != null">
-        LOAD_POINT_NO = #{loadPointNo,jdbcType=VARCHAR},
-      </if>
-      <if test="loadPointName != null">
-        LOAD_POINT_NAME = #{loadPointName,jdbcType=VARCHAR},
-      </if>
-      <if test="sampleNo != null">
-        SAMPLE_NO = #{sampleNo,jdbcType=VARCHAR},
-      </if>
-      <if test="sampleVoucher != null">
-        SAMPLE_VOUCHER = #{sampleVoucher,jdbcType=VARCHAR},
-      </if>
-      <if test="carrierUnitNo != null">
-        CARRIER_UNIT_NO = #{carrierUnitNo,jdbcType=VARCHAR},
-      </if>
-      <if test="carrierUnitName != null">
-        CARRIER_UNIT_NAME = #{carrierUnitName,jdbcType=VARCHAR},
-      </if>
-      <if test="predictionType != null">
-        PREDICTION_TYPE = #{predictionType,jdbcType=VARCHAR},
-      </if>
-      <if test="predictionCombination != null">
-        PREDICTION_COMBINATION = #{predictionCombination,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="effectiveStartTime != null">
-        EFFECTIVE_START_TIME = #{effectiveStartTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="effectiveEndTime != null">
-        EFFECTIVE_END_TIME = #{effectiveEndTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="railwayTypeNo != null">
-        RAILWAY_TYPE_NO = #{railwayTypeNo,jdbcType=VARCHAR},
-      </if>
-      <if test="railwayTypeName != null">
-        RAILWAY_TYPE_NAME = #{railwayTypeName,jdbcType=VARCHAR},
-      </if>
-      <if test="memo != null">
-        MEMO = #{memo,jdbcType=VARCHAR},
-      </if>
-      <if test="valueFlag != null">
-        VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="usedTime != null">
-        USED_TIME = #{usedTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="createManNo != null">
-        CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="createManName != null">
-        CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateManNo != null">
-        UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="updateManName != null">
-        UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="deleteManNo != null">
-        DELETE_MAN_NO = #{deleteManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteManName != null">
-        DELETE_MAN_NAME = #{deleteManName,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteTime != null">
-        DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="pValueFlag != null">
-        P_VALUE_FLAG = #{pValueFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="isChemical != null">
-        IS_CHEMICAL = #{isChemical,jdbcType=VARCHAR},
-      </if>
-      <if test="limitWeight != null">
-        LIMIT_WEIGHT = #{limitWeight,jdbcType=DECIMAL},
-      </if>
-      <if test="railwayModelNo != null">
-        RAILWAY_MODEL_NO = #{railwayModelNo,jdbcType=VARCHAR},
-      </if>
-      <if test="railwayModelName != null">
-        RAILWAY_MODEL_NAME = #{railwayModelName,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where PREDICTION_NO = #{predictionNo,jdbcType=VARCHAR}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where PREDICTION_NO = #{predictionNo,jdbcType=VARCHAR}
-  </select>
-  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="where"/>
-    order by  CREATE_TIME desc
-  </select>
-  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="whereLike"/>
-    order by  CREATE_TIME desc
-  </select>
-  <insert id="batchInsert" parameterType="java.util.List">
-    insert into PRE_RAILWAY_SCALE
-    (PREDICTION_NO,
-    NOTICE_NO, RAILWAY_NO, RAILWAY_CARRIAGE_NO,
-    MATTER_NO, MATTER_NAME, CONTRACT_NO,
-    BATCH_NO, CUSTOMER_SUPPLIER_NO,
-    CUSTOMER_SUPPLIER_NAME, SOURCE_AREA,
-    FORWARDING_UNIT_NO, FORWARDING_UNIT_NAME,
-    RECEIVING_UINT_NO, RECEIVING_UINT_NAME,
-    MATERIAL_NO, MATERIAL_NAME, SPEC_NO,
-    SPEC_NAME, SHIPMENT_GROSS_WEIGHT,
-    SHIPMENT_NET_WEIGHT, SHIPMENT_NUM,
-    LOAD_POINT_NO, LOAD_POINT_NAME, SAMPLE_NO,
-    SAMPLE_VOUCHER, CARRIER_UNIT_NO,
-    CARRIER_UNIT_NAME, PREDICTION_TYPE,
-    PREDICTION_COMBINATION, METER_TYPE_NO,
-    METER_TYPE_NAME, EFFECTIVE_START_TIME,
-    EFFECTIVE_END_TIME, RAILWAY_TYPE_NO,
-    RAILWAY_TYPE_NAME, MEMO, VALUE_FLAG,
-    USED_TIME, CREATE_MAN_NO, CREATE_MAN_NAME,
-    CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME,
-    UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME,
-    DELETE_TIME, P_VALUE_FLAG, IS_CHEMICAL,
-    LIMIT_WEIGHT, RAILWAY_MODEL_NO,
-    RAILWAY_MODEL_NAME)
-    ( <foreach collection="list" item="item" separator="union all">
-    select
-    #{item.predictionNo,jdbcType=VARCHAR},
-    #{item.noticeNo,jdbcType=VARCHAR}, #{item.railwayNo,jdbcType=VARCHAR}, #{item.railwayCarriageNo,jdbcType=VARCHAR},
-    #{item.matterNo,jdbcType=VARCHAR}, #{item.matterName,jdbcType=VARCHAR}, #{item.contractNo,jdbcType=VARCHAR},
-    #{item.batchNo,jdbcType=VARCHAR}, #{item.customerSupplierNo,jdbcType=VARCHAR},
-    #{item.customerSupplierName,jdbcType=VARCHAR}, #{item.sourceArea,jdbcType=VARCHAR},
-    #{item.forwardingUnitNo,jdbcType=VARCHAR}, #{item.forwardingUnitName,jdbcType=VARCHAR},
-    #{item.receivingUintNo,jdbcType=VARCHAR}, #{item.receivingUintName,jdbcType=VARCHAR},
-    #{item.materialNo,jdbcType=VARCHAR}, #{item.materialName,jdbcType=VARCHAR}, #{item.specNo,jdbcType=VARCHAR},
-    #{item.specName,jdbcType=VARCHAR}, #{item.shipmentGrossWeight,jdbcType=DECIMAL},
-    #{item.shipmentNetWeight,jdbcType=DECIMAL}, #{item.shipmentNum,jdbcType=DECIMAL},
-    #{item.loadPointNo,jdbcType=VARCHAR}, #{item.loadPointName,jdbcType=VARCHAR}, #{item.sampleNo,jdbcType=VARCHAR},
-    #{item.sampleVoucher,jdbcType=VARCHAR}, #{item.carrierUnitNo,jdbcType=VARCHAR},
-    #{item.carrierUnitName,jdbcType=VARCHAR}, #{item.predictionType,jdbcType=VARCHAR},
-    #{item.predictionCombination,jdbcType=VARCHAR}, #{item.meterTypeNo,jdbcType=VARCHAR},
-    #{item.meterTypeName,jdbcType=VARCHAR}, #{item.effectiveStartTime,jdbcType=TIMESTAMP},
-    #{item.effectiveEndTime,jdbcType=TIMESTAMP}, #{item.railwayTypeNo,jdbcType=VARCHAR},
-    #{item.railwayTypeName,jdbcType=VARCHAR}, #{item.memo,jdbcType=VARCHAR}, #{item.valueFlag,jdbcType=VARCHAR},
-    #{item.usedTime,jdbcType=TIMESTAMP}, #{item.createManNo,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR},
-    #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR},
-    #{item.updateTime,jdbcType=TIMESTAMP}, #{item.deleteManNo,jdbcType=VARCHAR}, #{item.deleteManName,jdbcType=VARCHAR},
-    #{item.deleteTime,jdbcType=TIMESTAMP}, #{item.pValueFlag,jdbcType=VARCHAR}, #{item.isChemical,jdbcType=VARCHAR},
-    #{item.limitWeight,jdbcType=DECIMAL}, #{item.railwayModelNo,jdbcType=VARCHAR},
-    #{item.railwayModelName,jdbcType=VARCHAR} from dual
-  </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-    update PRE_RAILWAY_SCALE
-    set
-    PREDICTION_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.predictionNo,jdbcType=VARCHAR}
-    </foreach>
-    ,NOTICE_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.noticeNo,jdbcType=VARCHAR}
-    </foreach>
-    ,RAILWAY_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.railwayNo,jdbcType=VARCHAR}
-    </foreach>
-    ,RAILWAY_CARRIAGE_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.railwayCarriageNo,jdbcType=VARCHAR}
-    </foreach>
-    ,MATTER_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.matterNo,jdbcType=VARCHAR}
-    </foreach>
-    ,MATTER_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.matterName,jdbcType=VARCHAR}
-    </foreach>
-    ,CONTRACT_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.contractNo,jdbcType=VARCHAR}
-    </foreach>
-    ,BATCH_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.batchNo,jdbcType=VARCHAR}
-    </foreach>
-    ,CUSTOMER_SUPPLIER_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.customerSupplierNo,jdbcType=VARCHAR}
-    </foreach>
-    ,CUSTOMER_SUPPLIER_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.customerSupplierName,jdbcType=VARCHAR}
-    </foreach>
-    ,SOURCE_AREA=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.sourceArea,jdbcType=VARCHAR}
-    </foreach>
-    ,FORWARDING_UNIT_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.forwardingUnitNo,jdbcType=VARCHAR}
-    </foreach>
-    ,FORWARDING_UNIT_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.forwardingUnitName,jdbcType=VARCHAR}
-    </foreach>
-    ,RECEIVING_UINT_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.receivingUintNo,jdbcType=VARCHAR}
-    </foreach>
-    ,RECEIVING_UINT_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.receivingUintName,jdbcType=VARCHAR}
-    </foreach>
-    ,MATERIAL_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.materialNo,jdbcType=VARCHAR}
-    </foreach>
-    ,MATERIAL_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.materialName,jdbcType=VARCHAR}
-    </foreach>
-    ,SPEC_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.specNo,jdbcType=VARCHAR}
-    </foreach>
-    ,SPEC_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.specName,jdbcType=VARCHAR}
-    </foreach>
-    ,SHIPMENT_GROSS_WEIGHT=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.shipmentGrossWeight,jdbcType=DECIMAL}
-    </foreach>
-    ,SHIPMENT_NET_WEIGHT=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.shipmentNetWeight,jdbcType=DECIMAL}
-    </foreach>
-    ,SHIPMENT_NUM=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.shipmentNum,jdbcType=DECIMAL}
-    </foreach>
-    ,LOAD_POINT_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.loadPointNo,jdbcType=VARCHAR}
-    </foreach>
-    ,LOAD_POINT_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.loadPointName,jdbcType=VARCHAR}
-    </foreach>
-    ,SAMPLE_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.sampleNo,jdbcType=VARCHAR}
-    </foreach>
-    ,SAMPLE_VOUCHER=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.sampleVoucher,jdbcType=VARCHAR}
-    </foreach>
-    ,CARRIER_UNIT_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.carrierUnitNo,jdbcType=VARCHAR}
-    </foreach>
-    ,CARRIER_UNIT_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.carrierUnitName,jdbcType=VARCHAR}
-    </foreach>
-    ,PREDICTION_TYPE=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.predictionType,jdbcType=VARCHAR}
-    </foreach>
-    ,PREDICTION_COMBINATION=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.predictionCombination,jdbcType=VARCHAR}
-    </foreach>
-    ,METER_TYPE_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.meterTypeNo,jdbcType=VARCHAR}
-    </foreach>
-    ,METER_TYPE_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.meterTypeName,jdbcType=VARCHAR}
-    </foreach>
-    ,EFFECTIVE_START_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.effectiveStartTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,EFFECTIVE_END_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.effectiveEndTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,RAILWAY_TYPE_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.railwayTypeNo,jdbcType=VARCHAR}
-    </foreach>
-    ,RAILWAY_TYPE_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.railwayTypeName,jdbcType=VARCHAR}
-    </foreach>
-    ,MEMO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
-    </foreach>
-    ,VALUE_FLAG=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.valueFlag,jdbcType=VARCHAR}
-    </foreach>
-    ,USED_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.usedTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,CREATE_MAN_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
-    </foreach>
-    ,CREATE_MAN_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
-    </foreach>
-    ,CREATE_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,UPDATE_MAN_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
-    </foreach>
-    ,UPDATE_MAN_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
-    </foreach>
-    ,UPDATE_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,DELETE_MAN_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.deleteManNo,jdbcType=VARCHAR}
-    </foreach>
-    ,DELETE_MAN_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.deleteManName,jdbcType=VARCHAR}
-    </foreach>
-    ,DELETE_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.deleteTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,P_VALUE_FLAG=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.pValueFlag,jdbcType=VARCHAR}
-    </foreach>
-    ,IS_CHEMICAL=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.isChemical,jdbcType=VARCHAR}
-    </foreach>
-    ,LIMIT_WEIGHT=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.limitWeight,jdbcType=DECIMAL}
-    </foreach>
-    ,RAILWAY_MODEL_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.railwayModelNo,jdbcType=VARCHAR}
-    </foreach>
-    ,RAILWAY_MODEL_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-      when #{item.predictionNo,jdbcType=VARCHAR} then #{item.railwayModelName,jdbcType=VARCHAR}
-    </foreach>
-    where PREDICTION_NO in
-    <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-      #{item.predictionNo,jdbcType=VARCHAR}
-    </foreach>
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from PRE_RAILWAY_SCALE
-    where PREDICTION_NO in
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  <select id="selectForApp"  parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where VALUE_FLAG in ('0','1')
-    <if test="predictionNo != null and predictionNo != ''">
-      and PREDICTION_NO = #{predictionNo}
-    </if>
-    <if test="noticeNo != null and noticeNo != ''">
-      and NOTICE_NO = #{noticeNo}
-    </if>
-    <if test="railwayNo != null and railwayNo != ''">
-      and RAILWAY_NO = #{railwayNo}
-    </if>
-    <if test="railwayCarriageNo != null and railwayCarriageNo != ''">
-      and RAILWAY_CARRIAGE_NO = #{railwayCarriageNo}
-    </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="contractNo != null and contractNo != ''">
-      and CONTRACT_NO = #{contractNo}
-    </if>
-    <if test="batchNo != null and batchNo != ''">
-      and BATCH_NO = #{batchNo}
-    </if>
-    <if test="customerSupplierNo != null and customerSupplierNo != ''">
-      and CUSTOMER_SUPPLIER_NO = #{customerSupplierNo}
-    </if>
-    <if test="customerSupplierName != null and customerSupplierName != ''">
-      and CUSTOMER_SUPPLIER_NAME = #{customerSupplierName}
-    </if>
-    <if test="sourceArea != null and sourceArea != ''">
-      and SOURCE_AREA = #{sourceArea}
-    </if>
-    <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
-      and FORWARDING_UNIT_NO = #{forwardingUnitNo}
-    </if>
-    <if test="forwardingUnitName != null and forwardingUnitName != ''">
-      and FORWARDING_UNIT_NAME = #{forwardingUnitName}
-    </if>
-    <if test="receivingUintNo != null and receivingUintNo != ''">
-      and RECEIVING_UINT_NO = #{receivingUintNo}
-    </if>
-    <if test="receivingUintName != null and receivingUintName != ''">
-      and RECEIVING_UINT_NAME = #{receivingUintName}
-    </if>
-    <if test="materialNo != null and materialNo != ''">
-      and MATERIAL_NO = #{materialNo}
-    </if>
-    <if test="materialName != null and materialName != ''">
-      and MATERIAL_NAME = #{materialName}
-    </if>
-    <if test="specNo != null and specNo != ''">
-      and SPEC_NO = #{specNo}
-    </if>
-    <if test="specName != null and specName != ''">
-      and SPEC_NAME = #{specName}
-    </if>
-    <if test="shipmentGrossWeight != null">
-      and SHIPMENT_GROSS_WEIGHT = #{shipmentGrossWeight}
-    </if>
-    <if test="shipmentNetWeight != null">
-      and SHIPMENT_NET_WEIGHT = #{shipmentNetWeight}
-    </if>
-    <if test="shipmentNum != null">
-      and SHIPMENT_NUM = #{shipmentNum}
-    </if>
-    <if test="loadPointNo != null and loadPointNo != ''">
-      and LOAD_POINT_NO = #{loadPointNo}
-    </if>
-    <if test="loadPointName != null and loadPointName != ''">
-      and LOAD_POINT_NAME = #{loadPointName}
-    </if>
-    <if test="sampleNo != null and sampleNo != ''">
-      and SAMPLE_NO = #{sampleNo}
-    </if>
-    <if test="sampleVoucher != null and sampleVoucher != ''">
-      and SAMPLE_VOUCHER = #{sampleVoucher}
-    </if>
-    <if test="carrierUnitNo != null and carrierUnitNo != ''">
-      and CARRIER_UNIT_NO = #{carrierUnitNo}
-    </if>
-    <if test="carrierUnitName != null and carrierUnitName != ''">
-      and CARRIER_UNIT_NAME = #{carrierUnitName}
-    </if>
-    <if test="predictionType != null and predictionType != ''">
-      and PREDICTION_TYPE = #{predictionType}
-    </if>
-    <if test="predictionCombination != null and predictionCombination != ''">
-      and PREDICTION_COMBINATION = #{predictionCombination}
-    </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="effectiveStartTime != null">
-      and TO_CHAR(EFFECTIVE_START_TIME,'yyyy-MM-dd') = #{effectiveStartTime}
-    </if>
-    <if test="effectiveEndTime != null">
-      and TO_CHAR(EFFECTIVE_END_TIME,'yyyy-MM-dd') = #{effectiveEndTime}
-    </if>
-    <if test="railwayTypeNo != null and railwayTypeNo != ''">
-      and RAILWAY_TYPE_NO = #{railwayTypeNo}
-    </if>
-    <if test="railwayTypeName != null and railwayTypeName != ''">
-      and RAILWAY_TYPE_NAME = #{railwayTypeName}
-    </if>
-    <if test="memo != null and memo != ''">
-      and MEMO = #{memo}
-    </if>
-    <if test="valueFlag != null and valueFlag != ''">
-      and VALUE_FLAG = #{valueFlag}
-    </if>
-    <if test="usedTime != null">
-      and TO_CHAR(USED_TIME,'yyyy-MM-dd') = #{usedTime}
-    </if>
-    <if test="createManNo != null and createManNo != ''">
-      and CREATE_MAN_NO = #{createManNo}
-    </if>
-    <if test="createManName != null and createManName != ''">
-      and CREATE_MAN_NAME = #{createManName}
-    </if>
-    <if test="createTime != null">
-      and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
-    </if>
-    <if test="updateManNo != null and updateManNo != ''">
-      and UPDATE_MAN_NO = #{updateManNo}
-    </if>
-    <if test="updateManName != null and updateManName != ''">
-      and UPDATE_MAN_NAME = #{updateManName}
-    </if>
-    <if test="updateTime != null">
-      and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-    </if>
-    <if test="deleteManNo != null and deleteManNo != ''">
-      and DELETE_MAN_NO = #{deleteManNo}
-    </if>
-    <if test="deleteManName != null and deleteManName != ''">
-      and DELETE_MAN_NAME = #{deleteManName}
-    </if>
-    <if test="deleteTime != null">
-      and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
-    </if>
-    <if test="pValueFlag != null and pValueFlag != ''">
-      and P_VALUE_FLAG = #{pValueFlag}
-    </if>
-    <if test="isChemical != null and isChemical != ''">
-      and IS_CHEMICAL = #{isChemical}
-    </if>
-    <if test="limitWeight != null">
-      and LIMIT_WEIGHT = #{limitWeight}
-    </if>
-    <if test="railwayModelNo != null and railwayModelNo != ''">
-      and RAILWAY_MODEL_NO = #{railwayModelNo}
-    </if>
-    <if test="railwayModelName != null and railwayModelName != ''">
-      and RAILWAY_MODEL_NAME = #{railwayModelName}
-    </if>
-    order by create_time desc
-  </select>
-  <select id="getNewID" parameterType="java.lang.String" resultType="java.lang.String">
-   SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(PREDICTION_NO, LENGTH(PREDICTION_NO) - 3))),0) + 1,4,'0') PREDICTION_NO
-   FROM PRE_RAILWAY_SCALE where instr(PREDICTION_NO,#{afl,jdbcType=VARCHAR})>0
-  </select>
-
-  <select id="selectBy" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <where>
-      VALUE_FLAG in ('1','4') and ROUND(TO_NUMBER(CREATE_TIME - sysdate)) <![CDATA[ <= ]]> 7
-      <if test="railwayNo != null and railwayNo != ''">
-        and RAILWAY_NO = #{railwayNo}
-      </if>
-      <if test="railwayCarriageNo != null and railwayCarriageNo != ''">
-        and RAILWAY_CARRIAGE_NO = #{railwayCarriageNo}
-      </if>
-    </where>
-    order by CREATE_TIME
-  </select>
-
-  <select id="selectByPraAndTime" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-      <where>
-        <if test="valueFlag != null and valueFlag != ''">
-          and VALUE_FLAG = #{valueFlag}
-        </if>
-        <if test="valueFlag == null || valueFlag == ''">
-          and VALUE_FLAG in ('1','4')
-        </if>
-        <if test="predictionNo != null and predictionNo != ''">
-          and PREDICTION_NO = #{predictionNo}
-        </if>
-        <if test="noticeNo != null and noticeNo != ''">
-          and NOTICE_NO = #{noticeNo}
-        </if>
-        <if test="railwayNo != null and railwayNo != ''">
-          and RAILWAY_NO = #{railwayNo}
-        </if>
-        <if test="railwayCarriageNo != null and railwayCarriageNo != ''">
-          and RAILWAY_CARRIAGE_NO = #{railwayCarriageNo}
-        </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="contractNo != null and contractNo != ''">
-          and CONTRACT_NO = #{contractNo}
-        </if>
-        <if test="batchNo != null and batchNo != ''">
-          and BATCH_NO = #{batchNo}
-        </if>
-        <if test="customerSupplierNo != null and customerSupplierNo != ''">
-          and CUSTOMER_SUPPLIER_NO = #{customerSupplierNo}
-        </if>
-        <if test="customerSupplierName != null and customerSupplierName != ''">
-          and CUSTOMER_SUPPLIER_NAME = #{customerSupplierName}
-        </if>
-        <if test="sourceArea != null and sourceArea != ''">
-          and SOURCE_AREA = #{sourceArea}
-        </if>
-        <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
-          and FORWARDING_UNIT_NO = #{forwardingUnitNo}
-        </if>
-        <if test="forwardingUnitName != null and forwardingUnitName != ''">
-          and FORWARDING_UNIT_NAME = #{forwardingUnitName}
-        </if>
-        <if test="receivingUintNo != null and receivingUintNo != ''">
-          and RECEIVING_UINT_NO = #{receivingUintNo}
-        </if>
-        <if test="receivingUintName != null and receivingUintName != ''">
-          and RECEIVING_UINT_NAME = #{receivingUintName}
-        </if>
-        <if test="materialNo != null and materialNo != ''">
-          and MATERIAL_NO = #{materialNo}
-        </if>
-        <if test="materialName != null and materialName != ''">
-          and MATERIAL_NAME = #{materialName}
-        </if>
-        <if test="specNo != null and specNo != ''">
-          and SPEC_NO = #{specNo}
-        </if>
-        <if test="specName != null and specName != ''">
-          and SPEC_NAME = #{specName}
-        </if>
-        <if test="shipmentGrossWeight != null">
-          and SHIPMENT_GROSS_WEIGHT = #{shipmentGrossWeight}
-        </if>
-        <if test="shipmentNetWeight != null">
-          and SHIPMENT_NET_WEIGHT = #{shipmentNetWeight}
-        </if>
-        <if test="shipmentNum != null">
-          and SHIPMENT_NUM = #{shipmentNum}
-        </if>
-        <if test="loadPointNo != null and loadPointNo != ''">
-          and LOAD_POINT_NO = #{loadPointNo}
-        </if>
-        <if test="loadPointName != null and loadPointName != ''">
-          and LOAD_POINT_NAME = #{loadPointName}
-        </if>
-        <if test="sampleNo != null and sampleNo != ''">
-          and SAMPLE_NO = #{sampleNo}
-        </if>
-        <if test="sampleVoucher != null and sampleVoucher != ''">
-          and SAMPLE_VOUCHER = #{sampleVoucher}
-        </if>
-        <if test="carrierUnitNo != null and carrierUnitNo != ''">
-          and CARRIER_UNIT_NO = #{carrierUnitNo}
-        </if>
-        <if test="carrierUnitName != null and carrierUnitName != ''">
-          and CARRIER_UNIT_NAME = #{carrierUnitName}
-        </if>
-        <if test="predictionType != null and predictionType != ''">
-          and PREDICTION_TYPE = #{predictionType}
-        </if>
-        <if test="predictionCombination != null and predictionCombination != ''">
-          and PREDICTION_COMBINATION = #{predictionCombination}
-        </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="effectiveStartTime != null">
-          and TO_CHAR(EFFECTIVE_START_TIME,'yyyy-MM-dd') = #{effectiveStartTime}
-        </if>
-        <if test="effectiveEndTime != null">
-          and TO_CHAR(EFFECTIVE_END_TIME,'yyyy-MM-dd') = #{effectiveEndTime}
-        </if>
-        <if test="railwayTypeNo != null and railwayTypeNo != ''">
-          and RAILWAY_TYPE_NO = #{railwayTypeNo}
-        </if>
-        <if test="railwayTypeName != null and railwayTypeName != ''">
-          and RAILWAY_TYPE_NAME = #{railwayTypeName}
-        </if>
-        <if test="memo != null and memo != ''">
-          and MEMO = #{memo}
-        </if>
-        <if test="usedTime != null">
-          and TO_CHAR(USED_TIME,'yyyy-MM-dd') = #{usedTime}
-        </if>
-        <if test="createManNo != null and createManNo != ''">
-          and CREATE_MAN_NO = #{createManNo}
-        </if>
-        <if test="createManName != null and createManName != ''">
-          and CREATE_MAN_NAME = #{createManName}
-        </if>
-        <if test="createTime != null">
-          and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
-        </if>
-        <if test="updateManNo != null and updateManNo != ''">
-          and UPDATE_MAN_NO = #{updateManNo}
-        </if>
-        <if test="updateManName != null and updateManName != ''">
-          and UPDATE_MAN_NAME = #{updateManName}
-        </if>
-        <if test="updateTime != null">
-          and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-        </if>
-        <if test="deleteManNo != null and deleteManNo != ''">
-          and DELETE_MAN_NO = #{deleteManNo}
-        </if>
-        <if test="deleteManName != null and deleteManName != ''">
-          and DELETE_MAN_NAME = #{deleteManName}
-        </if>
-        <if test="deleteTime != null">
-          and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
-        </if>
-        <if test="pValueFlag != null and pValueFlag != ''">
-          and P_VALUE_FLAG = #{pValueFlag}
-        </if>
-        <if test="isChemical != null and isChemical != ''">
-          and IS_CHEMICAL = #{isChemical}
-        </if>
-        <if test="limitWeight != null">
-          and LIMIT_WEIGHT = #{limitWeight}
-        </if>
-        <if test="railwayModelNo != null and railwayModelNo != ''">
-          and RAILWAY_MODEL_NO = #{railwayModelNo}
-        </if>
-        <if test="railwayModelName != null and railwayModelName != ''">
-          and RAILWAY_MODEL_NAME = #{railwayModelName}
-        </if>
-        <if test="startTime != null">
-        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') >= #{startTime}
-       </if>
-        <if test="endTime != null">
-          and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') <![CDATA[ <= ]]> #{endTime}
-        </if>
-      </where>
-        order by CREATE_TIME desc
-  </select>
-
-  <select id="batchSelect" parameterType="java.util.List" resultMap="BaseResultMap">
-    select from PRE_RAILWAY_SCALE
-    where PREDICTION_NO in
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </select>
-</mapper>

src/main/java/com/steerinfo/appservice/appprerailwayscale/model/AppPreRailwayScale.java

@@ -1,829 +0,0 @@
-package com.steerinfo.appservice.appprerailwayscale.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 AppPreRailwayScale implements IBasePO<String> {
-    /**
-     * 预报编号(PREDICTION_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="预报编号",required=true)
-    private String predictionNo;
-
-    /**
-     * 通知单号(NOTICE_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="通知单号",required=false)
-    private String noticeNo;
-
-    /**
-     * 车号(RAILWAY_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="车号",required=true)
-    private String railwayNo;
-
-    /**
-     * 车厢序号(RAILWAY_CARRIAGE_NO,VARCHAR,2)
-     */
-    @ApiModelProperty(value="车厢序号",required=false)
-    private String railwayCarriageNo;
-
-    /**
-     * 物料编号(MATTER_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="物料编号",required=false)
-    private String matterNo;
-
-    /**
-     * 物料名称(MATTER_NAME,VARCHAR,100)
-     */
-    @ApiModelProperty(value="物料名称",required=false)
-    private String matterName;
-
-    /**
-     * 合同号(CONTRACT_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="合同号",required=false)
-    private String contractNo;
-
-    /**
-     * 批次号(BATCH_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="批次号",required=false)
-    private String batchNo;
-
-    /**
-     * 供应商编号(CUSTOMER_SUPPLIER_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="供应商编号",required=false)
-    private String customerSupplierNo;
-
-    /**
-     * 供应商名称(CUSTOMER_SUPPLIER_NAME,VARCHAR,100)
-     */
-    @ApiModelProperty(value="供应商名称",required=false)
-    private String customerSupplierName;
-
-    /**
-     * 原产地(SOURCE_AREA,VARCHAR,50)
-     */
-    @ApiModelProperty(value="原产地",required=false)
-    private String sourceArea;
-
-    /**
-     * 发货单位编号(FORWARDING_UNIT_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="发货单位编号",required=false)
-    private String forwardingUnitNo;
-
-    /**
-     * 发货单位名称(FORWARDING_UNIT_NAME,VARCHAR,100)
-     */
-    @ApiModelProperty(value="发货单位名称",required=false)
-    private String forwardingUnitName;
-
-    /**
-     * 收货单位编号(RECEIVING_UINT_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="收货单位编号",required=false)
-    private String receivingUintNo;
-
-    /**
-     * 收货单位名称(RECEIVING_UINT_NAME,VARCHAR,100)
-     */
-    @ApiModelProperty(value="收货单位名称",required=false)
-    private String receivingUintName;
-
-    /**
-     * 材质编号(MATERIAL_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="材质编号",required=false)
-    private String materialNo;
-
-    /**
-     * 材质名称(MATERIAL_NAME,VARCHAR,100)
-     */
-    @ApiModelProperty(value="材质名称",required=false)
-    private String materialName;
-
-    /**
-     * 规格编号(SPEC_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="规格编号",required=false)
-    private String specNo;
-
-    /**
-     * 规格名称(SPEC_NAME,VARCHAR,100)
-     */
-    @ApiModelProperty(value="规格名称",required=false)
-    private String specName;
-
-    /**
-     * 发运毛重(SHIPMENT_GROSS_WEIGHT,DECIMAL,10)
-     */
-    @ApiModelProperty(value="发运毛重",required=false)
-    private BigDecimal shipmentGrossWeight;
-
-    /**
-     * 发运净重(SHIPMENT_NET_WEIGHT,DECIMAL,10)
-     */
-    @ApiModelProperty(value="发运净重",required=false)
-    private BigDecimal shipmentNetWeight;
-
-    /**
-     * 发运数量(SHIPMENT_NUM,DECIMAL,5)
-     */
-    @ApiModelProperty(value="发运数量",required=false)
-    private Integer shipmentNum;
-
-    /**
-     * 卸货地点编号(LOAD_POINT_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="卸货地点编号",required=false)
-    private String loadPointNo;
-
-    /**
-     * 卸货地点名称(LOAD_POINT_NAME,VARCHAR,60)
-     */
-    @ApiModelProperty(value="卸货地点名称",required=false)
-    private String loadPointName;
-
-    /**
-     * 取样编号(SAMPLE_NO,VARCHAR,40)
-     */
-    @ApiModelProperty(value="取样编号",required=false)
-    private String sampleNo;
-
-    /**
-     * 取样凭证(SAMPLE_VOUCHER,VARCHAR,40)
-     */
-    @ApiModelProperty(value="取样凭证",required=false)
-    private String sampleVoucher;
-
-    /**
-     * 承运单位编号(CARRIER_UNIT_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="承运单位编号",required=false)
-    private String carrierUnitNo;
-
-    /**
-     * 承运单位名称(CARRIER_UNIT_NAME,VARCHAR,100)
-     */
-    @ApiModelProperty(value="承运单位名称",required=false)
-    private String carrierUnitName;
-
-    /**
-     * 预报类型(PREDICTION_TYPE,VARCHAR,1)
-     */
-    @ApiModelProperty(value="预报类型",required=false)
-    private String predictionType;
-
-    /**
-     * 预报组合(PREDICTION_COMBINATION,VARCHAR,100)
-     */
-    @ApiModelProperty(value="预报组合",required=false)
-    private String predictionCombination;
-
-    /**
-     * 计量类型编号(METER_TYPE_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="计量类型编号",required=true)
-    private String meterTypeNo;
-
-    /**
-     * 计量类型名称(METER_TYPE_NAME,VARCHAR,30)
-     */
-    @ApiModelProperty(value="计量类型名称",required=true)
-    private String meterTypeName;
-
-    /**
-     * 有效开始时间(EFFECTIVE_START_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="有效开始时间",required=false)
-    private Date effectiveStartTime;
-
-    /**
-     * 有效结束时间(EFFECTIVE_END_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="有效结束时间",required=false)
-    private Date effectiveEndTime;
-
-    /**
-     * 轨道衡类型编号(RAILWAY_TYPE_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="轨道衡类型编号",required=true)
-    private String railwayTypeNo;
-
-    /**
-     * 轨道衡类型名称(RAILWAY_TYPE_NAME,VARCHAR,30)
-     */
-    @ApiModelProperty(value="轨道衡类型名称",required=true)
-    private String railwayTypeName;
-
-    /**
-     * 备注(MEMO,VARCHAR,200)
-     */
-    @ApiModelProperty(value="备注",required=false)
-    private String memo;
-
-    /**
-     * 状态(VALUE_FLAG,VARCHAR,1)
-     */
-    @ApiModelProperty(value="状态",required=true)
-    private String valueFlag;
-
-    /**
-     * 使用时间(USED_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="使用时间",required=false)
-    private Date usedTime;
-
-    /**
-     * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="创建人编号",required=true)
-    private String createManNo;
-
-    /**
-     * 创建人姓名(CREATE_MAN_NAME,VARCHAR,30)
-     */
-    @ApiModelProperty(value="创建人姓名",required=true)
-    private String createManName;
-
-    /**
-     * 创建时间(CREATE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="创建时间",required=true)
-    private Date createTime;
-
-    /**
-     * 修改人编号(UPDATE_MAN_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="修改人编号",required=false)
-    private String updateManNo;
-
-    /**
-     * 修改人姓名(UPDATE_MAN_NAME,VARCHAR,30)
-     */
-    @ApiModelProperty(value="修改人姓名",required=false)
-    private String updateManName;
-
-    /**
-     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="修改时间",required=false)
-    private Date updateTime;
-
-    /**
-     * 删除人编号(DELETE_MAN_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="删除人编号",required=false)
-    private String deleteManNo;
-
-    /**
-     * 删除人姓名(DELETE_MAN_NAME,VARCHAR,30)
-     */
-    @ApiModelProperty(value="删除人姓名",required=false)
-    private String deleteManName;
-
-    /**
-     * 删除时间(DELETE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="删除时间",required=false)
-    private Date deleteTime;
-
-    /**
-     * 前状态(P_VALUE_FLAG,VARCHAR,1)
-     */
-    @ApiModelProperty(value="前状态",required=false)
-    private String pValueFlag;
-
-    /**
-     * 是否危化品(IS_CHEMICAL,VARCHAR,1)
-     */
-    @ApiModelProperty(value="是否危化品",required=false)
-    private String isChemical;
-
-    /**
-     * 限载重量(LIMIT_WEIGHT,DECIMAL,10)
-     */
-    @ApiModelProperty(value="限载重量",required=false)
-    private BigDecimal limitWeight;
-
-    /**
-     * 车型编号(RAILWAY_MODEL_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="车型编号",required=false)
-    private String railwayModelNo;
-
-    /**
-     * 车型名称(RAILWAY_MODEL_NAME,VARCHAR,40)
-     */
-    @ApiModelProperty(value="车型名称",required=false)
-    private String railwayModelName;
-
-    private static final long serialVersionUID = 1L;
-
-    @Override
-    public String getId() {
-        return this.predictionNo;
-    }
-
-    @Override
-    public void setId(String predictionNo) {
-        this.predictionNo = predictionNo == null ? null : predictionNo.trim();
-    }
-
-    public String getPredictionNo() {
-        return predictionNo;
-    }
-
-    public void setPredictionNo(String predictionNo) {
-        this.predictionNo = predictionNo == null ? null : predictionNo.trim();
-    }
-
-    public String getNoticeNo() {
-        return noticeNo;
-    }
-
-    public void setNoticeNo(String noticeNo) {
-        this.noticeNo = noticeNo == null ? null : noticeNo.trim();
-    }
-
-    public String getRailwayNo() {
-        return railwayNo;
-    }
-
-    public void setRailwayNo(String railwayNo) {
-        this.railwayNo = railwayNo == null ? null : railwayNo.trim();
-    }
-
-    public String getRailwayCarriageNo() {
-        return railwayCarriageNo;
-    }
-
-    public void setRailwayCarriageNo(String railwayCarriageNo) {
-        this.railwayCarriageNo = railwayCarriageNo == null ? null : railwayCarriageNo.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 getContractNo() {
-        return contractNo;
-    }
-
-    public void setContractNo(String contractNo) {
-        this.contractNo = contractNo == null ? null : contractNo.trim();
-    }
-
-    public String getBatchNo() {
-        return batchNo;
-    }
-
-    public void setBatchNo(String batchNo) {
-        this.batchNo = batchNo == null ? null : batchNo.trim();
-    }
-
-    public String getCustomerSupplierNo() {
-        return customerSupplierNo;
-    }
-
-    public void setCustomerSupplierNo(String customerSupplierNo) {
-        this.customerSupplierNo = customerSupplierNo == null ? null : customerSupplierNo.trim();
-    }
-
-    public String getCustomerSupplierName() {
-        return customerSupplierName;
-    }
-
-    public void setCustomerSupplierName(String customerSupplierName) {
-        this.customerSupplierName = customerSupplierName == null ? null : customerSupplierName.trim();
-    }
-
-    public String getSourceArea() {
-        return sourceArea;
-    }
-
-    public void setSourceArea(String sourceArea) {
-        this.sourceArea = sourceArea == null ? null : sourceArea.trim();
-    }
-
-    public String getForwardingUnitNo() {
-        return forwardingUnitNo;
-    }
-
-    public void setForwardingUnitNo(String forwardingUnitNo) {
-        this.forwardingUnitNo = forwardingUnitNo == null ? null : forwardingUnitNo.trim();
-    }
-
-    public String getForwardingUnitName() {
-        return forwardingUnitName;
-    }
-
-    public void setForwardingUnitName(String forwardingUnitName) {
-        this.forwardingUnitName = forwardingUnitName == null ? null : forwardingUnitName.trim();
-    }
-
-    public String getReceivingUintNo() {
-        return receivingUintNo;
-    }
-
-    public void setReceivingUintNo(String receivingUintNo) {
-        this.receivingUintNo = receivingUintNo == null ? null : receivingUintNo.trim();
-    }
-
-    public String getReceivingUintName() {
-        return receivingUintName;
-    }
-
-    public void setReceivingUintName(String receivingUintName) {
-        this.receivingUintName = receivingUintName == null ? null : receivingUintName.trim();
-    }
-
-    public String getMaterialNo() {
-        return materialNo;
-    }
-
-    public void setMaterialNo(String materialNo) {
-        this.materialNo = materialNo == null ? null : materialNo.trim();
-    }
-
-    public String getMaterialName() {
-        return materialName;
-    }
-
-    public void setMaterialName(String materialName) {
-        this.materialName = materialName == null ? null : materialName.trim();
-    }
-
-    public String getSpecNo() {
-        return specNo;
-    }
-
-    public void setSpecNo(String specNo) {
-        this.specNo = specNo == null ? null : specNo.trim();
-    }
-
-    public String getSpecName() {
-        return specName;
-    }
-
-    public void setSpecName(String specName) {
-        this.specName = specName == null ? null : specName.trim();
-    }
-
-    public BigDecimal getShipmentGrossWeight() {
-        return shipmentGrossWeight;
-    }
-
-    public void setShipmentGrossWeight(BigDecimal shipmentGrossWeight) {
-        this.shipmentGrossWeight = shipmentGrossWeight;
-    }
-
-    public BigDecimal getShipmentNetWeight() {
-        return shipmentNetWeight;
-    }
-
-    public void setShipmentNetWeight(BigDecimal shipmentNetWeight) {
-        this.shipmentNetWeight = shipmentNetWeight;
-    }
-
-    public Integer getShipmentNum() {
-        return shipmentNum;
-    }
-
-    public void setShipmentNum(Integer shipmentNum) {
-        this.shipmentNum = shipmentNum;
-    }
-
-    public String getLoadPointNo() {
-        return loadPointNo;
-    }
-
-    public void setLoadPointNo(String loadPointNo) {
-        this.loadPointNo = loadPointNo == null ? null : loadPointNo.trim();
-    }
-
-    public String getLoadPointName() {
-        return loadPointName;
-    }
-
-    public void setLoadPointName(String loadPointName) {
-        this.loadPointName = loadPointName == null ? null : loadPointName.trim();
-    }
-
-    public String getSampleNo() {
-        return sampleNo;
-    }
-
-    public void setSampleNo(String sampleNo) {
-        this.sampleNo = sampleNo == null ? null : sampleNo.trim();
-    }
-
-    public String getSampleVoucher() {
-        return sampleVoucher;
-    }
-
-    public void setSampleVoucher(String sampleVoucher) {
-        this.sampleVoucher = sampleVoucher == null ? null : sampleVoucher.trim();
-    }
-
-    public String getCarrierUnitNo() {
-        return carrierUnitNo;
-    }
-
-    public void setCarrierUnitNo(String carrierUnitNo) {
-        this.carrierUnitNo = carrierUnitNo == null ? null : carrierUnitNo.trim();
-    }
-
-    public String getCarrierUnitName() {
-        return carrierUnitName;
-    }
-
-    public void setCarrierUnitName(String carrierUnitName) {
-        this.carrierUnitName = carrierUnitName == null ? null : carrierUnitName.trim();
-    }
-
-    public String getPredictionType() {
-        return predictionType;
-    }
-
-    public void setPredictionType(String predictionType) {
-        this.predictionType = predictionType == null ? null : predictionType.trim();
-    }
-
-    public String getPredictionCombination() {
-        return predictionCombination;
-    }
-
-    public void setPredictionCombination(String predictionCombination) {
-        this.predictionCombination = predictionCombination == null ? null : predictionCombination.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 Date getEffectiveStartTime() {
-        return effectiveStartTime;
-    }
-
-    public void setEffectiveStartTime(Date effectiveStartTime) {
-        this.effectiveStartTime = effectiveStartTime;
-    }
-
-    public Date getEffectiveEndTime() {
-        return effectiveEndTime;
-    }
-
-    public void setEffectiveEndTime(Date effectiveEndTime) {
-        this.effectiveEndTime = effectiveEndTime;
-    }
-
-    public String getRailwayTypeNo() {
-        return railwayTypeNo;
-    }
-
-    public void setRailwayTypeNo(String railwayTypeNo) {
-        this.railwayTypeNo = railwayTypeNo == null ? null : railwayTypeNo.trim();
-    }
-
-    public String getRailwayTypeName() {
-        return railwayTypeName;
-    }
-
-    public void setRailwayTypeName(String railwayTypeName) {
-        this.railwayTypeName = railwayTypeName == null ? null : railwayTypeName.trim();
-    }
-
-    public String 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 Date getUsedTime() {
-        return usedTime;
-    }
-
-    public void setUsedTime(Date usedTime) {
-        this.usedTime = usedTime;
-    }
-
-    public String getCreateManNo() {
-        return createManNo;
-    }
-
-    public void setCreateManNo(String createManNo) {
-        this.createManNo = createManNo == null ? null : createManNo.trim();
-    }
-
-    public String getCreateManName() {
-        return createManName;
-    }
-
-    public void setCreateManName(String createManName) {
-        this.createManName = createManName == null ? null : createManName.trim();
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getUpdateManNo() {
-        return updateManNo;
-    }
-
-    public void setUpdateManNo(String updateManNo) {
-        this.updateManNo = updateManNo == null ? null : updateManNo.trim();
-    }
-
-    public String getUpdateManName() {
-        return updateManName;
-    }
-
-    public void setUpdateManName(String updateManName) {
-        this.updateManName = updateManName == null ? null : updateManName.trim();
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getDeleteManNo() {
-        return deleteManNo;
-    }
-
-    public void setDeleteManNo(String deleteManNo) {
-        this.deleteManNo = deleteManNo == null ? null : deleteManNo.trim();
-    }
-
-    public String getDeleteManName() {
-        return deleteManName;
-    }
-
-    public void setDeleteManName(String deleteManName) {
-        this.deleteManName = deleteManName == null ? null : deleteManName.trim();
-    }
-
-    public Date getDeleteTime() {
-        return deleteTime;
-    }
-
-    public void setDeleteTime(Date deleteTime) {
-        this.deleteTime = deleteTime;
-    }
-
-    public String getpValueFlag() {
-        return pValueFlag;
-    }
-
-    public void setpValueFlag(String pValueFlag) {
-        this.pValueFlag = pValueFlag == null ? null : pValueFlag.trim();
-    }
-
-    public String getIsChemical() {
-        return isChemical;
-    }
-
-    public void setIsChemical(String isChemical) {
-        this.isChemical = isChemical == null ? null : isChemical.trim();
-    }
-
-    public BigDecimal getLimitWeight() {
-        return limitWeight;
-    }
-
-    public void setLimitWeight(BigDecimal limitWeight) {
-        this.limitWeight = limitWeight;
-    }
-
-    public String getRailwayModelNo() {
-        return railwayModelNo;
-    }
-
-    public void setRailwayModelNo(String railwayModelNo) {
-        this.railwayModelNo = railwayModelNo == null ? null : railwayModelNo.trim();
-    }
-
-    public String getRailwayModelName() {
-        return railwayModelName;
-    }
-
-    public void setRailwayModelName(String railwayModelName) {
-        this.railwayModelName = railwayModelName == null ? null : railwayModelName.trim();
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", predictionNo=").append(predictionNo);
-        sb.append(", noticeNo=").append(noticeNo);
-        sb.append(", railwayNo=").append(railwayNo);
-        sb.append(", railwayCarriageNo=").append(railwayCarriageNo);
-        sb.append(", matterNo=").append(matterNo);
-        sb.append(", matterName=").append(matterName);
-        sb.append(", contractNo=").append(contractNo);
-        sb.append(", batchNo=").append(batchNo);
-        sb.append(", customerSupplierNo=").append(customerSupplierNo);
-        sb.append(", customerSupplierName=").append(customerSupplierName);
-        sb.append(", sourceArea=").append(sourceArea);
-        sb.append(", forwardingUnitNo=").append(forwardingUnitNo);
-        sb.append(", forwardingUnitName=").append(forwardingUnitName);
-        sb.append(", receivingUintNo=").append(receivingUintNo);
-        sb.append(", receivingUintName=").append(receivingUintName);
-        sb.append(", materialNo=").append(materialNo);
-        sb.append(", materialName=").append(materialName);
-        sb.append(", specNo=").append(specNo);
-        sb.append(", specName=").append(specName);
-        sb.append(", shipmentGrossWeight=").append(shipmentGrossWeight);
-        sb.append(", shipmentNetWeight=").append(shipmentNetWeight);
-        sb.append(", shipmentNum=").append(shipmentNum);
-        sb.append(", loadPointNo=").append(loadPointNo);
-        sb.append(", loadPointName=").append(loadPointName);
-        sb.append(", sampleNo=").append(sampleNo);
-        sb.append(", sampleVoucher=").append(sampleVoucher);
-        sb.append(", carrierUnitNo=").append(carrierUnitNo);
-        sb.append(", carrierUnitName=").append(carrierUnitName);
-        sb.append(", predictionType=").append(predictionType);
-        sb.append(", predictionCombination=").append(predictionCombination);
-        sb.append(", meterTypeNo=").append(meterTypeNo);
-        sb.append(", meterTypeName=").append(meterTypeName);
-        sb.append(", effectiveStartTime=").append(effectiveStartTime);
-        sb.append(", effectiveEndTime=").append(effectiveEndTime);
-        sb.append(", railwayTypeNo=").append(railwayTypeNo);
-        sb.append(", railwayTypeName=").append(railwayTypeName);
-        sb.append(", memo=").append(memo);
-        sb.append(", valueFlag=").append(valueFlag);
-        sb.append(", usedTime=").append(usedTime);
-        sb.append(", createManNo=").append(createManNo);
-        sb.append(", createManName=").append(createManName);
-        sb.append(", createTime=").append(createTime);
-        sb.append(", updateManNo=").append(updateManNo);
-        sb.append(", updateManName=").append(updateManName);
-        sb.append(", updateTime=").append(updateTime);
-        sb.append(", deleteManNo=").append(deleteManNo);
-        sb.append(", deleteManName=").append(deleteManName);
-        sb.append(", deleteTime=").append(deleteTime);
-        sb.append(", pValueFlag=").append(pValueFlag);
-        sb.append(", isChemical=").append(isChemical);
-        sb.append(", limitWeight=").append(limitWeight);
-        sb.append(", railwayModelNo=").append(railwayModelNo);
-        sb.append(", railwayModelName=").append(railwayModelName);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}

src/main/java/com/steerinfo/appservice/appprerailwayscale/service/IAppPreRailwayScaleService.java

@@ -1,31 +0,0 @@
-package com.steerinfo.appservice.appprerailwayscale.service;
-
-import com.steerinfo.appservice.appprerailwayscale.model.AppPreRailwayScale;
-import com.steerinfo.framework.service.IBaseService;
-import com.steerinfo.framework.service.pagehelper.PageList;
-
-import java.util.HashMap;
-
-/**
- * PreRailwayScale服务接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2020-10-21 09:55
- * 类描述
- * 修订历史：
- * 日期：2020-10-21
- * 作者：generator
- * 参考：
- * 描述：PreRailwayScale服务接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-public interface IAppPreRailwayScaleService extends IBaseService<AppPreRailwayScale, String>{
-    String checkandadd(AppPreRailwayScale model);
-
-    PageList<AppPreRailwayScale> queryForApp(HashMap parmas, Integer pageNum, Integer pageSize);
-
-    String approval(AppPreRailwayScale model);
-
-    String uncheck(AppPreRailwayScale model);
-
-}

src/main/java/com/steerinfo/appservice/appprerailwayscale/service/impl/AppPreRailwayScaleServiceImpl.java

@@ -1,155 +0,0 @@
-package com.steerinfo.appservice.appprerailwayscale.service.impl;
-
-import com.steerinfo.appservice.appprerailwayscale.mapper.AppPreRailwayScaleMapper;
-import com.steerinfo.appservice.appprerailwayscale.model.AppPreRailwayScale;
-import com.steerinfo.appservice.appprerailwayscale.service.IAppPreRailwayScaleService;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
-import com.steerinfo.framework.service.pagehelper.PageHelper;
-import com.steerinfo.framework.service.pagehelper.PageList;
-import com.steerinfo.meterwork.except.MarkerMetException;
-import com.steerinfo.util.StringUtils;
-import org.springframework.context.annotation.Primary;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * PreRailwayScale服务实现：
- * @author generator
- * @version 1.0-SNAPSHORT 2020-10-21 09:55
- * 类描述
- * 修订历史：
- * 日期：2020-10-21
- * 作者：generator
- * 参考：
- * 描述：PreRailwayScale服务实现
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@Service(value = "appPreRailwayScaleService")
-@Primary
-public class AppPreRailwayScaleServiceImpl extends BaseServiceImpl<AppPreRailwayScale, String> implements IAppPreRailwayScaleService {
-
-    @Resource
-    private AppPreRailwayScaleMapper appPreRailwayScaleMapper;
-
-    @Override
-    protected IBaseMapper<AppPreRailwayScale, String> getMapper() {
-        return appPreRailwayScaleMapper;
-    }
-
-    @Override
-    public PageList<AppPreRailwayScale> queryForApp(HashMap parmas, Integer pageNum, Integer pageSize){
-        PageHelper.startPage(pageNum, pageSize);
-        List<AppPreRailwayScale> rows = appPreRailwayScaleMapper.selectForApp(parmas);
-        PageList pageInfo = new PageList(rows);
-        return pageInfo;
-    }
-
-    @Override
-    @Transactional
-    public String approval(AppPreRailwayScale model){
-        if(model == null){
-            throw  new MarkerMetException(500,"参数为空!!");
-        }
-        if (!model.getValueFlag().equals("0")) {
-            throw  new MarkerMetException(500,"该状态不允许审核!!");
-        }
-        AppPreRailwayScale aprs = new AppPreRailwayScale();
-        aprs.setPredictionNo(model.getPredictionNo());
-        aprs.setValueFlag("1");//未使用
-        aprs.setCreateTime(new Date());
-        appPreRailwayScaleMapper.updateByPrimaryKeySelective(aprs);
-        return aprs.getPredictionNo();
-    }
-
-    @Transactional
-    @Override
-    public String uncheck(AppPreRailwayScale model){
-        if(model == null){
-            throw  new MarkerMetException(500,"参数为空!!");
-        }
-        if (!model.getValueFlag().equals("1")) {
-            throw  new MarkerMetException(500,"该状态不允许反审!!");
-        }
-        AppPreRailwayScale aprs = new AppPreRailwayScale();
-        aprs.setPredictionNo(model.getPredictionNo());
-        aprs.setValueFlag("0");//未确定
-        aprs.setCreateTime(new Date());
-        appPreRailwayScaleMapper.updateByPrimaryKeySelective(aprs);
-        return aprs.getPredictionNo();
-    }
-
-    @Override
-    @Transactional(rollbackFor=Exception.class)
-    public String checkandadd(AppPreRailwayScale model)
-    {
-        if(model == null) {
-            throw  new MarkerMetException(500,"参数为空!!");
-        }
-        /*
-        String [] nos = model.getRailwayCarriageNo().split(",");
-        int start = Integer.parseInt(nos[0]);
-        int end = Integer.parseInt(nos[1]);
-        //若开始大于结束，调整位置
-        if (start > end){
-           int a = end;
-           end = start;
-           start = a;
-        }
-        for (int i = start;i <= end; i++){
-            model.setPredictionType("1");//单次预报
-            model.setRailwayTypeNo("001019002");
-            model.setRailwayTypeName("动态轨道衡");
-            model.setValueFlag("0");//未配车，未确认
-            model.setRailwayCarriageNo(Integer.toString(i));
-            check(model);
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-            String afl = sdf.format(model.getCreateTime());
-            String no =appPreRailwayScaleMapper.getNewID(afl);
-            model.setPredictionNo(afl+no);
-            appPreRailwayScaleMapper.insertSelective(model);
-        }
-        */
-        model.setPredictionType("1");//单次预报
-        model.setRailwayTypeNo("001019002");
-        model.setRailwayTypeName("动态轨道衡");
-        model.setValueFlag("0");//未配车，未确认
-        model.setRailwayCarriageNo(model.getRailwayCarriageNo());
-        check(model);
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-        String afl = sdf.format(model.getCreateTime());
-        String no =appPreRailwayScaleMapper.getNewID(afl);
-        model.setPredictionNo("T"+afl+no);
-        appPreRailwayScaleMapper.insertSelective(model);
-        return  model.getPredictionNo();
-    }
-
-    //检查数据是否符合要求
-    private void check (AppPreRailwayScale model)throws MarkerMetException
-    {
-        if(model.getMeterTypeNo() == null || model.getMeterTypeNo().equals("")) {
-            throw  new MarkerMetException(500,"业务类型编号为空!!");
-        }
-        if(model.getMeterTypeName() == null || model.getMeterTypeName().equals("")) {
-            throw  new MarkerMetException(500,"业务类型名称为空!!");
-        }
-        if(model.getRailwayTypeNo() == null || model.getRailwayTypeNo().equals("")) {
-            throw  new MarkerMetException(500,"轨道衡类型编号为空!!");
-        }
-        if(model.getRailwayTypeName() == null || model.getRailwayTypeName().equals("")) {
-            throw  new MarkerMetException(500,"轨道衡类型名称为空!!");
-        }
-        if(StringUtils.isEmpty(model.getPredictionNo())){
-            model.setValueFlag("0");//未配车，未确认
-            model.setCreateTime(new Date());
-        }
-    }
-
-}

src/main/java/com/steerinfo/appservice/apppretrackscale/controller/AppPreTrackScaleController.java

@@ -1,251 +0,0 @@
-package com.steerinfo.appservice.apppretrackscale.controller;
-
-import com.steerinfo.appservice.apppretrackscale.model.AppPreTrackScale;
-import com.steerinfo.appservice.apppretrackscale.service.IAppPreTrackScaleService;
-import com.steerinfo.appservice.dto.AppPreTrackScaleDto;
-import com.steerinfo.feign.DilFeign;
-import com.steerinfo.framework.controller.BaseRESTfulController;
-import com.steerinfo.framework.controller.RESTfulResult;
-import com.steerinfo.framework.service.pagehelper.PageList;
-import com.steerinfo.meterwork.except.MarkerMetException;
-import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
-import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
-import com.steerinfo.pretrack.pretracknotice.model.PreTrackNotice;
-import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
-import com.steerinfo.pretrack.pretrackscale.service.IPreTrackScaleService;
-import com.steerinfo.util.AESUtil;
-import com.steerinfo.util.FieldsCollector;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * PreTrackScale RESTful接口：
- *
- * @author generator
- * @version 1.0-SNAPSHORT 2020-10-20 09:26
- * 类描述
- * 修订历史：
- * 日期：2020-10-20
- * 作者：generator
- * 参考：
- * 描述：PreTrackScale RESTful接口
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- * @see null
- */
-@RestController
-@RequestMapping("/${api.version}/appservice/pretrackscales")
-public class AppPreTrackScaleController extends BaseRESTfulController {
-
-    @Autowired
-    IAppPreTrackScaleService apppreTrackScaleService;
-
-    @Autowired
-    IPreTrackScaleService preTrackScaleService;
-
-    @Autowired
-    DilFeign dilFeignService;
-
-    @ApiOperation(value = "App端获取预报信息", notes = "通过供应商获取预报信息")
-    @GetMapping(value = "/doQueryApp")
-    public RESTfulResult doQueryApp(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
-        try {
-            PageList<AppPreTrackScale> list = apppreTrackScaleService.doQueryApp(parmas, pageNum, pageSize);
-            return success(list);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new MarkerMetException(500, "操作异常！！");
-        }
-    }
-
-    @ApiOperation(value = "App端获取预报信息", notes = "通过车号获取预报信息")
-    @GetMapping(value = "/doQueryAppByCar")
-    public RESTfulResult doQueryAppByCar(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
-        try {
-            PageList<AppPreTrackScale> list = apppreTrackScaleService.doQueryAppByCar(parmas, pageNum, pageSize);
-            return success(list);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new MarkerMetException(500, "操作异常！！");
-        }
-    }
-
-    @ApiOperation(value = "二维码扫码解密", notes = "通过车号获取预报信息")
-    @PostMapping(value = "scanAndDecrypt")
-    public RESTfulResult scanAndDecrypt(@RequestBody String str) {
-        try {
-            RESTfulResult rm = success();
-            String deStr = AESUtil.decrypt(str, "abcdefghijklmnop", "0000000000000000");
-            String[] strs = deStr.split(",");
-            if (strs[2].equals("1")) {
-                MeterWorkCarActualFirst model = apppreTrackScaleService.scanAndDecryptFrist(strs[0], strs[1]);
-                rm.setCode("200");
-                rm.setMessage("1");
-                rm.setData(model);
-            }
-            if (strs[2].equals("2")) {
-                MeterWorkCarActual model = apppreTrackScaleService.scanAndDecryptActual(strs[0], strs[1]);
-                rm.setCode("200");
-                rm.setMessage("2");
-                rm.setData(model);
-            }
-            return rm;
-        } catch (Exception e) {
-            return failed(500, "操作异常，请确认");
-        }
-    }
-
-
-    @ApiOperation(value = "新增数据", notes = "根据PreTrackScale对象创建")
-    @PostMapping(value = "/add")
-    public RESTfulResult addByNotice(@RequestBody PreTrackScale model) {
-        RESTfulResult rm = failed();
-        try {
-            PreTrackScale pts = apppreTrackScaleService.addByNotice(model);
-            if (pts != null) {
-                return success(pts);
-            } else {
-                return failed("新增失败");
-            }
-        } catch (MarkerMetException e) {
-            e.printStackTrace();
-            rm.setMessage(e.getMessage());
-        } catch (Exception e) {
-            e.printStackTrace();
-            rm.setMessage("操作异常，请确认！");
-        } finally {
-
-        }
-        return rm;
-    }
-
-
-    @ApiOperation(value = "通过接口新增计量预报", notes = "根据AppPreTrackScaleDto对象创建")
-    @PostMapping(value = "/addFroInterface")
-    public RESTfulResult addFroInterface(@RequestBody AppPreTrackScaleDto model) {
-        RESTfulResult rm = failed();
-        try {
-            PreTrackScale pts;
-            model = apppreTrackScaleService.addBaseFroInterface(model);
-            pts = apppreTrackScaleService.addFroInterface(model);
-//            dilFeignService.delWaybillAndPlanByPreTrackScale(FieldsCollector.beanToMap(model));
-            if (pts != null) {
-                return success(pts);
-            } else {
-                return failed("新增失败");
-            }
-        } catch (MarkerMetException e) {
-            e.printStackTrace();
-            rm.setMessage(e.getMessage());
-        } catch (Exception e) {
-            e.printStackTrace();
-            rm.setMessage("操作异常，请确认！");
-            rm.setFailedMessage(e.getMessage());
-        } finally {
-
-        }
-        return rm;
-    }
-
-    @ApiOperation(value = "App端预约配车", notes = "分页查询")
-    @PostMapping(value = "/allocationApp", produces = "application/json;charset=UTF-8")
-    public RESTfulResult allocationApp(@RequestBody PreTrackScale model) {
-        RESTfulResult rm = failed();
-        try {
-            PreTrackScale pts = apppreTrackScaleService.allocationApp(model);
-            return success(pts);
-        } catch (MarkerMetException e) {
-            e.printStackTrace();
-            rm.setMessage(e.getMessage());
-        } catch (Exception e) {
-            e.printStackTrace();
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return failed(null, "操作异常，请确认！");
-        }
-        return rm;
-    }
-
-    @ApiOperation(value = "App端获取合同信息", notes = "通过供应商获取预报信息")
-    @GetMapping(value = "/doQueryNoticeApp")
-    public RESTfulResult doQueryNoticeApp(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
-        PageList<PreTrackNotice> list = apppreTrackScaleService.doQueryNoticeApp(parmas, pageNum, pageSize);
-        return success(list);
-    }
-
-    @ApiOperation(value = "停用数据", notes = "根据PreTrackScale对象停用")
-    @ApiImplicitParam(name = "model", value = "详细实体PreTrackScale", required = true, dataType = "PreTrackScale")
-    @PostMapping(value = "/abolish")
-    public RESTfulResult abolish(@RequestBody List<PreTrackScale> models) {
-        RESTfulResult rm = failed();
-        try {
-            int num = preTrackScaleService.abolish(models);
-            //作废物流的运单
-            for (PreTrackScale model : models) {
-                try {
-                    RESTfulResult result = dilFeignService.delWaybillAndPlanByPreTrackScale(FieldsCollector.beanToMap(model));
-                    System.out.println("物流作废运单接口delWaybillAndPlanByPreTrackScale完成！" + result.getResultMessage());
-                } catch (Exception e) {
-                    System.out.println("物流作废运单接口delWaybillAndPlanByPreTrackScale异常！" + e.getMessage());
-                }
-            }
-            if (num >= 1) {
-                return success(num);
-            } else {
-                return failed("新增失败");
-            }
-        } catch (MarkerMetException e) {
-            e.printStackTrace();
-            rm.setMessage(e.getMessage());
-        } catch (Exception e) {
-            e.printStackTrace();
-            rm.setFailedMessage("操作异常，请确认！" + e.getMessage());
-            rm.setMessage("操作异常，请确认！");
-        } finally {
-
-        }
-        return rm;
-    }
-
-    @ApiOperation(value = "非计量业务：出厂", notes = "")
-    @PostMapping(value = "/noMeterOutDoor")
-    public RESTfulResult noMeterOutDoor(@RequestBody PreTrackScale model) {
-        RESTfulResult rm = failed();
-        try {
-            String str = apppreTrackScaleService.noMeterDoor(model, "出厂");
-            return success(str);
-        } catch (MarkerMetException e) {
-            e.printStackTrace();
-            rm.setMessage(e.getMessage());
-        } catch (Exception e) {
-            e.printStackTrace();
-            rm.setMessage("操作异常，请确认！");
-        } finally {
-
-        }
-        return rm;
-    }
-
-    @ApiOperation(value = "非计量业务：进厂", notes = "")
-    @PostMapping(value = "/noMeterinDoor")
-    public RESTfulResult noMeterinDoor(@RequestBody PreTrackScale model) {
-        RESTfulResult rm = failed();
-        try {
-            String str = apppreTrackScaleService.noMeterDoor(model, "进厂");
-            return success(str);
-        } catch (MarkerMetException e) {
-            e.printStackTrace();
-            rm.setMessage(e.getMessage());
-        } catch (Exception e) {
-            e.printStackTrace();
-            rm.setMessage("操作异常，请确认！");
-        } finally {
-
-        }
-        return rm;
-    }
-}

src/main/java/com/steerinfo/appservice/apppretrackscale/mapper/AppPreTrackScaleMapper.java

@@ -1,25 +0,0 @@
-package com.steerinfo.appservice.apppretrackscale.mapper;
-
-import com.steerinfo.appservice.apppretrackscale.model.AppPreTrackScale;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-@Mapper
-public interface AppPreTrackScaleMapper extends IBaseMapper<AppPreTrackScale, String> {
-
-    List<AppPreTrackScale> selectPreTrackScaleByCompany(Map<String, Object> map);
-
-    List<AppPreTrackScale> selectPreTrackScaleByCarNo(@Param(value = "carNo") String carNo);
-
-    List<AppPreTrackScale> selectPreHD(List<String> ids);
-
-    /*查询124状态的车辆信息*/
-    List<AppPreTrackScale> selectPreTrackScaleByCarNoAll(@Param(value = "carNo") String carNo);
-
-    /*查询货代以及他创建的预报数据*/
-    List<AppPreTrackScale> selectPreHDandCreate(@Param("customerSupplierNo")String customerSupplierNo, @Param("list")List<String> ids);
-}

src/main/java/com/steerinfo/appservice/apppretrackscale/mapper/AppPreTrackScaleMapper.xml

@@ -1,1975 +0,0 @@
-<?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.appservice.apppretrackscale.mapper.AppPreTrackScaleMapper">
-    <resultMap id="BaseResultMap" type="com.steerinfo.appservice.apppretrackscale.model.AppPreTrackScale">
-        <id column="PREDICTION_NO" jdbcType="VARCHAR" property="predictionNo" />
-        <result column="NOTICE_NO" jdbcType="VARCHAR" property="noticeNo" />
-        <result column="CAR_NO" jdbcType="VARCHAR" property="carNo" />
-        <result column="TRAILER_NO" jdbcType="VARCHAR" property="trailerNo" />
-        <result column="MATTER_NO" jdbcType="VARCHAR" property="matterNo" />
-        <result column="MATTER_NAME" jdbcType="VARCHAR" property="matterName" />
-        <result column="CONTRACT_NO" jdbcType="VARCHAR" property="contractNo" />
-        <result column="BATCH_NO" jdbcType="VARCHAR" property="batchNo" />
-        <result column="CUSTOMER_SUPPLIER_NO" jdbcType="VARCHAR" property="customerSupplierNo" />
-        <result column="CUSTOMER_SUPPLIER_NAME" jdbcType="VARCHAR" property="customerSupplierName" />
-        <result column="SOURCE_AREA" jdbcType="VARCHAR" property="sourceArea" />
-        <result column="FORWARDING_UNIT_NO" jdbcType="VARCHAR" property="forwardingUnitNo" />
-        <result column="FORWARDING_UNIT_NAME" jdbcType="VARCHAR" property="forwardingUnitName" />
-        <result column="RECEIVING_UINT_NO" jdbcType="VARCHAR" property="receivingUintNo" />
-        <result column="RECEIVING_UINT_NAME" jdbcType="VARCHAR" property="receivingUintName" />
-        <result column="MATERIAL_NO" jdbcType="VARCHAR" property="materialNo" />
-        <result column="MATERIAL_NAME" jdbcType="VARCHAR" property="materialName" />
-        <result column="SPEC_NO" jdbcType="VARCHAR" property="specNo" />
-        <result column="SPEC_NAME" jdbcType="VARCHAR" property="specName" />
-        <result column="SHIPMENT_GROSS_WEIGHT" jdbcType="DECIMAL" property="shipmentGrossWeight" />
-        <result column="SHIPMENT_NET_WEIGHT" jdbcType="DECIMAL" property="shipmentNetWeight" />
-        <result column="SHIPMENT_NUM" jdbcType="DECIMAL" property="shipmentNum" />
-        <result column="ADD_WEIGHT_SUM" jdbcType="DECIMAL" property="addWeightSum" />
-        <result column="BIND_CARD_NO" jdbcType="VARCHAR" property="bindCardNo" />
-        <result column="LOAD_POINT_NO" jdbcType="VARCHAR" property="loadPointNo" />
-        <result column="LOAD_POINT_NAME" jdbcType="VARCHAR" property="loadPointName" />
-        <result column="SAMPLE_NO" jdbcType="VARCHAR" property="sampleNo" />
-        <result column="SAMPLE_VOUCHER" jdbcType="VARCHAR" property="sampleVoucher" />
-        <result column="CARRIER_UNIT_NO" jdbcType="VARCHAR" property="carrierUnitNo" />
-        <result column="CARRIER_UNIT_NAME" jdbcType="VARCHAR" property="carrierUnitName" />
-        <result column="PREDICTION_TYPE" jdbcType="VARCHAR" property="predictionType" />
-        <result column="PREDICTION_COMBINATION" jdbcType="VARCHAR" property="predictionCombination" />
-        <result column="METER_TYPE_NO" jdbcType="VARCHAR" property="meterTypeNo" />
-        <result column="METER_TYPE_NAME" jdbcType="VARCHAR" property="meterTypeName" />
-        <result column="USED_TYPE" jdbcType="VARCHAR" property="usedType" />
-        <result column="EFFECTIVE_START_TIME" jdbcType="TIMESTAMP" property="effectiveStartTime" />
-        <result column="EFFECTIVE_END_TIME" jdbcType="TIMESTAMP" property="effectiveEndTime" />
-        <result column="EFFECTIVE_WEIGHT" jdbcType="DECIMAL" property="effectiveWeight" />
-        <result column="EFFECTIVE_NUM" jdbcType="DECIMAL" property="effectiveNum" />
-        <result column="METER_WEIGHT" jdbcType="DECIMAL" property="meterWeight" />
-        <result column="METER_NUM" jdbcType="DECIMAL" property="meterNum" />
-        <result column="RAILWAY_NO" jdbcType="VARCHAR" property="railwayNo" />
-        <result column="METER_PROCESS_NO" jdbcType="VARCHAR" property="meterProcessNo" />
-        <result column="METER_PROCESS_EDITION_NO" jdbcType="VARCHAR" property="meterProcessEditionNo" />
-        <result column="MEMO" jdbcType="VARCHAR" property="memo" />
-        <result column="VALUE_FLAG" jdbcType="VARCHAR" property="valueFlag" />
-        <result column="USED_TIME" jdbcType="TIMESTAMP" property="usedTime" />
-        <result column="CREATE_MAN_NO" jdbcType="VARCHAR" property="createManNo" />
-        <result column="CREATE_MAN_NAME" jdbcType="VARCHAR" property="createManName" />
-        <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
-        <result column="UPDATE_MAN_NO" jdbcType="VARCHAR" property="updateManNo" />
-        <result column="UPDATE_MAN_NAME" jdbcType="VARCHAR" property="updateManName" />
-        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
-        <result column="DELETE_MAN_NO" jdbcType="VARCHAR" property="deleteManNo" />
-        <result column="DELETE_MAN_NAME" jdbcType="VARCHAR" property="deleteManName" />
-        <result column="DELETE_TIME" jdbcType="TIMESTAMP" property="deleteTime" />
-        <result column="P_VALUE_FLAG" jdbcType="VARCHAR" property="pValueFlag" />
-        <result column="CAR_ALLOCATION_TIME" jdbcType="TIMESTAMP" property="carAllocationTime" />
-        <result column="IS_COMPLETED" jdbcType="VARCHAR" property="isCompleted" />
-        <result column="LIMS_SAMPLING_FLAG" jdbcType="VARCHAR" property="limsSamplingFlag" />
-        <result column="HEAT_NO" jdbcType="VARCHAR" property="heatNo" />
-        <result column="ID_NUM" jdbcType="VARCHAR" property="idNum" />
-        <result column="PREDICTION_SOURCE" jdbcType="VARCHAR" property="predictionSource" />
-        <result column="METER_PIER_NAME" jdbcType="VARCHAR" property="meterPierName" />
-        <result column="METER_PIER_NO" jdbcType="VARCHAR" property="meterPierNo" />
-        <result column="CREATE_DEPNAME" jdbcType="VARCHAR" property="createDepname" />
-        <result column="CREATE_DEPID" jdbcType="VARCHAR" property="createDepid" />
-        <result column="LINE_DESC" jdbcType="VARCHAR" property="lineDesc" />
-        <result column="LINE_CODE" jdbcType="VARCHAR" property="lineCode" />
-        <result column="SHIP_NO" jdbcType="VARCHAR" property="shipNo" />
-    </resultMap>
-    <sql id="columns">
-        PREDICTION_NO, NOTICE_NO, CAR_NO, TRAILER_NO, MATTER_NO, MATTER_NAME, CONTRACT_NO, 
-    BATCH_NO, CUSTOMER_SUPPLIER_NO, CUSTOMER_SUPPLIER_NAME, SOURCE_AREA, FORWARDING_UNIT_NO, 
-    FORWARDING_UNIT_NAME, RECEIVING_UINT_NO, RECEIVING_UINT_NAME, MATERIAL_NO, MATERIAL_NAME, 
-    SPEC_NO, SPEC_NAME, SHIPMENT_GROSS_WEIGHT, SHIPMENT_NET_WEIGHT, SHIPMENT_NUM, ADD_WEIGHT_SUM, 
-    BIND_CARD_NO, LOAD_POINT_NO, LOAD_POINT_NAME, SAMPLE_NO, SAMPLE_VOUCHER, CARRIER_UNIT_NO, 
-    CARRIER_UNIT_NAME, PREDICTION_TYPE, PREDICTION_COMBINATION, METER_TYPE_NO, METER_TYPE_NAME, 
-    USED_TYPE, EFFECTIVE_START_TIME, EFFECTIVE_END_TIME, EFFECTIVE_WEIGHT, EFFECTIVE_NUM, 
-    METER_WEIGHT, METER_NUM, RAILWAY_NO, METER_PROCESS_NO, METER_PROCESS_EDITION_NO, 
-    MEMO, VALUE_FLAG, USED_TIME, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, 
-    UPDATE_MAN_NAME, UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, P_VALUE_FLAG, 
-    CAR_ALLOCATION_TIME, IS_COMPLETED, LIMS_SAMPLING_FLAG, HEAT_NO, ID_NUM, PREDICTION_SOURCE, 
-    METER_PIER_NAME, METER_PIER_NO, CREATE_DEPNAME, CREATE_DEPID, LINE_DESC, LINE_CODE, 
-    SHIP_NO
-    </sql>
-    <sql id="columns_alias">
-        t.PREDICTION_NO, t.NOTICE_NO, t.CAR_NO, t.TRAILER_NO, t.MATTER_NO, t.MATTER_NAME, 
-    t.CONTRACT_NO, t.BATCH_NO, t.CUSTOMER_SUPPLIER_NO, t.CUSTOMER_SUPPLIER_NAME, t.SOURCE_AREA, 
-    t.FORWARDING_UNIT_NO, t.FORWARDING_UNIT_NAME, t.RECEIVING_UINT_NO, t.RECEIVING_UINT_NAME, 
-    t.MATERIAL_NO, t.MATERIAL_NAME, t.SPEC_NO, t.SPEC_NAME, t.SHIPMENT_GROSS_WEIGHT, 
-    t.SHIPMENT_NET_WEIGHT, t.SHIPMENT_NUM, t.ADD_WEIGHT_SUM, t.BIND_CARD_NO, t.LOAD_POINT_NO, 
-    t.LOAD_POINT_NAME, t.SAMPLE_NO, t.SAMPLE_VOUCHER, t.CARRIER_UNIT_NO, t.CARRIER_UNIT_NAME, 
-    t.PREDICTION_TYPE, t.PREDICTION_COMBINATION, t.METER_TYPE_NO, t.METER_TYPE_NAME, 
-    t.USED_TYPE, t.EFFECTIVE_START_TIME, t.EFFECTIVE_END_TIME, t.EFFECTIVE_WEIGHT, t.EFFECTIVE_NUM, 
-    t.METER_WEIGHT, t.METER_NUM, t.RAILWAY_NO, t.METER_PROCESS_NO, t.METER_PROCESS_EDITION_NO, 
-    t.MEMO, t.VALUE_FLAG, t.USED_TIME, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME, 
-    t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME, t.DELETE_MAN_NO, t.DELETE_MAN_NAME, 
-    t.DELETE_TIME, t.P_VALUE_FLAG, t.CAR_ALLOCATION_TIME, t.IS_COMPLETED, t.LIMS_SAMPLING_FLAG, 
-    t.HEAT_NO, t.ID_NUM, t.PREDICTION_SOURCE, t.METER_PIER_NAME, t.METER_PIER_NO, t.CREATE_DEPNAME, 
-    t.CREATE_DEPID, t.LINE_DESC, t.LINE_CODE, t.SHIP_NO
-    </sql>
-    <sql id="select">
-        SELECT <include refid="columns"/> FROM PRE_TRACK_SCALE
-    </sql>
-    <sql id="select_alias">
-        SELECT <include refid="columns_alias"/> FROM PRE_TRACK_SCALE t
-    </sql>
-    <sql id="where">
-        <where>
-            <if test="predictionNo != null and predictionNo != ''">
-                and PREDICTION_NO = #{predictionNo}
-            </if>
-            <if test="noticeNo != null and noticeNo != ''">
-                and NOTICE_NO = #{noticeNo}
-            </if>
-            <if test="carNo != null and carNo != ''">
-                and CAR_NO = #{carNo}
-            </if>
-            <if test="trailerNo != null and trailerNo != ''">
-                and TRAILER_NO = #{trailerNo}
-            </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="contractNo != null and contractNo != ''">
-                and CONTRACT_NO = #{contractNo}
-            </if>
-            <if test="batchNo != null and batchNo != ''">
-                and BATCH_NO = #{batchNo}
-            </if>
-            <if test="customerSupplierNo != null and customerSupplierNo != ''">
-                and CUSTOMER_SUPPLIER_NO = #{customerSupplierNo}
-            </if>
-            <if test="customerSupplierName != null and customerSupplierName != ''">
-                and CUSTOMER_SUPPLIER_NAME = #{customerSupplierName}
-            </if>
-            <if test="sourceArea != null and sourceArea != ''">
-                and SOURCE_AREA = #{sourceArea}
-            </if>
-            <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
-                and FORWARDING_UNIT_NO = #{forwardingUnitNo}
-            </if>
-            <if test="forwardingUnitName != null and forwardingUnitName != ''">
-                and FORWARDING_UNIT_NAME = #{forwardingUnitName}
-            </if>
-            <if test="receivingUintNo != null and receivingUintNo != ''">
-                and RECEIVING_UINT_NO = #{receivingUintNo}
-            </if>
-            <if test="receivingUintName != null and receivingUintName != ''">
-                and RECEIVING_UINT_NAME = #{receivingUintName}
-            </if>
-            <if test="materialNo != null and materialNo != ''">
-                and MATERIAL_NO = #{materialNo}
-            </if>
-            <if test="materialName != null and materialName != ''">
-                and MATERIAL_NAME = #{materialName}
-            </if>
-            <if test="specNo != null and specNo != ''">
-                and SPEC_NO = #{specNo}
-            </if>
-            <if test="specName != null and specName != ''">
-                and SPEC_NAME = #{specName}
-            </if>
-            <if test="shipmentGrossWeight != null">
-                and SHIPMENT_GROSS_WEIGHT = #{shipmentGrossWeight}
-            </if>
-            <if test="shipmentNetWeight != null">
-                and SHIPMENT_NET_WEIGHT = #{shipmentNetWeight}
-            </if>
-            <if test="shipmentNum != null">
-                and SHIPMENT_NUM = #{shipmentNum}
-            </if>
-            <if test="addWeightSum != null">
-                and ADD_WEIGHT_SUM = #{addWeightSum}
-            </if>
-            <if test="bindCardNo != null and bindCardNo != ''">
-                and BIND_CARD_NO = #{bindCardNo}
-            </if>
-            <if test="loadPointNo != null and loadPointNo != ''">
-                and LOAD_POINT_NO = #{loadPointNo}
-            </if>
-            <if test="loadPointName != null and loadPointName != ''">
-                and LOAD_POINT_NAME = #{loadPointName}
-            </if>
-            <if test="sampleNo != null and sampleNo != ''">
-                and SAMPLE_NO = #{sampleNo}
-            </if>
-            <if test="sampleVoucher != null and sampleVoucher != ''">
-                and SAMPLE_VOUCHER = #{sampleVoucher}
-            </if>
-            <if test="carrierUnitNo != null and carrierUnitNo != ''">
-                and CARRIER_UNIT_NO = #{carrierUnitNo}
-            </if>
-            <if test="carrierUnitName != null and carrierUnitName != ''">
-                and CARRIER_UNIT_NAME = #{carrierUnitName}
-            </if>
-            <if test="predictionType != null and predictionType != ''">
-                and PREDICTION_TYPE = #{predictionType}
-            </if>
-            <if test="predictionCombination != null and predictionCombination != ''">
-                and PREDICTION_COMBINATION = #{predictionCombination}
-            </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="usedType != null and usedType != ''">
-                and USED_TYPE = #{usedType}
-            </if>
-            <if test="effectiveStartTime != null">
-                and TO_CHAR(EFFECTIVE_START_TIME,'yyyy-MM-dd') = #{effectiveStartTime}
-            </if>
-            <if test="effectiveEndTime != null">
-                and TO_CHAR(EFFECTIVE_END_TIME,'yyyy-MM-dd') = #{effectiveEndTime}
-            </if>
-            <if test="effectiveWeight != null">
-                and EFFECTIVE_WEIGHT = #{effectiveWeight}
-            </if>
-            <if test="effectiveNum != null">
-                and EFFECTIVE_NUM = #{effectiveNum}
-            </if>
-            <if test="meterWeight != null">
-                and METER_WEIGHT = #{meterWeight}
-            </if>
-            <if test="meterNum != null">
-                and METER_NUM = #{meterNum}
-            </if>
-            <if test="railwayNo != null and railwayNo != ''">
-                and RAILWAY_NO = #{railwayNo}
-            </if>
-            <if test="meterProcessNo != null and meterProcessNo != ''">
-                and METER_PROCESS_NO = #{meterProcessNo}
-            </if>
-            <if test="meterProcessEditionNo != null and meterProcessEditionNo != ''">
-                and METER_PROCESS_EDITION_NO = #{meterProcessEditionNo}
-            </if>
-            <if test="memo != null and memo != ''">
-                and MEMO = #{memo}
-            </if>
-            <if test="valueFlag != null and valueFlag != ''">
-                and VALUE_FLAG = #{valueFlag}
-            </if>
-            <if test="usedTime != null">
-                and TO_CHAR(USED_TIME,'yyyy-MM-dd') = #{usedTime}
-            </if>
-            <if test="createManNo != null and createManNo != ''">
-                and CREATE_MAN_NO = #{createManNo}
-            </if>
-            <if test="createManName != null and createManName != ''">
-                and CREATE_MAN_NAME = #{createManName}
-            </if>
-            <if test="createTime != null">
-                and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
-            </if>
-            <if test="updateManNo != null and updateManNo != ''">
-                and UPDATE_MAN_NO = #{updateManNo}
-            </if>
-            <if test="updateManName != null and updateManName != ''">
-                and UPDATE_MAN_NAME = #{updateManName}
-            </if>
-            <if test="updateTime != null">
-                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-            </if>
-            <if test="deleteManNo != null and deleteManNo != ''">
-                and DELETE_MAN_NO = #{deleteManNo}
-            </if>
-            <if test="deleteManName != null and deleteManName != ''">
-                and DELETE_MAN_NAME = #{deleteManName}
-            </if>
-            <if test="deleteTime != null">
-                and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
-            </if>
-            <if test="pValueFlag != null and pValueFlag != ''">
-                and P_VALUE_FLAG = #{pValueFlag}
-            </if>
-            <if test="carAllocationTime != null">
-                and TO_CHAR(CAR_ALLOCATION_TIME,'yyyy-MM-dd') = #{carAllocationTime}
-            </if>
-            <if test="isCompleted != null and isCompleted != ''">
-                and IS_COMPLETED = #{isCompleted}
-            </if>
-            <if test="limsSamplingFlag != null and limsSamplingFlag != ''">
-                and LIMS_SAMPLING_FLAG = #{limsSamplingFlag}
-            </if>
-            <if test="heatNo != null and heatNo != ''">
-                and HEAT_NO = #{heatNo}
-            </if>
-            <if test="idNum != null and idNum != ''">
-                and ID_NUM = #{idNum}
-            </if>
-            <if test="predictionSource != null and predictionSource != ''">
-                and PREDICTION_SOURCE = #{predictionSource}
-            </if>
-            <if test="meterPierName != null and meterPierName != ''">
-                and METER_PIER_NAME = #{meterPierName}
-            </if>
-            <if test="meterPierNo != null and meterPierNo != ''">
-                and METER_PIER_NO = #{meterPierNo}
-            </if>
-            <if test="createDepname != null and createDepname != ''">
-                and CREATE_DEPNAME = #{createDepname}
-            </if>
-            <if test="createDepid != null and createDepid != ''">
-                and CREATE_DEPID = #{createDepid}
-            </if>
-            <if test="lineDesc != null and lineDesc != ''">
-                and LINE_DESC = #{lineDesc}
-            </if>
-            <if test="lineCode != null and lineCode != ''">
-                and LINE_CODE = #{lineCode}
-            </if>
-            <if test="shipNo != null and shipNo != ''">
-                and SHIP_NO = #{shipNo}
-            </if>
-        </where>
-    </sql>
-    <sql id="whereLike">
-        <where>
-            <if test="predictionNo != null and predictionNo != ''">
-                and PREDICTION_NO LIKE '%${predictionNo}%'
-            </if>
-            <if test="noticeNo != null and noticeNo != ''">
-                and NOTICE_NO LIKE '%${noticeNo}%'
-            </if>
-            <if test="carNo != null and carNo != ''">
-                and CAR_NO LIKE '%${carNo}%'
-            </if>
-            <if test="trailerNo != null and trailerNo != ''">
-                and TRAILER_NO LIKE '%${trailerNo}%'
-            </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="contractNo != null and contractNo != ''">
-                and CONTRACT_NO LIKE '%${contractNo}%'
-            </if>
-            <if test="batchNo != null and batchNo != ''">
-                and BATCH_NO LIKE '%${batchNo}%'
-            </if>
-            <if test="customerSupplierNo != null and customerSupplierNo != ''">
-                and CUSTOMER_SUPPLIER_NO LIKE '%${customerSupplierNo}%'
-            </if>
-            <if test="customerSupplierName != null and customerSupplierName != ''">
-                and CUSTOMER_SUPPLIER_NAME LIKE '%${customerSupplierName}%'
-            </if>
-            <if test="sourceArea != null and sourceArea != ''">
-                and SOURCE_AREA LIKE '%${sourceArea}%'
-            </if>
-            <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
-                and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
-            </if>
-            <if test="forwardingUnitName != null and forwardingUnitName != ''">
-                and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
-            </if>
-            <if test="receivingUintNo != null and receivingUintNo != ''">
-                and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
-            </if>
-            <if test="receivingUintName != null and receivingUintName != ''">
-                and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
-            </if>
-            <if test="materialNo != null and materialNo != ''">
-                and MATERIAL_NO LIKE '%${materialNo}%'
-            </if>
-            <if test="materialName != null and materialName != ''">
-                and MATERIAL_NAME LIKE '%${materialName}%'
-            </if>
-            <if test="specNo != null and specNo != ''">
-                and SPEC_NO LIKE '%${specNo}%'
-            </if>
-            <if test="specName != null and specName != ''">
-                and SPEC_NAME LIKE '%${specName}%'
-            </if>
-            <if test="shipmentGrossWeight != null">
-                and SHIPMENT_GROSS_WEIGHT = #{shipmentGrossWeight}
-            </if>
-            <if test="shipmentNetWeight != null">
-                and SHIPMENT_NET_WEIGHT = #{shipmentNetWeight}
-            </if>
-            <if test="shipmentNum != null">
-                and SHIPMENT_NUM = #{shipmentNum}
-            </if>
-            <if test="addWeightSum != null">
-                and ADD_WEIGHT_SUM = #{addWeightSum}
-            </if>
-            <if test="bindCardNo != null and bindCardNo != ''">
-                and BIND_CARD_NO LIKE '%${bindCardNo}%'
-            </if>
-            <if test="loadPointNo != null and loadPointNo != ''">
-                and LOAD_POINT_NO LIKE '%${loadPointNo}%'
-            </if>
-            <if test="loadPointName != null and loadPointName != ''">
-                and LOAD_POINT_NAME LIKE '%${loadPointName}%'
-            </if>
-            <if test="sampleNo != null and sampleNo != ''">
-                and SAMPLE_NO LIKE '%${sampleNo}%'
-            </if>
-            <if test="sampleVoucher != null and sampleVoucher != ''">
-                and SAMPLE_VOUCHER LIKE '%${sampleVoucher}%'
-            </if>
-            <if test="carrierUnitNo != null and carrierUnitNo != ''">
-                and CARRIER_UNIT_NO LIKE '%${carrierUnitNo}%'
-            </if>
-            <if test="carrierUnitName != null and carrierUnitName != ''">
-                and CARRIER_UNIT_NAME LIKE '%${carrierUnitName}%'
-            </if>
-            <if test="predictionType != null and predictionType != ''">
-                and PREDICTION_TYPE LIKE '%${predictionType}%'
-            </if>
-            <if test="predictionCombination != null and predictionCombination != ''">
-                and PREDICTION_COMBINATION LIKE '%${predictionCombination}%'
-            </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="usedType != null and usedType != ''">
-                and USED_TYPE LIKE '%${usedType}%'
-            </if>
-            <if test="effectiveStartTime != null">
-                and TO_CHAR(EFFECTIVE_START_TIME,'yyyy-MM-dd') = #{effectiveStartTime}
-            </if>
-            <if test="effectiveEndTime != null">
-                and TO_CHAR(EFFECTIVE_END_TIME,'yyyy-MM-dd') = #{effectiveEndTime}
-            </if>
-            <if test="effectiveWeight != null">
-                and EFFECTIVE_WEIGHT = #{effectiveWeight}
-            </if>
-            <if test="effectiveNum != null">
-                and EFFECTIVE_NUM = #{effectiveNum}
-            </if>
-            <if test="meterWeight != null">
-                and METER_WEIGHT = #{meterWeight}
-            </if>
-            <if test="meterNum != null">
-                and METER_NUM = #{meterNum}
-            </if>
-            <if test="railwayNo != null and railwayNo != ''">
-                and RAILWAY_NO LIKE '%${railwayNo}%'
-            </if>
-            <if test="meterProcessNo != null and meterProcessNo != ''">
-                and METER_PROCESS_NO LIKE '%${meterProcessNo}%'
-            </if>
-            <if test="meterProcessEditionNo != null and meterProcessEditionNo != ''">
-                and METER_PROCESS_EDITION_NO LIKE '%${meterProcessEditionNo}%'
-            </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="usedTime != null">
-                and TO_CHAR(USED_TIME,'yyyy-MM-dd') = #{usedTime}
-            </if>
-            <if test="createManNo != null and createManNo != ''">
-                and CREATE_MAN_NO LIKE '%${createManNo}%'
-            </if>
-            <if test="createManName != null and createManName != ''">
-                and CREATE_MAN_NAME LIKE '%${createManName}%'
-            </if>
-            <if test="createTime != null">
-                and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
-            </if>
-            <if test="updateManNo != null and updateManNo != ''">
-                and UPDATE_MAN_NO LIKE '%${updateManNo}%'
-            </if>
-            <if test="updateManName != null and updateManName != ''">
-                and UPDATE_MAN_NAME LIKE '%${updateManName}%'
-            </if>
-            <if test="updateTime != null">
-                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-            </if>
-            <if test="deleteManNo != null and deleteManNo != ''">
-                and DELETE_MAN_NO LIKE '%${deleteManNo}%'
-            </if>
-            <if test="deleteManName != null and deleteManName != ''">
-                and DELETE_MAN_NAME LIKE '%${deleteManName}%'
-            </if>
-            <if test="deleteTime != null">
-                and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
-            </if>
-            <if test="pValueFlag != null and pValueFlag != ''">
-                and P_VALUE_FLAG LIKE '%${pValueFlag}%'
-            </if>
-            <if test="carAllocationTime != null">
-                and TO_CHAR(CAR_ALLOCATION_TIME,'yyyy-MM-dd') = #{carAllocationTime}
-            </if>
-            <if test="isCompleted != null and isCompleted != ''">
-                and IS_COMPLETED LIKE '%${isCompleted}%'
-            </if>
-            <if test="limsSamplingFlag != null and limsSamplingFlag != ''">
-                and LIMS_SAMPLING_FLAG LIKE '%${limsSamplingFlag}%'
-            </if>
-            <if test="heatNo != null and heatNo != ''">
-                and HEAT_NO LIKE '%${heatNo}%'
-            </if>
-            <if test="idNum != null and idNum != ''">
-                and ID_NUM LIKE '%${idNum}%'
-            </if>
-            <if test="predictionSource != null and predictionSource != ''">
-                and PREDICTION_SOURCE LIKE '%${predictionSource}%'
-            </if>
-            <if test="meterPierName != null and meterPierName != ''">
-                and METER_PIER_NAME LIKE '%${meterPierName}%'
-            </if>
-            <if test="meterPierNo != null and meterPierNo != ''">
-                and METER_PIER_NO LIKE '%${meterPierNo}%'
-            </if>
-            <if test="createDepname != null and createDepname != ''">
-                and CREATE_DEPNAME LIKE '%${createDepname}%'
-            </if>
-            <if test="createDepid != null and createDepid != ''">
-                and CREATE_DEPID LIKE '%${createDepid}%'
-            </if>
-            <if test="lineDesc != null and lineDesc != ''">
-                and LINE_DESC LIKE '%${lineDesc}%'
-            </if>
-            <if test="lineCode != null and lineCode != ''">
-                and LINE_CODE LIKE '%${lineCode}%'
-            </if>
-            <if test="shipNo != null and shipNo != ''">
-                and SHIP_NO LIKE '%${shipNo}%'
-            </if>
-        </where>
-    </sql>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-        delete from PRE_TRACK_SCALE
-        where PREDICTION_NO = #{predictionNo,jdbcType=VARCHAR}
-    </delete>
-    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-        delete from PRE_TRACK_SCALE
-        where 1!=1
-        <if test="noticeNo != null and noticeNo != ''">
-            or NOTICE_NO = #{noticeNo}
-        </if>
-        <if test="carNo != null and carNo != ''">
-            or CAR_NO = #{carNo}
-        </if>
-        <if test="trailerNo != null and trailerNo != ''">
-            or TRAILER_NO = #{trailerNo}
-        </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="contractNo != null and contractNo != ''">
-            or CONTRACT_NO = #{contractNo}
-        </if>
-        <if test="batchNo != null and batchNo != ''">
-            or BATCH_NO = #{batchNo}
-        </if>
-        <if test="customerSupplierNo != null and customerSupplierNo != ''">
-            or CUSTOMER_SUPPLIER_NO = #{customerSupplierNo}
-        </if>
-        <if test="customerSupplierName != null and customerSupplierName != ''">
-            or CUSTOMER_SUPPLIER_NAME = #{customerSupplierName}
-        </if>
-        <if test="sourceArea != null and sourceArea != ''">
-            or SOURCE_AREA = #{sourceArea}
-        </if>
-        <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
-            or FORWARDING_UNIT_NO = #{forwardingUnitNo}
-        </if>
-        <if test="forwardingUnitName != null and forwardingUnitName != ''">
-            or FORWARDING_UNIT_NAME = #{forwardingUnitName}
-        </if>
-        <if test="receivingUintNo != null and receivingUintNo != ''">
-            or RECEIVING_UINT_NO = #{receivingUintNo}
-        </if>
-        <if test="receivingUintName != null and receivingUintName != ''">
-            or RECEIVING_UINT_NAME = #{receivingUintName}
-        </if>
-        <if test="materialNo != null and materialNo != ''">
-            or MATERIAL_NO = #{materialNo}
-        </if>
-        <if test="materialName != null and materialName != ''">
-            or MATERIAL_NAME = #{materialName}
-        </if>
-        <if test="specNo != null and specNo != ''">
-            or SPEC_NO = #{specNo}
-        </if>
-        <if test="specName != null and specName != ''">
-            or SPEC_NAME = #{specName}
-        </if>
-        <if test="shipmentGrossWeight != null">
-            or SHIPMENT_GROSS_WEIGHT = #{shipmentGrossWeight}
-        </if>
-        <if test="shipmentNetWeight != null">
-            or SHIPMENT_NET_WEIGHT = #{shipmentNetWeight}
-        </if>
-        <if test="shipmentNum != null">
-            or SHIPMENT_NUM = #{shipmentNum}
-        </if>
-        <if test="addWeightSum != null">
-            or ADD_WEIGHT_SUM = #{addWeightSum}
-        </if>
-        <if test="bindCardNo != null and bindCardNo != ''">
-            or BIND_CARD_NO = #{bindCardNo}
-        </if>
-        <if test="loadPointNo != null and loadPointNo != ''">
-            or LOAD_POINT_NO = #{loadPointNo}
-        </if>
-        <if test="loadPointName != null and loadPointName != ''">
-            or LOAD_POINT_NAME = #{loadPointName}
-        </if>
-        <if test="sampleNo != null and sampleNo != ''">
-            or SAMPLE_NO = #{sampleNo}
-        </if>
-        <if test="sampleVoucher != null and sampleVoucher != ''">
-            or SAMPLE_VOUCHER = #{sampleVoucher}
-        </if>
-        <if test="carrierUnitNo != null and carrierUnitNo != ''">
-            or CARRIER_UNIT_NO = #{carrierUnitNo}
-        </if>
-        <if test="carrierUnitName != null and carrierUnitName != ''">
-            or CARRIER_UNIT_NAME = #{carrierUnitName}
-        </if>
-        <if test="predictionType != null and predictionType != ''">
-            or PREDICTION_TYPE = #{predictionType}
-        </if>
-        <if test="predictionCombination != null and predictionCombination != ''">
-            or PREDICTION_COMBINATION = #{predictionCombination}
-        </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="usedType != null and usedType != ''">
-            or USED_TYPE = #{usedType}
-        </if>
-        <if test="effectiveStartTime != null">
-            or TO_CHAR(EFFECTIVE_START_TIME,'yyyy-MM-dd') = '#{effectiveStartTime}'
-        </if>
-        <if test="effectiveEndTime != null">
-            or TO_CHAR(EFFECTIVE_END_TIME,'yyyy-MM-dd') = '#{effectiveEndTime}'
-        </if>
-        <if test="effectiveWeight != null">
-            or EFFECTIVE_WEIGHT = #{effectiveWeight}
-        </if>
-        <if test="effectiveNum != null">
-            or EFFECTIVE_NUM = #{effectiveNum}
-        </if>
-        <if test="meterWeight != null">
-            or METER_WEIGHT = #{meterWeight}
-        </if>
-        <if test="meterNum != null">
-            or METER_NUM = #{meterNum}
-        </if>
-        <if test="railwayNo != null and railwayNo != ''">
-            or RAILWAY_NO = #{railwayNo}
-        </if>
-        <if test="meterProcessNo != null and meterProcessNo != ''">
-            or METER_PROCESS_NO = #{meterProcessNo}
-        </if>
-        <if test="meterProcessEditionNo != null and meterProcessEditionNo != ''">
-            or METER_PROCESS_EDITION_NO = #{meterProcessEditionNo}
-        </if>
-        <if test="memo != null and memo != ''">
-            or MEMO = #{memo}
-        </if>
-        <if test="valueFlag != null and valueFlag != ''">
-            or VALUE_FLAG = #{valueFlag}
-        </if>
-        <if test="usedTime != null">
-            or TO_CHAR(USED_TIME,'yyyy-MM-dd') = '#{usedTime}'
-        </if>
-        <if test="createManNo != null and createManNo != ''">
-            or CREATE_MAN_NO = #{createManNo}
-        </if>
-        <if test="createManName != null and createManName != ''">
-            or CREATE_MAN_NAME = #{createManName}
-        </if>
-        <if test="createTime != null">
-            or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
-        </if>
-        <if test="updateManNo != null and updateManNo != ''">
-            or UPDATE_MAN_NO = #{updateManNo}
-        </if>
-        <if test="updateManName != null and updateManName != ''">
-            or UPDATE_MAN_NAME = #{updateManName}
-        </if>
-        <if test="updateTime != null">
-            or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-        </if>
-        <if test="deleteManNo != null and deleteManNo != ''">
-            or DELETE_MAN_NO = #{deleteManNo}
-        </if>
-        <if test="deleteManName != null and deleteManName != ''">
-            or DELETE_MAN_NAME = #{deleteManName}
-        </if>
-        <if test="deleteTime != null">
-            or TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = '#{deleteTime}'
-        </if>
-        <if test="pValueFlag != null and pValueFlag != ''">
-            or P_VALUE_FLAG = #{pValueFlag}
-        </if>
-        <if test="carAllocationTime != null">
-            or TO_CHAR(CAR_ALLOCATION_TIME,'yyyy-MM-dd') = '#{carAllocationTime}'
-        </if>
-        <if test="isCompleted != null and isCompleted != ''">
-            or IS_COMPLETED = #{isCompleted}
-        </if>
-        <if test="limsSamplingFlag != null and limsSamplingFlag != ''">
-            or LIMS_SAMPLING_FLAG = #{limsSamplingFlag}
-        </if>
-        <if test="heatNo != null and heatNo != ''">
-            or HEAT_NO = #{heatNo}
-        </if>
-        <if test="idNum != null and idNum != ''">
-            or ID_NUM = #{idNum}
-        </if>
-        <if test="predictionSource != null and predictionSource != ''">
-            or PREDICTION_SOURCE = #{predictionSource}
-        </if>
-        <if test="meterPierName != null and meterPierName != ''">
-            or METER_PIER_NAME = #{meterPierName}
-        </if>
-        <if test="meterPierNo != null and meterPierNo != ''">
-            or METER_PIER_NO = #{meterPierNo}
-        </if>
-        <if test="createDepname != null and createDepname != ''">
-            or CREATE_DEPNAME = #{createDepname}
-        </if>
-        <if test="createDepid != null and createDepid != ''">
-            or CREATE_DEPID = #{createDepid}
-        </if>
-        <if test="lineDesc != null and lineDesc != ''">
-            or LINE_DESC = #{lineDesc}
-        </if>
-        <if test="lineCode != null and lineCode != ''">
-            or LINE_CODE = #{lineCode}
-        </if>
-        <if test="shipNo != null and shipNo != ''">
-            or SHIP_NO = #{shipNo}
-        </if>
-    </delete>
-    <insert id="insert" parameterType="com.steerinfo.appservice.apppretrackscale.model.AppPreTrackScale">
-        insert into PRE_TRACK_SCALE (PREDICTION_NO, NOTICE_NO, CAR_NO,
-                                     TRAILER_NO, MATTER_NO, MATTER_NAME,
-                                     CONTRACT_NO, BATCH_NO, CUSTOMER_SUPPLIER_NO,
-                                     CUSTOMER_SUPPLIER_NAME, SOURCE_AREA, FORWARDING_UNIT_NO,
-                                     FORWARDING_UNIT_NAME, RECEIVING_UINT_NO, RECEIVING_UINT_NAME,
-                                     MATERIAL_NO, MATERIAL_NAME, SPEC_NO,
-                                     SPEC_NAME, SHIPMENT_GROSS_WEIGHT, SHIPMENT_NET_WEIGHT,
-                                     SHIPMENT_NUM, ADD_WEIGHT_SUM, BIND_CARD_NO,
-                                     LOAD_POINT_NO, LOAD_POINT_NAME, SAMPLE_NO,
-                                     SAMPLE_VOUCHER, CARRIER_UNIT_NO, CARRIER_UNIT_NAME,
-                                     PREDICTION_TYPE, PREDICTION_COMBINATION,
-                                     METER_TYPE_NO, METER_TYPE_NAME, USED_TYPE,
-                                     EFFECTIVE_START_TIME, EFFECTIVE_END_TIME,
-                                     EFFECTIVE_WEIGHT, EFFECTIVE_NUM, METER_WEIGHT,
-                                     METER_NUM, RAILWAY_NO, METER_PROCESS_NO,
-                                     METER_PROCESS_EDITION_NO, MEMO, VALUE_FLAG,
-                                     USED_TIME, CREATE_MAN_NO, CREATE_MAN_NAME,
-                                     CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME,
-                                     UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME,
-                                     DELETE_TIME, P_VALUE_FLAG, CAR_ALLOCATION_TIME,
-                                     IS_COMPLETED, LIMS_SAMPLING_FLAG, HEAT_NO,
-                                     ID_NUM, PREDICTION_SOURCE, METER_PIER_NAME,
-                                     METER_PIER_NO, CREATE_DEPNAME, CREATE_DEPID,
-                                     LINE_DESC, LINE_CODE, SHIP_NO
-        )
-        values (#{predictionNo,jdbcType=VARCHAR}, #{noticeNo,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR},
-                #{trailerNo,jdbcType=VARCHAR}, #{matterNo,jdbcType=VARCHAR}, #{matterName,jdbcType=VARCHAR},
-                #{contractNo,jdbcType=VARCHAR}, #{batchNo,jdbcType=VARCHAR}, #{customerSupplierNo,jdbcType=VARCHAR},
-                #{customerSupplierName,jdbcType=VARCHAR}, #{sourceArea,jdbcType=VARCHAR}, #{forwardingUnitNo,jdbcType=VARCHAR},
-                #{forwardingUnitName,jdbcType=VARCHAR}, #{receivingUintNo,jdbcType=VARCHAR}, #{receivingUintName,jdbcType=VARCHAR},
-                #{materialNo,jdbcType=VARCHAR}, #{materialName,jdbcType=VARCHAR}, #{specNo,jdbcType=VARCHAR},
-                #{specName,jdbcType=VARCHAR}, #{shipmentGrossWeight,jdbcType=DECIMAL}, #{shipmentNetWeight,jdbcType=DECIMAL},
-                #{shipmentNum,jdbcType=DECIMAL}, #{addWeightSum,jdbcType=DECIMAL}, #{bindCardNo,jdbcType=VARCHAR},
-                #{loadPointNo,jdbcType=VARCHAR}, #{loadPointName,jdbcType=VARCHAR}, #{sampleNo,jdbcType=VARCHAR},
-                #{sampleVoucher,jdbcType=VARCHAR}, #{carrierUnitNo,jdbcType=VARCHAR}, #{carrierUnitName,jdbcType=VARCHAR},
-                #{predictionType,jdbcType=VARCHAR}, #{predictionCombination,jdbcType=VARCHAR},
-                #{meterTypeNo,jdbcType=VARCHAR}, #{meterTypeName,jdbcType=VARCHAR}, #{usedType,jdbcType=VARCHAR},
-                #{effectiveStartTime,jdbcType=TIMESTAMP}, #{effectiveEndTime,jdbcType=TIMESTAMP},
-                #{effectiveWeight,jdbcType=DECIMAL}, #{effectiveNum,jdbcType=DECIMAL}, #{meterWeight,jdbcType=DECIMAL},
-                #{meterNum,jdbcType=DECIMAL}, #{railwayNo,jdbcType=VARCHAR}, #{meterProcessNo,jdbcType=VARCHAR},
-                #{meterProcessEditionNo,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, #{valueFlag,jdbcType=VARCHAR},
-                #{usedTime,jdbcType=TIMESTAMP}, #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR},
-                #{createTime,jdbcType=TIMESTAMP}, #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR},
-                #{updateTime,jdbcType=TIMESTAMP}, #{deleteManNo,jdbcType=VARCHAR}, #{deleteManName,jdbcType=VARCHAR},
-                #{deleteTime,jdbcType=TIMESTAMP}, #{pValueFlag,jdbcType=VARCHAR}, #{carAllocationTime,jdbcType=TIMESTAMP},
-                #{isCompleted,jdbcType=VARCHAR}, #{limsSamplingFlag,jdbcType=VARCHAR}, #{heatNo,jdbcType=VARCHAR},
-                #{idNum,jdbcType=VARCHAR}, #{predictionSource,jdbcType=VARCHAR}, #{meterPierName,jdbcType=VARCHAR},
-                #{meterPierNo,jdbcType=VARCHAR}, #{createDepname,jdbcType=VARCHAR}, #{createDepid,jdbcType=VARCHAR},
-                #{lineDesc,jdbcType=VARCHAR}, #{lineCode,jdbcType=VARCHAR}, #{shipNo,jdbcType=VARCHAR}
-               )
-    </insert>
-    <insert id="insertSelective" parameterType="com.steerinfo.appservice.apppretrackscale.model.AppPreTrackScale">
-        insert into PRE_TRACK_SCALE
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="predictionNo != null">
-                PREDICTION_NO,
-            </if>
-            <if test="noticeNo != null">
-                NOTICE_NO,
-            </if>
-            <if test="carNo != null">
-                CAR_NO,
-            </if>
-            <if test="trailerNo != null">
-                TRAILER_NO,
-            </if>
-            <if test="matterNo != null">
-                MATTER_NO,
-            </if>
-            <if test="matterName != null">
-                MATTER_NAME,
-            </if>
-            <if test="contractNo != null">
-                CONTRACT_NO,
-            </if>
-            <if test="batchNo != null">
-                BATCH_NO,
-            </if>
-            <if test="customerSupplierNo != null">
-                CUSTOMER_SUPPLIER_NO,
-            </if>
-            <if test="customerSupplierName != null">
-                CUSTOMER_SUPPLIER_NAME,
-            </if>
-            <if test="sourceArea != null">
-                SOURCE_AREA,
-            </if>
-            <if test="forwardingUnitNo != null">
-                FORWARDING_UNIT_NO,
-            </if>
-            <if test="forwardingUnitName != null">
-                FORWARDING_UNIT_NAME,
-            </if>
-            <if test="receivingUintNo != null">
-                RECEIVING_UINT_NO,
-            </if>
-            <if test="receivingUintName != null">
-                RECEIVING_UINT_NAME,
-            </if>
-            <if test="materialNo != null">
-                MATERIAL_NO,
-            </if>
-            <if test="materialName != null">
-                MATERIAL_NAME,
-            </if>
-            <if test="specNo != null">
-                SPEC_NO,
-            </if>
-            <if test="specName != null">
-                SPEC_NAME,
-            </if>
-            <if test="shipmentGrossWeight != null">
-                SHIPMENT_GROSS_WEIGHT,
-            </if>
-            <if test="shipmentNetWeight != null">
-                SHIPMENT_NET_WEIGHT,
-            </if>
-            <if test="shipmentNum != null">
-                SHIPMENT_NUM,
-            </if>
-            <if test="addWeightSum != null">
-                ADD_WEIGHT_SUM,
-            </if>
-            <if test="bindCardNo != null">
-                BIND_CARD_NO,
-            </if>
-            <if test="loadPointNo != null">
-                LOAD_POINT_NO,
-            </if>
-            <if test="loadPointName != null">
-                LOAD_POINT_NAME,
-            </if>
-            <if test="sampleNo != null">
-                SAMPLE_NO,
-            </if>
-            <if test="sampleVoucher != null">
-                SAMPLE_VOUCHER,
-            </if>
-            <if test="carrierUnitNo != null">
-                CARRIER_UNIT_NO,
-            </if>
-            <if test="carrierUnitName != null">
-                CARRIER_UNIT_NAME,
-            </if>
-            <if test="predictionType != null">
-                PREDICTION_TYPE,
-            </if>
-            <if test="predictionCombination != null">
-                PREDICTION_COMBINATION,
-            </if>
-            <if test="meterTypeNo != null">
-                METER_TYPE_NO,
-            </if>
-            <if test="meterTypeName != null">
-                METER_TYPE_NAME,
-            </if>
-            <if test="usedType != null">
-                USED_TYPE,
-            </if>
-            <if test="effectiveStartTime != null">
-                EFFECTIVE_START_TIME,
-            </if>
-            <if test="effectiveEndTime != null">
-                EFFECTIVE_END_TIME,
-            </if>
-            <if test="effectiveWeight != null">
-                EFFECTIVE_WEIGHT,
-            </if>
-            <if test="effectiveNum != null">
-                EFFECTIVE_NUM,
-            </if>
-            <if test="meterWeight != null">
-                METER_WEIGHT,
-            </if>
-            <if test="meterNum != null">
-                METER_NUM,
-            </if>
-            <if test="railwayNo != null">
-                RAILWAY_NO,
-            </if>
-            <if test="meterProcessNo != null">
-                METER_PROCESS_NO,
-            </if>
-            <if test="meterProcessEditionNo != null">
-                METER_PROCESS_EDITION_NO,
-            </if>
-            <if test="memo != null">
-                MEMO,
-            </if>
-            <if test="valueFlag != null">
-                VALUE_FLAG,
-            </if>
-            <if test="usedTime != null">
-                USED_TIME,
-            </if>
-            <if test="createManNo != null">
-                CREATE_MAN_NO,
-            </if>
-            <if test="createManName != null">
-                CREATE_MAN_NAME,
-            </if>
-            <if test="createTime != null">
-                CREATE_TIME,
-            </if>
-            <if test="updateManNo != null">
-                UPDATE_MAN_NO,
-            </if>
-            <if test="updateManName != null">
-                UPDATE_MAN_NAME,
-            </if>
-            <if test="updateTime != null">
-                UPDATE_TIME,
-            </if>
-            <if test="deleteManNo != null">
-                DELETE_MAN_NO,
-            </if>
-            <if test="deleteManName != null">
-                DELETE_MAN_NAME,
-            </if>
-            <if test="deleteTime != null">
-                DELETE_TIME,
-            </if>
-            <if test="pValueFlag != null">
-                P_VALUE_FLAG,
-            </if>
-            <if test="carAllocationTime != null">
-                CAR_ALLOCATION_TIME,
-            </if>
-            <if test="isCompleted != null">
-                IS_COMPLETED,
-            </if>
-            <if test="limsSamplingFlag != null">
-                LIMS_SAMPLING_FLAG,
-            </if>
-            <if test="heatNo != null">
-                HEAT_NO,
-            </if>
-            <if test="idNum != null">
-                ID_NUM,
-            </if>
-            <if test="predictionSource != null">
-                PREDICTION_SOURCE,
-            </if>
-            <if test="meterPierName != null">
-                METER_PIER_NAME,
-            </if>
-            <if test="meterPierNo != null">
-                METER_PIER_NO,
-            </if>
-            <if test="createDepname != null">
-                CREATE_DEPNAME,
-            </if>
-            <if test="createDepid != null">
-                CREATE_DEPID,
-            </if>
-            <if test="lineDesc != null">
-                LINE_DESC,
-            </if>
-            <if test="lineCode != null">
-                LINE_CODE,
-            </if>
-            <if test="shipNo != null">
-                SHIP_NO,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="predictionNo != null">
-                #{predictionNo,jdbcType=VARCHAR},
-            </if>
-            <if test="noticeNo != null">
-                #{noticeNo,jdbcType=VARCHAR},
-            </if>
-            <if test="carNo != null">
-                #{carNo,jdbcType=VARCHAR},
-            </if>
-            <if test="trailerNo != null">
-                #{trailerNo,jdbcType=VARCHAR},
-            </if>
-            <if test="matterNo != null">
-                #{matterNo,jdbcType=VARCHAR},
-            </if>
-            <if test="matterName != null">
-                #{matterName,jdbcType=VARCHAR},
-            </if>
-            <if test="contractNo != null">
-                #{contractNo,jdbcType=VARCHAR},
-            </if>
-            <if test="batchNo != null">
-                #{batchNo,jdbcType=VARCHAR},
-            </if>
-            <if test="customerSupplierNo != null">
-                #{customerSupplierNo,jdbcType=VARCHAR},
-            </if>
-            <if test="customerSupplierName != null">
-                #{customerSupplierName,jdbcType=VARCHAR},
-            </if>
-            <if test="sourceArea != null">
-                #{sourceArea,jdbcType=VARCHAR},
-            </if>
-            <if test="forwardingUnitNo != null">
-                #{forwardingUnitNo,jdbcType=VARCHAR},
-            </if>
-            <if test="forwardingUnitName != null">
-                #{forwardingUnitName,jdbcType=VARCHAR},
-            </if>
-            <if test="receivingUintNo != null">
-                #{receivingUintNo,jdbcType=VARCHAR},
-            </if>
-            <if test="receivingUintName != null">
-                #{receivingUintName,jdbcType=VARCHAR},
-            </if>
-            <if test="materialNo != null">
-                #{materialNo,jdbcType=VARCHAR},
-            </if>
-            <if test="materialName != null">
-                #{materialName,jdbcType=VARCHAR},
-            </if>
-            <if test="specNo != null">
-                #{specNo,jdbcType=VARCHAR},
-            </if>
-            <if test="specName != null">
-                #{specName,jdbcType=VARCHAR},
-            </if>
-            <if test="shipmentGrossWeight != null">
-                #{shipmentGrossWeight,jdbcType=DECIMAL},
-            </if>
-            <if test="shipmentNetWeight != null">
-                #{shipmentNetWeight,jdbcType=DECIMAL},
-            </if>
-            <if test="shipmentNum != null">
-                #{shipmentNum,jdbcType=DECIMAL},
-            </if>
-            <if test="addWeightSum != null">
-                #{addWeightSum,jdbcType=DECIMAL},
-            </if>
-            <if test="bindCardNo != null">
-                #{bindCardNo,jdbcType=VARCHAR},
-            </if>
-            <if test="loadPointNo != null">
-                #{loadPointNo,jdbcType=VARCHAR},
-            </if>
-            <if test="loadPointName != null">
-                #{loadPointName,jdbcType=VARCHAR},
-            </if>
-            <if test="sampleNo != null">
-                #{sampleNo,jdbcType=VARCHAR},
-            </if>
-            <if test="sampleVoucher != null">
-                #{sampleVoucher,jdbcType=VARCHAR},
-            </if>
-            <if test="carrierUnitNo != null">
-                #{carrierUnitNo,jdbcType=VARCHAR},
-            </if>
-            <if test="carrierUnitName != null">
-                #{carrierUnitName,jdbcType=VARCHAR},
-            </if>
-            <if test="predictionType != null">
-                #{predictionType,jdbcType=VARCHAR},
-            </if>
-            <if test="predictionCombination != null">
-                #{predictionCombination,jdbcType=VARCHAR},
-            </if>
-            <if test="meterTypeNo != null">
-                #{meterTypeNo,jdbcType=VARCHAR},
-            </if>
-            <if test="meterTypeName != null">
-                #{meterTypeName,jdbcType=VARCHAR},
-            </if>
-            <if test="usedType != null">
-                #{usedType,jdbcType=VARCHAR},
-            </if>
-            <if test="effectiveStartTime != null">
-                #{effectiveStartTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="effectiveEndTime != null">
-                #{effectiveEndTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="effectiveWeight != null">
-                #{effectiveWeight,jdbcType=DECIMAL},
-            </if>
-            <if test="effectiveNum != null">
-                #{effectiveNum,jdbcType=DECIMAL},
-            </if>
-            <if test="meterWeight != null">
-                #{meterWeight,jdbcType=DECIMAL},
-            </if>
-            <if test="meterNum != null">
-                #{meterNum,jdbcType=DECIMAL},
-            </if>
-            <if test="railwayNo != null">
-                #{railwayNo,jdbcType=VARCHAR},
-            </if>
-            <if test="meterProcessNo != null">
-                #{meterProcessNo,jdbcType=VARCHAR},
-            </if>
-            <if test="meterProcessEditionNo != null">
-                #{meterProcessEditionNo,jdbcType=VARCHAR},
-            </if>
-            <if test="memo != null">
-                #{memo,jdbcType=VARCHAR},
-            </if>
-            <if test="valueFlag != null">
-                #{valueFlag,jdbcType=VARCHAR},
-            </if>
-            <if test="usedTime != null">
-                #{usedTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="createManNo != null">
-                #{createManNo,jdbcType=VARCHAR},
-            </if>
-            <if test="createManName != null">
-                #{createManName,jdbcType=VARCHAR},
-            </if>
-            <if test="createTime != null">
-                #{createTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="updateManNo != null">
-                #{updateManNo,jdbcType=VARCHAR},
-            </if>
-            <if test="updateManName != null">
-                #{updateManName,jdbcType=VARCHAR},
-            </if>
-            <if test="updateTime != null">
-                #{updateTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="deleteManNo != null">
-                #{deleteManNo,jdbcType=VARCHAR},
-            </if>
-            <if test="deleteManName != null">
-                #{deleteManName,jdbcType=VARCHAR},
-            </if>
-            <if test="deleteTime != null">
-                #{deleteTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="pValueFlag != null">
-                #{pValueFlag,jdbcType=VARCHAR},
-            </if>
-            <if test="carAllocationTime != null">
-                #{carAllocationTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="isCompleted != null">
-                #{isCompleted,jdbcType=VARCHAR},
-            </if>
-            <if test="limsSamplingFlag != null">
-                #{limsSamplingFlag,jdbcType=VARCHAR},
-            </if>
-            <if test="heatNo != null">
-                #{heatNo,jdbcType=VARCHAR},
-            </if>
-            <if test="idNum != null">
-                #{idNum,jdbcType=VARCHAR},
-            </if>
-            <if test="predictionSource != null">
-                #{predictionSource,jdbcType=VARCHAR},
-            </if>
-            <if test="meterPierName != null">
-                #{meterPierName,jdbcType=VARCHAR},
-            </if>
-            <if test="meterPierNo != null">
-                #{meterPierNo,jdbcType=VARCHAR},
-            </if>
-            <if test="createDepname != null">
-                #{createDepname,jdbcType=VARCHAR},
-            </if>
-            <if test="createDepid != null">
-                #{createDepid,jdbcType=VARCHAR},
-            </if>
-            <if test="lineDesc != null">
-                #{lineDesc,jdbcType=VARCHAR},
-            </if>
-            <if test="lineCode != null">
-                #{lineCode,jdbcType=VARCHAR},
-            </if>
-            <if test="shipNo != null">
-                #{shipNo,jdbcType=VARCHAR},
-            </if>
-        </trim>
-    </insert>
-    <update id="updateByPrimaryKey" parameterType="com.steerinfo.appservice.apppretrackscale.model.AppPreTrackScale">
-        update PRE_TRACK_SCALE
-        set NOTICE_NO = #{noticeNo,jdbcType=VARCHAR},
-            CAR_NO = #{carNo,jdbcType=VARCHAR},
-            TRAILER_NO = #{trailerNo,jdbcType=VARCHAR},
-            MATTER_NO = #{matterNo,jdbcType=VARCHAR},
-            MATTER_NAME = #{matterName,jdbcType=VARCHAR},
-            CONTRACT_NO = #{contractNo,jdbcType=VARCHAR},
-            BATCH_NO = #{batchNo,jdbcType=VARCHAR},
-            CUSTOMER_SUPPLIER_NO = #{customerSupplierNo,jdbcType=VARCHAR},
-            CUSTOMER_SUPPLIER_NAME = #{customerSupplierName,jdbcType=VARCHAR},
-            SOURCE_AREA = #{sourceArea,jdbcType=VARCHAR},
-            FORWARDING_UNIT_NO = #{forwardingUnitNo,jdbcType=VARCHAR},
-            FORWARDING_UNIT_NAME = #{forwardingUnitName,jdbcType=VARCHAR},
-            RECEIVING_UINT_NO = #{receivingUintNo,jdbcType=VARCHAR},
-            RECEIVING_UINT_NAME = #{receivingUintName,jdbcType=VARCHAR},
-            MATERIAL_NO = #{materialNo,jdbcType=VARCHAR},
-            MATERIAL_NAME = #{materialName,jdbcType=VARCHAR},
-            SPEC_NO = #{specNo,jdbcType=VARCHAR},
-            SPEC_NAME = #{specName,jdbcType=VARCHAR},
-            SHIPMENT_GROSS_WEIGHT = #{shipmentGrossWeight,jdbcType=DECIMAL},
-            SHIPMENT_NET_WEIGHT = #{shipmentNetWeight,jdbcType=DECIMAL},
-            SHIPMENT_NUM = #{shipmentNum,jdbcType=DECIMAL},
-            ADD_WEIGHT_SUM = #{addWeightSum,jdbcType=DECIMAL},
-            BIND_CARD_NO = #{bindCardNo,jdbcType=VARCHAR},
-            LOAD_POINT_NO = #{loadPointNo,jdbcType=VARCHAR},
-            LOAD_POINT_NAME = #{loadPointName,jdbcType=VARCHAR},
-            SAMPLE_NO = #{sampleNo,jdbcType=VARCHAR},
-            SAMPLE_VOUCHER = #{sampleVoucher,jdbcType=VARCHAR},
-            CARRIER_UNIT_NO = #{carrierUnitNo,jdbcType=VARCHAR},
-            CARRIER_UNIT_NAME = #{carrierUnitName,jdbcType=VARCHAR},
-            PREDICTION_TYPE = #{predictionType,jdbcType=VARCHAR},
-            PREDICTION_COMBINATION = #{predictionCombination,jdbcType=VARCHAR},
-            METER_TYPE_NO = #{meterTypeNo,jdbcType=VARCHAR},
-            METER_TYPE_NAME = #{meterTypeName,jdbcType=VARCHAR},
-            USED_TYPE = #{usedType,jdbcType=VARCHAR},
-            EFFECTIVE_START_TIME = #{effectiveStartTime,jdbcType=TIMESTAMP},
-            EFFECTIVE_END_TIME = #{effectiveEndTime,jdbcType=TIMESTAMP},
-            EFFECTIVE_WEIGHT = #{effectiveWeight,jdbcType=DECIMAL},
-            EFFECTIVE_NUM = #{effectiveNum,jdbcType=DECIMAL},
-            METER_WEIGHT = #{meterWeight,jdbcType=DECIMAL},
-            METER_NUM = #{meterNum,jdbcType=DECIMAL},
-            RAILWAY_NO = #{railwayNo,jdbcType=VARCHAR},
-            METER_PROCESS_NO = #{meterProcessNo,jdbcType=VARCHAR},
-            METER_PROCESS_EDITION_NO = #{meterProcessEditionNo,jdbcType=VARCHAR},
-            MEMO = #{memo,jdbcType=VARCHAR},
-            VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
-            USED_TIME = #{usedTime,jdbcType=TIMESTAMP},
-            CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
-            CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
-            CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
-            UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
-            UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
-            UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-            DELETE_MAN_NO = #{deleteManNo,jdbcType=VARCHAR},
-            DELETE_MAN_NAME = #{deleteManName,jdbcType=VARCHAR},
-            DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
-            P_VALUE_FLAG = #{pValueFlag,jdbcType=VARCHAR},
-            CAR_ALLOCATION_TIME = #{carAllocationTime,jdbcType=TIMESTAMP},
-            IS_COMPLETED = #{isCompleted,jdbcType=VARCHAR},
-            LIMS_SAMPLING_FLAG = #{limsSamplingFlag,jdbcType=VARCHAR},
-            HEAT_NO = #{heatNo,jdbcType=VARCHAR},
-            ID_NUM = #{idNum,jdbcType=VARCHAR},
-            PREDICTION_SOURCE = #{predictionSource,jdbcType=VARCHAR},
-            METER_PIER_NAME = #{meterPierName,jdbcType=VARCHAR},
-            METER_PIER_NO = #{meterPierNo,jdbcType=VARCHAR},
-            CREATE_DEPNAME = #{createDepname,jdbcType=VARCHAR},
-            CREATE_DEPID = #{createDepid,jdbcType=VARCHAR},
-            LINE_DESC = #{lineDesc,jdbcType=VARCHAR},
-            LINE_CODE = #{lineCode,jdbcType=VARCHAR},
-            SHIP_NO = #{shipNo,jdbcType=VARCHAR}
-        where PREDICTION_NO = #{predictionNo,jdbcType=VARCHAR}
-    </update>
-    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.appservice.apppretrackscale.model.AppPreTrackScale">
-        update PRE_TRACK_SCALE
-        <set>
-            <if test="noticeNo != null">
-                NOTICE_NO = #{noticeNo,jdbcType=VARCHAR},
-            </if>
-            <if test="carNo != null">
-                CAR_NO = #{carNo,jdbcType=VARCHAR},
-            </if>
-            <if test="trailerNo != null">
-                TRAILER_NO = #{trailerNo,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="contractNo != null">
-                CONTRACT_NO = #{contractNo,jdbcType=VARCHAR},
-            </if>
-            <if test="batchNo != null">
-                BATCH_NO = #{batchNo,jdbcType=VARCHAR},
-            </if>
-            <if test="customerSupplierNo != null">
-                CUSTOMER_SUPPLIER_NO = #{customerSupplierNo,jdbcType=VARCHAR},
-            </if>
-            <if test="customerSupplierName != null">
-                CUSTOMER_SUPPLIER_NAME = #{customerSupplierName,jdbcType=VARCHAR},
-            </if>
-            <if test="sourceArea != null">
-                SOURCE_AREA = #{sourceArea,jdbcType=VARCHAR},
-            </if>
-            <if test="forwardingUnitNo != null">
-                FORWARDING_UNIT_NO = #{forwardingUnitNo,jdbcType=VARCHAR},
-            </if>
-            <if test="forwardingUnitName != null">
-                FORWARDING_UNIT_NAME = #{forwardingUnitName,jdbcType=VARCHAR},
-            </if>
-            <if test="receivingUintNo != null">
-                RECEIVING_UINT_NO = #{receivingUintNo,jdbcType=VARCHAR},
-            </if>
-            <if test="receivingUintName != null">
-                RECEIVING_UINT_NAME = #{receivingUintName,jdbcType=VARCHAR},
-            </if>
-            <if test="materialNo != null">
-                MATERIAL_NO = #{materialNo,jdbcType=VARCHAR},
-            </if>
-            <if test="materialName != null">
-                MATERIAL_NAME = #{materialName,jdbcType=VARCHAR},
-            </if>
-            <if test="specNo != null">
-                SPEC_NO = #{specNo,jdbcType=VARCHAR},
-            </if>
-            <if test="specName != null">
-                SPEC_NAME = #{specName,jdbcType=VARCHAR},
-            </if>
-            <if test="shipmentGrossWeight != null">
-                SHIPMENT_GROSS_WEIGHT = #{shipmentGrossWeight,jdbcType=DECIMAL},
-            </if>
-            <if test="shipmentNetWeight != null">
-                SHIPMENT_NET_WEIGHT = #{shipmentNetWeight,jdbcType=DECIMAL},
-            </if>
-            <if test="shipmentNum != null">
-                SHIPMENT_NUM = #{shipmentNum,jdbcType=DECIMAL},
-            </if>
-            <if test="addWeightSum != null">
-                ADD_WEIGHT_SUM = #{addWeightSum,jdbcType=DECIMAL},
-            </if>
-            <if test="bindCardNo != null">
-                BIND_CARD_NO = #{bindCardNo,jdbcType=VARCHAR},
-            </if>
-            <if test="loadPointNo != null">
-                LOAD_POINT_NO = #{loadPointNo,jdbcType=VARCHAR},
-            </if>
-            <if test="loadPointName != null">
-                LOAD_POINT_NAME = #{loadPointName,jdbcType=VARCHAR},
-            </if>
-            <if test="sampleNo != null">
-                SAMPLE_NO = #{sampleNo,jdbcType=VARCHAR},
-            </if>
-            <if test="sampleVoucher != null">
-                SAMPLE_VOUCHER = #{sampleVoucher,jdbcType=VARCHAR},
-            </if>
-            <if test="carrierUnitNo != null">
-                CARRIER_UNIT_NO = #{carrierUnitNo,jdbcType=VARCHAR},
-            </if>
-            <if test="carrierUnitName != null">
-                CARRIER_UNIT_NAME = #{carrierUnitName,jdbcType=VARCHAR},
-            </if>
-            <if test="predictionType != null">
-                PREDICTION_TYPE = #{predictionType,jdbcType=VARCHAR},
-            </if>
-            <if test="predictionCombination != null">
-                PREDICTION_COMBINATION = #{predictionCombination,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="usedType != null">
-                USED_TYPE = #{usedType,jdbcType=VARCHAR},
-            </if>
-            <if test="effectiveStartTime != null">
-                EFFECTIVE_START_TIME = #{effectiveStartTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="effectiveEndTime != null">
-                EFFECTIVE_END_TIME = #{effectiveEndTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="effectiveWeight != null">
-                EFFECTIVE_WEIGHT = #{effectiveWeight,jdbcType=DECIMAL},
-            </if>
-            <if test="effectiveNum != null">
-                EFFECTIVE_NUM = #{effectiveNum,jdbcType=DECIMAL},
-            </if>
-            <if test="meterWeight != null">
-                METER_WEIGHT = #{meterWeight,jdbcType=DECIMAL},
-            </if>
-            <if test="meterNum != null">
-                METER_NUM = #{meterNum,jdbcType=DECIMAL},
-            </if>
-            <if test="railwayNo != null">
-                RAILWAY_NO = #{railwayNo,jdbcType=VARCHAR},
-            </if>
-            <if test="meterProcessNo != null">
-                METER_PROCESS_NO = #{meterProcessNo,jdbcType=VARCHAR},
-            </if>
-            <if test="meterProcessEditionNo != null">
-                METER_PROCESS_EDITION_NO = #{meterProcessEditionNo,jdbcType=VARCHAR},
-            </if>
-            <if test="memo != null">
-                MEMO = #{memo,jdbcType=VARCHAR},
-            </if>
-            <if test="valueFlag != null">
-                VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
-            </if>
-            <if test="usedTime != null">
-                USED_TIME = #{usedTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="createManNo != null">
-                CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
-            </if>
-            <if test="createManName != null">
-                CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
-            </if>
-            <if test="createTime != null">
-                CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="updateManNo != null">
-                UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
-            </if>
-            <if test="updateManName != null">
-                UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
-            </if>
-            <if test="updateTime != null">
-                UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="deleteManNo != null">
-                DELETE_MAN_NO = #{deleteManNo,jdbcType=VARCHAR},
-            </if>
-            <if test="deleteManName != null">
-                DELETE_MAN_NAME = #{deleteManName,jdbcType=VARCHAR},
-            </if>
-            <if test="deleteTime != null">
-                DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="pValueFlag != null">
-                P_VALUE_FLAG = #{pValueFlag,jdbcType=VARCHAR},
-            </if>
-            <if test="carAllocationTime != null">
-                CAR_ALLOCATION_TIME = #{carAllocationTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="isCompleted != null">
-                IS_COMPLETED = #{isCompleted,jdbcType=VARCHAR},
-            </if>
-            <if test="limsSamplingFlag != null">
-                LIMS_SAMPLING_FLAG = #{limsSamplingFlag,jdbcType=VARCHAR},
-            </if>
-            <if test="heatNo != null">
-                HEAT_NO = #{heatNo,jdbcType=VARCHAR},
-            </if>
-            <if test="idNum != null">
-                ID_NUM = #{idNum,jdbcType=VARCHAR},
-            </if>
-            <if test="predictionSource != null">
-                PREDICTION_SOURCE = #{predictionSource,jdbcType=VARCHAR},
-            </if>
-            <if test="meterPierName != null">
-                METER_PIER_NAME = #{meterPierName,jdbcType=VARCHAR},
-            </if>
-            <if test="meterPierNo != null">
-                METER_PIER_NO = #{meterPierNo,jdbcType=VARCHAR},
-            </if>
-            <if test="createDepname != null">
-                CREATE_DEPNAME = #{createDepname,jdbcType=VARCHAR},
-            </if>
-            <if test="createDepid != null">
-                CREATE_DEPID = #{createDepid,jdbcType=VARCHAR},
-            </if>
-            <if test="lineDesc != null">
-                LINE_DESC = #{lineDesc,jdbcType=VARCHAR},
-            </if>
-            <if test="lineCode != null">
-                LINE_CODE = #{lineCode,jdbcType=VARCHAR},
-            </if>
-            <if test="shipNo != null">
-                SHIP_NO = #{shipNo,jdbcType=VARCHAR},
-            </if>
-        </set>
-        where PREDICTION_NO = #{predictionNo,jdbcType=VARCHAR}
-    </update>
-    <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-        <include refid="select"/>
-        where PREDICTION_NO = #{predictionNo,jdbcType=VARCHAR}
-    </select>
-    <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-        <include refid="select"/>
-        <include refid="where"/>
-        order by  CREATE_TIME desc
-    </select>
-    <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-        <include refid="select"/>
-        <include refid="whereLike"/>
-        order by  CREATE_TIME desc
-    </select>
-    <insert id="batchInsert" parameterType="java.util.List">
-        insert into PRE_TRACK_SCALE
-        (PREDICTION_NO,
-        NOTICE_NO, CAR_NO, TRAILER_NO,
-        MATTER_NO, MATTER_NAME, CONTRACT_NO,
-        BATCH_NO, CUSTOMER_SUPPLIER_NO,
-        CUSTOMER_SUPPLIER_NAME, SOURCE_AREA,
-        FORWARDING_UNIT_NO, FORWARDING_UNIT_NAME,
-        RECEIVING_UINT_NO, RECEIVING_UINT_NAME,
-        MATERIAL_NO, MATERIAL_NAME, SPEC_NO,
-        SPEC_NAME, SHIPMENT_GROSS_WEIGHT,
-        SHIPMENT_NET_WEIGHT, SHIPMENT_NUM,
-        ADD_WEIGHT_SUM, BIND_CARD_NO, LOAD_POINT_NO,
-        LOAD_POINT_NAME, SAMPLE_NO, SAMPLE_VOUCHER,
-        CARRIER_UNIT_NO, CARRIER_UNIT_NAME,
-        PREDICTION_TYPE, PREDICTION_COMBINATION,
-        METER_TYPE_NO, METER_TYPE_NAME, USED_TYPE,
-        EFFECTIVE_START_TIME, EFFECTIVE_END_TIME,
-        EFFECTIVE_WEIGHT, EFFECTIVE_NUM,
-        METER_WEIGHT, METER_NUM, RAILWAY_NO,
-        METER_PROCESS_NO, METER_PROCESS_EDITION_NO,
-        MEMO, VALUE_FLAG, USED_TIME,
-        CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME,
-        UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME,
-        DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME,
-        P_VALUE_FLAG, CAR_ALLOCATION_TIME,
-        IS_COMPLETED, LIMS_SAMPLING_FLAG,
-        HEAT_NO, ID_NUM, PREDICTION_SOURCE,
-        METER_PIER_NAME, METER_PIER_NO, CREATE_DEPNAME,
-        CREATE_DEPID, LINE_DESC, LINE_CODE,
-        SHIP_NO)
-        ( <foreach collection="list" item="item" separator="union all">
-        select
-        #{item.predictionNo,jdbcType=VARCHAR},
-        #{item.noticeNo,jdbcType=VARCHAR}, #{item.carNo,jdbcType=VARCHAR}, #{item.trailerNo,jdbcType=VARCHAR},
-        #{item.matterNo,jdbcType=VARCHAR}, #{item.matterName,jdbcType=VARCHAR}, #{item.contractNo,jdbcType=VARCHAR},
-        #{item.batchNo,jdbcType=VARCHAR}, #{item.customerSupplierNo,jdbcType=VARCHAR},
-        #{item.customerSupplierName,jdbcType=VARCHAR}, #{item.sourceArea,jdbcType=VARCHAR},
-        #{item.forwardingUnitNo,jdbcType=VARCHAR}, #{item.forwardingUnitName,jdbcType=VARCHAR},
-        #{item.receivingUintNo,jdbcType=VARCHAR}, #{item.receivingUintName,jdbcType=VARCHAR},
-        #{item.materialNo,jdbcType=VARCHAR}, #{item.materialName,jdbcType=VARCHAR}, #{item.specNo,jdbcType=VARCHAR},
-        #{item.specName,jdbcType=VARCHAR}, #{item.shipmentGrossWeight,jdbcType=DECIMAL},
-        #{item.shipmentNetWeight,jdbcType=DECIMAL}, #{item.shipmentNum,jdbcType=DECIMAL},
-        #{item.addWeightSum,jdbcType=DECIMAL}, #{item.bindCardNo,jdbcType=VARCHAR}, #{item.loadPointNo,jdbcType=VARCHAR},
-        #{item.loadPointName,jdbcType=VARCHAR}, #{item.sampleNo,jdbcType=VARCHAR}, #{item.sampleVoucher,jdbcType=VARCHAR},
-        #{item.carrierUnitNo,jdbcType=VARCHAR}, #{item.carrierUnitName,jdbcType=VARCHAR},
-        #{item.predictionType,jdbcType=VARCHAR}, #{item.predictionCombination,jdbcType=VARCHAR},
-        #{item.meterTypeNo,jdbcType=VARCHAR}, #{item.meterTypeName,jdbcType=VARCHAR}, #{item.usedType,jdbcType=VARCHAR},
-        #{item.effectiveStartTime,jdbcType=TIMESTAMP}, #{item.effectiveEndTime,jdbcType=TIMESTAMP},
-        #{item.effectiveWeight,jdbcType=DECIMAL}, #{item.effectiveNum,jdbcType=DECIMAL},
-        #{item.meterWeight,jdbcType=DECIMAL}, #{item.meterNum,jdbcType=DECIMAL}, #{item.railwayNo,jdbcType=VARCHAR},
-        #{item.meterProcessNo,jdbcType=VARCHAR}, #{item.meterProcessEditionNo,jdbcType=VARCHAR},
-        #{item.memo,jdbcType=VARCHAR}, #{item.valueFlag,jdbcType=VARCHAR}, #{item.usedTime,jdbcType=TIMESTAMP},
-        #{item.createManNo,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP},
-        #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
-        #{item.deleteManNo,jdbcType=VARCHAR}, #{item.deleteManName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=TIMESTAMP},
-        #{item.pValueFlag,jdbcType=VARCHAR}, #{item.carAllocationTime,jdbcType=TIMESTAMP},
-        #{item.isCompleted,jdbcType=VARCHAR}, #{item.limsSamplingFlag,jdbcType=VARCHAR},
-        #{item.heatNo,jdbcType=VARCHAR}, #{item.idNum,jdbcType=VARCHAR}, #{item.predictionSource,jdbcType=VARCHAR},
-        #{item.meterPierName,jdbcType=VARCHAR}, #{item.meterPierNo,jdbcType=VARCHAR}, #{item.createDepname,jdbcType=VARCHAR},
-        #{item.createDepid,jdbcType=VARCHAR}, #{item.lineDesc,jdbcType=VARCHAR}, #{item.lineCode,jdbcType=VARCHAR},
-        #{item.shipNo,jdbcType=VARCHAR} from dual
-    </foreach> )
-    </insert>
-    <update id="batchUpdate" parameterType="java.util.List">
-        update PRE_TRACK_SCALE
-        set
-        PREDICTION_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.predictionNo,jdbcType=VARCHAR}
-        </foreach>
-        ,NOTICE_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.noticeNo,jdbcType=VARCHAR}
-        </foreach>
-        ,CAR_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.carNo,jdbcType=VARCHAR}
-        </foreach>
-        ,TRAILER_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.trailerNo,jdbcType=VARCHAR}
-        </foreach>
-        ,MATTER_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.matterNo,jdbcType=VARCHAR}
-        </foreach>
-        ,MATTER_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.matterName,jdbcType=VARCHAR}
-        </foreach>
-        ,CONTRACT_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.contractNo,jdbcType=VARCHAR}
-        </foreach>
-        ,BATCH_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.batchNo,jdbcType=VARCHAR}
-        </foreach>
-        ,CUSTOMER_SUPPLIER_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.customerSupplierNo,jdbcType=VARCHAR}
-        </foreach>
-        ,CUSTOMER_SUPPLIER_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.customerSupplierName,jdbcType=VARCHAR}
-        </foreach>
-        ,SOURCE_AREA=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.sourceArea,jdbcType=VARCHAR}
-        </foreach>
-        ,FORWARDING_UNIT_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.forwardingUnitNo,jdbcType=VARCHAR}
-        </foreach>
-        ,FORWARDING_UNIT_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.forwardingUnitName,jdbcType=VARCHAR}
-        </foreach>
-        ,RECEIVING_UINT_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.receivingUintNo,jdbcType=VARCHAR}
-        </foreach>
-        ,RECEIVING_UINT_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.receivingUintName,jdbcType=VARCHAR}
-        </foreach>
-        ,MATERIAL_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.materialNo,jdbcType=VARCHAR}
-        </foreach>
-        ,MATERIAL_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.materialName,jdbcType=VARCHAR}
-        </foreach>
-        ,SPEC_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.specNo,jdbcType=VARCHAR}
-        </foreach>
-        ,SPEC_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.specName,jdbcType=VARCHAR}
-        </foreach>
-        ,SHIPMENT_GROSS_WEIGHT=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.shipmentGrossWeight,jdbcType=DECIMAL}
-        </foreach>
-        ,SHIPMENT_NET_WEIGHT=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.shipmentNetWeight,jdbcType=DECIMAL}
-        </foreach>
-        ,SHIPMENT_NUM=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.shipmentNum,jdbcType=DECIMAL}
-        </foreach>
-        ,ADD_WEIGHT_SUM=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.addWeightSum,jdbcType=DECIMAL}
-        </foreach>
-        ,BIND_CARD_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.bindCardNo,jdbcType=VARCHAR}
-        </foreach>
-        ,LOAD_POINT_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.loadPointNo,jdbcType=VARCHAR}
-        </foreach>
-        ,LOAD_POINT_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.loadPointName,jdbcType=VARCHAR}
-        </foreach>
-        ,SAMPLE_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.sampleNo,jdbcType=VARCHAR}
-        </foreach>
-        ,SAMPLE_VOUCHER=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.sampleVoucher,jdbcType=VARCHAR}
-        </foreach>
-        ,CARRIER_UNIT_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.carrierUnitNo,jdbcType=VARCHAR}
-        </foreach>
-        ,CARRIER_UNIT_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.carrierUnitName,jdbcType=VARCHAR}
-        </foreach>
-        ,PREDICTION_TYPE=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.predictionType,jdbcType=VARCHAR}
-        </foreach>
-        ,PREDICTION_COMBINATION=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.predictionCombination,jdbcType=VARCHAR}
-        </foreach>
-        ,METER_TYPE_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.meterTypeNo,jdbcType=VARCHAR}
-        </foreach>
-        ,METER_TYPE_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.meterTypeName,jdbcType=VARCHAR}
-        </foreach>
-        ,USED_TYPE=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.usedType,jdbcType=VARCHAR}
-        </foreach>
-        ,EFFECTIVE_START_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.effectiveStartTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,EFFECTIVE_END_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.effectiveEndTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,EFFECTIVE_WEIGHT=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.effectiveWeight,jdbcType=DECIMAL}
-        </foreach>
-        ,EFFECTIVE_NUM=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.effectiveNum,jdbcType=DECIMAL}
-        </foreach>
-        ,METER_WEIGHT=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.meterWeight,jdbcType=DECIMAL}
-        </foreach>
-        ,METER_NUM=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.meterNum,jdbcType=DECIMAL}
-        </foreach>
-        ,RAILWAY_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.railwayNo,jdbcType=VARCHAR}
-        </foreach>
-        ,METER_PROCESS_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.meterProcessNo,jdbcType=VARCHAR}
-        </foreach>
-        ,METER_PROCESS_EDITION_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.meterProcessEditionNo,jdbcType=VARCHAR}
-        </foreach>
-        ,MEMO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
-        </foreach>
-        ,VALUE_FLAG=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.valueFlag,jdbcType=VARCHAR}
-        </foreach>
-        ,USED_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.usedTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,CREATE_MAN_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
-        </foreach>
-        ,CREATE_MAN_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
-        </foreach>
-        ,CREATE_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,UPDATE_MAN_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
-        </foreach>
-        ,UPDATE_MAN_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
-        </foreach>
-        ,UPDATE_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,DELETE_MAN_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.deleteManNo,jdbcType=VARCHAR}
-        </foreach>
-        ,DELETE_MAN_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.deleteManName,jdbcType=VARCHAR}
-        </foreach>
-        ,DELETE_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.deleteTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,P_VALUE_FLAG=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.pValueFlag,jdbcType=VARCHAR}
-        </foreach>
-        ,CAR_ALLOCATION_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.carAllocationTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,IS_COMPLETED=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.isCompleted,jdbcType=VARCHAR}
-        </foreach>
-        ,LIMS_SAMPLING_FLAG=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.limsSamplingFlag,jdbcType=VARCHAR}
-        </foreach>
-        ,HEAT_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.heatNo,jdbcType=VARCHAR}
-        </foreach>
-        ,ID_NUM=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.idNum,jdbcType=VARCHAR}
-        </foreach>
-        ,PREDICTION_SOURCE=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.predictionSource,jdbcType=VARCHAR}
-        </foreach>
-        ,METER_PIER_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.meterPierName,jdbcType=VARCHAR}
-        </foreach>
-        ,METER_PIER_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.meterPierNo,jdbcType=VARCHAR}
-        </foreach>
-        ,CREATE_DEPNAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.createDepname,jdbcType=VARCHAR}
-        </foreach>
-        ,CREATE_DEPID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.createDepid,jdbcType=VARCHAR}
-        </foreach>
-        ,LINE_DESC=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.lineDesc,jdbcType=VARCHAR}
-        </foreach>
-        ,LINE_CODE=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.lineCode,jdbcType=VARCHAR}
-        </foreach>
-        ,SHIP_NO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PREDICTION_NO" close="end">
-            when #{item.predictionNo,jdbcType=VARCHAR} then #{item.shipNo,jdbcType=VARCHAR}
-        </foreach>
-        where PREDICTION_NO in
-        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-            #{item.predictionNo,jdbcType=VARCHAR}
-        </foreach>
-    </update>
-    <delete id="batchDelete" parameterType="java.util.List">
-        delete from PRE_TRACK_SCALE
-        where PREDICTION_NO in
-        <foreach collection="list" item="id" open="(" close=")" separator=",">
-            #{id}
-        </foreach>
-    </delete>
-    <!-- 友情提示！！！-->
-    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-    <!-- 友情提示！！！-->
-    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-
-    <!-- 友情提示！！！-->
-    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-    <select id="selectPreTrackScaleByCompany" parameterType="map" resultMap="BaseResultMap">
-        SELECT
-        <include refid="columns"/>
-        from PRE_TRACK_SCALE t
-        <where>
-            <if test="receivingUintNo != null and  customerSupplierNo == null ">
-                and t.Receiving_Uint_No = #{receivingUintNo}
-            </if>
-            <if test="customerSupplierNo != null and receivingUintNo == null ">
-                and t.customer_supplier_no = #{customerSupplierNo}
-            </if>
-            <if test="customerSupplierNo != null and receivingUintNo != null ">
-                and (t.customer_supplier_no = #{customerSupplierNo} or t.Receiving_Uint_No = #{receivingUintNo})
-            </if>
-            <if test="meterTypeNos != null and meterTypeNos.size()>0">
-                and t.meter_type_no in
-                <foreach collection="meterTypeNos" index="index" item="item" separator="," open="(" close=")">
-                    #{item}
-                </foreach>
-            </if>
-            and t.value_flag in ('0','1') order by value_flag asc,CAR_ALLOCATION_TIME desc
-        </where>
-    </select>
-
-    <select id="selectPreTrackScaleByCarNo" parameterType="java.lang.String" resultMap="BaseResultMap">
-        SELECT
-        <include refid="columns"/>
-        from PRE_TRACK_SCALE t
-        <where>
-            t.value_flag in ('1','4')
-            <if test="carNo != null and carNo != ''">
-                and CAR_NO = #{carNo,jdbcType=VARCHAR}
-            </if>
-        </where>
-        order by t.value_flag desc,t.LIMS_SAMPLING_FLAG desc,t.car_allocation_time desc
-    </select>
-
-    <!--按照车号查询已使用完成的预报信息-->
-    <select id="selectPreTrackScaleByCarNoAll" parameterType="java.lang.String" resultMap="BaseResultMap">
-        SELECT
-        <include refid="columns"/>
-        from PRE_TRACK_SCALE t
-        <where>
-            <if test="carNo != null and carNo != ''">
-                and CAR_NO = #{carNo,jdbcType=VARCHAR}
-            </if>
-            and t.value_flag ='2'
-            and t.CAR_ALLOCATION_TIME>sysdate -7 order by value_flag asc,t.CAR_ALLOCATION_TIME desc
-        </where>
-    </select>
-
-    <select id="selectPreHD" parameterType="java.util.List" resultMap="BaseResultMap">
-        select *
-        from PRE_TRACK_SCALE
-        where CUSTOMER_SUPPLIER_NO in
-        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-            #{item}
-        </foreach>
-        and value_flag in ('0','1')
-        order by value_flag asc,CAR_ALLOCATION_TIME desc
-    </select>
-
-    <!--查询预报时，查询他自己的数据-->
-    <select id="selectPreHDandCreate" parameterType="java.util.List" resultMap="BaseResultMap">
-        select *
-        from PRE_TRACK_SCALE
-        where (CUSTOMER_SUPPLIER_NO in
-        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-            #{item}
-        </foreach>
-        or create_Man_No = #{customerSupplierNo})
-        and value_flag in ('0','1')
-        order by value_flag asc,CAR_ALLOCATION_TIME desc
-    </select>
-</mapper>

src/main/java/com/steerinfo/appservice/apppretrackscale/model/AppPreTrackScale.java

@@ -1,1089 +0,0 @@
-package com.steerinfo.appservice.apppretrackscale.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 AppPreTrackScale implements IBasePO<String> {
-    /**
-     * 预报编号（YYYYMMDD+4位流水）(PREDICTION_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value = "预报编号（YYYYMMDD+4位流水）", required = true)
-    private String predictionNo;
-
-    /**
-     * 通知单号(NOTICE_NO,VARCHAR,100)
-     */
-    @ApiModelProperty(value = "通知单号", required = false)
-    private String noticeNo;
-
-    /**
-     * 车号(CAR_NO,VARCHAR,100)
-     */
-    @ApiModelProperty(value = "车号", required = false)
-    private String carNo;
-
-    /**
-     * 挂号(TRAILER_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value = "挂号", required = false)
-    private String trailerNo;
-
-    /**
-     * 物料编号(MATTER_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value = "物料编号", required = true)
-    private String matterNo;
-
-    /**
-     * 物料名称(MATTER_NAME,VARCHAR,100)
-     */
-    @ApiModelProperty(value = "物料名称", required = true)
-    private String matterName;
-
-    /**
-     * 合同号(CONTRACT_NO,VARCHAR,40)
-     */
-    @ApiModelProperty(value = "合同号", required = false)
-    private String contractNo;
-
-    /**
-     * 批次号(BATCH_NO,VARCHAR,100)
-     */
-    @ApiModelProperty(value = "批次号", required = false)
-    private String batchNo;
-
-    /**
-     * 供应商/客户编号（外部单位账号）(CUSTOMER_SUPPLIER_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value = "供应商/客户编号（外部单位账号）", required = false)
-    private String customerSupplierNo;
-
-    /**
-     * 供应商/客户名称（外部单位名称）(CUSTOMER_SUPPLIER_NAME,VARCHAR,100)
-     */
-    @ApiModelProperty(value = "供应商/客户名称（外部单位名称）", required = false)
-    private String customerSupplierName;
-
-    /**
-     * 原产地(SOURCE_AREA,VARCHAR,50)
-     */
-    @ApiModelProperty(value = "原产地", required = false)
-    private String sourceArea;
-
-    /**
-     * 发货单位编号(FORWARDING_UNIT_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value = "发货单位编号", required = false)
-    private String forwardingUnitNo;
-
-    /**
-     * 发货单位名称(FORWARDING_UNIT_NAME,VARCHAR,100)
-     */
-    @ApiModelProperty(value = "发货单位名称", required = false)
-    private String forwardingUnitName;
-
-    /**
-     * 收货单位编号(RECEIVING_UINT_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value = "收货单位编号", required = false)
-    private String receivingUintNo;
-
-    /**
-     * 收货单位名称(RECEIVING_UINT_NAME,VARCHAR,100)
-     */
-    @ApiModelProperty(value = "收货单位名称", required = false)
-    private String receivingUintName;
-
-    /**
-     * 材质编号(MATERIAL_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value = "材质编号", required = false)
-    private String materialNo;
-
-    /**
-     * 材质名称(MATERIAL_NAME,VARCHAR,100)
-     */
-    @ApiModelProperty(value = "材质名称", required = false)
-    private String materialName;
-
-    /**
-     * 规格编号(SPEC_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value = "规格编号", required = false)
-    private String specNo;
-
-    /**
-     * 规格名称(SPEC_NAME,VARCHAR,100)
-     */
-    @ApiModelProperty(value = "规格名称", required = false)
-    private String specName;
-
-    /**
-     * 发运毛重(SHIPMENT_GROSS_WEIGHT,DECIMAL,10)
-     */
-    @ApiModelProperty(value = "发运毛重", required = false)
-    private BigDecimal shipmentGrossWeight;
-
-    /**
-     * 发运净重(SHIPMENT_NET_WEIGHT,DECIMAL,10)
-     */
-    @ApiModelProperty(value = "发运净重", required = false)
-    private BigDecimal shipmentNetWeight;
-
-    /**
-     * 发运数量(SHIPMENT_NUM,DECIMAL,5)
-     */
-    @ApiModelProperty(value = "发运数量", required = false)
-    private Integer shipmentNum;
-
-    /**
-     * 附加重量总和(ADD_WEIGHT_SUM,DECIMAL,10)
-     */
-    @ApiModelProperty(value = "附加重量总和", required = false)
-    private BigDecimal addWeightSum;
-
-    /**
-     * 绑定卡号(BIND_CARD_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value = "绑定卡号", required = false)
-    private String bindCardNo;
-
-    /**
-     * 卸货地点编号(LOAD_POINT_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value = "卸货地点编号", required = false)
-    private String loadPointNo;
-
-    /**
-     * 卸货地点名称(LOAD_POINT_NAME,VARCHAR,60)
-     */
-    @ApiModelProperty(value = "卸货地点名称", required = false)
-    private String loadPointName;
-
-    /**
-     * 取样编号(SAMPLE_NO,VARCHAR,40)
-     */
-    @ApiModelProperty(value = "取样编号", required = false)
-    private String sampleNo;
-
-    /**
-     * 取样凭证(SAMPLE_VOUCHER,VARCHAR,40)
-     */
-    @ApiModelProperty(value = "取样凭证", required = false)
-    private String sampleVoucher;
-
-    /**
-     * 承运单位编号(CARRIER_UNIT_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value = "承运单位编号", required = false)
-    private String carrierUnitNo;
-
-    /**
-     * 承运单位名称(CARRIER_UNIT_NAME,VARCHAR,100)
-     */
-    @ApiModelProperty(value = "承运单位名称", required = false)
-    private String carrierUnitName;
-
-    /**
-     * 预报类型（0：批次预报；1：单次预报；2：联运预报；3：分检预报；4：集装箱预报（同单次预报）
-     * <p>
-     * <p>
-     * 分检预报：火车皮上托运了几种物料，在完成计量后需修改动态轨道衡那边的数据
-     * ）(PREDICTION_TYPE,VARCHAR,1)
-     */
-    @ApiModelProperty(value = "预报类型（0：批次预报；1：单次预报；2：联运预报；3：分检预报；4：集装箱预报（同单次预报）分检预报：火车皮上托运了几种物料，在完成计量后需修改动态轨道衡那边的数据）", required = false)
-    private String predictionType;
-
-    /**
-     * 预报组合(PREDICTION_COMBINATION,VARCHAR,100)
-     */
-    @ApiModelProperty(value = "预报组合", required = false)
-    private String predictionCombination;
-
-    /**
-     * 计量类型编号（业务类型）(METER_TYPE_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value = "计量类型编号（业务类型）", required = true)
-    private String meterTypeNo;
-
-    /**
-     * 计量类型名称（业务类型）(METER_TYPE_NAME,VARCHAR,30)
-     */
-    @ApiModelProperty(value = "计量类型名称（业务类型）", required = true)
-    private String meterTypeName;
-
-    /**
-     * 可用类型（0：次数；1：时间；2：总量）(USED_TYPE,VARCHAR,1)
-     */
-    @ApiModelProperty(value = "可用类型（0：次数；1：时间；2：总量）", required = false)
-    private String usedType;
-
-    /**
-     * 有效开始时间（YYYY-MM-DD HH:mm:ss）(EFFECTIVE_START_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value = "有效开始时间（YYYY-MM-DD HH:mm:ss）", required = false)
-    private Date effectiveStartTime;
-
-    /**
-     * 有效结束时间（YYYY-MM-DD HH:mm:ss）(EFFECTIVE_END_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value = "有效结束时间（YYYY-MM-DD HH:mm:ss）", required = false)
-    private Date effectiveEndTime;
-
-    /**
-     * 有效总量(EFFECTIVE_WEIGHT,DECIMAL,10)
-     */
-    @ApiModelProperty(value = "有效总量", required = false)
-    private BigDecimal effectiveWeight;
-
-    /**
-     * 有效次数(EFFECTIVE_NUM,DECIMAL,5)
-     */
-    @ApiModelProperty(value = "有效次数", required = false)
-    private Integer effectiveNum;
-
-    /**
-     * 检斤重量(METER_WEIGHT,DECIMAL,10)
-     */
-    @ApiModelProperty(value = "检斤重量", required = false)
-    private BigDecimal meterWeight;
-
-    /**
-     * 检斤次数(METER_NUM,DECIMAL,5)
-     */
-    @ApiModelProperty(value = "检斤次数", required = false)
-    private Integer meterNum;
-
-    /**
-     * 火车车号（container_no集装箱号）(RAILWAY_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value = "火车车号（container_no集装箱号）", required = false)
-    private String railwayNo;
-
-    /**
-     * 计量流程编号(METER_PROCESS_NO,VARCHAR,50)
-     */
-    @ApiModelProperty(value = "计量流程编号", required = false)
-    private String meterProcessNo;
-
-    /**
-     * 计量流程版本号(METER_PROCESS_EDITION_NO,VARCHAR,50)
-     */
-    @ApiModelProperty(value = "计量流程版本号", required = false)
-    private String meterProcessEditionNo;
-
-    /**
-     * 备注(MEMO,VARCHAR,2000)
-     */
-    @ApiModelProperty(value = "备注", required = false)
-    private String memo;
-
-    /**
-     * 状态（0：未配车；1：未使用；2：已使用；3：已作废；4：正使用）(VALUE_FLAG,VARCHAR,1)
-     */
-    @ApiModelProperty(value = "状态（0：未配车；1：未使用；2：已使用；3：已作废；4：正使用）", required = true)
-    private String valueFlag;
-
-    /**
-     * 使用时间(USED_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value = "使用时间", required = false)
-    private Date usedTime;
-
-    /**
-     * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value = "创建人编号", required = true)
-    private String createManNo;
-
-    /**
-     * 创建人姓名(CREATE_MAN_NAME,VARCHAR,100)
-     */
-    @ApiModelProperty(value = "创建人姓名", required = true)
-    private String createManName;
-
-    /**
-     * 创建时间（YYYY-MM-DD HH:mm:SS）(CREATE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value = "创建时间（YYYY-MM-DD HH:mm:SS）", required = true)
-    private Date createTime;
-
-    /**
-     * 修改人编号(UPDATE_MAN_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value = "修改人编号", required = false)
-    private String updateManNo;
-
-    /**
-     * 修改人姓名(UPDATE_MAN_NAME,VARCHAR,100)
-     */
-    @ApiModelProperty(value = "修改人姓名", required = false)
-    private String updateManName;
-
-    /**
-     * 修改时间（YYYY-MM-DD HH:mm:SS）(UPDATE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value = "修改时间（YYYY-MM-DD HH:mm:SS）", required = false)
-    private Date updateTime;
-
-    /**
-     * 删除人编号(DELETE_MAN_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value = "删除人编号", required = false)
-    private String deleteManNo;
-
-    /**
-     * 删除人姓名(DELETE_MAN_NAME,VARCHAR,100)
-     */
-    @ApiModelProperty(value = "删除人姓名", required = false)
-    private String deleteManName;
-
-    /**
-     * 删除时间（YYYY-MM-DD HH:mm:SS）(DELETE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value = "删除时间（YYYY-MM-DD HH:mm:SS）", required = false)
-    private Date deleteTime;
-
-    /**
-     * 前状态(P_VALUE_FLAG,VARCHAR,1)
-     */
-    @ApiModelProperty(value = "前状态", required = false)
-    private String pValueFlag;
-
-    /**
-     * 配车时间（YYYY-MM-DD HH:mm:SS）(CAR_ALLOCATION_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value = "配车时间（YYYY-MM-DD HH:mm:SS）", required = false)
-    private Date carAllocationTime;
-
-    /**
-     * 是否完批（0=未完批；1=已完批）(IS_COMPLETED,VARCHAR,1)
-     */
-    @ApiModelProperty(value = "是否完批（0=未完批；1=已完批）", required = false)
-    private String isCompleted;
-
-    /**
-     * 检化验取样状态（0=未处理；1=待取样；2=已取样）(LIMS_SAMPLING_FLAG,VARCHAR,1)
-     */
-    @ApiModelProperty(value = "检化验取样状态（0=未处理；1=待取样；2=已取样）", required = false)
-    private String limsSamplingFlag;
-
-    /**
-     * 炉号(HEAT_NO,VARCHAR,100)
-     */
-    @ApiModelProperty(value = "炉号", required = false)
-    private String heatNo;
-
-    /**
-     * 身份证号(ID_NUM,VARCHAR,40)
-     */
-    @ApiModelProperty(value = "身份证号", required = false)
-    private String idNum;
-
-    /**
-     * 预报来源:物流、计量小程序、计量WEB、MES接口(PREDICTION_SOURCE,VARCHAR,40)
-     */
-    @ApiModelProperty(value = "预报来源:物流、计量小程序、计量WEB、MES接口", required = false)
-    private String predictionSource;
-
-    /**
-     * 计量码头名称(METER_PIER_NAME,VARCHAR,40)
-     */
-    @ApiModelProperty(value = "计量码头名称", required = false)
-    private String meterPierName;
-
-    /**
-     * 计量码头编号(METER_PIER_NO,VARCHAR,40)
-     */
-    @ApiModelProperty(value = "计量码头编号", required = false)
-    private String meterPierNo;
-
-    /**
-     * 创建机构名称(CREATE_DEPNAME,VARCHAR,40)
-     */
-    @ApiModelProperty(value = "创建机构名称", required = false)
-    private String createDepname;
-
-    /**
-     * 创建机构ID(CREATE_DEPID,VARCHAR,40)
-     */
-    @ApiModelProperty(value = "创建机构ID", required = false)
-    private String createDepid;
-
-    /**
-     * 物流线路描述(LINE_DESC,VARCHAR,256)
-     */
-    @ApiModelProperty(value = "物流线路描述", required = false)
-    private String lineDesc;
-
-    /**
-     * 线路编号（即:作业地点）(LINE_CODE,VARCHAR,40)
-     */
-    @ApiModelProperty(value = "线路编号（即:作业地点）", required = false)
-    private String lineCode;
-
-    /**
-     * 船号(SHIP_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value = "船号", required = false)
-    private String shipNo;
-
-    private static final long serialVersionUID = 1L;
-
-    @Override
-    public String getId() {
-        return this.predictionNo;
-    }
-
-    @Override
-    public void setId(String predictionNo) {
-        this.predictionNo = predictionNo == null ? null : predictionNo.trim();
-    }
-
-    public String getPredictionNo() {
-        return predictionNo;
-    }
-
-    public void setPredictionNo(String predictionNo) {
-        this.predictionNo = predictionNo == null ? null : predictionNo.trim();
-    }
-
-    public String getNoticeNo() {
-        return noticeNo;
-    }
-
-    public void setNoticeNo(String noticeNo) {
-        this.noticeNo = noticeNo == null ? null : noticeNo.trim();
-    }
-
-    public String getCarNo() {
-        return carNo;
-    }
-
-    public void setCarNo(String carNo) {
-        this.carNo = carNo == null ? null : carNo.trim();
-    }
-
-    public String getTrailerNo() {
-        return trailerNo;
-    }
-
-    public void setTrailerNo(String trailerNo) {
-        this.trailerNo = trailerNo == null ? null : trailerNo.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 getContractNo() {
-        return contractNo;
-    }
-
-    public void setContractNo(String contractNo) {
-        this.contractNo = contractNo == null ? null : contractNo.trim();
-    }
-
-    public String getBatchNo() {
-        return batchNo;
-    }
-
-    public void setBatchNo(String batchNo) {
-        this.batchNo = batchNo == null ? null : batchNo.trim();
-    }
-
-    public String getCustomerSupplierNo() {
-        return customerSupplierNo;
-    }
-
-    public void setCustomerSupplierNo(String customerSupplierNo) {
-        this.customerSupplierNo = customerSupplierNo == null ? null : customerSupplierNo.trim();
-    }
-
-    public String getCustomerSupplierName() {
-        return customerSupplierName;
-    }
-
-    public void setCustomerSupplierName(String customerSupplierName) {
-        this.customerSupplierName = customerSupplierName == null ? null : customerSupplierName.trim();
-    }
-
-    public String getSourceArea() {
-        return sourceArea;
-    }
-
-    public void setSourceArea(String sourceArea) {
-        this.sourceArea = sourceArea == null ? null : sourceArea.trim();
-    }
-
-    public String getForwardingUnitNo() {
-        return forwardingUnitNo;
-    }
-
-    public void setForwardingUnitNo(String forwardingUnitNo) {
-        this.forwardingUnitNo = forwardingUnitNo == null ? null : forwardingUnitNo.trim();
-    }
-
-    public String getForwardingUnitName() {
-        return forwardingUnitName;
-    }
-
-    public void setForwardingUnitName(String forwardingUnitName) {
-        this.forwardingUnitName = forwardingUnitName == null ? null : forwardingUnitName.trim();
-    }
-
-    public String getReceivingUintNo() {
-        return receivingUintNo;
-    }
-
-    public void setReceivingUintNo(String receivingUintNo) {
-        this.receivingUintNo = receivingUintNo == null ? null : receivingUintNo.trim();
-    }
-
-    public String getReceivingUintName() {
-        return receivingUintName;
-    }
-
-    public void setReceivingUintName(String receivingUintName) {
-        this.receivingUintName = receivingUintName == null ? null : receivingUintName.trim();
-    }
-
-    public String getMaterialNo() {
-        return materialNo;
-    }
-
-    public void setMaterialNo(String materialNo) {
-        this.materialNo = materialNo == null ? null : materialNo.trim();
-    }
-
-    public String getMaterialName() {
-        return materialName;
-    }
-
-    public void setMaterialName(String materialName) {
-        this.materialName = materialName == null ? null : materialName.trim();
-    }
-
-    public String getSpecNo() {
-        return specNo;
-    }
-
-    public void setSpecNo(String specNo) {
-        this.specNo = specNo == null ? null : specNo.trim();
-    }
-
-    public String getSpecName() {
-        return specName;
-    }
-
-    public void setSpecName(String specName) {
-        this.specName = specName == null ? null : specName.trim();
-    }
-
-    public BigDecimal getShipmentGrossWeight() {
-        return shipmentGrossWeight;
-    }
-
-    public void setShipmentGrossWeight(BigDecimal shipmentGrossWeight) {
-        this.shipmentGrossWeight = shipmentGrossWeight;
-    }
-
-    public BigDecimal getShipmentNetWeight() {
-        return shipmentNetWeight;
-    }
-
-    public void setShipmentNetWeight(BigDecimal shipmentNetWeight) {
-        this.shipmentNetWeight = shipmentNetWeight;
-    }
-
-    public Integer getShipmentNum() {
-        return shipmentNum;
-    }
-
-    public void setShipmentNum(Integer shipmentNum) {
-        this.shipmentNum = shipmentNum;
-    }
-
-    public BigDecimal getAddWeightSum() {
-        return addWeightSum;
-    }
-
-    public void setAddWeightSum(BigDecimal addWeightSum) {
-        this.addWeightSum = addWeightSum;
-    }
-
-    public String getBindCardNo() {
-        return bindCardNo;
-    }
-
-    public void setBindCardNo(String bindCardNo) {
-        this.bindCardNo = bindCardNo == null ? null : bindCardNo.trim();
-    }
-
-    public String getLoadPointNo() {
-        return loadPointNo;
-    }
-
-    public void setLoadPointNo(String loadPointNo) {
-        this.loadPointNo = loadPointNo == null ? null : loadPointNo.trim();
-    }
-
-    public String getLoadPointName() {
-        return loadPointName;
-    }
-
-    public void setLoadPointName(String loadPointName) {
-        this.loadPointName = loadPointName == null ? null : loadPointName.trim();
-    }
-
-    public String getSampleNo() {
-        return sampleNo;
-    }
-
-    public void setSampleNo(String sampleNo) {
-        this.sampleNo = sampleNo == null ? null : sampleNo.trim();
-    }
-
-    public String getSampleVoucher() {
-        return sampleVoucher;
-    }
-
-    public void setSampleVoucher(String sampleVoucher) {
-        this.sampleVoucher = sampleVoucher == null ? null : sampleVoucher.trim();
-    }
-
-    public String getCarrierUnitNo() {
-        return carrierUnitNo;
-    }
-
-    public void setCarrierUnitNo(String carrierUnitNo) {
-        this.carrierUnitNo = carrierUnitNo == null ? null : carrierUnitNo.trim();
-    }
-
-    public String getCarrierUnitName() {
-        return carrierUnitName;
-    }
-
-    public void setCarrierUnitName(String carrierUnitName) {
-        this.carrierUnitName = carrierUnitName == null ? null : carrierUnitName.trim();
-    }
-
-    public String getPredictionType() {
-        return predictionType;
-    }
-
-    public void setPredictionType(String predictionType) {
-        this.predictionType = predictionType == null ? null : predictionType.trim();
-    }
-
-    public String getPredictionCombination() {
-        return predictionCombination;
-    }
-
-    public void setPredictionCombination(String predictionCombination) {
-        this.predictionCombination = predictionCombination == null ? null : predictionCombination.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 getUsedType() {
-        return usedType;
-    }
-
-    public void setUsedType(String usedType) {
-        this.usedType = usedType == null ? null : usedType.trim();
-    }
-
-    public Date getEffectiveStartTime() {
-        return effectiveStartTime;
-    }
-
-    public void setEffectiveStartTime(Date effectiveStartTime) {
-        this.effectiveStartTime = effectiveStartTime;
-    }
-
-    public Date getEffectiveEndTime() {
-        return effectiveEndTime;
-    }
-
-    public void setEffectiveEndTime(Date effectiveEndTime) {
-        this.effectiveEndTime = effectiveEndTime;
-    }
-
-    public BigDecimal getEffectiveWeight() {
-        return effectiveWeight;
-    }
-
-    public void setEffectiveWeight(BigDecimal effectiveWeight) {
-        this.effectiveWeight = effectiveWeight;
-    }
-
-    public Integer getEffectiveNum() {
-        return effectiveNum;
-    }
-
-    public void setEffectiveNum(Integer effectiveNum) {
-        this.effectiveNum = effectiveNum;
-    }
-
-    public BigDecimal getMeterWeight() {
-        return meterWeight;
-    }
-
-    public void setMeterWeight(BigDecimal meterWeight) {
-        this.meterWeight = meterWeight;
-    }
-
-    public Integer getMeterNum() {
-        return meterNum;
-    }
-
-    public void setMeterNum(Integer meterNum) {
-        this.meterNum = meterNum;
-    }
-
-    public String getRailwayNo() {
-        return railwayNo;
-    }
-
-    public void setRailwayNo(String railwayNo) {
-        this.railwayNo = railwayNo == null ? null : railwayNo.trim();
-    }
-
-    public String getMeterProcessNo() {
-        return meterProcessNo;
-    }
-
-    public void setMeterProcessNo(String meterProcessNo) {
-        this.meterProcessNo = meterProcessNo == null ? null : meterProcessNo.trim();
-    }
-
-    public String getMeterProcessEditionNo() {
-        return meterProcessEditionNo;
-    }
-
-    public void setMeterProcessEditionNo(String meterProcessEditionNo) {
-        this.meterProcessEditionNo = meterProcessEditionNo == null ? null : meterProcessEditionNo.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 Date getUsedTime() {
-        return usedTime;
-    }
-
-    public void setUsedTime(Date usedTime) {
-        this.usedTime = usedTime;
-    }
-
-    public String getCreateManNo() {
-        return createManNo;
-    }
-
-    public void setCreateManNo(String createManNo) {
-        this.createManNo = createManNo == null ? null : createManNo.trim();
-    }
-
-    public String getCreateManName() {
-        return createManName;
-    }
-
-    public void setCreateManName(String createManName) {
-        this.createManName = createManName == null ? null : createManName.trim();
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getUpdateManNo() {
-        return updateManNo;
-    }
-
-    public void setUpdateManNo(String updateManNo) {
-        this.updateManNo = updateManNo == null ? null : updateManNo.trim();
-    }
-
-    public String getUpdateManName() {
-        return updateManName;
-    }
-
-    public void setUpdateManName(String updateManName) {
-        this.updateManName = updateManName == null ? null : updateManName.trim();
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getDeleteManNo() {
-        return deleteManNo;
-    }
-
-    public void setDeleteManNo(String deleteManNo) {
-        this.deleteManNo = deleteManNo == null ? null : deleteManNo.trim();
-    }
-
-    public String getDeleteManName() {
-        return deleteManName;
-    }
-
-    public void setDeleteManName(String deleteManName) {
-        this.deleteManName = deleteManName == null ? null : deleteManName.trim();
-    }
-
-    public Date getDeleteTime() {
-        return deleteTime;
-    }
-
-    public void setDeleteTime(Date deleteTime) {
-        this.deleteTime = deleteTime;
-    }
-
-    public String getpValueFlag() {
-        return pValueFlag;
-    }
-
-    public void setpValueFlag(String pValueFlag) {
-        this.pValueFlag = pValueFlag == null ? null : pValueFlag.trim();
-    }
-
-    public Date getCarAllocationTime() {
-        return carAllocationTime;
-    }
-
-    public void setCarAllocationTime(Date carAllocationTime) {
-        this.carAllocationTime = carAllocationTime;
-    }
-
-    public String getIsCompleted() {
-        return isCompleted;
-    }
-
-    public void setIsCompleted(String isCompleted) {
-        this.isCompleted = isCompleted == null ? null : isCompleted.trim();
-    }
-
-    public String getLimsSamplingFlag() {
-        return limsSamplingFlag;
-    }
-
-    public void setLimsSamplingFlag(String limsSamplingFlag) {
-        this.limsSamplingFlag = limsSamplingFlag == null ? null : limsSamplingFlag.trim();
-    }
-
-    public String getHeatNo() {
-        return heatNo;
-    }
-
-    public void setHeatNo(String heatNo) {
-        this.heatNo = heatNo == null ? null : heatNo.trim();
-    }
-
-    public String getIdNum() {
-        return idNum;
-    }
-
-    public void setIdNum(String idNum) {
-        this.idNum = idNum == null ? null : idNum.trim();
-    }
-
-    public String getPredictionSource() {
-        return predictionSource;
-    }
-
-    public void setPredictionSource(String predictionSource) {
-        this.predictionSource = predictionSource == null ? null : predictionSource.trim();
-    }
-
-    public String getMeterPierName() {
-        return meterPierName;
-    }
-
-    public void setMeterPierName(String meterPierName) {
-        this.meterPierName = meterPierName == null ? null : meterPierName.trim();
-    }
-
-    public String getMeterPierNo() {
-        return meterPierNo;
-    }
-
-    public void setMeterPierNo(String meterPierNo) {
-        this.meterPierNo = meterPierNo == null ? null : meterPierNo.trim();
-    }
-
-    public String getCreateDepname() {
-        return createDepname;
-    }
-
-    public void setCreateDepname(String createDepname) {
-        this.createDepname = createDepname == null ? null : createDepname.trim();
-    }
-
-    public String getCreateDepid() {
-        return createDepid;
-    }
-
-    public void setCreateDepid(String createDepid) {
-        this.createDepid = createDepid == null ? null : createDepid.trim();
-    }
-
-    public String getLineDesc() {
-        return lineDesc;
-    }
-
-    public void setLineDesc(String lineDesc) {
-        this.lineDesc = lineDesc == null ? null : lineDesc.trim();
-    }
-
-    public String getLineCode() {
-        return lineCode;
-    }
-
-    public void setLineCode(String lineCode) {
-        this.lineCode = lineCode == null ? null : lineCode.trim();
-    }
-
-    public String getShipNo() {
-        return shipNo;
-    }
-
-    public void setShipNo(String shipNo) {
-        this.shipNo = shipNo == null ? null : shipNo.trim();
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", predictionNo=").append(predictionNo);
-        sb.append(", noticeNo=").append(noticeNo);
-        sb.append(", carNo=").append(carNo);
-        sb.append(", trailerNo=").append(trailerNo);
-        sb.append(", matterNo=").append(matterNo);
-        sb.append(", matterName=").append(matterName);
-        sb.append(", contractNo=").append(contractNo);
-        sb.append(", batchNo=").append(batchNo);
-        sb.append(", customerSupplierNo=").append(customerSupplierNo);
-        sb.append(", customerSupplierName=").append(customerSupplierName);
-        sb.append(", sourceArea=").append(sourceArea);
-        sb.append(", forwardingUnitNo=").append(forwardingUnitNo);
-        sb.append(", forwardingUnitName=").append(forwardingUnitName);
-        sb.append(", receivingUintNo=").append(receivingUintNo);
-        sb.append(", receivingUintName=").append(receivingUintName);
-        sb.append(", materialNo=").append(materialNo);
-        sb.append(", materialName=").append(materialName);
-        sb.append(", specNo=").append(specNo);
-        sb.append(", specName=").append(specName);
-        sb.append(", shipmentGrossWeight=").append(shipmentGrossWeight);
-        sb.append(", shipmentNetWeight=").append(shipmentNetWeight);
-        sb.append(", shipmentNum=").append(shipmentNum);
-        sb.append(", addWeightSum=").append(addWeightSum);
-        sb.append(", bindCardNo=").append(bindCardNo);
-        sb.append(", loadPointNo=").append(loadPointNo);
-        sb.append(", loadPointName=").append(loadPointName);
-        sb.append(", sampleNo=").append(sampleNo);
-        sb.append(", sampleVoucher=").append(sampleVoucher);
-        sb.append(", carrierUnitNo=").append(carrierUnitNo);
-        sb.append(", carrierUnitName=").append(carrierUnitName);
-        sb.append(", predictionType=").append(predictionType);
-        sb.append(", predictionCombination=").append(predictionCombination);
-        sb.append(", meterTypeNo=").append(meterTypeNo);
-        sb.append(", meterTypeName=").append(meterTypeName);
-        sb.append(", usedType=").append(usedType);
-        sb.append(", effectiveStartTime=").append(effectiveStartTime);
-        sb.append(", effectiveEndTime=").append(effectiveEndTime);
-        sb.append(", effectiveWeight=").append(effectiveWeight);
-        sb.append(", effectiveNum=").append(effectiveNum);
-        sb.append(", meterWeight=").append(meterWeight);
-        sb.append(", meterNum=").append(meterNum);
-        sb.append(", railwayNo=").append(railwayNo);
-        sb.append(", meterProcessNo=").append(meterProcessNo);
-        sb.append(", meterProcessEditionNo=").append(meterProcessEditionNo);
-        sb.append(", memo=").append(memo);
-        sb.append(", valueFlag=").append(valueFlag);
-        sb.append(", usedTime=").append(usedTime);
-        sb.append(", createManNo=").append(createManNo);
-        sb.append(", createManName=").append(createManName);
-        sb.append(", createTime=").append(createTime);
-        sb.append(", updateManNo=").append(updateManNo);
-        sb.append(", updateManName=").append(updateManName);
-        sb.append(", updateTime=").append(updateTime);
-        sb.append(", deleteManNo=").append(deleteManNo);
-        sb.append(", deleteManName=").append(deleteManName);
-        sb.append(", deleteTime=").append(deleteTime);
-        sb.append(", pValueFlag=").append(pValueFlag);
-        sb.append(", carAllocationTime=").append(carAllocationTime);
-        sb.append(", isCompleted=").append(isCompleted);
-        sb.append(", limsSamplingFlag=").append(limsSamplingFlag);
-        sb.append(", heatNo=").append(heatNo);
-        sb.append(", idNum=").append(idNum);
-        sb.append(", predictionSource=").append(predictionSource);
-        sb.append(", meterPierName=").append(meterPierName);
-        sb.append(", meterPierNo=").append(meterPierNo);
-        sb.append(", createDepname=").append(createDepname);
-        sb.append(", createDepid=").append(createDepid);
-        sb.append(", lineDesc=").append(lineDesc);
-        sb.append(", lineCode=").append(lineCode);
-        sb.append(", shipNo=").append(shipNo);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}

src/main/java/com/steerinfo/appservice/apppretrackscale/service/IAppPreTrackScaleService.java

@@ -1,64 +0,0 @@
-package com.steerinfo.appservice.apppretrackscale.service;
-
-import com.steerinfo.appservice.apppretrackscale.model.AppPreTrackScale;
-import com.steerinfo.appservice.dto.AppPreTrackScaleDto;
-import com.steerinfo.framework.service.IBaseService;
-import com.steerinfo.framework.service.pagehelper.PageList;
-import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
-import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
-import com.steerinfo.pretrack.pretracknotice.model.PreTrackNotice;
-import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
-
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * PreTrackScale服务接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2020-10-20 09:26
- * 类描述
- * 修订历史：
- * 日期：2020-10-20
- * 作者：generator
- * 参考：
- * 描述：PreTrackScale服务接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-public interface IAppPreTrackScaleService extends IBaseService<AppPreTrackScale, String>{
-    PageList<AppPreTrackScale> doQueryApp(HashMap parmas,Integer pageNum, Integer pageSize);
-
-    PageList<AppPreTrackScale> doQueryAppByCar(HashMap parmas, Integer pageNum, Integer pageSize);
-
-    MeterWorkCarActualFirst scanAndDecryptFrist(String str, String str1);
-
-    MeterWorkCarActual scanAndDecryptActual(String str, String str1);
-
-    PreTrackScale addByNotice(PreTrackScale model);
-
-    PreTrackScale allocationApp(PreTrackScale model) ;
-
-    PageList<PreTrackNotice> doQueryNoticeApp(HashMap parmas, Integer pageNum, Integer pageSize);
-
-    /**
-     * 通过预报：创建接口
-     * @param model
-     * @return
-     */
-    PreTrackScale addFroInterface(AppPreTrackScaleDto model);
-
-    /**
-     * 通过预报接口，添加车辆、车辆及供应商匹配表、物料、收货单位、发货单位基础信息
-     * @param model
-     * @return
-     */
-    AppPreTrackScaleDto addBaseFroInterface(AppPreTrackScaleDto model);
-
-    /**
-     * 非计量进出厂
-     * @param model
-     * @param str
-     * @return
-     */
-    String noMeterDoor(PreTrackScale model, String str);
-}

src/main/java/com/steerinfo/appservice/apppretrackscale/service/impl/AppPreTrackScaleServiceImpl.java

@@ -1,565 +0,0 @@
-package com.steerinfo.appservice.apppretrackscale.service.impl;
-
-import com.steerinfo.appservice.appmeterbasecarlogin.mapper.AppMeterBaseCarLoginMapper;
-import com.steerinfo.appservice.appmeterbasecarlogin.model.AppMeterBaseCarLogin;
-import com.steerinfo.appservice.appmeterbasecustomersupplier.mapper.AppMeterBaseCustomerSupplierMapper;
-import com.steerinfo.appservice.appmeterbasecustomersupplier.model.AppMeterBaseCustomerSupplier;
-import com.steerinfo.appservice.apppretrackscale.mapper.AppPreTrackScaleMapper;
-import com.steerinfo.appservice.apppretrackscale.model.AppPreTrackScale;
-import com.steerinfo.appservice.apppretrackscale.service.IAppPreTrackScaleService;
-import com.steerinfo.appservice.dto.AppPreTrackScaleDto;
-import com.steerinfo.baseinfo.combaseinfo.mapper.ComBaseInfoMapper;
-import com.steerinfo.baseinfo.meterbasecarblacelist.mapper.MeterBaseCarBlacelistMapper;
-import com.steerinfo.baseinfo.meterbasecarriercustomer.mapper.MeterBaseCarrierCustomerMapper;
-import com.steerinfo.baseinfo.meterbasecarrierunitcar.mapper.MeterBaseCarrierUnitCarMapper;
-import com.steerinfo.baseinfo.meterbasecussupcar.mapper.MeterBaseCusSupCarMapper;
-import com.steerinfo.baseinfo.meterbasecussupcar.model.MeterBaseCusSupCar;
-import com.steerinfo.baseinfo.meterbasecustomersupplier.mapper.MeterBaseCustomerSupplierMapper;
-import com.steerinfo.baseinfo.meterbasecustomersupplier.model.MeterBaseCustomerSupplier;
-import com.steerinfo.baseinfo.meterbasematterinfo.mapper.MeterBaseMatterInfoMapper;
-import com.steerinfo.baseinfo.meterbasematterinfo.model.MeterBaseMatterInfo;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
-import com.steerinfo.framework.service.pagehelper.PageHelper;
-import com.steerinfo.framework.service.pagehelper.PageList;
-import com.steerinfo.framework.utils.collection.ListUtils;
-import com.steerinfo.meterwork.except.MarkerMetException;
-import com.steerinfo.meterwork.meterworkcaractual.mapper.MeterWorkCarActualMapper;
-import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
-import com.steerinfo.meterwork.meterworkcaractualfirst.mapper.MeterWorkCarActualFirstMapper;
-import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
-import com.steerinfo.meterwork.meterworkprelink.mapper.MeterWorkPreLinkMapper;
-import com.steerinfo.meterwork.meterworkprelink.model.MeterWorkPreLink;
-import com.steerinfo.meterwork.meterworkprelink.service.impl.MeterWorkPreLinkServiceImpl;
-import com.steerinfo.meterwork.meterworkpreprocess.mapper.MeterWorkPreProcessMapper;
-import com.steerinfo.pretrack.constants.DbConstants;
-import com.steerinfo.pretrack.pretracknotice.mapper.PreTrackNoticeMapper;
-import com.steerinfo.pretrack.pretracknotice.model.PreTrackNotice;
-import com.steerinfo.pretrack.pretrackscale.mapper.PreTrackScaleMapper;
-import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
-import com.steerinfo.pretrack.pretrackscale.service.impl.PreTrackScaleServiceImpl;
-import com.steerinfo.util.DoChinFilters;
-import com.steerinfo.util.FieldsCollector;
-import com.steerinfo.util.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Primary;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-/**
- * PreTrackScale服务实现：
- *
- * @author generator
- * @version 1.0-SNAPSHORT 2020-10-20 09:26
- * 类描述
- * 修订历史：
- * 日期：2020-10-20
- * 作者：generator
- * 参考：
- * 描述：PreTrackScale服务实现
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- * @see null
- */
-@Service(value = "appServicePreTrackScaleService")
-@Primary
-public class AppPreTrackScaleServiceImpl extends BaseServiceImpl<AppPreTrackScale, String> implements IAppPreTrackScaleService {
-
-    @Resource
-    private MeterWorkCarActualMapper meterWorkCarActualMapper;
-
-    @Resource
-    private MeterWorkCarActualFirstMapper meterWorkCarActualFirstMapper;
-
-    @Resource
-    private MeterBaseCustomerSupplierMapper meterBaseCustomerSupplierMapper;
-
-    @Resource
-    private AppPreTrackScaleMapper apppreTrackScaleMapper;
-
-    @Resource
-    private MeterWorkPreLinkMapper meterWorkPreLinkMapper;
-
-    @Resource
-    private MeterWorkPreProcessMapper meterWorkPreProcessMapper;
-
-    @Resource
-    private MeterBaseMatterInfoMapper meterBaseMatterInfoMapper;
-
-    @Resource
-    private AppMeterBaseCustomerSupplierMapper appmeterBaseCustomerSupplierMapper;
-
-    @Resource
-    private MeterBaseCarBlacelistMapper meterBaseCarBlacelistMapper;
-
-    @Resource
-    private MeterBaseCusSupCarMapper meterBaseCusSupCarMapper;
-
-    @Resource
-    private MeterBaseCarrierUnitCarMapper meterBaseCarrierUnitCarMapper;
-
-    @Resource
-    private PreTrackNoticeMapper preTrackNoticeMapper;
-
-    @Autowired
-    public MeterWorkPreLinkServiceImpl meterWorkPreLinkServiceImpl;
-
-    @Resource
-    private PreTrackScaleMapper preTrackScaleMapper;
-
-    @Autowired
-    private PreTrackScaleServiceImpl preTrackScaleService;
-
-    @Autowired
-    private MeterBaseCarrierCustomerMapper meterBaseCarrierCustomerMapper;
-
-    @Autowired
-    private ComBaseInfoMapper comBaseInfoMapper;
-
-    /**
-     * 车辆登陆表
-     */
-    @Autowired
-    private AppMeterBaseCarLoginMapper appMeterBaseCarLoginMapper;
-
-    @Override
-    protected IBaseMapper<AppPreTrackScale, String> getMapper() {
-        return apppreTrackScaleMapper;
-    }
-
-    //根据客商编号查询预报信息
-    @Override
-    @Transactional
-    public PageList<AppPreTrackScale> doQueryApp(HashMap parameters, Integer pageNum, Integer pageSize) {
-        if (parameters == null || parameters.size() < 1) {
-            return null;
-        }
-        Object customerSupplierNoObj = parameters.get("customerSupplierNo");
-        if (customerSupplierNoObj == null) {
-            return null;
-        }
-        String no = customerSupplierNoObj.toString(); //当前登录用户
-        AppMeterBaseCustomerSupplier mbcs = appmeterBaseCustomerSupplierMapper.selectByPrimaryKey(no);
-        List<String> meterTypeNos = new ArrayList<>();
-        String customerSupplierNo = null;
-        String receivingUintNo = null;
-        switch (mbcs.getCustomerSupplierType()) {
-            case "0": //客户
-                meterTypeNos.add("001006002");
-                receivingUintNo = no;
-                break;
-            case "1": //供应商
-                meterTypeNos.add("001006001");
-                customerSupplierNo = no;
-                break;
-            case "2": //客户&供应商
-                meterTypeNos.add("001006001");
-                customerSupplierNo = no;
-                meterTypeNos.add("001006002");
-                receivingUintNo = no;
-                break;
-            case "3"://货代
-                return selectPreHD(no, pageNum, pageSize);
-            default:
-                return null;
-        }
-        Map<String, Object> map = new HashMap<>();
-        map.put("meterTypeNos", meterTypeNos);
-        map.put("customerSupplierNo", customerSupplierNo);
-        map.put("receivingUintNo", receivingUintNo);
-
-        PageHelper.startPage(pageNum, pageSize);
-        List<AppPreTrackScale> list = apppreTrackScaleMapper.selectPreTrackScaleByCompany(map);
-        PageList pageInfo = new PageList(list);
-        return pageInfo;
-    }
-
-    @Override
-    public PageList<AppPreTrackScale> doQueryAppByCar(HashMap parmas, Integer pageNum, Integer pageSize) {
-        Object carNoObj = parmas.get("carNo");
-        if (carNoObj == null || "".equals(carNoObj)) {
-            return null;
-        }
-        String carNo = carNoObj.toString();
-        if (parmas.get("memo") != null && parmas.get("memo").equals("1")) {
-            PageHelper.startPage(pageNum, pageSize);
-            List<AppPreTrackScale> rows = apppreTrackScaleMapper.selectPreTrackScaleByCarNoAll(carNo);
-            PageList pageInfo = new PageList(rows);
-            return pageInfo;
-        }
-        PageHelper.startPage(pageNum, pageSize);
-        List<AppPreTrackScale> rows = apppreTrackScaleMapper.selectPreTrackScaleByCarNo(carNo);
-        PageList pageInfo = new PageList(rows);
-        return pageInfo;
-    }
-
-
-    @Override
-    public MeterWorkCarActualFirst scanAndDecryptFrist(String str, String str1) {
-        MeterWorkCarActualFirst mwcaf = meterWorkCarActualFirstMapper.selectByPrimaryKey(str);
-        BigDecimal bd = new BigDecimal(str1);
-        if (mwcaf.getMeterWeight().compareTo(bd) == 0) {
-            return mwcaf;
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public MeterWorkCarActual scanAndDecryptActual(String str, String str1) {
-        MeterWorkCarActual mwca = meterWorkCarActualMapper.selectByPrimaryKey(str);
-        BigDecimal bd = new BigDecimal(str1);
-        if (mwca.getNetWeight().compareTo(bd) == 0) {
-            return mwca;
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    @Transactional
-    public PreTrackScale allocationApp(PreTrackScale model) {
-        //直接调用预报的修改方法.(匹配过程相当于修改)
-        if (model == null) {
-            throw new MarkerMetException(500, "参数为空!!");
-        }
-        if (model.getValueFlag().equals("2") || model.getValueFlag().equals("3") || model.getValueFlag().equals("4")) {
-            throw new MarkerMetException(500, "该状态不允许修改!!");
-        }
-        PreTrackScale pts = preTrackScaleMapper.selectByPrimaryKey(model.getPredictionNo());
-        if (StringUtils.isNotEmpty(pts.getCarNo())) {
-            List<MeterWorkPreLink> meterWorkPreLink = meterWorkPreLinkServiceImpl.getNextFlag(pts.getPredictionNo(), DbConstants.APPOINTMENT);
-            if (meterWorkPreLink.size() > 0) {
-                if (meterWorkPreLink.get(0).getValueFlag().equals("1")) {
-                    throw new MarkerMetException(500, "下一步环节已执行，无法修改!!");
-                }
-            }
-            //对预流程、预环节进行删除
-            preTrackScaleService.canceleAllocation(pts);
-        }
-        preTrackScaleMapper.deleteByPrimaryKey(pts.getPredictionNo());
-        preTrackScaleService.checkandaddApp(model);
-        return model;
-    }
-
-
-    @Override
-    @Transactional
-    public PreTrackScale addByNotice(PreTrackScale model) {
-        if (model == null) {
-            throw new MarkerMetException(500, "参数为空!!");
-        }
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-        String no = preTrackScaleMapper.getNewID(sdf.format(new Date()));
-        model.setPredictionNo(sdf.format(new Date()) + no);
-        model.setCreateTime(new Date());
-
-        //新增一条预报
-        model = preTrackScaleService.checkandadd(model);
-        return model;
-    }
-
-    /**
-     * APP预报查询接口
-     *
-     * @param parmas
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @Override
-    @Transactional
-    public PageList<PreTrackNotice> doQueryNoticeApp(HashMap parmas, Integer pageNum, Integer pageSize) {
-        Object customerSupplierNoObj = parmas.get("customerSupplierNo");
-        if (customerSupplierNoObj == null) {
-            return null;
-        }
-        String customerSupplierNo = customerSupplierNoObj.toString();
-        MeterBaseCustomerSupplier meterBaseCustomerSupplier = meterBaseCustomerSupplierMapper.selectByPrimaryKey(customerSupplierNo);
-        List<String> ids = new ArrayList<>();
-        if (meterBaseCustomerSupplier.getCustomerSupplierType().equals("3")) {
-            ids = meterBaseCarrierCustomerMapper.selectHD(customerSupplierNo);
-        } else {
-            ids.add(customerSupplierNo);
-        }
-        PageHelper.startPage(pageNum, pageSize);
-        List<PreTrackNotice> rows = preTrackNoticeMapper.selectByCustomer(ids);
-        PageList pageInfo = new PageList(rows);
-        return pageInfo;
-    }
-
-    /**
-     * 通过预报：创建接口
-     *
-     * @param model
-     * @return
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public PreTrackScale addFroInterface(AppPreTrackScaleDto model) {
-        if (model == null || StringUtils.isEmpty(model.getCarNo()) || StringUtils.isEmpty(model.getPredictionSource())) {
-            throw new MarkerMetException(500, "车号、数据来源不允许为空!!");
-        }
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-        String no = preTrackScaleMapper.getNewID(sdf.format(new Date()));
-        model.setPredictionNo(sdf.format(new Date()) + no);
-        model.setCreateTime(new Date());
-
-        PreTrackScale scale = new PreTrackScale();
-        BeanUtils.copyProperties(model, scale);
-
-        //新增一条预报
-        if ("非计量".equals(scale.getMeterTypeName())) {
-            scale = preTrackScaleService.checkandaddNotMetter(scale);
-        } else {
-            scale = preTrackScaleService.checkandadd(scale);
-        }
-        return scale;
-    }
-
-    /**
-     * 通过预报接口，添加车辆、车辆及供应商匹配表、物料、收货单位、发货单位基础信息
-     *
-     * @param model
-     * @return
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public AppPreTrackScaleDto addBaseFroInterface(AppPreTrackScaleDto model) {
-        //进行基础的数据核查
-        check(model);
-        model.setCarNo(model.getCarNo().toUpperCase());
-
-        //=====================物资表处理：开始======================
-        MeterBaseMatterInfo matterInfo = new MeterBaseMatterInfo();
-        matterInfo.setMatterName(model.getMatterName());
-        List<MeterBaseMatterInfo> matterInfoList = meterBaseMatterInfoMapper.selectByParameters(FieldsCollector.beanToMap(matterInfo));
-        if (ListUtils.isEmpty(matterInfoList)) {
-            throw new MarkerMetException(500, "物资【" + model.getMatterName() + "】未找到对应的编码，请先维护物资基础数据!!");
-            /*
-            String matterNo = meterBaseMatterInfoMapper.GetNewID();
-            matterInfo.setMatterNo(matterNo);
-            matterInfo.setMatterName(model.getMatterName());
-            matterInfo.setCreateTime(new Date());
-            //有效
-            matterInfo.setValidFlag("1");
-            matterInfo.setCreateTime(new Date());
-            matterInfo.setCreateManNo(model.getCreateManNo());
-            matterInfo.setCreateManName(model.getCreateManName() + "" + model.getPredictionSource());
-            meterBaseMatterInfoMapper.insert(matterInfo);
-             */
-        } else {
-            model.setMatterNo(matterInfoList.get(0).getMatterNo());
-        }
-        //=====================物资表处理：开始======================
-
-        //=====================发货单位表处理：开始======================
-        MeterBaseCustomerSupplier forwardingUnit = new MeterBaseCustomerSupplier();
-        forwardingUnit.setCustomerSupplierName(model.getForwardingUnitName().trim());
-        List<MeterBaseCustomerSupplier> forwardingUnitList = meterBaseCustomerSupplierMapper.selectByParameters(FieldsCollector.beanToMap(forwardingUnit));
-        if (ListUtils.isEmpty(forwardingUnitList)) {
-            throw new MarkerMetException(500, "发货单位【" + model.getForwardingUnitName() + "】未找到对应的编码，请先维护发货单位数据!!");
-            /*
-            String customerNo = meterBaseCustomerSupplierMapper.GetNewID();
-            forwardingUnit.setCustomerSupplierNo(customerNo);
-            forwardingUnit.setCustomerSupplierPassword("123456");
-            forwardingUnit.setCustomerSupplierLogin(customerNo);
-            //客商类型（0:客户；1：供应商；2：客户/供应商；3：货代）;
-            forwardingUnit.setCustomerSupplierType("2");
-            forwardingUnit.setValidFlag("0");
-            forwardingUnit.setCreateTime(new Date());
-            forwardingUnit.setCreateManNo(model.getCreateManNo());
-            forwardingUnit.setCreateManName(model.getCreateManName() + "" + model.getPredictionSource());
-            meterBaseCustomerSupplierMapper.insertSelective(forwardingUnit);
-            */
-        } else {
-            model.setForwardingUnitNo(forwardingUnitList.get(0).getCustomerSupplierNo());
-        }
-        //=====================发货单位表处理：结束======================
-
-
-        //=====================收货单位表处理：开始======================
-        MeterBaseCustomerSupplier receivingUnit = new MeterBaseCustomerSupplier();
-        receivingUnit.setCustomerSupplierName(model.getForwardingUnitName().trim());
-        List<MeterBaseCustomerSupplier> receivingUnitList = meterBaseCustomerSupplierMapper.selectByParameters(FieldsCollector.beanToMap(receivingUnit));
-        if (ListUtils.isEmpty(receivingUnitList)) {
-            throw new MarkerMetException(500, "收货单位【" + model.getForwardingUnitName() + "】未找到对应的编码，请先维护收货单位数据!!");
-            /*
-            String customerNo = meterBaseCustomerSupplierMapper.GetNewID();
-            receivingUnit.setCustomerSupplierNo(customerNo);
-            receivingUnit.setCustomerSupplierPassword("123456");
-            receivingUnit.setCustomerSupplierLogin(customerNo);
-            //客商类型（0:客户；1：供应商；2：客户/供应商；3：货代）;
-            receivingUnit.setCustomerSupplierType("2");
-            receivingUnit.setValidFlag("0");
-            receivingUnit.setCreateTime(new Date());
-            receivingUnit.setCreateManNo(model.getCreateManNo());
-            receivingUnit.setCreateManName(model.getCreateManName() + "" + model.getPredictionSource());
-            meterBaseCustomerSupplierMapper.insertSelective(forwardingUnit);
-             */
-        } else {
-            model.setForwardingUnitNo(receivingUnitList.get(0).getCustomerSupplierNo());
-        }
-        //=====================收货单位表处理：结束======================
-        if (StringUtils.isNotEmpty(model.getForwardingUnitNo()) && StringUtils.isNotEmpty(model.getForwardingUnitName())) {
-            if ("001006002".equals(model.getMeterTypeNo()) || "001006005".equals(model.getMeterTypeNo())) {
-                model.setCustomerSupplierNo(model.getReceivingUintNo());
-                model.setCustomerSupplierName(model.getReceivingUintName());
-            } else {
-                model.setCustomerSupplierNo(model.getForwardingUnitNo());
-                model.setCustomerSupplierName(model.getForwardingUnitName());
-            }
-        }
-
-        //=====================车辆登陆表处理：开始======================
-        AppMeterBaseCarLogin carLogin = appMeterBaseCarLoginMapper.selectByPrimaryKey(model.getCarNo());
-        if (carLogin == null || StringUtils.isEmpty(carLogin.getCarNo())) {
-            AppMeterBaseCarLogin carLoginInsert = new AppMeterBaseCarLogin();
-            carLoginInsert.setCarNo(model.getCarNo());
-            carLoginInsert.setPassWord("123456");
-            carLoginInsert.setCreateManNo(model.getCreateManNo());
-            carLoginInsert.setCreateManName(model.getCreateManName());
-            carLoginInsert.setCreateTime(new Date());
-            carLoginInsert.setMemo(model.getPredictionSource());
-            appMeterBaseCarLoginMapper.insertSelective(carLoginInsert);
-        }
-        //=====================车辆登陆表处理：结束======================
-
-        //=====================车辆用户表处理：开始======================
-        MeterBaseCusSupCar cusSupCarSelect = new MeterBaseCusSupCar();
-        cusSupCarSelect.setCusSupCarNo(model.getCarNo());
-        cusSupCarSelect.setCustomerSupplierNo(model.getCustomerSupplierNo());
-        List<MeterBaseCusSupCar> cusSupCarList = meterBaseCusSupCarMapper.selectByParameters(FieldsCollector.beanToMap(cusSupCarSelect));
-        if (ListUtils.isEmpty(cusSupCarList)) {
-            String maxID = comBaseInfoMapper.getConfigID("meter_base_cus_sup_car", "PK_no");
-            BeanUtils.copyProperties(model, cusSupCarSelect);
-            cusSupCarSelect.setPkNo(maxID);
-            cusSupCarSelect.setValidFlag("0");
-            cusSupCarSelect.setCreateTime(new Date());
-            cusSupCarSelect.setCusSupCarNo(model.getCarNo());
-            cusSupCarSelect.setMnemonicCode(model.getTrailerNo());
-            meterBaseCusSupCarMapper.insertSelective(cusSupCarSelect);
-        }
-        //=====================车辆用户表处理：结束======================
-        return model;
-    }
-
-
-    /**
-     * 检查数据是否符合要求
-     *
-     * @param model
-     * @throws MarkerMetException
-     */
-    private void check(AppPreTrackScaleDto model) throws MarkerMetException {
-        if (model == null) {
-            throw new MarkerMetException(500, "参数不允许为空!!");
-        }
-        if (StringUtils.isEmpty(model.getPredictionType())) {
-            throw new MarkerMetException(500, "预报类型(0：批次预报；1：单次预报；2：联运预报)不允许为空!!");
-        }
-        if (model.getPredictionType().length() > 1) {
-            throw new MarkerMetException(500, "预报类型(0：批次预报；1：单次预报；2：联运预报)只允许传编码!!");
-        }
-        if (StringUtils.isEmpty(model.getUsedType())) {
-            throw new MarkerMetException(500, "预报使用类型（可用类型（0：次数；1：时间；2：总量）不允许为空!!");
-        }
-        if (StringUtils.isEmpty(model.getCarNo())) {
-            throw new MarkerMetException(500, "车号不允许为空!!");
-        }
-        if (StringUtils.isEmpty(model.getCreateManNo()) || StringUtils.isEmpty(model.getCreateManName())) {
-            throw new MarkerMetException(500, "创建人名称及编码不允许为空!!");
-        }
-        if (StringUtils.isEmpty(model.getMatterNo())) {
-            throw new MarkerMetException(500, "物料编号不允许为空!!");
-        }
-        if (StringUtils.isEmpty(model.getMatterName())) {
-            throw new MarkerMetException(500, "物料名称不允许为空!!");
-        }
-        if (StringUtils.isEmpty(model.getMeterTypeNo())) {
-            throw new MarkerMetException(500, "业务类型编号不允许为空!!");
-        }
-        if (StringUtils.isEmpty(model.getMeterTypeName())) {
-            throw new MarkerMetException(500, "业务类型名称不允许为空!!");
-        }
-        if (StringUtils.isEmpty(model.getForwardingUnitName())) {
-            throw new MarkerMetException(500, "发货单位名称不允许为空!!");
-        }
-        if (StringUtils.isEmpty(model.getReceivingUintName())) {
-            throw new MarkerMetException(500, "收货单位名称不允许为空!!");
-        }
-        if ("连铸坯".equals(model.getMatterName()) && model.getReceivingUintName().equals(model.getForwardingUnitName())) {
-            throw new MarkerMetException(500, "物资名称为【连铸坯】，收货单位与发货单位相同，不允许做预报!!");
-        }
-        //预报信息制作界面中如检斤类型为厂际调拨，收发货单位为同一区域时，预报信息不允许提交成功。
-        if ("001006009".equals(model.getMeterTypeNo()) || "001006006".equals(model.getMeterTypeNo())) {
-            if (model.getForwardingUnitName().contains("东区") && model.getReceivingUintName().contains("东区")) {
-                throw new MarkerMetException(500, "厂际调拨业务，收发货单位均包含“东区”，不允许做预报!!");
-            }
-            if (model.getForwardingUnitName().contains("西区") && model.getReceivingUintName().contains("西区")) {
-                throw new MarkerMetException(500, "厂际调拨业务，收发货单位均包含“西区”，不允许做预报!!");
-            }
-        }
-        if (StringUtils.isEmpty(model.getDriverName())) {
-            throw new MarkerMetException(500, "司机姓名不允许为空!!");
-        }
-    }
-
-    //货代登录时，获取与该货代对应的供应商下所有预报
-    private PageList<AppPreTrackScale> selectPreHD(String customerSupplierNo, Integer pageNum, Integer pageSize) {
-        List<String> ids = meterBaseCarrierCustomerMapper.selectHD(customerSupplierNo);
-        PageHelper.startPage(pageNum, pageSize);
-//        List<AppPreTrackScale> rows = apppreTrackScaleMapper.selectPreHD(ids);
-        List<AppPreTrackScale> rows = apppreTrackScaleMapper.selectPreHDandCreate(customerSupplierNo, ids);
-        PageList pageInfo = new PageList(rows);
-        return pageInfo;
-    }
-
-    /**
-     * 非计量进出厂
-     *
-     * @param model
-     * @param str
-     * @return
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public String noMeterDoor(PreTrackScale model, String str) {
-        if (model == null || StringUtils.isEmpty(model.getPredictionNo()) || StringUtils.isEmpty(model.getCarNo())) {
-            return "禁止" + str + "！预报编号及车号不允许为空！";
-        }
-        PreTrackScale scale = preTrackScaleMapper.selectByPrimaryKey(model.getPredictionNo());
-        if (scale == null || StringUtils.isEmpty(scale.getPredictionNo())) {
-            return "禁止" + str + "！预报中的车号与传入车号不一致！";
-        }
-        if (StringUtils.isEmpty(scale.getMeterTypeNo()) || !"001006007".equals(scale.getMeterTypeNo())) {
-            return "禁止" + str + "！预报类型不是“非计量”！";
-        }
-        switch (str) {
-            case "出厂":
-                if (!DbConstants.IN.equals(scale.getValueFlag()) && !DbConstants.DROP.equals(scale.getValueFlag())) {
-                    return "禁止" + str + "！非计量预报不是使用中或者作废的状态！";
-                }
-                model.setValueFlag("2");
-                break;
-            case "进厂":
-                if (!DbConstants.NOT.equals(scale.getValueFlag())) {
-                    return "禁止" + str + "！非计量预报不是未使用状态！";
-                }
-                model.setValueFlag("4");
-                break;
-            default:
-                return "禁止" + str + "！参数异常！";
-        }
-        model.setUpdateTime(new Date());
-        model.setUpdateManNo("dil");
-        model.setUpdateManName("物流" + str);
-        preTrackScaleMapper.updateByPrimaryKeySelective(model);
-        return "允许" + str;
-    }
-}

src/main/java/com/steerinfo/appservice/dto/ActualAndFrist.java

@@ -1,6 +0,0 @@
-package com.steerinfo.appservice.dto;
-
-public class ActualAndFrist<A> {
-    //接收的对象1
-    private A one;
-}

src/main/java/com/steerinfo/appservice/dto/AppMeterWorkCarActualDemo.java

@@ -1,45 +0,0 @@
-package com.steerinfo.appservice.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-
-@Data
-public class AppMeterWorkCarActualDemo {
-
-    /**
-     * 物料编号(MATTER_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value = "物料编号", required = true)
-    private String matterNo;
-
-    /**
-     * 物料名称(MATTER_NAME,VARCHAR,60)
-     */
-    @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;
-
-    //总重量
-    private double sumWeight;
-
-    //总车数
-    private long carNum;
-
-    private static final long serialVersionUID = 1L;
-
-}

src/main/java/com/steerinfo/appservice/dto/AppPreTrackScaleDto.java

@@ -1,40 +0,0 @@
-package com.steerinfo.appservice.dto;
-
-import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
-import lombok.Data;
-import io.swagger.annotations.ApiModelProperty;
-
-@Data
-public class AppPreTrackScaleDto extends PreTrackScale {
-
-    /**
-     * 车号(CUS_SUP_CAR_NO,VARCHAR,10)
-     */
-    @ApiModelProperty(value="车号",required=true)
-    private String cusSupCarNo;
-
-    /**
-     * 挂号(MNEMONIC_CODE,VARCHAR,10)
-     */
-    @ApiModelProperty(value="挂号",required=false)
-    private String mnemonicCode;
-
-    /**
-     * 司机姓名(DRIVER_NAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="司机姓名",required=true)
-    private String driverName;
-
-    /**
-     * 身份证号(ID_NUM,VARCHAR,40)
-     */
-    @ApiModelProperty(value="身份证号",required=true)
-    private String idNum;
-
-    /**
-     * 联系电话(TEL_NUM,VARCHAR,20)
-     */
-    @ApiModelProperty(value="联系电话",required=false)
-    private String telNum;
-
-}

src/main/java/com/steerinfo/appservice/dto/LoadLinkDemo.java

@@ -1,227 +0,0 @@
-package com.steerinfo.appservice.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class LoadLinkDemo {
-    /**
-     * 车号(CAR_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value = "车号", required = true)
-    private String carNo;
-    /**
-     * 物料编号(MATTER_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value = "物料编号", required = true)
-    private String matterNo;
-
-    /**
-     * 物料名称(MATTER_NAME,VARCHAR,60)
-     */
-    @ApiModelProperty(value = "物料名称", required = true)
-    private String matterName;
-
-    private Date loadTime;
-
-    private Long carNum;
-
-    private double countWeight;
-
-    @ApiModelProperty(value = "卸货人", required = false)
-    private String loadManName;
-
-    @ApiModelProperty(value = "重量", required = true)
-    private double meterWeight;
-
-    @ApiModelProperty(value = "毛重", required = false)
-    private double grossWeight;
-    @ApiModelProperty(value = "皮重", required = false)
-    private double tareWeight;
-
-    @ApiModelProperty(value = "净重", required = false)
-    private double netWeight;
-
-    @ApiModelProperty(value = "毛重时间", required = false)
-    private Date grossTime;
-
-    @ApiModelProperty(value = "皮重时间", required = false)
-    private Date tareTime;
-
-    @ApiModelProperty(value = "净重时间", required = false)
-    private Date netTime;
-
-    @ApiModelProperty(value = "合同号", required = false)
-    private String contractNo;
-
-    @ApiModelProperty(value = "批次号", required = false)
-    private String batchNo;
-
-    @ApiModelProperty(value = "发货单位", required = false)
-    private String forwardingUnitName;
-
-    @ApiModelProperty(value = "收货单位", required = false)
-    private String receivingUintName;
-
-    @ApiModelProperty(value = "规格", required = false)
-    private String  specName;
-
-    public String getSpecName() {
-        return specName;
-    }
-
-    public void setSpecName(String specName) {
-        this.specName = specName;
-    }
-
-    public String getContractNo() {
-        return contractNo;
-    }
-
-    public void setContractNo(String contractNo) {
-        this.contractNo = contractNo;
-    }
-
-    public String getBatchNo() {
-        return batchNo;
-    }
-
-    public void setBatchNo(String batchNo) {
-        this.batchNo = batchNo;
-    }
-
-    public String getForwardingUnitName() {
-        return forwardingUnitName;
-    }
-
-    public void setForwardingUnitName(String forwardingUnitName) {
-        this.forwardingUnitName = forwardingUnitName;
-    }
-
-    public String getReceivingUintName() {
-        return receivingUintName;
-    }
-
-    public void setReceivingUintName(String receivingUintName) {
-        this.receivingUintName = receivingUintName;
-    }
-
-
-    public String getLoadManName() {
-        return loadManName;
-    }
-
-    public void setLoadManName(String loadManName) {
-        this.loadManName = loadManName;
-    }
-
-
-    public String getCarNo() {
-        return carNo;
-    }
-
-    public void setCarNo(String carNo) {
-        this.carNo = carNo;
-    }
-
-    public String getMatterNo() {
-        return matterNo;
-    }
-
-    public void setMatterNo(String matterNo) {
-        this.matterNo = matterNo;
-    }
-
-    public String getMatterName() {
-        return matterName;
-    }
-
-    public void setMatterName(String matterName) {
-        this.matterName = matterName;
-    }
-
-    public Date getLoadTime() {
-        return loadTime;
-    }
-
-    public void setLoadTime(Date loadTime) {
-        this.loadTime = loadTime;
-    }
-
-    public Long getCarNum() {
-        return carNum;
-    }
-
-    public void setCarNum(Long carNum) {
-        this.carNum = carNum;
-    }
-
-    public double getCountWeight() {
-        return countWeight;
-    }
-
-    public void setCountWeight(double countWeight) {
-        this.countWeight = countWeight;
-    }
-
-    public double getGrossWeight() {
-        return grossWeight;
-    }
-
-    public void setGrossWeight(double grossWeight) {
-        this.grossWeight = grossWeight;
-    }
-
-    public double getNetWeight() {
-        return netWeight;
-    }
-
-    public void setNetWeight(double netWeight) {
-        this.netWeight = netWeight;
-    }
-
-    public Date getGrossTime() {
-        return grossTime;
-    }
-
-    public void setGrossTime(Date grossTime) {
-        this.grossTime = grossTime;
-    }
-
-    public Date getTareTime() {
-        return tareTime;
-    }
-
-    public void setTareTime(Date tareTime) {
-        this.tareTime = tareTime;
-    }
-
-    public Date getNetTime() {
-        return netTime;
-    }
-
-    public void setNetTime(Date netTime) {
-        this.netTime = netTime;
-    }
-
-    public double getMeterWeight() {
-        return meterWeight;
-    }
-
-    public void setMeterWeight(double meterWeight) {
-        this.meterWeight = meterWeight;
-    }
-
-
-    public double getTareWeight() {
-        return tareWeight;
-    }
-
-    public void setTareWeight(double tareWeight) {
-        this.tareWeight = tareWeight;
-    }
-
-
-}

src/main/java/com/steerinfo/appservice/dto/UserDto.java

@@ -1,34 +0,0 @@
-package com.steerinfo.appservice.dto;
-
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-public class UserDto {
-    /**
-     * 密码
-     */
-    @ApiModelProperty(value="密码",required=true)
-    private String password;
-
-    /**
-     * 账号
-     */
-    @ApiModelProperty(value="账号",required=false)
-    private String login;
-
-
-    /**
-     * 类型（0：供应商 1：承运单位)(供应商的编号为五位，承运的编号为12位)
-     */
-    @ApiModelProperty(value="类型",required=false)
-    private String type;
-
-    /**
-     * 新密码
-     */
-    @ApiModelProperty(value="新密码",required=true)
-    private String newPassword;
-
-}

src/main/java/com/steerinfo/appservice/dto/companyDemo.java

@@ -1,23 +0,0 @@
-package com.steerinfo.appservice.dto;
-
-import com.steerinfo.baseinfo.meterbasecustomersupplier.model.MeterBaseCustomerSupplier;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-
-@Data
-public class companyDemo {
-    /**
-     * 单位编号
-     */
-    @ApiModelProperty(value="单位编号",required=true)
-    private String companyNo;
-
-    /**
-     * 客商名称
-     */
-    @ApiModelProperty(value="单位名称",required=true)
-    private String companyName;
-
-
-}

src/main/java/com/steerinfo/associate/maintenancerecord/controller/MaintenanceRecordController.java

@@ -1,155 +0,0 @@
-package com.steerinfo.associate.maintenancerecord.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.associate.maintenancerecord.model.MaintenanceRecord;
-import com.steerinfo.associate.maintenancerecord.service.IMaintenanceRecordService;
-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;
-
-/**
- * MaintenanceRecord RESTful接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2022-02-16 02:57
- * 类描述
- * 修订历史：
- * 日期：2022-02-16
- * 作者：generator
- * 参考：
- * 描述：MaintenanceRecord RESTful接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@RestController
-@RequestMapping("/${api.version}/maintenancerecords")
-@Api(value = "/${api.version}/maintenancerecords", tags = "故障维修记录 - MaintenanceRecordController")
-public class MaintenanceRecordController extends BaseRESTfulController {
-
-    @Autowired
-    IMaintenanceRecordService maintenanceRecordService;
-
-    @ApiOperation(value="获取列表", notes="分页查询")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
-    })
-    //@RequiresPermissions("maintenancerecord:view")
-    @GetMapping(value = "/")
-    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
-        PageList<MaintenanceRecord> list = maintenanceRecordService.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("maintenancerecord:view")
-    @GetMapping(value = "/like/")
-    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
-        PageList<MaintenanceRecord> list = maintenanceRecordService.queryLikeForPage(parmas, pageNum, pageSize);
-        return success(list);
-    }
-
-    @ApiOperation(value="获取列表", notes="分页模糊查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
-    })
-    //@RequiresPermissions("maintenancerecord:view")
-    @PostMapping(value = "/like/")
-    public RESTfulResult listpost(@RequestBody HashMap parmas,Integer pageNum, Integer pageSize){
-        PageList<MaintenanceRecord> list = maintenanceRecordService.queryLikeForPage(parmas, pageNum, pageSize);
-        return success(list);
-    }
-    
-    @ApiOperation(value="创建", notes="根据MaintenanceRecord对象创建")
-    @ApiImplicitParam(name = "maintenanceRecord", value = "详细实体maintenanceRecord", required = true, dataType = "MaintenanceRecord")
-    //@RequiresPermissions("maintenancerecord:create")
-    @PostMapping(value = "/")
-    public RESTfulResult add(@RequestBody MaintenanceRecord model){
-        try{
-            String msg = maintenanceRecordService.checkandadd(model);
-            if (msg != "" && !msg.equals("")){
-                return failed(null,msg);
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            return failed(null,"操作异常,请确认");
-        }
-        return success();
-    }
-
-    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
-    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
-    //@RequiresPermissions("maintenancerecord:view")
-    @GetMapping(value = "/{id}")
-    public RESTfulResult get(@PathVariable String id){
-        MaintenanceRecord maintenanceRecord = maintenanceRecordService.getById(id);
-        return success(maintenanceRecord);
-    }
-
-    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的maintenanceRecord信息来更新详细信息")
-    @ApiImplicitParams({
-        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
-        @ApiImplicitParam(name = "maintenanceRecord", value = "详细实体maintenanceRecord", required = true, dataType = "MaintenanceRecord")
-    })
-    //@RequiresPermissions("maintenancerecord:update")
-    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
-    public RESTfulResult update(@PathVariable String id, @RequestBody MaintenanceRecord model){
-        try{
-            String msg = maintenanceRecordService.checkandupdate(id,model);
-            if (msg != "" && !msg.equals("")){
-                return failed(null,msg);
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            return failed(null,"操作异常,请确认");
-        }
-        return success();
-    }
-
-    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
-    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
-    //@RequiresPermissions("maintenancerecord: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);
-			  maintenanceRecordService.delete(ids);
-    	}
-      return success();
-    }
-
-    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
-    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
-    //@RequiresPermissions("maintenancerecord:delete")
-    @PutMapping(value = "/deleteBacth")//String
-    public RESTfulResult deleteBacth(@RequestBody List<MaintenanceRecord> model){
-        List<String> list = new ArrayList<>();
-        for(MaintenanceRecord models: model){
-            list.add(models.getMaintenanceRecordNo());
-        }
-        if(ListUtils.isNotEmpty(list)) {
-            List<String> ids = ListUtils.convertList(list);
-            maintenanceRecordService.delete(ids);
-        }
-        return success();
-    }
-}

src/main/java/com/steerinfo/associate/maintenancerecord/mapper/MaintenanceRecordMapper.java

@@ -1,17 +0,0 @@
-package com.steerinfo.associate.maintenancerecord.mapper;
-
-import com.steerinfo.associate.maintenancerecord.model.MaintenanceRecord;
-import com.steerinfo.baseinfo.meterbaseunitdirect.model.MeterBaseUnitDirect;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import java.math.*;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface MaintenanceRecordMapper extends IBaseMapper<MaintenanceRecord, String> {
-    String GetNewID();
-
-    List<MeterBaseUnitDirect> selectForUpdate(Map<String, Object> parameters);
-}

src/main/java/com/steerinfo/associate/maintenancerecord/mapper/MaintenanceRecordMapper.xml

@@ -1,666 +0,0 @@
-<?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.associate.maintenancerecord.mapper.MaintenanceRecordMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.associate.maintenancerecord.model.MaintenanceRecord">
-    <id column="MAINTENANCE_RECORD_NO" jdbcType="VARCHAR" property="maintenanceRecordNo" />
-    <result column="EQUIPMENT_NO" jdbcType="VARCHAR" property="equipmentNo" />
-    <result column="TEAM_GROUP_NO" jdbcType="VARCHAR" property="teamGroupNo" />
-    <result column="START_TIME" jdbcType="TIMESTAMP" property="startTime" />
-    <result column="END_TIME" jdbcType="TIMESTAMP" property="endTime" />
-    <result column="FAULT_PHENOMENON" jdbcType="VARCHAR" property="faultPhenomenon" />
-    <result column="RESULT_HANDLING" jdbcType="VARCHAR" property="resultHandling" />
-    <result column="DISPOSE_MAN_NAME" jdbcType="VARCHAR" property="disposeManName" />
-    <result column="SUBMISSION_MAN_NAME" jdbcType="VARCHAR" property="submissionManName" />
-    <result column="RECORD_MAN_NAME" jdbcType="VARCHAR" property="recordManName" />
-    <result column="VAILD_FLAG" jdbcType="VARCHAR" property="vaildFlag" />
-    <result column="MEMO" jdbcType="VARCHAR" property="memo" />
-    <result column="CREATE_MAN_NO" jdbcType="VARCHAR" property="createManNo" />
-    <result column="CREATE_MAN_NAME" jdbcType="VARCHAR" property="createManName" />
-    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="UPDATE_MAN_NO" jdbcType="VARCHAR" property="updateManNo" />
-    <result column="UPDATE_MAN_NAME" jdbcType="VARCHAR" property="updateManName" />
-    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="DELETE_MAN_NO" jdbcType="VARCHAR" property="deleteManNo" />
-    <result column="DELETE_MAN_NAME" jdbcType="VARCHAR" property="deleteManName" />
-    <result column="DELETE_TIME" jdbcType="TIMESTAMP" property="deleteTime" />
-    <result column="EQUIPMENT_NAME" jdbcType="VARCHAR" property="equipmentName" />
-  </resultMap>
-  <sql id="columns">
-    MAINTENANCE_RECORD_NO, EQUIPMENT_NO, TEAM_GROUP_NO, START_TIME, END_TIME, FAULT_PHENOMENON, 
-    RESULT_HANDLING, DISPOSE_MAN_NAME, SUBMISSION_MAN_NAME, RECORD_MAN_NAME, VAILD_FLAG, 
-    MEMO, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, 
-    UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, EQUIPMENT_NAME
-  </sql>
-  <sql id="columns_alias">
-    t.MAINTENANCE_RECORD_NO, t.EQUIPMENT_NO, t.TEAM_GROUP_NO, t.START_TIME, t.END_TIME, 
-    t.FAULT_PHENOMENON, t.RESULT_HANDLING, t.DISPOSE_MAN_NAME, t.SUBMISSION_MAN_NAME, 
-    t.RECORD_MAN_NAME, t.VAILD_FLAG, t.MEMO, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME, 
-    t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME, t.DELETE_MAN_NO, t.DELETE_MAN_NAME, 
-    t.DELETE_TIME, t.EQUIPMENT_NAME
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns" /> FROM MAINTENANCE_RECORD
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias" /> FROM MAINTENANCE_RECORD t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="maintenanceRecordNo != null and maintenanceRecordNo != ''">
-        and MAINTENANCE_RECORD_NO = #{maintenanceRecordNo}
-      </if>
-      <if test="equipmentNo != null and equipmentNo != ''">
-        and EQUIPMENT_NO = #{equipmentNo}
-      </if>
-      <if test="teamGroupNo != null and teamGroupNo != ''">
-        and TEAM_GROUP_NO = #{teamGroupNo}
-      </if>
-      <if test="startTime != null">
-        and TO_CHAR(START_TIME,'yyyy-MM-dd') = #{startTime}
-      </if>
-      <if test="endTime != null">
-        and TO_CHAR(END_TIME,'yyyy-MM-dd') = #{endTime}
-      </if>
-      <if test="faultPhenomenon != null and faultPhenomenon != ''">
-        and FAULT_PHENOMENON = #{faultPhenomenon}
-      </if>
-      <if test="resultHandling != null and resultHandling != ''">
-        and RESULT_HANDLING = #{resultHandling}
-      </if>
-      <if test="disposeManName != null and disposeManName != ''">
-        and DISPOSE_MAN_NAME = #{disposeManName}
-      </if>
-      <if test="submissionManName != null and submissionManName != ''">
-        and SUBMISSION_MAN_NAME = #{submissionManName}
-      </if>
-      <if test="recordManName != null and recordManName != ''">
-        and RECORD_MAN_NAME = #{recordManName}
-      </if>
-      <if test="vaildFlag != null and vaildFlag != ''">
-        and VAILD_FLAG = #{vaildFlag}
-      </if>
-      <if test="memo != null and memo != ''">
-        and MEMO = #{memo}
-      </if>
-      <if test="createManNo != null and createManNo != ''">
-        and CREATE_MAN_NO = #{createManNo}
-      </if>
-      <if test="createManName != null and createManName != ''">
-        and CREATE_MAN_NAME = #{createManName}
-      </if>
-      <if test="createTime != null">
-        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
-      </if>
-      <if test="updateManNo != null and updateManNo != ''">
-        and UPDATE_MAN_NO = #{updateManNo}
-      </if>
-      <if test="updateManName != null and updateManName != ''">
-        and UPDATE_MAN_NAME = #{updateManName}
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="deleteManNo != null and deleteManNo != ''">
-        and DELETE_MAN_NO = #{deleteManNo}
-      </if>
-      <if test="deleteManName != null and deleteManName != ''">
-        and DELETE_MAN_NAME = #{deleteManName}
-      </if>
-      <if test="deleteTime != null">
-        and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
-      </if>
-      <if test="equipmentName != null and equipmentName != ''">
-        and EQUIPMENT_NAME = #{equipmentName}
-      </if>
-      <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
-        and  CREATE_TIME  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and CREATE_TIME  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="maintenanceRecordNo != null and maintenanceRecordNo != ''">
-        and MAINTENANCE_RECORD_NO LIKE '%${maintenanceRecordNo}%'
-      </if>
-      <if test="equipmentNo != null and equipmentNo != ''">
-        and EQUIPMENT_NO LIKE '%${equipmentNo}%'
-      </if>
-      <if test="teamGroupNo != null and teamGroupNo != ''">
-        and TEAM_GROUP_NO LIKE '%${teamGroupNo}%'
-      </if>
-      <if test="startTime != null">
-        and TO_CHAR(START_TIME,'yyyy-MM-dd') = #{startTime}
-      </if>
-      <if test="endTime != null">
-        and TO_CHAR(END_TIME,'yyyy-MM-dd') = #{endTime}
-      </if>
-      <if test="faultPhenomenon != null and faultPhenomenon != ''">
-        and FAULT_PHENOMENON LIKE '%${faultPhenomenon}%'
-      </if>
-      <if test="resultHandling != null and resultHandling != ''">
-        and RESULT_HANDLING LIKE '%${resultHandling}%'
-      </if>
-      <if test="disposeManName != null and disposeManName != ''">
-        and DISPOSE_MAN_NAME LIKE '%${disposeManName}%'
-      </if>
-      <if test="submissionManName != null and submissionManName != ''">
-        and SUBMISSION_MAN_NAME LIKE '%${submissionManName}%'
-      </if>
-      <if test="recordManName != null and recordManName != ''">
-        and RECORD_MAN_NAME LIKE '%${recordManName}%'
-      </if>
-      <if test="vaildFlag != null and vaildFlag != ''">
-        and VAILD_FLAG LIKE '%${vaildFlag}%'
-      </if>
-      <if test="memo != null and memo != ''">
-        and MEMO LIKE '%${memo}%'
-      </if>
-      <if test="createManNo != null and createManNo != ''">
-        and CREATE_MAN_NO LIKE '%${createManNo}%'
-      </if>
-      <if test="createManName != null and createManName != ''">
-        and CREATE_MAN_NAME LIKE '%${createManName}%'
-      </if>
-      <if test="createTime != null">
-        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
-      </if>
-      <if test="updateManNo != null and updateManNo != ''">
-        and UPDATE_MAN_NO LIKE '%${updateManNo}%'
-      </if>
-      <if test="updateManName != null and updateManName != ''">
-        and UPDATE_MAN_NAME LIKE '%${updateManName}%'
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="deleteManNo != null and deleteManNo != ''">
-        and DELETE_MAN_NO LIKE '%${deleteManNo}%'
-      </if>
-      <if test="deleteManName != null and deleteManName != ''">
-        and DELETE_MAN_NAME LIKE '%${deleteManName}%'
-      </if>
-      <if test="deleteTime != null">
-        and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
-      </if>
-      <if test="equipmentName != null and equipmentName != ''">
-        and EQUIPMENT_NAME LIKE '%${equipmentName}%'
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from MAINTENANCE_RECORD
-    where MAINTENANCE_RECORD_NO = #{maintenanceRecordNo,jdbcType=VARCHAR}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from MAINTENANCE_RECORD
-    where 1!=1 
-      <if test="equipmentNo != null and equipmentNo != ''">
-        or EQUIPMENT_NO = #{equipmentNo}
-      </if>
-      <if test="teamGroupNo != null and teamGroupNo != ''">
-        or TEAM_GROUP_NO = #{teamGroupNo}
-      </if>
-      <if test="startTime != null">
-        or TO_CHAR(START_TIME,'yyyy-MM-dd') = '#{startTime}'
-      </if>
-      <if test="endTime != null">
-        or TO_CHAR(END_TIME,'yyyy-MM-dd') = '#{endTime}'
-      </if>
-      <if test="faultPhenomenon != null and faultPhenomenon != ''">
-        or FAULT_PHENOMENON = #{faultPhenomenon}
-      </if>
-      <if test="resultHandling != null and resultHandling != ''">
-        or RESULT_HANDLING = #{resultHandling}
-      </if>
-      <if test="disposeManName != null and disposeManName != ''">
-        or DISPOSE_MAN_NAME = #{disposeManName}
-      </if>
-      <if test="submissionManName != null and submissionManName != ''">
-        or SUBMISSION_MAN_NAME = #{submissionManName}
-      </if>
-      <if test="recordManName != null and recordManName != ''">
-        or RECORD_MAN_NAME = #{recordManName}
-      </if>
-      <if test="vaildFlag != null and vaildFlag != ''">
-        or VAILD_FLAG = #{vaildFlag}
-      </if>
-      <if test="memo != null and memo != ''">
-        or MEMO = #{memo}
-      </if>
-      <if test="createManNo != null and createManNo != ''">
-        or CREATE_MAN_NO = #{createManNo}
-      </if>
-      <if test="createManName != null and createManName != ''">
-        or CREATE_MAN_NAME = #{createManName}
-      </if>
-      <if test="createTime != null">
-        or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
-      </if>
-      <if test="updateManNo != null and updateManNo != ''">
-        or UPDATE_MAN_NO = #{updateManNo}
-      </if>
-      <if test="updateManName != null and updateManName != ''">
-        or UPDATE_MAN_NAME = #{updateManName}
-      </if>
-      <if test="updateTime != null">
-        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-      </if>
-      <if test="deleteManNo != null and deleteManNo != ''">
-        or DELETE_MAN_NO = #{deleteManNo}
-      </if>
-      <if test="deleteManName != null and deleteManName != ''">
-        or DELETE_MAN_NAME = #{deleteManName}
-      </if>
-      <if test="deleteTime != null">
-        or TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = '#{deleteTime}'
-      </if>
-      <if test="equipmentName != null and equipmentName != ''">
-        or EQUIPMENT_NAME = #{equipmentName}
-      </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.associate.maintenancerecord.model.MaintenanceRecord">
-    insert into MAINTENANCE_RECORD (MAINTENANCE_RECORD_NO, EQUIPMENT_NO, 
-      TEAM_GROUP_NO, START_TIME, END_TIME, 
-      FAULT_PHENOMENON, RESULT_HANDLING, DISPOSE_MAN_NAME, 
-      SUBMISSION_MAN_NAME, RECORD_MAN_NAME, VAILD_FLAG, 
-      MEMO, CREATE_MAN_NO, CREATE_MAN_NAME, 
-      CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, 
-      UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME, 
-      DELETE_TIME, EQUIPMENT_NAME)
-    values (#{maintenanceRecordNo,jdbcType=VARCHAR}, #{equipmentNo,jdbcType=VARCHAR}, 
-      #{teamGroupNo,jdbcType=VARCHAR}, #{startTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, 
-      #{faultPhenomenon,jdbcType=VARCHAR}, #{resultHandling,jdbcType=VARCHAR}, #{disposeManName,jdbcType=VARCHAR}, 
-      #{submissionManName,jdbcType=VARCHAR}, #{recordManName,jdbcType=VARCHAR}, #{vaildFlag,jdbcType=VARCHAR}, 
-      #{memo,jdbcType=VARCHAR}, #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateManNo,jdbcType=VARCHAR}, #{updateManName,jdbcType=VARCHAR}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{deleteManNo,jdbcType=VARCHAR}, #{deleteManName,jdbcType=VARCHAR}, 
-      #{deleteTime,jdbcType=TIMESTAMP}, #{equipmentName,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.associate.maintenancerecord.model.MaintenanceRecord">
-    insert into MAINTENANCE_RECORD
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="maintenanceRecordNo != null">
-        MAINTENANCE_RECORD_NO,
-      </if>
-      <if test="equipmentNo != null">
-        EQUIPMENT_NO,
-      </if>
-      <if test="teamGroupNo != null">
-        TEAM_GROUP_NO,
-      </if>
-      <if test="startTime != null">
-        START_TIME,
-      </if>
-      <if test="endTime != null">
-        END_TIME,
-      </if>
-      <if test="faultPhenomenon != null">
-        FAULT_PHENOMENON,
-      </if>
-      <if test="resultHandling != null">
-        RESULT_HANDLING,
-      </if>
-      <if test="disposeManName != null">
-        DISPOSE_MAN_NAME,
-      </if>
-      <if test="submissionManName != null">
-        SUBMISSION_MAN_NAME,
-      </if>
-      <if test="recordManName != null">
-        RECORD_MAN_NAME,
-      </if>
-      <if test="vaildFlag != null">
-        VAILD_FLAG,
-      </if>
-      <if test="memo != null">
-        MEMO,
-      </if>
-      <if test="createManNo != null">
-        CREATE_MAN_NO,
-      </if>
-      <if test="createManName != null">
-        CREATE_MAN_NAME,
-      </if>
-      <if test="createTime != null">
-        CREATE_TIME,
-      </if>
-      <if test="updateManNo != null">
-        UPDATE_MAN_NO,
-      </if>
-      <if test="updateManName != null">
-        UPDATE_MAN_NAME,
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME,
-      </if>
-      <if test="deleteManNo != null">
-        DELETE_MAN_NO,
-      </if>
-      <if test="deleteManName != null">
-        DELETE_MAN_NAME,
-      </if>
-      <if test="deleteTime != null">
-        DELETE_TIME,
-      </if>
-      <if test="equipmentName != null">
-        EQUIPMENT_NAME,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="maintenanceRecordNo != null">
-        #{maintenanceRecordNo,jdbcType=VARCHAR},
-      </if>
-      <if test="equipmentNo != null">
-        #{equipmentNo,jdbcType=VARCHAR},
-      </if>
-      <if test="teamGroupNo != null">
-        #{teamGroupNo,jdbcType=VARCHAR},
-      </if>
-      <if test="startTime != null">
-        #{startTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="endTime != null">
-        #{endTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="faultPhenomenon != null">
-        #{faultPhenomenon,jdbcType=VARCHAR},
-      </if>
-      <if test="resultHandling != null">
-        #{resultHandling,jdbcType=VARCHAR},
-      </if>
-      <if test="disposeManName != null">
-        #{disposeManName,jdbcType=VARCHAR},
-      </if>
-      <if test="submissionManName != null">
-        #{submissionManName,jdbcType=VARCHAR},
-      </if>
-      <if test="recordManName != null">
-        #{recordManName,jdbcType=VARCHAR},
-      </if>
-      <if test="vaildFlag != null">
-        #{vaildFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="memo != null">
-        #{memo,jdbcType=VARCHAR},
-      </if>
-      <if test="createManNo != null">
-        #{createManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="createManName != null">
-        #{createManName,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateManNo != null">
-        #{updateManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="updateManName != null">
-        #{updateManName,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="deleteManNo != null">
-        #{deleteManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteManName != null">
-        #{deleteManName,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteTime != null">
-        #{deleteTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="equipmentName != null">
-        #{equipmentName,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.associate.maintenancerecord.model.MaintenanceRecord">
-    update MAINTENANCE_RECORD
-    set EQUIPMENT_NO = #{equipmentNo,jdbcType=VARCHAR},
-      TEAM_GROUP_NO = #{teamGroupNo,jdbcType=VARCHAR},
-      START_TIME = #{startTime,jdbcType=TIMESTAMP},
-      END_TIME = #{endTime,jdbcType=TIMESTAMP},
-      FAULT_PHENOMENON = #{faultPhenomenon,jdbcType=VARCHAR},
-      RESULT_HANDLING = #{resultHandling,jdbcType=VARCHAR},
-      DISPOSE_MAN_NAME = #{disposeManName,jdbcType=VARCHAR},
-      SUBMISSION_MAN_NAME = #{submissionManName,jdbcType=VARCHAR},
-      RECORD_MAN_NAME = #{recordManName,jdbcType=VARCHAR},
-      VAILD_FLAG = #{vaildFlag,jdbcType=VARCHAR},
-      MEMO = #{memo,jdbcType=VARCHAR},
-      CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
-      CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
-      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
-      UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
-      UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
-      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      DELETE_MAN_NO = #{deleteManNo,jdbcType=VARCHAR},
-      DELETE_MAN_NAME = #{deleteManName,jdbcType=VARCHAR},
-      DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
-      EQUIPMENT_NAME = #{equipmentName,jdbcType=VARCHAR}
-    where MAINTENANCE_RECORD_NO = #{maintenanceRecordNo,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.associate.maintenancerecord.model.MaintenanceRecord">
-    update MAINTENANCE_RECORD
-    <set>
-      <if test="equipmentNo != null">
-        EQUIPMENT_NO = #{equipmentNo,jdbcType=VARCHAR},
-      </if>
-      <if test="teamGroupNo != null">
-        TEAM_GROUP_NO = #{teamGroupNo,jdbcType=VARCHAR},
-      </if>
-      <if test="startTime != null">
-        START_TIME = #{startTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="endTime != null">
-        END_TIME = #{endTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="faultPhenomenon != null">
-        FAULT_PHENOMENON = #{faultPhenomenon,jdbcType=VARCHAR},
-      </if>
-      <if test="resultHandling != null">
-        RESULT_HANDLING = #{resultHandling,jdbcType=VARCHAR},
-      </if>
-      <if test="disposeManName != null">
-        DISPOSE_MAN_NAME = #{disposeManName,jdbcType=VARCHAR},
-      </if>
-      <if test="submissionManName != null">
-        SUBMISSION_MAN_NAME = #{submissionManName,jdbcType=VARCHAR},
-      </if>
-      <if test="recordManName != null">
-        RECORD_MAN_NAME = #{recordManName,jdbcType=VARCHAR},
-      </if>
-      <if test="vaildFlag != null">
-        VAILD_FLAG = #{vaildFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="memo != null">
-        MEMO = #{memo,jdbcType=VARCHAR},
-      </if>
-      <if test="createManNo != null">
-        CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="createManName != null">
-        CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateManNo != null">
-        UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="updateManName != null">
-        UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="deleteManNo != null">
-        DELETE_MAN_NO = #{deleteManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteManName != null">
-        DELETE_MAN_NAME = #{deleteManName,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteTime != null">
-        DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="equipmentName != null">
-        EQUIPMENT_NAME = #{equipmentName,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where MAINTENANCE_RECORD_NO = #{maintenanceRecordNo,jdbcType=VARCHAR}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    <include refid="select" />
-    where MAINTENANCE_RECORD_NO = #{maintenanceRecordNo,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 MAINTENANCE_RECORD 
-      (MAINTENANCE_RECORD_NO, 
-      EQUIPMENT_NO, TEAM_GROUP_NO, START_TIME, 
-      END_TIME, FAULT_PHENOMENON, RESULT_HANDLING, 
-      DISPOSE_MAN_NAME, SUBMISSION_MAN_NAME, 
-      RECORD_MAN_NAME, VAILD_FLAG, MEMO, 
-      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
-      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
-      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, 
-      EQUIPMENT_NAME)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.maintenanceRecordNo,jdbcType=VARCHAR}, 
-      #{item.equipmentNo,jdbcType=VARCHAR}, #{item.teamGroupNo,jdbcType=VARCHAR}, #{item.startTime,jdbcType=TIMESTAMP}, 
-      #{item.endTime,jdbcType=TIMESTAMP}, #{item.faultPhenomenon,jdbcType=VARCHAR}, #{item.resultHandling,jdbcType=VARCHAR}, 
-      #{item.disposeManName,jdbcType=VARCHAR}, #{item.submissionManName,jdbcType=VARCHAR}, 
-      #{item.recordManName,jdbcType=VARCHAR}, #{item.vaildFlag,jdbcType=VARCHAR}, #{item.memo,jdbcType=VARCHAR}, 
-      #{item.createManNo,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
-      #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
-      #{item.deleteManNo,jdbcType=VARCHAR}, #{item.deleteManName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=TIMESTAMP}, 
-      #{item.equipmentName,jdbcType=VARCHAR} from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update MAINTENANCE_RECORD
-     set
-       MAINTENANCE_RECORD_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case MAINTENANCE_RECORD_NO" separator=" ">
-          when #{item.maintenanceRecordNo,jdbcType=VARCHAR} then #{item.maintenanceRecordNo,jdbcType=VARCHAR}
-       </foreach>
-       ,EQUIPMENT_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case MAINTENANCE_RECORD_NO" separator=" ">
-          when #{item.maintenanceRecordNo,jdbcType=VARCHAR} then #{item.equipmentNo,jdbcType=VARCHAR}
-       </foreach>
-       ,TEAM_GROUP_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case MAINTENANCE_RECORD_NO" separator=" ">
-          when #{item.maintenanceRecordNo,jdbcType=VARCHAR} then #{item.teamGroupNo,jdbcType=VARCHAR}
-       </foreach>
-       ,START_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case MAINTENANCE_RECORD_NO" separator=" ">
-          when #{item.maintenanceRecordNo,jdbcType=VARCHAR} then #{item.startTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,END_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case MAINTENANCE_RECORD_NO" separator=" ">
-          when #{item.maintenanceRecordNo,jdbcType=VARCHAR} then #{item.endTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,FAULT_PHENOMENON=
-       <foreach close="end" collection="list" index="index" item="item" open="case MAINTENANCE_RECORD_NO" separator=" ">
-          when #{item.maintenanceRecordNo,jdbcType=VARCHAR} then #{item.faultPhenomenon,jdbcType=VARCHAR}
-       </foreach>
-       ,RESULT_HANDLING=
-       <foreach close="end" collection="list" index="index" item="item" open="case MAINTENANCE_RECORD_NO" separator=" ">
-          when #{item.maintenanceRecordNo,jdbcType=VARCHAR} then #{item.resultHandling,jdbcType=VARCHAR}
-       </foreach>
-       ,DISPOSE_MAN_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case MAINTENANCE_RECORD_NO" separator=" ">
-          when #{item.maintenanceRecordNo,jdbcType=VARCHAR} then #{item.disposeManName,jdbcType=VARCHAR}
-       </foreach>
-       ,SUBMISSION_MAN_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case MAINTENANCE_RECORD_NO" separator=" ">
-          when #{item.maintenanceRecordNo,jdbcType=VARCHAR} then #{item.submissionManName,jdbcType=VARCHAR}
-       </foreach>
-       ,RECORD_MAN_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case MAINTENANCE_RECORD_NO" separator=" ">
-          when #{item.maintenanceRecordNo,jdbcType=VARCHAR} then #{item.recordManName,jdbcType=VARCHAR}
-       </foreach>
-       ,VAILD_FLAG=
-       <foreach close="end" collection="list" index="index" item="item" open="case MAINTENANCE_RECORD_NO" separator=" ">
-          when #{item.maintenanceRecordNo,jdbcType=VARCHAR} then #{item.vaildFlag,jdbcType=VARCHAR}
-       </foreach>
-       ,MEMO=
-       <foreach close="end" collection="list" index="index" item="item" open="case MAINTENANCE_RECORD_NO" separator=" ">
-          when #{item.maintenanceRecordNo,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
-       </foreach>
-       ,CREATE_MAN_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case MAINTENANCE_RECORD_NO" separator=" ">
-          when #{item.maintenanceRecordNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
-       </foreach>
-       ,CREATE_MAN_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case MAINTENANCE_RECORD_NO" separator=" ">
-          when #{item.maintenanceRecordNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
-       </foreach>
-       ,CREATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case MAINTENANCE_RECORD_NO" separator=" ">
-          when #{item.maintenanceRecordNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_MAN_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case MAINTENANCE_RECORD_NO" separator=" ">
-          when #{item.maintenanceRecordNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_MAN_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case MAINTENANCE_RECORD_NO" separator=" ">
-          when #{item.maintenanceRecordNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case MAINTENANCE_RECORD_NO" separator=" ">
-          when #{item.maintenanceRecordNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,DELETE_MAN_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case MAINTENANCE_RECORD_NO" separator=" ">
-          when #{item.maintenanceRecordNo,jdbcType=VARCHAR} then #{item.deleteManNo,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETE_MAN_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case MAINTENANCE_RECORD_NO" separator=" ">
-          when #{item.maintenanceRecordNo,jdbcType=VARCHAR} then #{item.deleteManName,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case MAINTENANCE_RECORD_NO" separator=" ">
-          when #{item.maintenanceRecordNo,jdbcType=VARCHAR} then #{item.deleteTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,EQUIPMENT_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case MAINTENANCE_RECORD_NO" separator=" ">
-          when #{item.maintenanceRecordNo,jdbcType=VARCHAR} then #{item.equipmentName,jdbcType=VARCHAR}
-       </foreach>
-     where MAINTENANCE_RECORD_NO in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.maintenanceRecordNo,jdbcType=VARCHAR}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from MAINTENANCE_RECORD
-    where MAINTENANCE_RECORD_NO in 
-    <foreach close=")" collection="list" item="id" open="(" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  <select id="GetNewID" parameterType="java.lang.String" resultType="java.lang.String">
-    SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(MAINTENANCE_RECORD_NO, LENGTH(MAINTENANCE_RECORD_NO) -3))),0) + 1,4,'0') MAINTENANCE_RECORD_NO
-    FROM MAINTENANCE_RECORD
-   </select>
-
-  <select id="selectForUpdate" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <where>
-      <if test="maintenanceRecordNo != null and maintenanceRecordNo != ''">
-        and MAINTENANCE_RECORD_NO != #{carrierUnitNo}
-      </if>
-    </where>
-  </select>
-</mapper>

src/main/java/com/steerinfo/associate/maintenancerecord/model/MaintenanceRecord.java

@@ -1,362 +0,0 @@
-package com.steerinfo.associate.maintenancerecord.model;
-
-import com.steerinfo.framework.model.IBasePO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-
-@ApiModel(value="null")
-public class MaintenanceRecord implements IBasePO<String> {
-    /**
-     * 维修记录编号(MAINTENANCE_RECORD_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="维修记录编号",required=true)
-    private String maintenanceRecordNo;
-
-    /**
-     * 设备编号(EQUIPMENT_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="设备编号",required=true)
-    private String equipmentNo;
-
-    /**
-     * 班组编号(TEAM_GROUP_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="班组编号",required=true)
-    private String teamGroupNo;
-
-    /**
-     * 开始时间(START_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="开始时间",required=false)
-    private Date startTime;
-
-    /**
-     * 结束时间(END_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="结束时间",required=false)
-    private Date endTime;
-
-    /**
-     * 故障现象(FAULT_PHENOMENON,VARCHAR,255)
-     */
-    @ApiModelProperty(value="故障现象",required=false)
-    private String faultPhenomenon;
-
-    /**
-     * 处理结果(RESULT_HANDLING,VARCHAR,255)
-     */
-    @ApiModelProperty(value="处理结果",required=false)
-    private String resultHandling;
-
-    /**
-     * 处理人(DISPOSE_MAN_NAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="处理人",required=false)
-    private String disposeManName;
-
-    /**
-     * 提报人(SUBMISSION_MAN_NAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="提报人",required=false)
-    private String submissionManName;
-
-    /**
-     * 记录人(RECORD_MAN_NAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="记录人",required=false)
-    private String recordManName;
-
-    /**
-     * 状态（1：有效；0：无效）(VAILD_FLAG,VARCHAR,1)
-     */
-    @ApiModelProperty(value="状态（1：有效；0：无效）",required=true)
-    private String vaildFlag;
-
-    /**
-     * 备注(MEMO,VARCHAR,200)
-     */
-    @ApiModelProperty(value="备注",required=false)
-    private String memo;
-
-    /**
-     * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="创建人编号",required=true)
-    private String createManNo;
-
-    /**
-     * 创建人姓名(CREATE_MAN_NAME,VARCHAR,30)
-     */
-    @ApiModelProperty(value="创建人姓名",required=true)
-    private String createManName;
-
-    /**
-     * 创建时间（YYYY-MM-DD HH:mm:SS）(CREATE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="创建时间（YYYY-MM-DD HH:mm:SS）",required=true)
-    private Date createTime;
-
-    /**
-     * 修改人编号(UPDATE_MAN_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="修改人编号",required=false)
-    private String updateManNo;
-
-    /**
-     * 修改人姓名(UPDATE_MAN_NAME,VARCHAR,30)
-     */
-    @ApiModelProperty(value="修改人姓名",required=false)
-    private String updateManName;
-
-    /**
-     * 修改时间（YYYY-MM-DD HH:mm:SS）(UPDATE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="修改时间（YYYY-MM-DD HH:mm:SS）",required=false)
-    private Date updateTime;
-
-    /**
-     * 删除人编号(DELETE_MAN_NO,VARCHAR,30)
-     */
-    @ApiModelProperty(value="删除人编号",required=false)
-    private String deleteManNo;
-
-    /**
-     * 删除人姓名(DELETE_MAN_NAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="删除人姓名",required=false)
-    private String deleteManName;
-
-    /**
-     * 删除时间（YYYY-MM-DD HH:mm:SS）(DELETE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="删除时间（YYYY-MM-DD HH:mm:SS）",required=false)
-    private Date deleteTime;
-
-    /**
-     * 设备名称(EQUIPMENT_NAME,VARCHAR,30)
-     */
-    @ApiModelProperty(value="设备名称",required=true)
-    private String equipmentName;
-
-    private static final long serialVersionUID = 1L;
-
-    @Override
-    public String getId() {
-        return this.maintenanceRecordNo;
-    }
-
-    @Override
-    public void setId(String maintenanceRecordNo) {
-        this.maintenanceRecordNo = maintenanceRecordNo == null ? null : maintenanceRecordNo.trim();
-    }
-
-    public String getMaintenanceRecordNo() {
-        return maintenanceRecordNo;
-    }
-
-    public void setMaintenanceRecordNo(String maintenanceRecordNo) {
-        this.maintenanceRecordNo = maintenanceRecordNo == null ? null : maintenanceRecordNo.trim();
-    }
-
-    public String getEquipmentNo() {
-        return equipmentNo;
-    }
-
-    public void setEquipmentNo(String equipmentNo) {
-        this.equipmentNo = equipmentNo == null ? null : equipmentNo.trim();
-    }
-
-    public String getTeamGroupNo() {
-        return teamGroupNo;
-    }
-
-    public void setTeamGroupNo(String teamGroupNo) {
-        this.teamGroupNo = teamGroupNo == null ? null : teamGroupNo.trim();
-    }
-
-    public Date getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(Date startTime) {
-        this.startTime = startTime;
-    }
-
-    public Date getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
-    }
-
-    public String getFaultPhenomenon() {
-        return faultPhenomenon;
-    }
-
-    public void setFaultPhenomenon(String faultPhenomenon) {
-        this.faultPhenomenon = faultPhenomenon == null ? null : faultPhenomenon.trim();
-    }
-
-    public String getResultHandling() {
-        return resultHandling;
-    }
-
-    public void setResultHandling(String resultHandling) {
-        this.resultHandling = resultHandling == null ? null : resultHandling.trim();
-    }
-
-    public String getDisposeManName() {
-        return disposeManName;
-    }
-
-    public void setDisposeManName(String disposeManName) {
-        this.disposeManName = disposeManName == null ? null : disposeManName.trim();
-    }
-
-    public String getSubmissionManName() {
-        return submissionManName;
-    }
-
-    public void setSubmissionManName(String submissionManName) {
-        this.submissionManName = submissionManName == null ? null : submissionManName.trim();
-    }
-
-    public String getRecordManName() {
-        return recordManName;
-    }
-
-    public void setRecordManName(String recordManName) {
-        this.recordManName = recordManName == null ? null : recordManName.trim();
-    }
-
-    public String getVaildFlag() {
-        return vaildFlag;
-    }
-
-    public void setVaildFlag(String vaildFlag) {
-        this.vaildFlag = vaildFlag == null ? null : vaildFlag.trim();
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo == null ? null : memo.trim();
-    }
-
-    public String getCreateManNo() {
-        return createManNo;
-    }
-
-    public void setCreateManNo(String createManNo) {
-        this.createManNo = createManNo == null ? null : createManNo.trim();
-    }
-
-    public String getCreateManName() {
-        return createManName;
-    }
-
-    public void setCreateManName(String createManName) {
-        this.createManName = createManName == null ? null : createManName.trim();
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getUpdateManNo() {
-        return updateManNo;
-    }
-
-    public void setUpdateManNo(String updateManNo) {
-        this.updateManNo = updateManNo == null ? null : updateManNo.trim();
-    }
-
-    public String getUpdateManName() {
-        return updateManName;
-    }
-
-    public void setUpdateManName(String updateManName) {
-        this.updateManName = updateManName == null ? null : updateManName.trim();
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getDeleteManNo() {
-        return deleteManNo;
-    }
-
-    public void setDeleteManNo(String deleteManNo) {
-        this.deleteManNo = deleteManNo == null ? null : deleteManNo.trim();
-    }
-
-    public String getDeleteManName() {
-        return deleteManName;
-    }
-
-    public void setDeleteManName(String deleteManName) {
-        this.deleteManName = deleteManName == null ? null : deleteManName.trim();
-    }
-
-    public Date getDeleteTime() {
-        return deleteTime;
-    }
-
-    public void setDeleteTime(Date deleteTime) {
-        this.deleteTime = deleteTime;
-    }
-
-    public String getEquipmentName() {
-        return equipmentName;
-    }
-
-    public void setEquipmentName(String equipmentName) {
-        this.equipmentName = equipmentName == null ? null : equipmentName.trim();
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", maintenanceRecordNo=").append(maintenanceRecordNo);
-        sb.append(", equipmentNo=").append(equipmentNo);
-        sb.append(", teamGroupNo=").append(teamGroupNo);
-        sb.append(", startTime=").append(startTime);
-        sb.append(", endTime=").append(endTime);
-        sb.append(", faultPhenomenon=").append(faultPhenomenon);
-        sb.append(", resultHandling=").append(resultHandling);
-        sb.append(", disposeManName=").append(disposeManName);
-        sb.append(", submissionManName=").append(submissionManName);
-        sb.append(", recordManName=").append(recordManName);
-        sb.append(", vaildFlag=").append(vaildFlag);
-        sb.append(", memo=").append(memo);
-        sb.append(", createManNo=").append(createManNo);
-        sb.append(", createManName=").append(createManName);
-        sb.append(", createTime=").append(createTime);
-        sb.append(", updateManNo=").append(updateManNo);
-        sb.append(", updateManName=").append(updateManName);
-        sb.append(", updateTime=").append(updateTime);
-        sb.append(", deleteManNo=").append(deleteManNo);
-        sb.append(", deleteManName=").append(deleteManName);
-        sb.append(", deleteTime=").append(deleteTime);
-        sb.append(", equipmentName=").append(equipmentName);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}

src/main/java/com/steerinfo/associate/maintenancerecord/service/IMaintenanceRecordService.java

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

src/main/java/com/steerinfo/associate/maintenancerecord/service/impl/MaintenanceRecordServiceImpl.java

@@ -1,73 +0,0 @@
-package com.steerinfo.associate.maintenancerecord.service.impl;
-
-import com.steerinfo.baseinfo.meterbaseunitdirect.model.MeterBaseUnitDirect;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
-import com.steerinfo.associate.maintenancerecord.model.MaintenanceRecord;
-import com.steerinfo.associate.maintenancerecord.mapper.MaintenanceRecordMapper;
-import com.steerinfo.associate.maintenancerecord.service.IMaintenanceRecordService;
-import com.steerinfo.util.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import java.util.Date;
-import java.math.BigDecimal;
-
-/**
- * MaintenanceRecord服务实现：
- * @author generator
- * @version 1.0-SNAPSHORT 2022-02-16 02:57
- * 类描述
- * 修订历史：
- * 日期：2022-02-16
- * 作者：generator
- * 参考：
- * 描述：MaintenanceRecord服务实现
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@Service(value = "maintenanceRecordService")
-public class MaintenanceRecordServiceImpl extends BaseServiceImpl<MaintenanceRecord, String> implements IMaintenanceRecordService {
-
-    @Autowired
-    private MaintenanceRecordMapper maintenanceRecordMapper;
-
-    @Override
-    protected IBaseMapper<MaintenanceRecord, String> getMapper() {
-        return maintenanceRecordMapper;
-    }
-
-    @Override
-    public String checkandadd(MaintenanceRecord model) {
-        if (StringUtils.isEmpty(model.getEquipmentNo())){
-            return "设备编号不能为空";
-        }
-        if (StringUtils.isEmpty(model.getEquipmentName())){
-            return "设备名称不能为空";
-        }
-        if (StringUtils.isEmpty(model.getTeamGroupNo())){
-            return "班组编号不能为空";
-        }
-        String no = maintenanceRecordMapper.GetNewID();
-        model.setMaintenanceRecordNo(no);
-        model.setVaildFlag("1");
-        model.setCreateTime(new Date());
-        maintenanceRecordMapper.insert(model);
-        return "";
-    }
-
-    @Override
-    public String checkandupdate(String id, MaintenanceRecord model) {
-        if (model.getEquipmentNo() == null || model.getEquipmentNo().equals("")){
-            return "设备编号不能为空";
-        }
-        if (model.getEquipmentName() == null || model.getEquipmentName().equals("")){
-            return "设备名称不能为空";
-        }
-        if (model.getTeamGroupNo() == null || model.getTeamGroupNo().equals("")){
-            return "班组编号不能为空";
-        }
-        model.setUpdateTime(new Date());
-        maintenanceRecordMapper.updateByPrimaryKey(model);
-        return "";
-    }
-}

src/main/java/com/steerinfo/baseinfo/appphonehelp/controller/AppPhoneHelpController.java

@@ -1,168 +0,0 @@
-package com.steerinfo.baseinfo.appphonehelp.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.appphonehelp.model.AppPhoneHelp;
-import com.steerinfo.baseinfo.appphonehelp.service.IAppPhoneHelpService;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import oracle.jdbc.proxy.annotation.Post;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.apache.shiro.crypto.hash.Hash;
-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;
-
-/**
- * AppPhoneHelp RESTful接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2022-03-18 05:31
- * 类描述
- * 修订历史：
- * 日期：2022-03-18
- * 作者：generator
- * 参考：
- * 描述：AppPhoneHelp RESTful接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@RestController
-@RequestMapping("/${api.version}/appphonehelps")
-public class AppPhoneHelpController extends BaseRESTfulController {
-
-    @Autowired
-    IAppPhoneHelpService appPhoneHelpService;
-
-    @ApiOperation(value="获取列表", notes="分页查询")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
-    })
-    //@RequiresPermissions("appphonehelp:view")
-    @GetMapping(value = "/")
-    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
-        PageList<AppPhoneHelp> list = appPhoneHelpService.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("appphonehelp:view")
-    @GetMapping(value = "/like/")
-    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
-        PageList<AppPhoneHelp> list = appPhoneHelpService.queryLikeForPage(parmas, pageNum, pageSize);
-        return success(list);
-    }
-    
-    @ApiOperation(value="创建", notes="根据AppPhoneHelp对象创建")
-    @ApiImplicitParam(name = "appPhoneHelp", value = "详细实体appPhoneHelp", required = true, dataType = "AppPhoneHelp")
-    //@RequiresPermissions("appphonehelp:create")
-    @PostMapping(value = "/")
-    public RESTfulResult add(@ModelAttribute AppPhoneHelp model){
-        AppPhoneHelp appPhoneHelp = appPhoneHelpService.add(model);
-        return success(appPhoneHelp);
-    }
-
-    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
-    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
-    //@RequiresPermissions("appphonehelp:view")
-    @GetMapping(value = "/{id}")
-    public RESTfulResult get(@PathVariable String id){
-        AppPhoneHelp appPhoneHelp = appPhoneHelpService.getById(id);
-        return success(appPhoneHelp);
-    }
-
-    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的appPhoneHelp信息来更新详细信息")
-    @ApiImplicitParams({
-        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
-        @ApiImplicitParam(name = "appPhoneHelp", value = "详细实体appPhoneHelp", required = true, dataType = "AppPhoneHelp")
-    })
-    //@RequiresPermissions("appphonehelp:update")
-    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
-    public RESTfulResult update(@PathVariable String id, @RequestBody AppPhoneHelp model){
-        model.setId(id);
-        AppPhoneHelp appPhoneHelp = appPhoneHelpService.modify(model);
-        return success(appPhoneHelp);
-    }
-
-    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
-    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
-    //@RequiresPermissions("appphonehelp: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);
-			  appPhoneHelpService.delete(ids);
-    	}
-      return success();
-    }
-
-    @ApiOperation(value = "App端远程求助按钮", notes = "App端远程求助按钮")
-    @PostMapping(value = "/phoneHelp")
-    public RESTfulResult phoneHelp(@RequestBody HashMap<String, Object> param) {
-        RESTfulResult rm = failed();
-        String carNo = param.get("carNo") == null ? "":param.get("carNo").toString();
-        String phoneNo = param.get("phoneNo") == null ? "" : param.get("phoneNo").toString();
-        String driverName = param.get("driverName") == null ? "" : param.get("driverName").toString();
-        try{
-            if(com.steerinfo.util.StringUtils.isEmpty(carNo)){
-                rm.setMessage("车号不能为空！！");
-                return rm;
-            }else if(com.steerinfo.util.StringUtils.isEmpty(phoneNo)){
-                rm.setMessage("电话号码不能为空！！");
-                return rm;
-            }else if(com.steerinfo.util.StringUtils.isEmpty(driverName)){
-                rm.setMessage("司机姓名不能为空！！");
-                return rm;
-            }else{
-                rm = appPhoneHelpService.phoneHelp(carNo, phoneNo, driverName);
-            }
-        }catch(Exception e){
-            e.printStackTrace();
-            rm.setMessage("操作异常，请确认！！");
-        }
-        return rm;
-    }
-
-    @ApiOperation(value = "App端远程求助确认按钮", notes = "App端远程求助确认按钮")
-    @PostMapping(value = "/phoneHelpConfirm")
-    public RESTfulResult phoneHelpConfirm(@RequestBody HashMap params) {
-        RESTfulResult rm = failed();
-        String id = params.get("helpId") == null ? "": params.get("helpId").toString();
-        String createNo = params.get("createNo") == null ? "" : params.get("createNo").toString();
-        String createName = params.get("createName") == null ? "" : params.get("createName").toString();
-        String result = params.get("result") == null ? "" : params.get("result").toString();
-        try{
-            if(com.steerinfo.util.StringUtils.isEmpty(id)){
-                rm.setMessage("远程求助ID不能为空！！");
-                return rm;
-            }else if(com.steerinfo.util.StringUtils.isEmpty(createNo)){
-                rm.setMessage("处理人编号不能为空！！");
-                return rm;
-            }else if(com.steerinfo.util.StringUtils.isEmpty(createName)){
-                rm.setMessage("处理人名称不能为空！！");
-                return rm;
-            }else{
-                rm = appPhoneHelpService.phoneHelpComfirm(id, createNo, createName, result);
-            }
-        }catch(Exception e){
-            e.printStackTrace();
-            rm.setMessage("操作异常，请确认！！");
-        }
-        return rm;
-    }
-
-}

src/main/java/com/steerinfo/baseinfo/appphonehelp/mapper/AppPhoneHelpMapper.java

@@ -1,14 +0,0 @@
-package com.steerinfo.baseinfo.appphonehelp.mapper;
-
-import com.steerinfo.baseinfo.appphonehelp.model.AppPhoneHelp;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import java.util.HashMap;
-import java.util.List;
-
-import com.steerinfo.metadata.App;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface AppPhoneHelpMapper extends IBaseMapper<AppPhoneHelp, String> {
-        AppPhoneHelp selectByMap(HashMap<String, Object> map);
-}

src/main/java/com/steerinfo/baseinfo/appphonehelp/mapper/AppPhoneHelpMapper.xml

@@ -1,346 +0,0 @@
-<?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.appphonehelp.mapper.AppPhoneHelpMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.baseinfo.appphonehelp.model.AppPhoneHelp">
-    <id column="HELP_ID" jdbcType="VARCHAR" property="helpId" />
-    <result column="CAR_NO" jdbcType="VARCHAR" property="carNo" />
-    <result column="PHONE_NO" jdbcType="VARCHAR" property="phoneNo" />
-    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="END_TIME" jdbcType="TIMESTAMP" property="endTime" />
-    <result column="CREATE_NO" jdbcType="VARCHAR" property="createNo" />
-    <result column="CREATE_NAME" jdbcType="VARCHAR" property="createName" />
-    <result column="RESULT" jdbcType="VARCHAR" property="result" />
-    <result column="VALUE_FLAG" jdbcType="VARCHAR" property="valueFlag" />
-    <result column="DRIVER_NAME" jdbcType="VARCHAR" property="driverName" />
-  </resultMap>
-  <sql id="columns">
-    HELP_ID, CAR_NO, PHONE_NO, CREATE_TIME, END_TIME, CREATE_NO, CREATE_NAME, RESULT, 
-    VALUE_FLAG, DRIVER_NAME
-  </sql>
-  <sql id="columns_alias">
-    t.HELP_ID, t.CAR_NO, t.PHONE_NO, t.CREATE_TIME, t.END_TIME, t.CREATE_NO, t.CREATE_NAME, 
-    t.RESULT, t.VALUE_FLAG, t.DRIVER_NAME
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns"/> FROM APP_PHONE_HELP
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM APP_PHONE_HELP t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="helpId != null and helpId != ''">
-        and HELP_ID = #{helpId}
-      </if>
-      <if test="carNo != null and carNo != ''">
-        and CAR_NO = #{carNo}
-      </if>
-      <if test="phoneNo != null and phoneNo != ''">
-        and PHONE_NO = #{phoneNo}
-      </if>
-      <if test="createTime != null">
-        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
-      </if>
-      <if test="endTime != null">
-        and TO_CHAR(END_TIME,'yyyy-MM-dd') = #{endTime}
-      </if>
-      <if test="createNo != null and createNo != ''">
-        and CREATE_NO = #{createNo}
-      </if>
-      <if test="createName != null and createName != ''">
-        and CREATE_NAME = #{createName}
-      </if>
-      <if test="result != null and result != ''">
-        and RESULT = #{result}
-      </if>
-      <if test="valueFlag != null and valueFlag != ''">
-        and VALUE_FLAG = #{valueFlag}
-      </if>
-      <if test="driverName != null and driverName != ''">
-        and DRIVER_NAME = #{driverName}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="helpId != null and helpId != ''">
-        and HELP_ID LIKE '%${helpId}%'
-      </if>
-      <if test="carNo != null and carNo != ''">
-        and CAR_NO LIKE '%${carNo}%'
-      </if>
-      <if test="phoneNo != null and phoneNo != ''">
-        and PHONE_NO LIKE '%${phoneNo}%'
-      </if>
-      <if test="createTime != null">
-        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
-      </if>
-      <if test="endTime != null">
-        and TO_CHAR(END_TIME,'yyyy-MM-dd') = #{endTime}
-      </if>
-      <if test="createNo != null and createNo != ''">
-        and CREATE_NO LIKE '%${createNo}%'
-      </if>
-      <if test="createName != null and createName != ''">
-        and CREATE_NAME LIKE '%${createName}%'
-      </if>
-      <if test="result != null and result != ''">
-        and RESULT LIKE '%${result}%'
-      </if>
-      <if test="valueFlag != null and valueFlag != ''">
-        and VALUE_FLAG LIKE '%${valueFlag}%'
-      </if>
-      <if test="driverName != null and driverName != ''">
-        and DRIVER_NAME LIKE '%${driverName}%'
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from APP_PHONE_HELP
-    where HELP_ID = #{helpId,jdbcType=VARCHAR}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from APP_PHONE_HELP
-    where 1!=1 
-      <if test="carNo != null and carNo != ''">
-        or CAR_NO = #{carNo}
-      </if>
-      <if test="phoneNo != null and phoneNo != ''">
-        or PHONE_NO = #{phoneNo}
-      </if>
-      <if test="createTime != null">
-        or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
-      </if>
-      <if test="endTime != null">
-        or TO_CHAR(END_TIME,'yyyy-MM-dd') = '#{endTime}'
-      </if>
-      <if test="createNo != null and createNo != ''">
-        or CREATE_NO = #{createNo}
-      </if>
-      <if test="createName != null and createName != ''">
-        or CREATE_NAME = #{createName}
-      </if>
-      <if test="result != null and result != ''">
-        or RESULT = #{result}
-      </if>
-      <if test="valueFlag != null and valueFlag != ''">
-        or VALUE_FLAG = #{valueFlag}
-      </if>
-      <if test="driverName != null and driverName != ''">
-        or DRIVER_NAME = #{driverName}
-      </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.baseinfo.appphonehelp.model.AppPhoneHelp">
-    insert into APP_PHONE_HELP (HELP_ID, CAR_NO, PHONE_NO, 
-      CREATE_TIME, END_TIME, CREATE_NO, 
-      CREATE_NAME, RESULT, VALUE_FLAG, 
-      DRIVER_NAME)
-    values (#{helpId,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR}, #{phoneNo,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, #{createNo,jdbcType=VARCHAR}, 
-      #{createName,jdbcType=VARCHAR}, #{result,jdbcType=VARCHAR}, #{valueFlag,jdbcType=VARCHAR}, 
-      #{driverName,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.appphonehelp.model.AppPhoneHelp">
-    insert into APP_PHONE_HELP
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="helpId != null">
-        HELP_ID,
-      </if>
-      <if test="carNo != null">
-        CAR_NO,
-      </if>
-      <if test="phoneNo != null">
-        PHONE_NO,
-      </if>
-      <if test="createTime != null">
-        CREATE_TIME,
-      </if>
-      <if test="endTime != null">
-        END_TIME,
-      </if>
-      <if test="createNo != null">
-        CREATE_NO,
-      </if>
-      <if test="createName != null">
-        CREATE_NAME,
-      </if>
-      <if test="result != null">
-        RESULT,
-      </if>
-      <if test="valueFlag != null">
-        VALUE_FLAG,
-      </if>
-      <if test="driverName != null">
-        DRIVER_NAME,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="helpId != null">
-        #{helpId,jdbcType=VARCHAR},
-      </if>
-      <if test="carNo != null">
-        #{carNo,jdbcType=VARCHAR},
-      </if>
-      <if test="phoneNo != null">
-        #{phoneNo,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="endTime != null">
-        #{endTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="createNo != null">
-        #{createNo,jdbcType=VARCHAR},
-      </if>
-      <if test="createName != null">
-        #{createName,jdbcType=VARCHAR},
-      </if>
-      <if test="result != null">
-        #{result,jdbcType=VARCHAR},
-      </if>
-      <if test="valueFlag != null">
-        #{valueFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="driverName != null">
-        #{driverName,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.appphonehelp.model.AppPhoneHelp">
-    update APP_PHONE_HELP
-    set CAR_NO = #{carNo,jdbcType=VARCHAR},
-      PHONE_NO = #{phoneNo,jdbcType=VARCHAR},
-      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
-      END_TIME = #{endTime,jdbcType=TIMESTAMP},
-      CREATE_NO = #{createNo,jdbcType=VARCHAR},
-      CREATE_NAME = #{createName,jdbcType=VARCHAR},
-      RESULT = #{result,jdbcType=VARCHAR},
-      VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
-      DRIVER_NAME = #{driverName,jdbcType=VARCHAR}
-    where HELP_ID = #{helpId,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.appphonehelp.model.AppPhoneHelp">
-    update APP_PHONE_HELP
-    <set>
-      <if test="carNo != null">
-        CAR_NO = #{carNo,jdbcType=VARCHAR},
-      </if>
-      <if test="phoneNo != null">
-        PHONE_NO = #{phoneNo,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="endTime != null">
-        END_TIME = #{endTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="createNo != null">
-        CREATE_NO = #{createNo,jdbcType=VARCHAR},
-      </if>
-      <if test="createName != null">
-        CREATE_NAME = #{createName,jdbcType=VARCHAR},
-      </if>
-      <if test="result != null">
-        RESULT = #{result,jdbcType=VARCHAR},
-      </if>
-      <if test="valueFlag != null">
-        VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="driverName != null">
-        DRIVER_NAME = #{driverName,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where HELP_ID = #{helpId,jdbcType=VARCHAR}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where HELP_ID = #{helpId,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 APP_PHONE_HELP 
-      (HELP_ID, 
-      CAR_NO, PHONE_NO, CREATE_TIME, 
-      END_TIME, CREATE_NO, CREATE_NAME, 
-      RESULT, VALUE_FLAG, DRIVER_NAME
-      )
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.helpId,jdbcType=VARCHAR}, 
-      #{item.carNo,jdbcType=VARCHAR}, #{item.phoneNo,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
-      #{item.endTime,jdbcType=TIMESTAMP}, #{item.createNo,jdbcType=VARCHAR}, #{item.createName,jdbcType=VARCHAR}, 
-      #{item.result,jdbcType=VARCHAR}, #{item.valueFlag,jdbcType=VARCHAR}, #{item.driverName,jdbcType=VARCHAR}
-       from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update APP_PHONE_HELP
-     set
-       HELP_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case HELP_ID" close="end">
-          when #{item.helpId,jdbcType=VARCHAR} then #{item.helpId,jdbcType=VARCHAR}
-       </foreach>
-       ,CAR_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case HELP_ID" close="end">
-          when #{item.helpId,jdbcType=VARCHAR} then #{item.carNo,jdbcType=VARCHAR}
-       </foreach>
-       ,PHONE_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case HELP_ID" close="end">
-          when #{item.helpId,jdbcType=VARCHAR} then #{item.phoneNo,jdbcType=VARCHAR}
-       </foreach>
-       ,CREATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case HELP_ID" close="end">
-          when #{item.helpId,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,END_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case HELP_ID" close="end">
-          when #{item.helpId,jdbcType=VARCHAR} then #{item.endTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,CREATE_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case HELP_ID" close="end">
-          when #{item.helpId,jdbcType=VARCHAR} then #{item.createNo,jdbcType=VARCHAR}
-       </foreach>
-       ,CREATE_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case HELP_ID" close="end">
-          when #{item.helpId,jdbcType=VARCHAR} then #{item.createName,jdbcType=VARCHAR}
-       </foreach>
-       ,RESULT=
-       <foreach collection="list" item="item" index="index" separator=" " open="case HELP_ID" close="end">
-          when #{item.helpId,jdbcType=VARCHAR} then #{item.result,jdbcType=VARCHAR}
-       </foreach>
-       ,VALUE_FLAG=
-       <foreach collection="list" item="item" index="index" separator=" " open="case HELP_ID" close="end">
-          when #{item.helpId,jdbcType=VARCHAR} then #{item.valueFlag,jdbcType=VARCHAR}
-       </foreach>
-       ,DRIVER_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case HELP_ID" close="end">
-          when #{item.helpId,jdbcType=VARCHAR} then #{item.driverName,jdbcType=VARCHAR}
-       </foreach>
-     where HELP_ID in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-    #{item.helpId,jdbcType=VARCHAR}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from APP_PHONE_HELP
-    where HELP_ID in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-
-  <select id="selectByMap" parameterType="java.util.Map" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="where"/>
-  </select>
-</mapper>

src/main/java/com/steerinfo/baseinfo/appphonehelp/model/AppPhoneHelp.java

@@ -1,182 +0,0 @@
-package com.steerinfo.baseinfo.appphonehelp.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 AppPhoneHelp implements IBasePO<String> {
-    /**
-     * 主键(HELP_ID,VARCHAR,20)
-     */
-    @ApiModelProperty(value="主键",required=true)
-    private String helpId;
-
-    /**
-     * 车号(CAR_NO,VARCHAR,11)
-     */
-    @ApiModelProperty(value="车号",required=false)
-    private String carNo;
-
-    /**
-     * 电话号码(PHONE_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="电话号码",required=false)
-    private String phoneNo;
-
-    /**
-     * 求助时间(CREATE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="求助时间",required=false)
-    private Date createTime;
-
-    /**
-     * 结束时间(END_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="结束时间",required=false)
-    private Date endTime;
-
-    /**
-     * 处理人编号(CREATE_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="处理人编号",required=false)
-    private String createNo;
-
-    /**
-     * 处理人(CREATE_NAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="处理人",required=false)
-    private String createName;
-
-    /**
-     * 处理结果(RESULT,VARCHAR,2)
-     */
-    @ApiModelProperty(value="处理结果",required=false)
-    private String result;
-
-    /**
-     * 是否接听（0：未接听，1：已接听）(VALUE_FLAG,VARCHAR,1)
-     */
-    @ApiModelProperty(value="是否接听（0：未接听，1：已接听）",required=false)
-    private String valueFlag;
-
-    /**
-     * 司机姓名(DRIVER_NAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="司机姓名",required=false)
-    private String driverName;
-
-    private static final long serialVersionUID = 1L;
-
-    @Override
-    public String getId() {
-        return this.helpId;
-    }
-
-    @Override
-    public void setId(String helpId) {
-        this.helpId = helpId == null ? null : helpId.trim();
-    }
-
-    public String getHelpId() {
-        return helpId;
-    }
-
-    public void setHelpId(String helpId) {
-        this.helpId = helpId == null ? null : helpId.trim();
-    }
-
-    public String getCarNo() {
-        return carNo;
-    }
-
-    public void setCarNo(String carNo) {
-        this.carNo = carNo == null ? null : carNo.trim();
-    }
-
-    public String getPhoneNo() {
-        return phoneNo;
-    }
-
-    public void setPhoneNo(String phoneNo) {
-        this.phoneNo = phoneNo == null ? null : phoneNo.trim();
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
-    }
-
-    public String getCreateNo() {
-        return createNo;
-    }
-
-    public void setCreateNo(String createNo) {
-        this.createNo = createNo == null ? null : createNo.trim();
-    }
-
-    public String getCreateName() {
-        return createName;
-    }
-
-    public void setCreateName(String createName) {
-        this.createName = createName == null ? null : createName.trim();
-    }
-
-    public String getResult() {
-        return result;
-    }
-
-    public void setResult(String result) {
-        this.result = result == null ? null : result.trim();
-    }
-
-    public String getValueFlag() {
-        return valueFlag;
-    }
-
-    public void setValueFlag(String valueFlag) {
-        this.valueFlag = valueFlag == null ? null : valueFlag.trim();
-    }
-
-    public String getDriverName() {
-        return driverName;
-    }
-
-    public void setDriverName(String driverName) {
-        this.driverName = driverName == null ? null : driverName.trim();
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", helpId=").append(helpId);
-        sb.append(", carNo=").append(carNo);
-        sb.append(", phoneNo=").append(phoneNo);
-        sb.append(", createTime=").append(createTime);
-        sb.append(", endTime=").append(endTime);
-        sb.append(", createNo=").append(createNo);
-        sb.append(", createName=").append(createName);
-        sb.append(", result=").append(result);
-        sb.append(", valueFlag=").append(valueFlag);
-        sb.append(", driverName=").append(driverName);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}

src/main/java/com/steerinfo/baseinfo/appphonehelp/service/IAppPhoneHelpService.java

@@ -1,25 +0,0 @@
-package com.steerinfo.baseinfo.appphonehelp.service;
-
-import com.steerinfo.framework.controller.RESTfulResult;
-import com.steerinfo.framework.service.IBaseService;
-import com.steerinfo.baseinfo.appphonehelp.model.AppPhoneHelp;
-import java.util.Date;
-import java.math.BigDecimal;
-
-/**
- * AppPhoneHelp服务接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2022-03-18 05:31
- * 类描述
- * 修订历史：
- * 日期：2022-03-18
- * 作者：generator
- * 参考：
- * 描述：AppPhoneHelp服务接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-public interface IAppPhoneHelpService extends IBaseService<AppPhoneHelp, String>{
-    RESTfulResult phoneHelp(String carNo, String phoneNo, String driverName);
-    RESTfulResult phoneHelpComfirm(String id, String createNo, String createName, String result);
-}

src/main/java/com/steerinfo/baseinfo/appphonehelp/service/impl/AppPhoneHelpServiceImpl.java

@@ -1,116 +0,0 @@
-package com.steerinfo.baseinfo.appphonehelp.service.impl;
-
-import com.steerinfo.framework.controller.RESTfulResult;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
-import com.steerinfo.baseinfo.appphonehelp.model.AppPhoneHelp;
-import com.steerinfo.baseinfo.appphonehelp.mapper.AppPhoneHelpMapper;
-import com.steerinfo.baseinfo.appphonehelp.service.IAppPhoneHelpService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-
-/**
- * AppPhoneHelp服务实现：
- * @author generator
- * @version 1.0-SNAPSHORT 2022-03-18 05:31
- * 类描述
- * 修订历史：
- * 日期：2022-03-18
- * 作者：generator
- * 参考：
- * 描述：AppPhoneHelp服务实现
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@Service(value = "appPhoneHelpService")
-public class AppPhoneHelpServiceImpl extends BaseServiceImpl<AppPhoneHelp, String> implements IAppPhoneHelpService {
-
-    @Autowired
-    private AppPhoneHelpMapper appPhoneHelpMapper;
-
-    @Override
-    protected IBaseMapper<AppPhoneHelp, String> getMapper() {
-        return appPhoneHelpMapper;
-    }
-
-    @Override
-    public RESTfulResult phoneHelp(String carNo, String phoneNo, String driverName) {
-        RESTfulResult rm = new RESTfulResult();
-        //新建AppPhoneHelp类存储远程救助信息
-        AppPhoneHelp helpModel = new AppPhoneHelp();
-        //根据车号、电话、司机姓名获取远程求助信息
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("carNo", carNo);
-        map.put("phoneNo", phoneNo);
-        map.put("driverName", driverName);
-        AppPhoneHelp model = appPhoneHelpMapper.selectByMap(map);
-        //若是远程求助信息里面没有求助信息，重新生成Id直接插入
-        if(model == null){
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
-            helpModel.setHelpId(sdf.format(new Date()));
-            helpModel.setCarNo(carNo);
-            helpModel.setPhoneNo(phoneNo);
-            helpModel.setDriverName(driverName);
-            helpModel.setCreateTime(new Date());
-            helpModel.setValueFlag("0");
-            helpModel.setHelpId(sdf.format(new Date()));
-            int i = appPhoneHelpMapper.insertSelective(helpModel);
-            if( i > 0){
-                rm.setSucceed();
-                rm.setMessage("数据正在处理，请等待！！");
-                rm.setCode("200");
-                rm.setData(helpModel);
-            }else{
-                rm.setMessage("操作失败");
-                rm.setCode("500");
-                rm.setFailed();
-            }
-        }else{  //若有求助信息，更新远程求助表
-            model.setCreateTime(new Date());
-            model.setValueFlag("0");
-            int i = appPhoneHelpMapper.updateByPrimaryKeySelective(model);
-            if( i > 0){
-                rm.setSucceed();
-                rm.setMessage("数据正在处理，请等待！！");
-                rm.setCode("200");
-                rm.setData(model);
-            }else{
-                rm.setMessage("操作失败");
-                rm.setCode("500");
-                rm.setFailed();
-            }
-        }
-        return rm;
-    }
-
-    @Override
-    public RESTfulResult phoneHelpComfirm(String id, String createNo, String createName, String result) {
-        RESTfulResult rm = new RESTfulResult();
-        AppPhoneHelp model = appPhoneHelpMapper.selectByPrimaryKey(id);
-        if(model == null){
-            rm.setMessage("根据远程求助信息ID未找到相应远程求助信息，请确认！！");
-            rm.setData(null);
-            rm.setFailed();
-        }else{
-            model.setCreateNo(createNo);
-            model.setCreateName(createName);
-            model.setEndTime(new Date());
-            model.setValueFlag("1");
-            model.setResult(result);
-            int i = appPhoneHelpMapper.updateByPrimaryKey(model);
-            if( i > 0){
-                rm.setMessage("操作成功");
-                rm.setSucceed();
-            }else{
-                rm.setMessage("操作失败");
-                rm.setFailed();
-            }
-        }
-        return rm;
-    }
-
-}

src/main/java/com/steerinfo/baseinfo/appverificationcode/controller/AppVerificationCodeController.java

@@ -1,129 +0,0 @@
-package com.steerinfo.baseinfo.appverificationcode.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.appverificationcode.model.AppVerificationCode;
-import com.steerinfo.baseinfo.appverificationcode.service.IAppVerificationCodeService;
-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;
-
-/**
- * AppVerificationCode RESTful接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2022-03-16 04:15
- * 类描述
- * 修订历史：
- * 日期：2022-03-16
- * 作者：generator
- * 参考：
- * 描述：AppVerificationCode RESTful接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@RestController
-@RequestMapping("/${api.version}/appverificationcodes")
-public class AppVerificationCodeController extends BaseRESTfulController {
-
-    @Autowired
-    IAppVerificationCodeService appVerificationCodeService;
-
-    @ApiOperation(value="获取列表", notes="分页查询")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
-    })
-    //@RequiresPermissions("appverificationcode:view")
-    @GetMapping(value = "/")
-    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
-        PageList<AppVerificationCode> list = appVerificationCodeService.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("appverificationcode:view")
-    @GetMapping(value = "/like/")
-    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
-        PageList<AppVerificationCode> list = appVerificationCodeService.queryLikeForPage(parmas, pageNum, pageSize);
-        return success(list);
-    }
-    
-    @ApiOperation(value="创建", notes="根据AppVerificationCode对象创建")
-    @ApiImplicitParam(name = "appVerificationCode", value = "详细实体appVerificationCode", required = true, dataType = "AppVerificationCode")
-    //@RequiresPermissions("appverificationcode:create")
-    @PostMapping(value = "/")
-    public RESTfulResult add(@ModelAttribute AppVerificationCode model){
-        AppVerificationCode appVerificationCode = appVerificationCodeService.add(model);
-        return success(appVerificationCode);
-    }
-
-    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
-    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
-    //@RequiresPermissions("appverificationcode:view")
-    @GetMapping(value = "/{id}")
-    public RESTfulResult get(@PathVariable String id){
-        AppVerificationCode appVerificationCode = appVerificationCodeService.getById(id);
-        return success(appVerificationCode);
-    }
-
-    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的appVerificationCode信息来更新详细信息")
-    @ApiImplicitParams({
-        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
-        @ApiImplicitParam(name = "appVerificationCode", value = "详细实体appVerificationCode", required = true, dataType = "AppVerificationCode")
-    })
-    //@RequiresPermissions("appverificationcode:update")
-    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
-    public RESTfulResult update(@PathVariable String id, @RequestBody AppVerificationCode model){
-        model.setId(id);
-        AppVerificationCode appVerificationCode = appVerificationCodeService.modify(model);
-        return success(appVerificationCode);
-    }
-
-    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
-    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
-    //@RequiresPermissions("appverificationcode: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);
-			  appVerificationCodeService.delete(ids);
-    	}
-      return success();
-    }
-
-    @ApiOperation(value = "电话短信发送功能-酒钢信息发送平台", notes = "电话短信发送功能-酒钢信息发送平台")
-    @GetMapping(value = "/sendInfo")
-    public RESTfulResult sendInfo(@RequestParam String phoneNum) {
-        RESTfulResult rm = failed();
-        int len = phoneNum.length();
-        try{
-            if(len != 11){
-                rm.setMessage("电话号码为无效号码！！");
-            }else{
-                appVerificationCodeService.sendInfo(phoneNum);
-                rm = success();
-            }
-        }catch(Exception e){
-            e.printStackTrace();
-            rm.setMessage("操作异常，请确认！！");
-        }
-        return rm;
-    }
-}

src/main/java/com/steerinfo/baseinfo/appverificationcode/mapper/AppVerificationCodeMapper.java

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

src/main/java/com/steerinfo/baseinfo/appverificationcode/mapper/AppVerificationCodeMapper.xml

@@ -1,242 +0,0 @@
-<?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.appverificationcode.mapper.AppVerificationCodeMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.baseinfo.appverificationcode.model.AppVerificationCode">
-    <id column="INFO_ID" jdbcType="VARCHAR" property="infoId" />
-    <result column="PHONE_NO" jdbcType="VARCHAR" property="phoneNo" />
-    <result column="CODE" jdbcType="VARCHAR" property="code" />
-    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="EXPIRATION_TIME" jdbcType="TIMESTAMP" property="expirationTime" />
-    <result column="VALUE_FLAG" jdbcType="VARCHAR" property="valueFlag" />
-  </resultMap>
-  <sql id="columns">
-    INFO_ID, PHONE_NO, CODE, CREATE_TIME, EXPIRATION_TIME, VALUE_FLAG
-  </sql>
-  <sql id="columns_alias">
-    t.INFO_ID, t.PHONE_NO, t.CODE, t.CREATE_TIME, t.EXPIRATION_TIME, t.VALUE_FLAG
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns"/> FROM APP_VERIFICATION_CODE
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM APP_VERIFICATION_CODE t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="infoId != null and infoId != ''">
-        and INFO_ID = #{infoId}
-      </if>
-      <if test="phoneNo != null and phoneNo != ''">
-        and PHONE_NO = #{phoneNo}
-      </if>
-      <if test="code != null and code != ''">
-        and CODE = #{code}
-      </if>
-      <if test="createTime != null">
-        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
-      </if>
-      <if test="expirationTime != null">
-        and TO_CHAR(EXPIRATION_TIME,'yyyy-MM-dd') = #{expirationTime}
-      </if>
-      <if test="valueFlag != null and valueFlag != ''">
-        and VALUE_FLAG = #{valueFlag}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="infoId != null and infoId != ''">
-        and INFO_ID LIKE '%${infoId}%'
-      </if>
-      <if test="phoneNo != null and phoneNo != ''">
-        and PHONE_NO LIKE '%${phoneNo}%'
-      </if>
-      <if test="code != null and code != ''">
-        and CODE LIKE '%${code}%'
-      </if>
-      <if test="createTime != null">
-        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
-      </if>
-      <if test="expirationTime != null">
-        and TO_CHAR(EXPIRATION_TIME,'yyyy-MM-dd') = #{expirationTime}
-      </if>
-      <if test="valueFlag != null and valueFlag != ''">
-        and VALUE_FLAG LIKE '%${valueFlag}%'
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from APP_VERIFICATION_CODE
-    where INFO_ID = #{infoId,jdbcType=VARCHAR}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from APP_VERIFICATION_CODE
-    where 1!=1 
-      <if test="phoneNo != null and phoneNo != ''">
-        or PHONE_NO = #{phoneNo}
-      </if>
-      <if test="code != null and code != ''">
-        or CODE = #{code}
-      </if>
-      <if test="createTime != null">
-        or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
-      </if>
-      <if test="expirationTime != null">
-        or TO_CHAR(EXPIRATION_TIME,'yyyy-MM-dd') = '#{expirationTime}'
-      </if>
-      <if test="valueFlag != null and valueFlag != ''">
-        or VALUE_FLAG = #{valueFlag}
-      </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.baseinfo.appverificationcode.model.AppVerificationCode">
-    insert into APP_VERIFICATION_CODE (INFO_ID, PHONE_NO, CODE, 
-      CREATE_TIME, EXPIRATION_TIME, VALUE_FLAG
-      )
-    values (#{infoId,jdbcType=VARCHAR}, #{phoneNo,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{expirationTime,jdbcType=TIMESTAMP}, #{valueFlag,jdbcType=VARCHAR}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.appverificationcode.model.AppVerificationCode">
-    insert into APP_VERIFICATION_CODE
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="infoId != null">
-        INFO_ID,
-      </if>
-      <if test="phoneNo != null">
-        PHONE_NO,
-      </if>
-      <if test="code != null">
-        CODE,
-      </if>
-      <if test="createTime != null">
-        CREATE_TIME,
-      </if>
-      <if test="expirationTime != null">
-        EXPIRATION_TIME,
-      </if>
-      <if test="valueFlag != null">
-        VALUE_FLAG,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="infoId != null">
-        #{infoId,jdbcType=VARCHAR},
-      </if>
-      <if test="phoneNo != null">
-        #{phoneNo,jdbcType=VARCHAR},
-      </if>
-      <if test="code != null">
-        #{code,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="expirationTime != null">
-        #{expirationTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="valueFlag != null">
-        #{valueFlag,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.appverificationcode.model.AppVerificationCode">
-    update APP_VERIFICATION_CODE
-    set PHONE_NO = #{phoneNo,jdbcType=VARCHAR},
-      CODE = #{code,jdbcType=VARCHAR},
-      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
-      EXPIRATION_TIME = #{expirationTime,jdbcType=TIMESTAMP},
-      VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR}
-    where INFO_ID = #{infoId,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.appverificationcode.model.AppVerificationCode">
-    update APP_VERIFICATION_CODE
-    <set>
-      <if test="phoneNo != null">
-        PHONE_NO = #{phoneNo,jdbcType=VARCHAR},
-      </if>
-      <if test="code != null">
-        CODE = #{code,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="expirationTime != null">
-        EXPIRATION_TIME = #{expirationTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="valueFlag != null">
-        VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where INFO_ID = #{infoId,jdbcType=VARCHAR}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where INFO_ID = #{infoId,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 APP_VERIFICATION_CODE 
-      (INFO_ID, 
-      PHONE_NO, CODE, CREATE_TIME, 
-      EXPIRATION_TIME, VALUE_FLAG)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.infoId,jdbcType=VARCHAR}, 
-      #{item.phoneNo,jdbcType=VARCHAR}, #{item.code,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
-      #{item.expirationTime,jdbcType=TIMESTAMP}, #{item.valueFlag,jdbcType=VARCHAR} from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update APP_VERIFICATION_CODE
-     set
-       INFO_ID=
-       <foreach collection="list" item="item" index="index" separator=" " open="case INFO_ID" close="end">
-          when #{item.infoId,jdbcType=VARCHAR} then #{item.infoId,jdbcType=VARCHAR}
-       </foreach>
-       ,PHONE_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case INFO_ID" close="end">
-          when #{item.infoId,jdbcType=VARCHAR} then #{item.phoneNo,jdbcType=VARCHAR}
-       </foreach>
-       ,CODE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case INFO_ID" close="end">
-          when #{item.infoId,jdbcType=VARCHAR} then #{item.code,jdbcType=VARCHAR}
-       </foreach>
-       ,CREATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case INFO_ID" close="end">
-          when #{item.infoId,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,EXPIRATION_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case INFO_ID" close="end">
-          when #{item.infoId,jdbcType=VARCHAR} then #{item.expirationTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,VALUE_FLAG=
-       <foreach collection="list" item="item" index="index" separator=" " open="case INFO_ID" close="end">
-          when #{item.infoId,jdbcType=VARCHAR} then #{item.valueFlag,jdbcType=VARCHAR}
-       </foreach>
-     where INFO_ID in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-    #{item.infoId,jdbcType=VARCHAR}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from APP_VERIFICATION_CODE
-    where INFO_ID in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-
-  <select id="selectByPhone" parameterType="java.lang.String" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where phone_no = #{phoneNum,jdbcType=VARCHAR}
-  </select>
-</mapper>

src/main/java/com/steerinfo/baseinfo/appverificationcode/model/AppVerificationCode.java

@@ -1,122 +0,0 @@
-package com.steerinfo.baseinfo.appverificationcode.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 AppVerificationCode implements IBasePO<String> {
-    /**
-     * 主键(INFO_ID,VARCHAR,20)
-     */
-    @ApiModelProperty(value="主键",required=true)
-    private String infoId;
-
-    /**
-     * 电话号码(PHONE_NO,VARCHAR,11)
-     */
-    @ApiModelProperty(value="电话号码",required=true)
-    private String phoneNo;
-
-    /**
-     * 验证码(CODE,VARCHAR,20)
-     */
-    @ApiModelProperty(value="验证码",required=false)
-    private String code;
-
-    /**
-     * 创建时间(CREATE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="创建时间",required=false)
-    private Date createTime;
-
-    /**
-     * 过期时间(EXPIRATION_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="过期时间",required=false)
-    private Date expirationTime;
-
-    /**
-     * 验证码有效状态（0：作废，1：有效）(VALUE_FLAG,VARCHAR,1)
-     */
-    @ApiModelProperty(value="验证码有效状态（0：作废，1：有效）",required=false)
-    private String valueFlag;
-
-    private static final long serialVersionUID = 1L;
-
-    @Override
-    public String getId() {
-        return this.infoId;
-    }
-
-    @Override
-    public void setId(String infoId) {
-        this.infoId = infoId == null ? null : infoId.trim();
-    }
-
-    public String getInfoId() {
-        return infoId;
-    }
-
-    public void setInfoId(String infoId) {
-        this.infoId = infoId == null ? null : infoId.trim();
-    }
-
-    public String getPhoneNo() {
-        return phoneNo;
-    }
-
-    public void setPhoneNo(String phoneNo) {
-        this.phoneNo = phoneNo == null ? null : phoneNo.trim();
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code == null ? null : code.trim();
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getExpirationTime() {
-        return expirationTime;
-    }
-
-    public void setExpirationTime(Date expirationTime) {
-        this.expirationTime = expirationTime;
-    }
-
-    public String getValueFlag() {
-        return valueFlag;
-    }
-
-    public void setValueFlag(String valueFlag) {
-        this.valueFlag = valueFlag == null ? null : valueFlag.trim();
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", infoId=").append(infoId);
-        sb.append(", phoneNo=").append(phoneNo);
-        sb.append(", code=").append(code);
-        sb.append(", createTime=").append(createTime);
-        sb.append(", expirationTime=").append(expirationTime);
-        sb.append(", valueFlag=").append(valueFlag);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}

src/main/java/com/steerinfo/baseinfo/appverificationcode/service/IAppVerificationCodeService.java

@@ -1,25 +0,0 @@
-package com.steerinfo.baseinfo.appverificationcode.service;
-
-import com.steerinfo.framework.service.IBaseService;
-import com.steerinfo.baseinfo.appverificationcode.model.AppVerificationCode;
-
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * AppVerificationCode服务接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2022-03-16 04:15
- * 类描述
- * 修订历史：
- * 日期：2022-03-16
- * 作者：generator
- * 参考：
- * 描述：AppVerificationCode服务接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-public interface IAppVerificationCodeService extends IBaseService<AppVerificationCode, String>{
-    void sendInfo(String phoneNum) throws InterruptedException;
-
-}

src/main/java/com/steerinfo/baseinfo/appverificationcode/service/impl/AppVerificationCodeServiceImpl.java

@@ -1,218 +0,0 @@
-package com.steerinfo.baseinfo.appverificationcode.service.impl;
-
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
-import com.steerinfo.baseinfo.appverificationcode.model.AppVerificationCode;
-import com.steerinfo.baseinfo.appverificationcode.mapper.AppVerificationCodeMapper;
-import com.steerinfo.baseinfo.appverificationcode.service.IAppVerificationCodeService;
-import com.wellbole.sms.client.callback.InboundMessageFetchCallback;
-import com.wellbole.sms.client.callback.StatusReportMessageFetchCallback;
-import com.wellbole.sms.client.impl.HttpPostSmsClient;
-import com.wellbole.sms.client.impl.SmsFetcherImpl;
-import com.wellbole.sms.client.impl.SmsSenderImpl;
-import com.wellbole.sms.client.impl.StatusReportFetcherImpl;
-import com.wellbole.sms.client.message.InboundMessage;
-import com.wellbole.sms.client.message.OutboundMessage;
-import com.wellbole.sms.client.message.StatusReportMessage;
-import com.wellbole.sms.client.result.SmsFetchResult;
-import com.wellbole.sms.client.result.SmsSendResult;
-import com.wellbole.sms.client.service.SmsFetcherThreadService;
-import com.wellbole.sms.client.service.StatusReportFetcherThreadService;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
-/**
- * AppVerificationCode服务实现：
- * @author generator
- * @version 1.0-SNAPSHORT 2022-03-16 04:15
- * 类描述
- * 修订历史：
- * 日期：2022-03-16
- * 作者：generator
- * 参考：
- * 描述：AppVerificationCode服务实现
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@Service(value = "appVerificationCodeService")
-public class AppVerificationCodeServiceImpl extends BaseServiceImpl<AppVerificationCode, String> implements IAppVerificationCodeService {
-
-    @Resource
-    private AppVerificationCodeMapper appVerificationCodeMapper;
-
-    @Override
-    protected IBaseMapper<AppVerificationCode, String> getMapper() {
-        return appVerificationCodeMapper;
-    }
-
-    @Override
-    public void sendInfo(String phoneNum) throws InterruptedException{
-        Logger logger = LogManager.getLogger(AppVerificationCodeServiceImpl.class);
-
-        /*********************************************
-         * 构造基本发送数据客户端，短信发送器，短信接收器
-         ********************************************/
-        //构造基于HTTP POST方式的发送数据客户端
-        //注入方式HttpPostSmsClient实现了SmsClient接口
-        HttpPostSmsClient client = new HttpPostSmsClient();
-        client.setServerUrl("http://10.99.200.19:10086/router");
-        //f2e0d49b4f7c4735a0e3e3b9d173e5e4]
-        client.setAppKey("53e548b23a784379b6c30ec88b28c801");
-        client.setAppSecret("c339eaa1099449fba94751649f185f63");
-
-
-        //构造短信发送器（平台－》用户手机）
-        //SmsSenderImpl smsSender = new SmsSenderImpl(client);
-        //注入方式，SmsSenderImpl实现了SmsSender接口
-        SmsSenderImpl smsSender = new SmsSenderImpl();
-        smsSender.setClient(client);
-
-        /*********************************************
-         * 短信发送测试
-         ********************************************/
-        //构造下行短信（平台－》用户手机）
-        OutboundMessage message = new OutboundMessage();
-        message.setPhone(phoneNum);
-        //开会通知，xxx在xxx召开xxx会议，请准时参加。
-        //系统异常报告：xxx系统于xxx 发生故障，请及时处理。
-        //message.setContent("系统异常报告：站群系统于2016-01-18 20:32:04 发生故障，请及时处理。");
-        //message.setExtCode("");
-
-        //随机生成六位数的密码
-        Integer randNum = (int)(Math.random()* (999999)+1);
-        String password = String.format("%06d",randNum);
-        //查询出有多少与phoneNum匹配的号码
-        AppVerificationCode modelTemp =  appVerificationCodeMapper.selectByPhone(phoneNum);
-
-        Calendar c = Calendar.getInstance();
-        //如果电话号码已存在，只需更新新建时间、过期时间、标志位,
-        if(appVerificationCodeMapper.selectByPhone(phoneNum) != null && modelTemp.getPhoneNo().equals(phoneNum)) {
-            //验证码有效
-            modelTemp.setValueFlag("1");
-            //验证码发送时间
-            modelTemp.setCreateTime(new Date());
-            //过期时间:当前时间后三分钟
-               //实例化
-            c.add(Calendar.MINUTE, 3);  //分钟+3
-            modelTemp.setExpirationTime(c.getTime());
-            //设置验证码
-            modelTemp.setCode(password);
-            appVerificationCodeMapper.updateByPrimaryKey(modelTemp);
-        }else{  //未查到号码直接插入验证码匹配信息
-            //生成ID
-            AppVerificationCode model = new AppVerificationCode();
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
-            model.setInfoId(sdf.format(new Date()));
-            //设置电话号码
-            model.setPhoneNo(phoneNum);
-            //设置验证码
-            model.setCode(password);
-            //验证码有效
-            model.setValueFlag("1");
-            //验证码发送时间
-            model.setCreateTime(new Date());
-            //过期时间:当前时间后三分钟
-            c.add(Calendar.MINUTE, 3);
-            model.setExpirationTime(c.getTime());
-
-            appVerificationCodeMapper.insertSelective(model);
-        }
-
-        message.setContent("您的验证码是"+ password +"（3分钟之内有效），请不要把验证码泄露给其他人。如非本人操作，可不用理会");
-        //以下是可选参数
-        //默认不指定该参数，若指定，平台将返回该指定的msgid，若不指定，则由平台自动生成
-        //message.setMsgid("用户指定的id");
-        //设定发送时间，可指定未来的时间，表示延迟发送，若不指定，则默认立即发送。
-        //message.setSendAt(new Date());
-        //发送短信
-        StatusReportFetcherThreadService statusService = new StatusReportFetcherThreadService();
-        StatusReportFetcherImpl statusReportFetcher = new StatusReportFetcherImpl();
-        statusReportFetcher.setClient(client);
-        statusService.setStatusReportFetcher(statusReportFetcher);
-        statusService.setPeriod(10);
-        statusService.setStatusReportMessageFetchCallback(new StatusReportMessageFetchCallback(){
-            @Override
-            public void onFetch(StatusReportMessage msg) {
-                logger.info("phone=" + msg.getPhone());
-                logger.info("status="+msg.getStatusCode());
-            }
-        });
-        statusService.start();
-        for(int index =0 ;index < 1; index++){
-            SmsSendResult sendResult = smsSender.send(message);
-            if(sendResult != null){
-                //statusService.AddToStatusReportQueue(sendResult.getMsgid());
-            }
-            //发送结果检查
-            if(sendResult.hasError()){
-                logger.info("发送失败，原因＝" + sendResult.getErrorMessage());
-            }else{
-                //发送成功时，服务器端会生成一个36字节长度的唯一标示。
-                logger.info("发送成功，服务器端返回的msgid＝" +sendResult.getMsgid());
-            }
-        }
-
-        /*********************************************
-         * 短信接收测试（由调用端调用接收接口进行接收，手动模式）
-         ********************************************/
-
-
-        //构造短信接收器(用户手机－》平台)
-        //SmsFetcher smsFetcher = new SmsFetcherImpl(client);
-        //注入方式，SmsFetcherImpl实现了SmsFetcher接口
-        SmsFetcherImpl smsFetcher = new SmsFetcherImpl();
-        smsFetcher.setClient(client);
-        //获取上行短信，建议每间隔5秒以上获取一次，
-        //太频繁会造成短信服务负载过大。
-        String extCode = "";
-        SmsFetchResult fetchResult = smsFetcher.fetch(extCode);
-        if(fetchResult.hasError()){
-            logger.info("获取上行短信失败，原因＝" + fetchResult.getErrorMessage());
-        }else if(fetchResult.hasData()){//有数据返回。
-            for(InboundMessage inboundMessage : fetchResult.getInboundMessageList()){
-                //msgid，平台自动生成的消息id
-                logger.info("msgid=" + inboundMessage.getMsgid());
-                //扩展代码，默认为空。
-                logger.info("extcode=" + inboundMessage.getExtCode());
-                //用户手机号码
-                logger.info("phone=" + inboundMessage.getPhone());
-                //用户发送的短信内容
-                logger.info("content=" + inboundMessage.getContent());
-                //平台接收上行短信时间
-                logger.info("receiverAt=" + inboundMessage.getReceiveAt());
-            }
-        }
-
-
-
-
-        /*********************************************
-         * 短信接收测试（内置线程自动获取方式，需要提供回调接口实现，自动模式）
-         *******************************************
-        //构造回调接口实现
-
-        //上行短信（用户手机－》平台）回调接口实现
-        InboundMessageFetchCallback callback = new InboundMessageCallbackTestImpl();
-        //构造短息获取服务线程
-        SmsFetcherThreadService fetcherService = new SmsFetcherThreadService();
-        //注入接收器（服务线程定期调用接收器来获取平台的上行短信）
-        fetcherService.setSmsFetcher(smsFetcher);
-        //每隔10秒检查一次
-        fetcherService.setPeriod(5);
-        //设定回调接口
-        fetcherService.setInboundMessageFetchCallback(callback);
-        //开始服务
-        fetcherService.start();
-        //15分钟后停止服务
-        Thread.sleep(1000);
-        fetcherService.stop();
-        statusService.stop();*/
-    }
-}

src/main/java/com/steerinfo/baseinfo/appverificationcode/service/impl/InboundMessageCallbackTestImpl.java

@@ -1,38 +0,0 @@
-package com.steerinfo.baseinfo.appverificationcode.service.impl;
-
-import com.wellbole.sms.client.callback.InboundMessageFetchCallback;
-import com.wellbole.sms.client.message.InboundMessage;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
-
-/**
- * @description: TODO
- * @author: dyj
- * @date: 2022年03月16日11:00
- */
-public class InboundMessageCallbackTestImpl implements InboundMessageFetchCallback {
-    /**
-     * 日志
-     */
-    private static final Logger logger = LogManager.getLogger(InboundMessageCallbackTestImpl.class);
-
-    /**
-     * (non-Javadoc)
-     * TODO 简单描述该方法的实现功能（可选）
-     * @see com.wellbole.sms.client.callback.InboundMessageFetchCallback#onFetch(com.wellbole.sms.client.message.InboundMessage)
-     */
-    @Override
-    public void onFetch(InboundMessage inboundMessage) {
-        //inboundMessage是上行短信（用户手机－》平台）
-        //msgid，平台自动生成的消息id
-        logger.info("msgid=" + inboundMessage.getMsgid());
-        //扩展代码，默认为空。
-        logger.info("extcode=" + inboundMessage.getExtCode());
-        //用户手机号码
-        logger.info("phone=" + inboundMessage.getPhone());
-        //用户发送的短信内容
-        logger.info("content=" + inboundMessage.getContent());
-        //平台接收上行短信时间
-        logger.info("receiverAt=" + inboundMessage.getReceiveAt());
-    }
-}

src/main/java/com/steerinfo/baseinfo/appversionmsg/controller/AppVersionMsgController.java

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

src/main/java/com/steerinfo/baseinfo/appversionmsg/mapper/AppVersionMsgMapper.java

@@ -1,9 +0,0 @@
-package com.steerinfo.baseinfo.appversionmsg.mapper;
-
-import com.steerinfo.baseinfo.appversionmsg.model.AppVersionMsg;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface AppVersionMsgMapper extends IBaseMapper<AppVersionMsg, String> {
-}

src/main/java/com/steerinfo/baseinfo/appversionmsg/mapper/AppVersionMsgMapper.xml

@@ -1,652 +0,0 @@
-<?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.appversionmsg.mapper.AppVersionMsgMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.baseinfo.appversionmsg.model.AppVersionMsg">
-    <id column="VERSION_ID" jdbcType="VARCHAR" property="versionId" />
-    <result column="TEANT_ID" jdbcType="VARCHAR" property="teantId" />
-    <result column="PROGRAM_ID" jdbcType="VARCHAR" property="programId" />
-    <result column="PROGRAM_NAME" jdbcType="VARCHAR" property="programName" />
-    <result column="VERSION_NUM" jdbcType="VARCHAR" property="versionNum" />
-    <result column="PROGRAM_TYPE" jdbcType="VARCHAR" property="programType" />
-    <result column="VERSION_UPDATE_CONTENT" jdbcType="VARCHAR" property="versionUpdateContent" />
-    <result column="PUBLISH_DATE" jdbcType="TIMESTAMP" property="publishDate" />
-    <result column="PUBLISH_USER_ID" jdbcType="VARCHAR" property="publishUserId" />
-    <result column="PUBLISH_USER_NAME" jdbcType="VARCHAR" property="publishUserName" />
-    <result column="PUBLISH_IP" jdbcType="VARCHAR" property="publishIp" />
-    <result column="PUBLISH_TO_URL" jdbcType="VARCHAR" property="publishToUrl" />
-    <result column="DOWNLOAD_FROM_URL" jdbcType="VARCHAR" property="downloadFromUrl" />
-    <result column="IS_MUST_DOWNLOAD_TAG" jdbcType="VARCHAR" property="isMustDownloadTag" />
-    <result column="REMARK" jdbcType="VARCHAR" property="remark" />
-    <result column="VALUE_FLAG" jdbcType="VARCHAR" property="valueFlag" />
-    <result column="CREATE_ID" jdbcType="VARCHAR" property="createId" />
-    <result column="CREATE_NAME" jdbcType="VARCHAR" property="createName" />
-    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="UPDATE_ID" jdbcType="VARCHAR" property="updateId" />
-    <result column="UPDATE_NAME" jdbcType="VARCHAR" property="updateName" />
-    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
-  </resultMap>
-  <sql id="columns">
-    VERSION_ID, TEANT_ID, PROGRAM_ID, PROGRAM_NAME, VERSION_NUM, PROGRAM_TYPE, VERSION_UPDATE_CONTENT, 
-    PUBLISH_DATE, PUBLISH_USER_ID, PUBLISH_USER_NAME, PUBLISH_IP, PUBLISH_TO_URL, DOWNLOAD_FROM_URL, 
-    IS_MUST_DOWNLOAD_TAG, REMARK, VALUE_FLAG, CREATE_ID, CREATE_NAME, CREATE_TIME, UPDATE_ID, 
-    UPDATE_NAME, UPDATE_TIME
-  </sql>
-  <sql id="columns_alias">
-    t.VERSION_ID, t.TEANT_ID, t.PROGRAM_ID, t.PROGRAM_NAME, t.VERSION_NUM, t.PROGRAM_TYPE, 
-    t.VERSION_UPDATE_CONTENT, t.PUBLISH_DATE, t.PUBLISH_USER_ID, t.PUBLISH_USER_NAME, 
-    t.PUBLISH_IP, t.PUBLISH_TO_URL, t.DOWNLOAD_FROM_URL, t.IS_MUST_DOWNLOAD_TAG, t.REMARK, 
-    t.VALUE_FLAG, t.CREATE_ID, t.CREATE_NAME, t.CREATE_TIME, t.UPDATE_ID, t.UPDATE_NAME, 
-    t.UPDATE_TIME
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns" /> FROM APP_VERSION_MSG
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias" /> FROM APP_VERSION_MSG t
-  </sql>
-  <sql id="where">
-    <where> 
-      <if test="versionId != null and versionId != ''">
-        and VERSION_ID = #{versionId}
-      </if>
-      <if test="teantId != null and teantId != ''">
-        and TEANT_ID = #{teantId}
-      </if>
-      <if test="programId != null and programId != ''">
-        and PROGRAM_ID = #{programId}
-      </if>
-      <if test="programName != null and programName != ''">
-        and PROGRAM_NAME = #{programName}
-      </if>
-      <if test="versionNum != null and versionNum != ''">
-        and VERSION_NUM = #{versionNum}
-      </if>
-      <if test="programType != null and programType != ''">
-        and PROGRAM_TYPE = #{programType}
-      </if>
-      <if test="versionUpdateContent != null and versionUpdateContent != ''">
-        and VERSION_UPDATE_CONTENT = #{versionUpdateContent}
-      </if>
-      <if test="publishDate != null">
-        and TO_CHAR(PUBLISH_DATE,'yyyy-MM-dd') = #{publishDate}
-      </if>
-      <if test="publishUserId != null and publishUserId != ''">
-        and PUBLISH_USER_ID = #{publishUserId}
-      </if>
-      <if test="publishUserName != null and publishUserName != ''">
-        and PUBLISH_USER_NAME = #{publishUserName}
-      </if>
-      <if test="publishIp != null and publishIp != ''">
-        and PUBLISH_IP = #{publishIp}
-      </if>
-      <if test="publishToUrl != null and publishToUrl != ''">
-        and PUBLISH_TO_URL = #{publishToUrl}
-      </if>
-      <if test="downloadFromUrl != null and downloadFromUrl != ''">
-        and DOWNLOAD_FROM_URL = #{downloadFromUrl}
-      </if>
-      <if test="isMustDownloadTag != null and isMustDownloadTag != ''">
-        and IS_MUST_DOWNLOAD_TAG = #{isMustDownloadTag}
-      </if>
-      <if test="remark != null and remark != ''">
-        and REMARK = #{remark}
-      </if>
-      <if test="valueFlag != null and valueFlag != ''">
-        and VALUE_FLAG = #{valueFlag}
-      </if>
-      <if test="createId != null and createId != ''">
-        and CREATE_ID = #{createId}
-      </if>
-      <if test="createName != null and createName != ''">
-        and CREATE_NAME = #{createName}
-      </if>
-      <if test="createTime != null">
-        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
-      </if>
-      <if test="updateId != null and updateId != ''">
-        and UPDATE_ID = #{updateId}
-      </if>
-      <if test="updateName != null and updateName != ''">
-        and UPDATE_NAME = #{updateName}
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where> 
-      <if test="versionId != null and versionId != ''">
-        and VERSION_ID LIKE '%${versionId}%'
-      </if>
-      <if test="teantId != null and teantId != ''">
-        and TEANT_ID LIKE '%${teantId}%'
-      </if>
-      <if test="programId != null and programId != ''">
-        and PROGRAM_ID LIKE '%${programId}%'
-      </if>
-      <if test="programName != null and programName != ''">
-        and PROGRAM_NAME LIKE '%${programName}%'
-      </if>
-      <if test="versionNum != null and versionNum != ''">
-        and VERSION_NUM LIKE '%${versionNum}%'
-      </if>
-      <if test="programType != null and programType != ''">
-        and PROGRAM_TYPE LIKE '%${programType}%'
-      </if>
-      <if test="versionUpdateContent != null and versionUpdateContent != ''">
-        and VERSION_UPDATE_CONTENT LIKE '%${versionUpdateContent}%'
-      </if>
-      <if test="publishDate != null">
-        and TO_CHAR(PUBLISH_DATE,'yyyy-MM-dd') = #{publishDate}
-      </if>
-      <if test="publishUserId != null and publishUserId != ''">
-        and PUBLISH_USER_ID LIKE '%${publishUserId}%'
-      </if>
-      <if test="publishUserName != null and publishUserName != ''">
-        and PUBLISH_USER_NAME LIKE '%${publishUserName}%'
-      </if>
-      <if test="publishIp != null and publishIp != ''">
-        and PUBLISH_IP LIKE '%${publishIp}%'
-      </if>
-      <if test="publishToUrl != null and publishToUrl != ''">
-        and PUBLISH_TO_URL LIKE '%${publishToUrl}%'
-      </if>
-      <if test="downloadFromUrl != null and downloadFromUrl != ''">
-        and DOWNLOAD_FROM_URL LIKE '%${downloadFromUrl}%'
-      </if>
-      <if test="isMustDownloadTag != null and isMustDownloadTag != ''">
-        and IS_MUST_DOWNLOAD_TAG LIKE '%${isMustDownloadTag}%'
-      </if>
-      <if test="remark != null and remark != ''">
-        and REMARK LIKE '%${remark}%'
-      </if>
-      <if test="valueFlag != null and valueFlag != ''">
-        and VALUE_FLAG LIKE '%${valueFlag}%'
-      </if>
-      <if test="createId != null and createId != ''">
-        and CREATE_ID LIKE '%${createId}%'
-      </if>
-      <if test="createName != null and createName != ''">
-        and CREATE_NAME LIKE '%${createName}%'
-      </if>
-      <if test="createTime != null">
-        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
-      </if>
-      <if test="updateId != null and updateId != ''">
-        and UPDATE_ID LIKE '%${updateId}%'
-      </if>
-      <if test="updateName != null and updateName != ''">
-        and UPDATE_NAME LIKE '%${updateName}%'
-      </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 APP_VERSION_MSG
-    where VERSION_ID = #{versionId,jdbcType=VARCHAR}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from APP_VERSION_MSG
-    where 1!=1 
-      <if test="teantId != null and teantId != ''">
-        or TEANT_ID = #{teantId}
-      </if>
-      <if test="programId != null and programId != ''">
-        or PROGRAM_ID = #{programId}
-      </if>
-      <if test="programName != null and programName != ''">
-        or PROGRAM_NAME = #{programName}
-      </if>
-      <if test="versionNum != null and versionNum != ''">
-        or VERSION_NUM = #{versionNum}
-      </if>
-      <if test="programType != null and programType != ''">
-        or PROGRAM_TYPE = #{programType}
-      </if>
-      <if test="versionUpdateContent != null and versionUpdateContent != ''">
-        or VERSION_UPDATE_CONTENT = #{versionUpdateContent}
-      </if>
-      <if test="publishDate != null">
-        or TO_CHAR(PUBLISH_DATE,'yyyy-MM-dd') = '#{publishDate}'
-      </if>
-      <if test="publishUserId != null and publishUserId != ''">
-        or PUBLISH_USER_ID = #{publishUserId}
-      </if>
-      <if test="publishUserName != null and publishUserName != ''">
-        or PUBLISH_USER_NAME = #{publishUserName}
-      </if>
-      <if test="publishIp != null and publishIp != ''">
-        or PUBLISH_IP = #{publishIp}
-      </if>
-      <if test="publishToUrl != null and publishToUrl != ''">
-        or PUBLISH_TO_URL = #{publishToUrl}
-      </if>
-      <if test="downloadFromUrl != null and downloadFromUrl != ''">
-        or DOWNLOAD_FROM_URL = #{downloadFromUrl}
-      </if>
-      <if test="isMustDownloadTag != null and isMustDownloadTag != ''">
-        or IS_MUST_DOWNLOAD_TAG = #{isMustDownloadTag}
-      </if>
-      <if test="remark != null and remark != ''">
-        or REMARK = #{remark}
-      </if>
-      <if test="valueFlag != null and valueFlag != ''">
-        or VALUE_FLAG = #{valueFlag}
-      </if>
-      <if test="createId != null and createId != ''">
-        or CREATE_ID = #{createId}
-      </if>
-      <if test="createName != null and createName != ''">
-        or CREATE_NAME = #{createName}
-      </if>
-      <if test="createTime != null">
-        or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
-      </if>
-      <if test="updateId != null and updateId != ''">
-        or UPDATE_ID = #{updateId}
-      </if>
-      <if test="updateName != null and updateName != ''">
-        or UPDATE_NAME = #{updateName}
-      </if>
-      <if test="updateTime != null">
-        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-      </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.baseinfo.appversionmsg.model.AppVersionMsg">
-    insert into APP_VERSION_MSG (VERSION_ID, TEANT_ID, PROGRAM_ID, 
-      PROGRAM_NAME, VERSION_NUM, PROGRAM_TYPE, 
-      VERSION_UPDATE_CONTENT, PUBLISH_DATE, PUBLISH_USER_ID, 
-      PUBLISH_USER_NAME, PUBLISH_IP, PUBLISH_TO_URL, 
-      DOWNLOAD_FROM_URL, IS_MUST_DOWNLOAD_TAG, REMARK, 
-      VALUE_FLAG, CREATE_ID, CREATE_NAME, 
-      CREATE_TIME, UPDATE_ID, UPDATE_NAME, 
-      UPDATE_TIME)
-    values (#{versionId,jdbcType=VARCHAR}, #{teantId,jdbcType=VARCHAR}, #{programId,jdbcType=VARCHAR}, 
-      #{programName,jdbcType=VARCHAR}, #{versionNum,jdbcType=VARCHAR}, #{programType,jdbcType=VARCHAR}, 
-      #{versionUpdateContent,jdbcType=VARCHAR}, #{publishDate,jdbcType=TIMESTAMP}, #{publishUserId,jdbcType=VARCHAR}, 
-      #{publishUserName,jdbcType=VARCHAR}, #{publishIp,jdbcType=VARCHAR}, #{publishToUrl,jdbcType=VARCHAR}, 
-      #{downloadFromUrl,jdbcType=VARCHAR}, #{isMustDownloadTag,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, 
-      #{valueFlag,jdbcType=VARCHAR}, #{createId,jdbcType=VARCHAR}, #{createName,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateId,jdbcType=VARCHAR}, #{updateName,jdbcType=VARCHAR}, 
-      #{updateTime,jdbcType=TIMESTAMP})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.appversionmsg.model.AppVersionMsg">
-    insert into APP_VERSION_MSG
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="versionId != null">
-        VERSION_ID,
-      </if>
-      <if test="teantId != null">
-        TEANT_ID,
-      </if>
-      <if test="programId != null">
-        PROGRAM_ID,
-      </if>
-      <if test="programName != null">
-        PROGRAM_NAME,
-      </if>
-      <if test="versionNum != null">
-        VERSION_NUM,
-      </if>
-      <if test="programType != null">
-        PROGRAM_TYPE,
-      </if>
-      <if test="versionUpdateContent != null">
-        VERSION_UPDATE_CONTENT,
-      </if>
-      <if test="publishDate != null">
-        PUBLISH_DATE,
-      </if>
-      <if test="publishUserId != null">
-        PUBLISH_USER_ID,
-      </if>
-      <if test="publishUserName != null">
-        PUBLISH_USER_NAME,
-      </if>
-      <if test="publishIp != null">
-        PUBLISH_IP,
-      </if>
-      <if test="publishToUrl != null">
-        PUBLISH_TO_URL,
-      </if>
-      <if test="downloadFromUrl != null">
-        DOWNLOAD_FROM_URL,
-      </if>
-      <if test="isMustDownloadTag != null">
-        IS_MUST_DOWNLOAD_TAG,
-      </if>
-      <if test="remark != null">
-        REMARK,
-      </if>
-      <if test="valueFlag != null">
-        VALUE_FLAG,
-      </if>
-      <if test="createId != null">
-        CREATE_ID,
-      </if>
-      <if test="createName != null">
-        CREATE_NAME,
-      </if>
-      <if test="createTime != null">
-        CREATE_TIME,
-      </if>
-      <if test="updateId != null">
-        UPDATE_ID,
-      </if>
-      <if test="updateName != null">
-        UPDATE_NAME,
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="versionId != null">
-        #{versionId,jdbcType=VARCHAR},
-      </if>
-      <if test="teantId != null">
-        #{teantId,jdbcType=VARCHAR},
-      </if>
-      <if test="programId != null">
-        #{programId,jdbcType=VARCHAR},
-      </if>
-      <if test="programName != null">
-        #{programName,jdbcType=VARCHAR},
-      </if>
-      <if test="versionNum != null">
-        #{versionNum,jdbcType=VARCHAR},
-      </if>
-      <if test="programType != null">
-        #{programType,jdbcType=VARCHAR},
-      </if>
-      <if test="versionUpdateContent != null">
-        #{versionUpdateContent,jdbcType=VARCHAR},
-      </if>
-      <if test="publishDate != null">
-        #{publishDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="publishUserId != null">
-        #{publishUserId,jdbcType=VARCHAR},
-      </if>
-      <if test="publishUserName != null">
-        #{publishUserName,jdbcType=VARCHAR},
-      </if>
-      <if test="publishIp != null">
-        #{publishIp,jdbcType=VARCHAR},
-      </if>
-      <if test="publishToUrl != null">
-        #{publishToUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="downloadFromUrl != null">
-        #{downloadFromUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="isMustDownloadTag != null">
-        #{isMustDownloadTag,jdbcType=VARCHAR},
-      </if>
-      <if test="remark != null">
-        #{remark,jdbcType=VARCHAR},
-      </if>
-      <if test="valueFlag != null">
-        #{valueFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="createId != null">
-        #{createId,jdbcType=VARCHAR},
-      </if>
-      <if test="createName != null">
-        #{createName,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateId != null">
-        #{updateId,jdbcType=VARCHAR},
-      </if>
-      <if test="updateName != null">
-        #{updateName,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.appversionmsg.model.AppVersionMsg">
-    update APP_VERSION_MSG
-    set TEANT_ID = #{teantId,jdbcType=VARCHAR},
-      PROGRAM_ID = #{programId,jdbcType=VARCHAR},
-      PROGRAM_NAME = #{programName,jdbcType=VARCHAR},
-      VERSION_NUM = #{versionNum,jdbcType=VARCHAR},
-      PROGRAM_TYPE = #{programType,jdbcType=VARCHAR},
-      VERSION_UPDATE_CONTENT = #{versionUpdateContent,jdbcType=VARCHAR},
-      PUBLISH_DATE = #{publishDate,jdbcType=TIMESTAMP},
-      PUBLISH_USER_ID = #{publishUserId,jdbcType=VARCHAR},
-      PUBLISH_USER_NAME = #{publishUserName,jdbcType=VARCHAR},
-      PUBLISH_IP = #{publishIp,jdbcType=VARCHAR},
-      PUBLISH_TO_URL = #{publishToUrl,jdbcType=VARCHAR},
-      DOWNLOAD_FROM_URL = #{downloadFromUrl,jdbcType=VARCHAR},
-      IS_MUST_DOWNLOAD_TAG = #{isMustDownloadTag,jdbcType=VARCHAR},
-      REMARK = #{remark,jdbcType=VARCHAR},
-      VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
-      CREATE_ID = #{createId,jdbcType=VARCHAR},
-      CREATE_NAME = #{createName,jdbcType=VARCHAR},
-      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
-      UPDATE_ID = #{updateId,jdbcType=VARCHAR},
-      UPDATE_NAME = #{updateName,jdbcType=VARCHAR},
-      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP}
-    where VERSION_ID = #{versionId,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.appversionmsg.model.AppVersionMsg">
-    update APP_VERSION_MSG
-    <set>
-      <if test="teantId != null">
-        TEANT_ID = #{teantId,jdbcType=VARCHAR},
-      </if>
-      <if test="programId != null">
-        PROGRAM_ID = #{programId,jdbcType=VARCHAR},
-      </if>
-      <if test="programName != null">
-        PROGRAM_NAME = #{programName,jdbcType=VARCHAR},
-      </if>
-      <if test="versionNum != null">
-        VERSION_NUM = #{versionNum,jdbcType=VARCHAR},
-      </if>
-      <if test="programType != null">
-        PROGRAM_TYPE = #{programType,jdbcType=VARCHAR},
-      </if>
-      <if test="versionUpdateContent != null">
-        VERSION_UPDATE_CONTENT = #{versionUpdateContent,jdbcType=VARCHAR},
-      </if>
-      <if test="publishDate != null">
-        PUBLISH_DATE = #{publishDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="publishUserId != null">
-        PUBLISH_USER_ID = #{publishUserId,jdbcType=VARCHAR},
-      </if>
-      <if test="publishUserName != null">
-        PUBLISH_USER_NAME = #{publishUserName,jdbcType=VARCHAR},
-      </if>
-      <if test="publishIp != null">
-        PUBLISH_IP = #{publishIp,jdbcType=VARCHAR},
-      </if>
-      <if test="publishToUrl != null">
-        PUBLISH_TO_URL = #{publishToUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="downloadFromUrl != null">
-        DOWNLOAD_FROM_URL = #{downloadFromUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="isMustDownloadTag != null">
-        IS_MUST_DOWNLOAD_TAG = #{isMustDownloadTag,jdbcType=VARCHAR},
-      </if>
-      <if test="remark != null">
-        REMARK = #{remark,jdbcType=VARCHAR},
-      </if>
-      <if test="valueFlag != null">
-        VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="createId != null">
-        CREATE_ID = #{createId,jdbcType=VARCHAR},
-      </if>
-      <if test="createName != null">
-        CREATE_NAME = #{createName,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateId != null">
-        UPDATE_ID = #{updateId,jdbcType=VARCHAR},
-      </if>
-      <if test="updateName != null">
-        UPDATE_NAME = #{updateName,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where VERSION_ID = #{versionId,jdbcType=VARCHAR}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    <include refid="select" />
-    where VERSION_ID = #{versionId,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 APP_VERSION_MSG 
-      (VERSION_ID, 
-      TEANT_ID, PROGRAM_ID, PROGRAM_NAME, 
-      VERSION_NUM, PROGRAM_TYPE, VERSION_UPDATE_CONTENT, 
-      PUBLISH_DATE, PUBLISH_USER_ID, 
-      PUBLISH_USER_NAME, PUBLISH_IP, PUBLISH_TO_URL, 
-      DOWNLOAD_FROM_URL, IS_MUST_DOWNLOAD_TAG, 
-      REMARK, VALUE_FLAG, CREATE_ID, 
-      CREATE_NAME, CREATE_TIME, UPDATE_ID, 
-      UPDATE_NAME, UPDATE_TIME)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.versionId,jdbcType=VARCHAR}, 
-      #{item.teantId,jdbcType=VARCHAR}, #{item.programId,jdbcType=VARCHAR}, #{item.programName,jdbcType=VARCHAR}, 
-      #{item.versionNum,jdbcType=VARCHAR}, #{item.programType,jdbcType=VARCHAR}, #{item.versionUpdateContent,jdbcType=VARCHAR}, 
-      #{item.publishDate,jdbcType=TIMESTAMP}, #{item.publishUserId,jdbcType=VARCHAR}, 
-      #{item.publishUserName,jdbcType=VARCHAR}, #{item.publishIp,jdbcType=VARCHAR}, #{item.publishToUrl,jdbcType=VARCHAR}, 
-      #{item.downloadFromUrl,jdbcType=VARCHAR}, #{item.isMustDownloadTag,jdbcType=VARCHAR}, 
-      #{item.remark,jdbcType=VARCHAR}, #{item.valueFlag,jdbcType=VARCHAR}, #{item.createId,jdbcType=VARCHAR}, 
-      #{item.createName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateId,jdbcType=VARCHAR}, 
-      #{item.updateName,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP} from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update APP_VERSION_MSG
-     set
-       VERSION_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-          when #{item.versionId,jdbcType=VARCHAR} then #{item.versionId,jdbcType=VARCHAR}
-       </foreach>
-       ,TEANT_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-          when #{item.versionId,jdbcType=VARCHAR} then #{item.teantId,jdbcType=VARCHAR}
-       </foreach>
-       ,PROGRAM_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-          when #{item.versionId,jdbcType=VARCHAR} then #{item.programId,jdbcType=VARCHAR}
-       </foreach>
-       ,PROGRAM_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-          when #{item.versionId,jdbcType=VARCHAR} then #{item.programName,jdbcType=VARCHAR}
-       </foreach>
-       ,VERSION_NUM=
-       <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-          when #{item.versionId,jdbcType=VARCHAR} then #{item.versionNum,jdbcType=VARCHAR}
-       </foreach>
-       ,PROGRAM_TYPE=
-       <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-          when #{item.versionId,jdbcType=VARCHAR} then #{item.programType,jdbcType=VARCHAR}
-       </foreach>
-       ,VERSION_UPDATE_CONTENT=
-       <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-          when #{item.versionId,jdbcType=VARCHAR} then #{item.versionUpdateContent,jdbcType=VARCHAR}
-       </foreach>
-       ,PUBLISH_DATE=
-       <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-          when #{item.versionId,jdbcType=VARCHAR} then #{item.publishDate,jdbcType=TIMESTAMP}
-       </foreach>
-       ,PUBLISH_USER_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-          when #{item.versionId,jdbcType=VARCHAR} then #{item.publishUserId,jdbcType=VARCHAR}
-       </foreach>
-       ,PUBLISH_USER_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-          when #{item.versionId,jdbcType=VARCHAR} then #{item.publishUserName,jdbcType=VARCHAR}
-       </foreach>
-       ,PUBLISH_IP=
-       <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-          when #{item.versionId,jdbcType=VARCHAR} then #{item.publishIp,jdbcType=VARCHAR}
-       </foreach>
-       ,PUBLISH_TO_URL=
-       <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-          when #{item.versionId,jdbcType=VARCHAR} then #{item.publishToUrl,jdbcType=VARCHAR}
-       </foreach>
-       ,DOWNLOAD_FROM_URL=
-       <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-          when #{item.versionId,jdbcType=VARCHAR} then #{item.downloadFromUrl,jdbcType=VARCHAR}
-       </foreach>
-       ,IS_MUST_DOWNLOAD_TAG=
-       <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-          when #{item.versionId,jdbcType=VARCHAR} then #{item.isMustDownloadTag,jdbcType=VARCHAR}
-       </foreach>
-       ,REMARK=
-       <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-          when #{item.versionId,jdbcType=VARCHAR} then #{item.remark,jdbcType=VARCHAR}
-       </foreach>
-       ,VALUE_FLAG=
-       <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-          when #{item.versionId,jdbcType=VARCHAR} then #{item.valueFlag,jdbcType=VARCHAR}
-       </foreach>
-       ,CREATE_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-          when #{item.versionId,jdbcType=VARCHAR} then #{item.createId,jdbcType=VARCHAR}
-       </foreach>
-       ,CREATE_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-          when #{item.versionId,jdbcType=VARCHAR} then #{item.createName,jdbcType=VARCHAR}
-       </foreach>
-       ,CREATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-          when #{item.versionId,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-          when #{item.versionId,jdbcType=VARCHAR} then #{item.updateId,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-          when #{item.versionId,jdbcType=VARCHAR} then #{item.updateName,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case VERSION_ID" separator=" ">
-          when #{item.versionId,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-     where VERSION_ID in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.versionId,jdbcType=VARCHAR}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from APP_VERSION_MSG
-    where VERSION_ID in 
-    <foreach close=")" collection="list" item="id" open="(" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  
-  
-</mapper>

src/main/java/com/steerinfo/baseinfo/appversionmsg/model/AppVersionMsg.java

@@ -1,363 +0,0 @@
-package com.steerinfo.baseinfo.appversionmsg.model;
-
-import com.steerinfo.framework.model.IBasePO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-
-@ApiModel(value="app版本信息表")
-public class AppVersionMsg implements IBasePO<String> {
-    /**
-     * 主键(VERSION_ID,VARCHAR,20)
-     */
-    @ApiModelProperty(value="主键",required=true)
-    private String versionId;
-
-    /**
-     * 租户ID(TEANT_ID,VARCHAR,30)
-     */
-    @ApiModelProperty(value="租户ID",required=false)
-    private String teantId;
-
-    /**
-     * 程序ID(PROGRAM_ID,VARCHAR,30)
-     */
-    @ApiModelProperty(value="程序ID",required=false)
-    private String programId;
-
-    /**
-     * 程序名称(PROGRAM_NAME,VARCHAR,30)
-     */
-    @ApiModelProperty(value="程序名称",required=false)
-    private String programName;
-
-    /**
-     * 程序版本号(VERSION_NUM,VARCHAR,30)
-     */
-    @ApiModelProperty(value="程序版本号",required=false)
-    private String versionNum;
-
-    /**
-     * 程序类型(PROGRAM_TYPE,VARCHAR,50)
-     */
-    @ApiModelProperty(value="程序类型",required=false)
-    private String programType;
-
-    /**
-     * 更新内容(VERSION_UPDATE_CONTENT,VARCHAR,500)
-     */
-    @ApiModelProperty(value="更新内容",required=false)
-    private String versionUpdateContent;
-
-    /**
-     * 发布时间(PUBLISH_DATE,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="发布时间",required=false)
-    private Date publishDate;
-
-    /**
-     * 发布用户(PUBLISH_USER_ID,VARCHAR,30)
-     */
-    @ApiModelProperty(value="发布用户",required=false)
-    private String publishUserId;
-
-    /**
-     * 发布人(PUBLISH_USER_NAME,VARCHAR,30)
-     */
-    @ApiModelProperty(value="发布人",required=false)
-    private String publishUserName;
-
-    /**
-     * 发布人IP(PUBLISH_IP,VARCHAR,30)
-     */
-    @ApiModelProperty(value="发布人IP",required=false)
-    private String publishIp;
-
-    /**
-     * 发布到地址(PUBLISH_TO_URL,VARCHAR,200)
-     */
-    @ApiModelProperty(value="发布到地址",required=false)
-    private String publishToUrl;
-
-    /**
-     * 下载地址(DOWNLOAD_FROM_URL,VARCHAR,200)
-     */
-    @ApiModelProperty(value="下载地址",required=false)
-    private String downloadFromUrl;
-
-    /**
-     * 强制更新标记(IS_MUST_DOWNLOAD_TAG,VARCHAR,1)
-     */
-    @ApiModelProperty(value="强制更新标记",required=false)
-    private String isMustDownloadTag;
-
-    /**
-     * 备注(REMARK,VARCHAR,200)
-     */
-    @ApiModelProperty(value="备注",required=false)
-    private String remark;
-
-    /**
-     * 有效标记（0：正常 1：作废）(VALUE_FLAG,VARCHAR,1)
-     */
-    @ApiModelProperty(value="有效标记（0：正常 1：作废）",required=false)
-    private String valueFlag;
-
-    /**
-     * 创建人ID(CREATE_ID,VARCHAR,30)
-     */
-    @ApiModelProperty(value="创建人ID",required=false)
-    private String createId;
-
-    /**
-     * 创建人(CREATE_NAME,VARCHAR,30)
-     */
-    @ApiModelProperty(value="创建人",required=false)
-    private String createName;
-
-    /**
-     * 创建时间(CREATE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="创建时间",required=false)
-    private Date createTime;
-
-    /**
-     * 修改人ID(UPDATE_ID,VARCHAR,30)
-     */
-    @ApiModelProperty(value="修改人ID",required=false)
-    private String updateId;
-
-    /**
-     * 修改人(UPDATE_NAME,VARCHAR,30)
-     */
-    @ApiModelProperty(value="修改人",required=false)
-    private String updateName;
-
-    /**
-     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="修改时间",required=false)
-    private Date updateTime;
-
-    private static final long serialVersionUID = 1L;
-
-    @Override
-    public String getId() {
-        return this.versionId;
-    }
-
-    @Override
-    public void setId(String versionId) {
-        this.versionId = versionId == null ? null : versionId.trim();
-    }
-
-    public String getVersionId() {
-        return versionId;
-    }
-
-    public void setVersionId(String versionId) {
-        this.versionId = versionId == null ? null : versionId.trim();
-    }
-
-    public String getTeantId() {
-        return teantId;
-    }
-
-    public void setTeantId(String teantId) {
-        this.teantId = teantId == null ? null : teantId.trim();
-    }
-
-    public String getProgramId() {
-        return programId;
-    }
-
-    public void setProgramId(String programId) {
-        this.programId = programId == null ? null : programId.trim();
-    }
-
-    public String getProgramName() {
-        return programName;
-    }
-
-    public void setProgramName(String programName) {
-        this.programName = programName == null ? null : programName.trim();
-    }
-
-    public String getVersionNum() {
-        return versionNum;
-    }
-
-    public void setVersionNum(String versionNum) {
-        this.versionNum = versionNum == null ? null : versionNum.trim();
-    }
-
-    public String getProgramType() {
-        return programType;
-    }
-
-    public void setProgramType(String programType) {
-        this.programType = programType == null ? null : programType.trim();
-    }
-
-    public String getVersionUpdateContent() {
-        return versionUpdateContent;
-    }
-
-    public void setVersionUpdateContent(String versionUpdateContent) {
-        this.versionUpdateContent = versionUpdateContent == null ? null : versionUpdateContent.trim();
-    }
-
-    public Date getPublishDate() {
-        return publishDate;
-    }
-
-    public void setPublishDate(Date publishDate) {
-        this.publishDate = publishDate;
-    }
-
-    public String getPublishUserId() {
-        return publishUserId;
-    }
-
-    public void setPublishUserId(String publishUserId) {
-        this.publishUserId = publishUserId == null ? null : publishUserId.trim();
-    }
-
-    public String getPublishUserName() {
-        return publishUserName;
-    }
-
-    public void setPublishUserName(String publishUserName) {
-        this.publishUserName = publishUserName == null ? null : publishUserName.trim();
-    }
-
-    public String getPublishIp() {
-        return publishIp;
-    }
-
-    public void setPublishIp(String publishIp) {
-        this.publishIp = publishIp == null ? null : publishIp.trim();
-    }
-
-    public String getPublishToUrl() {
-        return publishToUrl;
-    }
-
-    public void setPublishToUrl(String publishToUrl) {
-        this.publishToUrl = publishToUrl == null ? null : publishToUrl.trim();
-    }
-
-    public String getDownloadFromUrl() {
-        return downloadFromUrl;
-    }
-
-    public void setDownloadFromUrl(String downloadFromUrl) {
-        this.downloadFromUrl = downloadFromUrl == null ? null : downloadFromUrl.trim();
-    }
-
-    public String getIsMustDownloadTag() {
-        return isMustDownloadTag;
-    }
-
-    public void setIsMustDownloadTag(String isMustDownloadTag) {
-        this.isMustDownloadTag = isMustDownloadTag == null ? null : isMustDownloadTag.trim();
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark == null ? null : remark.trim();
-    }
-
-    public String getValueFlag() {
-        return valueFlag;
-    }
-
-    public void setValueFlag(String valueFlag) {
-        this.valueFlag = valueFlag == null ? null : valueFlag.trim();
-    }
-
-    public String getCreateId() {
-        return createId;
-    }
-
-    public void setCreateId(String createId) {
-        this.createId = createId == null ? null : createId.trim();
-    }
-
-    public String getCreateName() {
-        return createName;
-    }
-
-    public void setCreateName(String createName) {
-        this.createName = createName == null ? null : createName.trim();
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getUpdateId() {
-        return updateId;
-    }
-
-    public void setUpdateId(String updateId) {
-        this.updateId = updateId == null ? null : updateId.trim();
-    }
-
-    public String getUpdateName() {
-        return updateName;
-    }
-
-    public void setUpdateName(String updateName) {
-        this.updateName = updateName == null ? null : updateName.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(", versionId=").append(versionId);
-        sb.append(", teantId=").append(teantId);
-        sb.append(", programId=").append(programId);
-        sb.append(", programName=").append(programName);
-        sb.append(", versionNum=").append(versionNum);
-        sb.append(", programType=").append(programType);
-        sb.append(", versionUpdateContent=").append(versionUpdateContent);
-        sb.append(", publishDate=").append(publishDate);
-        sb.append(", publishUserId=").append(publishUserId);
-        sb.append(", publishUserName=").append(publishUserName);
-        sb.append(", publishIp=").append(publishIp);
-        sb.append(", publishToUrl=").append(publishToUrl);
-        sb.append(", downloadFromUrl=").append(downloadFromUrl);
-        sb.append(", isMustDownloadTag=").append(isMustDownloadTag);
-        sb.append(", remark=").append(remark);
-        sb.append(", valueFlag=").append(valueFlag);
-        sb.append(", createId=").append(createId);
-        sb.append(", createName=").append(createName);
-        sb.append(", createTime=").append(createTime);
-        sb.append(", updateId=").append(updateId);
-        sb.append(", updateName=").append(updateName);
-        sb.append(", updateTime=").append(updateTime);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}

src/main/java/com/steerinfo/baseinfo/appversionmsg/service/IAppVersionMsgService.java

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

src/main/java/com/steerinfo/baseinfo/appversionmsg/service/impl/AppVersionMsgServiceImpl.java

@@ -1,66 +0,0 @@
-package com.steerinfo.baseinfo.appversionmsg.service.impl;
-
-import com.steerinfo.baseinfo.appversionmsg.mapper.AppVersionMsgMapper;
-import com.steerinfo.baseinfo.appversionmsg.model.AppVersionMsg;
-import com.steerinfo.baseinfo.appversionmsg.service.IAppVersionMsgService;
-import com.steerinfo.framework.controller.RESTfulResult;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
-import com.steerinfo.framework.user.UserPayload;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.HashMap;
-
-/**
- * AppVersionMsg服务实现：
- * @author generator
- * @version 1.0-SNAPSHORT 2022-04-09 11:53
- * 类描述
- * 修订历史：
- * 日期：2022-04-09
- * 作者：generator
- * 参考：
- * 描述：AppVersionMsg服务实现
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@Service(value = "appVersionMsgService")
-public class AppVersionMsgServiceImpl extends BaseServiceImpl<AppVersionMsg, String> implements IAppVersionMsgService {
-
-    @Resource
-    private AppVersionMsgMapper appVersionMsgMapper;
-
-    @Override
-    protected IBaseMapper<AppVersionMsg, String> getMapper() {
-        return appVersionMsgMapper;
-    }
-
-    /*@Override
-    public RESTfulResult addModel(HashMap<String, Object> params) {
-        RESTfulResult rm = new RESTfulResult();
-
-        AppVersionMsg model = new AppVersionMsg();
-        model.setVersionId(model.getId());
-        model.setValueFlag("0");
-        //获取用户ID和用户名
-        UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
-        String userName = payload.getUserName();
-        model.setCreateId(userId);
-        model.setCreateName(userName);
-        model.setCreateTime(new Date());
-        int i = appVersionMsgMapper.insertSelective(model);
-        if(i >= 1) {
-            rm.setSucceed();
-            rm.setMessage("操作成功！！");
-            rm.setCode("200");
-            rm.setData(model);
-            return rm;
-        }else {
-            return null;
-        }
-    }*/
-}

src/main/java/com/steerinfo/baseinfo/combaseinfo/controller/ComBaseInfoController.java

@@ -1,283 +0,0 @@
-package com.steerinfo.baseinfo.combaseinfo.controller;
-
-
-import com.steerinfo.baseinfo.combaseinfo.model.ComBaseInfo;
-import com.steerinfo.baseinfo.combaseinfo.service.IComBaseInfoService;
-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.meterworkstoragecalibration.model.MeterWorkStorageCalibration;
-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.Collections;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * ComBaseInfo RESTful接口：
- *
- * @author generator
- * @version 1.0-SNAPSHORT 2020-06-05 06:15
- * 类描述
- * 修订历史：
- * 日期：2020-06-05
- * 作者：generator
- * 参考：
- * 描述：ComBaseInfo RESTful接口
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- * @see null
- */
-@RestController
-@RequestMapping("/${api.version}/combaseinfos")
-@Api(value = "/${api.version}/combaseinfos", tags = "基础数据配置 - ComBaseInfoController")
-public class ComBaseInfoController extends BaseRESTfulController {
-
-    @Autowired
-    IComBaseInfoService comBaseInfoService;
-
-    @ApiOperation(value = "获取列表", notes = "分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
-    })
-    @GetMapping(value = "/")
-    public RESTfulResult list(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
-        try {
-            PageList<ComBaseInfo> list = comBaseInfoService.queryForPage(parmas, pageNum, pageSize);
-            Collections.reverse(list.getList());
-            return success(list);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new MarkerMetException(500, "操作异常！！");
-        }
-    }
-
-    @ApiOperation(value = "创建", notes = "根据ComBaseInfo对象创建")
-    @ApiImplicitParam(name = "comBaseInfo", value = "详细实体comBaseInfo", required = true, dataType = "ComBaseInfo")
-    @Transactional
-    @PostMapping(value = "/")
-    public RESTfulResult add(@RequestBody ComBaseInfo model) {
-        try {
-            String msg = comBaseInfoService.checkandadd(model);
-            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("combaseinfo:view")
-    @GetMapping(value = "/{id}")
-    public RESTfulResult get(@PathVariable String id) {
-        try {
-            ComBaseInfo comBaseInfo = comBaseInfoService.getById(id);
-            return success(comBaseInfo);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new MarkerMetException(500, "操作异常！！");
-        }
-    }
-
-    @ApiOperation(value = "更新详细信息", notes = "根据url的id来指定更新对象，并根据传过来的comBaseInfo信息来更新详细信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "comBaseInfo", value = "详细实体comBaseInfo", required = true, dataType = "ComBaseInfo")
-    })
-    @Transactional
-    @PutMapping(value = "/{id}", produces = "application/json;charset=UTF-8")
-    public RESTfulResult update(@PathVariable String id, @RequestBody ComBaseInfo model) {
-        try {
-            String msg = comBaseInfoService.checkAndUpdate(id, model);
-            if (StringUtils.isNotEmpty(msg)) {
-                return failed(null, msg);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return failed(null, "操作异常，请确认！");
-        }
-        return success(model);
-    }
-
-    @ApiOperation(value = "删除", notes = "根据url的id来指定删除对象")
-    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
-    //@RequiresPermissions("combaseinfo:delete")
-    @DeleteMapping(value = "/{id}")
-    public RESTfulResult delete(@PathVariable String id) {
-        try {
-            List<String> list = Arrays.asList(id.split(","));
-            if (ListUtils.isNotEmpty(list)) {
-                List<String> ids = ListUtils.convertList(list);
-                comBaseInfoService.delete(ids);
-            }
-            return success();
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new MarkerMetException(500, "操作异常！！");
-        }
-    }
-
-    @ApiOperation(value = "启用标识符", notes = "根据传过来的ComBaseInfo集合信息来更新详细信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "ComBaseInfo", value = "详细实体ComBaseInfo", required = true, dataType = "ComBaseInfo")
-    })
-    @Transactional
-    @PostMapping(value = "/Recovery")
-    public RESTfulResult Recovery(@RequestBody List<ComBaseInfo> models) {
-        try {
-            String msg = comBaseInfoService.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 = "根据传过来的ComBaseInfo集合信息来更新详细信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "ComBaseInfo", value = "详细实体ComBaseInfo", required = true, dataType = "ComBaseInfo")
-    })
-    //@RequiresPermissions("combaseinfo:update")
-    @Transactional
-    @PostMapping(value = "/abolish")
-    public RESTfulResult abolish(@RequestBody List<ComBaseInfo> models) {
-        try {
-            String msg = comBaseInfoService.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 = "分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
-    })
-    @GetMapping(value = "/selectSpoType")
-    public RESTfulResult selectSpoType() {
-        List<ComBaseInfo> list = comBaseInfoService.selectSpoType();
-        return success(list);
-    }
-
-    @ApiOperation(value = "获取硬盘录像机类型", notes = "分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
-    })
-    @GetMapping(value = "/selectVideoType")
-    public RESTfulResult selectVideoType() {
-        try {
-            List<ComBaseInfo> list = comBaseInfoService.selectVideoType();
-            return success(list);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new MarkerMetException(500, "操作异常！！");
-        }
-    }
-
-
-    @ApiOperation(value = "获取硬盘录像机型号", notes = "分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
-    })
-    @GetMapping(value = "/selectVideoMark")
-    public RESTfulResult selectVideoMark(String baseName, String baseCode) {
-        RESTfulResult rm = failed();
-        try {
-            List<ComBaseInfo> list = comBaseInfoService.selectVideoMark(baseName, baseCode);
-            return success(list);
-        } catch (MarkerMetException e) {
-            e.printStackTrace();
-            rm.setMessage(e.getMessage());
-        } catch (Exception e) {
-            e.printStackTrace();
-            rm.setMessage("操作异常，请确认！");
-        } finally {
-
-        }
-        return rm;
-    }
-
-    @ApiOperation(value = "获取列表", notes = "查询所有不分页")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
-    })
-    @GetMapping(value = "/noPage")
-    public RESTfulResult list(@RequestParam HashMap parmas) {
-        try {
-            List<ComBaseInfo> list = comBaseInfoService.queryAll(parmas);
-            Collections.reverse(list);
-            return success(list);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new MarkerMetException(500, "操作异常！！");
-        }
-    }
-
-    @ApiOperation(value = "执行Sql获取列表")
-    @PostMapping(value = "/executeSqlDataWf", produces = "application/json;charset=UTF-8")
-    public RESTfulResult executeSqlDataWf(@RequestBody String sql) {
-        try {
-            RESTfulResult rm = comBaseInfoService.executeSqlDataWf(sql);
-            return rm;
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new MarkerMetException(500, "操作异常！！");
-        }
-    }
-
-    @ApiOperation(value = "修改数据,客户端用", notes = "界面填写数据，服务端做二次校验及赋值")
-    @Transactional(rollbackFor = {MarkerMetException.class, Exception.class})
-    @PostMapping(value = "/doUpdateWf")
-    public RESTfulResult doUpdateWf(@RequestBody ComBaseInfo model) {
-        RESTfulResult rm = failed();
-        try {
-            String str = comBaseInfoService.doUpdateWf(model);
-            if (StringUtils.isEmpty(str)) {
-                return success();
-            } else {
-                return failed("操作失败!" + str);
-            }
-        }catch (MarkerMetException e) {
-            e.printStackTrace();
-            rm.setMessage(e.getMessage());
-            rm.setData(e.getMessage());
-        } catch (Exception e) {
-            e.printStackTrace();
-            rm.setMessage("操作异常，请确认！"+e.getMessage());
-            rm.setData("操作异常，请确认！");
-        } finally {
-
-        }
-        return rm;
-    }
-}

src/main/java/com/steerinfo/baseinfo/combaseinfo/mapper/ComBaseInfoMapper.java

@@ -1,29 +0,0 @@
-package com.steerinfo.baseinfo.combaseinfo.mapper;
-
-import com.steerinfo.baseinfo.combaseinfo.model.ComBaseInfo;
-import com.steerinfo.framework.mapper.IBaseMapper;
-
-import feign.Param;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Mapper
-public interface ComBaseInfoMapper extends IBaseMapper<ComBaseInfo, String> {
-
-    List<ComBaseInfo> selectSpoType();
-
-    List<ComBaseInfo> selectVideoType();
-
-    List<ComBaseInfo> queryAll(Map<String, Object> parameters);
-
-    List<HashMap> executeSqlData(Map<String,Object> map);
-
-    /*按照表名和主键生成当前最大的序列号*/
-    String getConfigID(@Param(value = "tablName") String tablName, @Param(value = "primaryKey") String primaryKey);
-
-    /*按照表名和主键生成当前最大的序列号(五位)*/
-    String getConfigIDByFive(@Param(value = "tablName") String tablName, @Param(value = "primaryKey") String primaryKey);
-}

src/main/java/com/steerinfo/baseinfo/combaseinfo/mapper/ComBaseInfoMapper.xml

@@ -1,556 +0,0 @@
-<?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.combaseinfo.mapper.ComBaseInfoMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.baseinfo.combaseinfo.model.ComBaseInfo">
-    <id column="BASE_CODE" jdbcType="VARCHAR" property="baseCode" />
-    <result column="BASE_NAME" jdbcType="VARCHAR" property="baseName" />
-    <result column="P_BASE_CODE" jdbcType="VARCHAR" property="pBaseCode" />
-    <result column="IS_EDIT_FLAG" jdbcType="VARCHAR" property="isEditFlag" />
-    <result column="IS_CREATE_SUBCLASE_FLAG" jdbcType="VARCHAR" property="isCreateSubclaseFlag" />
-    <result column="MNEMONIC_CODE" jdbcType="VARCHAR" property="mnemonicCode" />
-    <result column="MEMO" jdbcType="VARCHAR" property="memo" />
-    <result column="VALID_FLAG" jdbcType="VARCHAR" property="validFlag" />
-    <result column="CREATE_MAN_NO" jdbcType="VARCHAR" property="createManNo" />
-    <result column="CREATE_MAN_NAME" jdbcType="VARCHAR" property="createManName" />
-    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="UPDATE_MAN_NO" jdbcType="VARCHAR" property="updateManNo" />
-    <result column="UPDATE_MAN_NAME" jdbcType="VARCHAR" property="updateManName" />
-    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="DELETE_MAN_NO" jdbcType="VARCHAR" property="deleteManNo" />
-    <result column="DELETE_MAN_NAME" jdbcType="VARCHAR" property="deleteManName" />
-    <result column="DELETE_TIME" jdbcType="TIMESTAMP" property="deleteTime" />
-  </resultMap>
-  <sql id="columns">
-    BASE_CODE, BASE_NAME, P_BASE_CODE, IS_EDIT_FLAG, IS_CREATE_SUBCLASE_FLAG, MNEMONIC_CODE, 
-    MEMO, VALID_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, 
-    UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME
-  </sql>
-  <sql id="columns_alias">
-    t.BASE_CODE, t.BASE_NAME, t.P_BASE_CODE, t.IS_EDIT_FLAG, t.IS_CREATE_SUBCLASE_FLAG, 
-    t.MNEMONIC_CODE, t.MEMO, t.VALID_FLAG, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME,
-    t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME, t.DELETE_MAN_NO, t.DELETE_MAN_NAME, 
-    t.DELETE_TIME
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns"/> FROM COM_BASE_INFO
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM COM_BASE_INFO t
-  </sql>
-  <sql id="where">
-    <where>
-      <if test="baseCode != null and baseCode != ''">
-        and BASE_CODE = #{baseCode}
-      </if>
-      <if test="baseName != null and baseName != ''">
-        and BASE_NAME = #{baseName}
-      </if>
-      <if test="mnemonicCode != null and mnemonicCode != ''">
-        and MNEMONIC_CODE = #{mnemonicCode}
-      </if>
-      <if test="memo != null and memo != ''">
-        and MEMO = #{memo}
-      </if>
-      <if test="validFlag != null and validFlag != ''">
-        and VALID_FLAG = #{validFlag}
-      </if>
-      <if test="createTime != null">
-        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="deleteTime != null">
-        and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
-      </if>
-      <if test="pBaseCode != null and pBaseCode != ''">
-        and P_BASE_CODE = #{pBaseCode}
-      </if>
-      <if test="isEditFlag != null and isEditFlag != ''">
-        and IS_EDIT_FLAG = #{isEditFlag}
-      </if>
-      <if test="isCreateSubclaseFlag != null and isCreateSubclaseFlag != ''">
-        and IS_CREATE_SUBCLASE_FLAG = #{isCreateSubclaseFlag}
-      </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="updateManNo != null and updateManNo != ''">
-        and UPDATE_MAN_NO = #{updateManNo}
-      </if>
-      <if test="updateManName != null and updateManName != ''">
-        and UPDATE_MAN_NAME = #{updateManName}
-      </if>
-      <if test="deleteManNo != null and deleteManNo != ''">
-        and DELETE_MAN_NO = #{deleteManNo}
-      </if>
-      <if test="deleteManName != null and deleteManName != ''">
-        and DELETE_MAN_NAME = #{deleteManName}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where>
-      <if test="baseCode != null and baseCode != ''">
-        and BASE_CODE LIKE '%${baseCode}%'
-      </if>
-      <if test="baseName != null and baseName != ''">
-        and BASE_NAME LIKE '%${baseName}%'
-      </if>
-      <if test="mnemonicCode != null and mnemonicCode != ''">
-        and MNEMONIC_CODE LIKE '%${mnemonicCode}%'
-      </if>
-      <if test="memo != null and memo != ''">
-        and MEMO LIKE '%${memo}%'
-      </if>
-      <if test="validFlag != null and validFlag != ''">
-        and VALID_FLAG LIKE '%${validFlag}%'
-      </if>
-      <if test="createTime != null">
-        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="deleteTime != null">
-        and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
-      </if>
-      <if test="pBaseCode != null and pBaseCode != ''">
-        and P_BASE_CODE LIKE '%${pBaseCode}%'
-      </if>
-      <if test="isEditFlag != null and isEditFlag != ''">
-        and IS_EDIT_FLAG LIKE '%${isEditFlag}%'
-      </if>
-      <if test="isCreateSubclaseFlag != null and isCreateSubclaseFlag != ''">
-        and IS_CREATE_SUBCLASE_FLAG LIKE '%${isCreateSubclaseFlag}%'
-      </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="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="deleteManNo != null and deleteManNo != ''">
-        and DELETE_MAN_NO LIKE '%${deleteManNo}%'
-      </if>
-      <if test="deleteManName != null and deleteManName != ''">
-        and DELETE_MAN_NAME LIKE '%${deleteManName}%'
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from COM_BASE_INFO
-    where BASE_CODE = #{baseCode,jdbcType=VARCHAR}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from COM_BASE_INFO
-    where 1!=1 
-      <if test="baseName != null and baseName != ''">
-        or BASE_NAME = #{baseName}
-      </if>
-      <if test="pBaseCode != null and pBaseCode != ''">
-        or P_BASE_CODE = #{pBaseCode}
-      </if>
-      <if test="isEditFlag != null and isEditFlag != ''">
-        or IS_EDIT_FLAG = #{isEditFlag}
-      </if>
-      <if test="isCreateSubclaseFlag != null and isCreateSubclaseFlag != ''">
-        or IS_CREATE_SUBCLASE_FLAG = #{isCreateSubclaseFlag}
-      </if>
-      <if test="mnemonicCode != null and mnemonicCode != ''">
-        or MNEMONIC_CODE = #{mnemonicCode}
-      </if>
-      <if test="memo != null and memo != ''">
-        or MEMO = #{memo}
-      </if>
-      <if test="validFlag != null and validFlag != ''">
-        or VALID_FLAG = #{validFlag}
-      </if>
-      <if test="createManNo != null and createManNo != ''">
-        or CREATE_MAN_NO = #{createManNo}
-      </if>
-      <if test="createManName != null and createManName != ''">
-        or CREATE_MAN_NAME = #{createManName}
-      </if>
-      <if test="createTime != null">
-        or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
-      </if>
-      <if test="updateManNo != null and updateManNo != ''">
-        or UPDATE_MAN_NO = #{updateManNo}
-      </if>
-      <if test="updateManName != null and updateManName != ''">
-        or UPDATE_MAN_NAME = #{updateManName}
-      </if>
-      <if test="updateTime != null">
-        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-      </if>
-      <if test="deleteManNo != null and deleteManNo != ''">
-        or DELETE_MAN_NO = #{deleteManNo}
-      </if>
-      <if test="deleteManName != null and deleteManName != ''">
-        or DELETE_MAN_NAME = #{deleteManName}
-      </if>
-      <if test="deleteTime != null">
-        or TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = '#{deleteTime}'
-      </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.baseinfo.combaseinfo.model.ComBaseInfo">
-    insert into COM_BASE_INFO (BASE_CODE, BASE_NAME, P_BASE_CODE, 
-      IS_EDIT_FLAG, IS_CREATE_SUBCLASE_FLAG, MNEMONIC_CODE, 
-      MEMO, VALID_FLAG, CREATE_MAN_NO, 
-      CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, 
-      UPDATE_MAN_NAME, UPDATE_TIME, DELETE_MAN_NO, 
-      DELETE_MAN_NAME, DELETE_TIME)
-    values (#{baseCode,jdbcType=VARCHAR}, #{baseName,jdbcType=VARCHAR}, #{pBaseCode,jdbcType=VARCHAR}, 
-      #{isEditFlag,jdbcType=VARCHAR}, #{isCreateSubclaseFlag,jdbcType=VARCHAR}, #{mnemonicCode,jdbcType=VARCHAR}, 
-      #{memo,jdbcType=VARCHAR}, #{validFlag,jdbcType=VARCHAR}, #{createManNo,jdbcType=VARCHAR}, 
-      #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateManNo,jdbcType=VARCHAR},
-      #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{deleteManNo,jdbcType=VARCHAR}, 
-      #{deleteManName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.baseinfo.combaseinfo.model.ComBaseInfo">
-    insert into COM_BASE_INFO
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="baseCode != null">
-        BASE_CODE,
-      </if>
-      <if test="baseName != null">
-        BASE_NAME,
-      </if>
-      <if test="pBaseCode != null">
-        P_BASE_CODE,
-      </if>
-      <if test="isEditFlag != null">
-        IS_EDIT_FLAG,
-      </if>
-      <if test="isCreateSubclaseFlag != null">
-        IS_CREATE_SUBCLASE_FLAG,
-      </if>
-      <if test="mnemonicCode != null">
-        MNEMONIC_CODE,
-      </if>
-      <if test="memo != null">
-        MEMO,
-      </if>
-      <if test="validFlag != null">
-        VALID_FLAG,
-      </if>
-      <if test="createManNo != null">
-        CREATE_MAN_NO,
-      </if>
-      <if test="createManName != null">
-        CREATE_MAN_NAME,
-      </if>
-      <if test="createTime != null">
-        CREATE_TIME,
-      </if>
-      <if test="updateManNo != null">
-        UPDATE_MAN_NO,
-      </if>
-      <if test="updateManName != null">
-        UPDATE_MAN_NAME,
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME,
-      </if>
-      <if test="deleteManNo != null">
-        DELETE_MAN_NO,
-      </if>
-      <if test="deleteManName != null">
-        DELETE_MAN_NAME,
-      </if>
-      <if test="deleteTime != null">
-        DELETE_TIME,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="baseCode != null">
-        #{baseCode,jdbcType=VARCHAR},
-      </if>
-      <if test="baseName != null">
-        #{baseName,jdbcType=VARCHAR},
-      </if>
-      <if test="pBaseCode != null">
-        #{pBaseCode,jdbcType=VARCHAR},
-      </if>
-      <if test="isEditFlag != null">
-        #{isEditFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="isCreateSubclaseFlag != null">
-        #{isCreateSubclaseFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="mnemonicCode != null">
-        #{mnemonicCode,jdbcType=VARCHAR},
-      </if>
-      <if test="memo != null">
-        #{memo,jdbcType=VARCHAR},
-      </if>
-      <if test="validFlag != null">
-        #{validFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="createManNo != null">
-        #{createManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="createManName != null">
-        #{createManName,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateManNo != null">
-        #{updateManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="updateManName != null">
-        #{updateManName,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="deleteManNo != null">
-        #{deleteManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteManName != null">
-        #{deleteManName,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteTime != null">
-        #{deleteTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.baseinfo.combaseinfo.model.ComBaseInfo">
-    update COM_BASE_INFO
-    set BASE_NAME = #{baseName,jdbcType=VARCHAR},
-      P_BASE_CODE = #{pBaseCode,jdbcType=VARCHAR},
-      IS_EDIT_FLAG = #{isEditFlag,jdbcType=VARCHAR},
-      IS_CREATE_SUBCLASE_FLAG = #{isCreateSubclaseFlag,jdbcType=VARCHAR},
-      MNEMONIC_CODE = #{mnemonicCode,jdbcType=VARCHAR},
-      MEMO = #{memo,jdbcType=VARCHAR},
-      VALID_FLAG = #{validFlag,jdbcType=VARCHAR},
-      CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
-      CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
-      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
-      UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
-      UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
-      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      DELETE_MAN_NO = #{deleteManNo,jdbcType=VARCHAR},
-      DELETE_MAN_NAME = #{deleteManName,jdbcType=VARCHAR},
-      DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP}
-    where BASE_CODE = #{baseCode,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.baseinfo.combaseinfo.model.ComBaseInfo">
-    update COM_BASE_INFO
-    <set>
-        <if test="baseCode != null">
-        BASE_CODE= #{baseCode,jdbcType=VARCHAR},
-        </if>
-      <if test="baseName != null">
-        BASE_NAME = #{baseName,jdbcType=VARCHAR},
-      </if>
-      <if test="pBaseCode != null">
-        P_BASE_CODE = #{pBaseCode,jdbcType=VARCHAR},
-      </if>
-      <if test="isEditFlag != null">
-        IS_EDIT_FLAG = #{isEditFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="isCreateSubclaseFlag != null">
-        IS_CREATE_SUBCLASE_FLAG = #{isCreateSubclaseFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="mnemonicCode != null">
-        MNEMONIC_CODE = #{mnemonicCode,jdbcType=VARCHAR},
-      </if>
-      <if test="memo != null">
-        MEMO = #{memo,jdbcType=VARCHAR},
-      </if>
-      <if test="validFlag != null">
-        VALID_FLAG = #{validFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="createManNo != null">
-        CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="createManName != null">
-        CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateManNo != null">
-        UPDATE_MAN_NO = #{updateManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="updateManName != null">
-        UPDATE_MAN_NAME = #{updateManName,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="deleteManNo != null">
-        DELETE_MAN_NO = #{deleteManNo,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteManName != null">
-        DELETE_MAN_NAME = #{deleteManName,jdbcType=VARCHAR},
-      </if>
-      <if test="deleteTime != null">
-        DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where BASE_CODE = #{baseCode,jdbcType=VARCHAR}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where BASE_CODE = #{baseCode,jdbcType=VARCHAR}
-  </select>
-  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="where"/>
-    order by  base_code desc
-  </select>
-  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="whereLike"/>d
-    order by  base_code desc
-  </select>
-  <insert id="batchInsert" parameterType="java.util.List">
-    insert into COM_BASE_INFO 
-      (BASE_CODE, 
-      BASE_NAME, P_BASE_CODE, IS_EDIT_FLAG, 
-      IS_CREATE_SUBCLASE_FLAG, MNEMONIC_CODE, 
-      MEMO, VALID_FLAG, CREATE_MAN_NO, 
-      CREATE_MAN_NAME, CREATE_TIME, 
-      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
-      DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME
-      )
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.baseCode,jdbcType=VARCHAR}, 
-      #{item.baseName,jdbcType=VARCHAR}, #{item.pBaseCode,jdbcType=VARCHAR}, #{item.isEditFlag,jdbcType=VARCHAR}, 
-      #{item.isCreateSubclaseFlag,jdbcType=VARCHAR}, #{item.mnemonicCode,jdbcType=VARCHAR}, 
-      #{item.memo,jdbcType=VARCHAR}, #{item.validFlag,jdbcType=VARCHAR}, #{item.createManNo,jdbcType=VARCHAR}, 
-      #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
-      #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
-      #{item.deleteManNo,jdbcType=VARCHAR}, #{item.deleteManName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=TIMESTAMP}
-       from dual  
-   </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-     update COM_BASE_INFO
-     set
-       BASE_CODE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BASE_CODE" close="end">
-          when #{item.baseCode,jdbcType=VARCHAR} then #{item.baseCode,jdbcType=VARCHAR}
-       </foreach>
-       ,BASE_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BASE_CODE" close="end">
-          when #{item.baseCode,jdbcType=VARCHAR} then #{item.baseName,jdbcType=VARCHAR}
-       </foreach>
-       ,P_BASE_CODE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BASE_CODE" close="end">
-          when #{item.baseCode,jdbcType=VARCHAR} then #{item.pBaseCode,jdbcType=VARCHAR}
-       </foreach>
-       ,IS_EDIT_FLAG=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BASE_CODE" close="end">
-          when #{item.baseCode,jdbcType=VARCHAR} then #{item.isEditFlag,jdbcType=VARCHAR}
-       </foreach>
-       ,IS_CREATE_SUBCLASE_FLAG=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BASE_CODE" close="end">
-          when #{item.baseCode,jdbcType=VARCHAR} then #{item.isCreateSubclaseFlag,jdbcType=VARCHAR}
-       </foreach>
-       ,MNEMONIC_CODE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BASE_CODE" close="end">
-          when #{item.baseCode,jdbcType=VARCHAR} then #{item.mnemonicCode,jdbcType=VARCHAR}
-       </foreach>
-       ,MEMO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BASE_CODE" close="end">
-          when #{item.baseCode,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
-       </foreach>
-       ,VALID_FLAG=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BASE_CODE" close="end">
-          when #{item.baseCode,jdbcType=VARCHAR} then #{item.validFlag,jdbcType=VARCHAR}
-       </foreach>
-       ,CREATE_MAN_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BASE_CODE" close="end">
-          when #{item.baseCode,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
-       </foreach>
-       ,CREATE_MAN_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BASE_CODE" close="end">
-          when #{item.baseCode,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
-       </foreach>
-       ,CREATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BASE_CODE" close="end">
-          when #{item.baseCode,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_MAN_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BASE_CODE" close="end">
-          when #{item.baseCode,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_MAN_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BASE_CODE" close="end">
-          when #{item.baseCode,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BASE_CODE" close="end">
-          when #{item.baseCode,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,DELETE_MAN_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BASE_CODE" close="end">
-          when #{item.baseCode,jdbcType=VARCHAR} then #{item.deleteManNo,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETE_MAN_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BASE_CODE" close="end">
-          when #{item.baseCode,jdbcType=VARCHAR} then #{item.deleteManName,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case BASE_CODE" close="end">
-          when #{item.baseCode,jdbcType=VARCHAR} then #{item.deleteTime,jdbcType=TIMESTAMP}
-       </foreach>
-     where BASE_CODE in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-       #{item.baseCode,jdbcType=VARCHAR}
-     </foreach> 
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from COM_BASE_INFO
-    where BASE_CODE in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  <select id="selectSpoType"  resultMap="BaseResultMap">
-    <include refid="select"/>
-    where P_BASE_CODE = '001002' and VALID_FLAG='1'
-    order by BASE_CODE desc
-  </select>
-  <select id="selectVideoType"  resultMap="BaseResultMap">
-    <include refid="select"/>
-    where P_BASE_CODE = '001020' and VALID_FLAG='1'
-    order by BASE_CODE desc
-  </select>
-
-
-  <select id="executeSqlData" parameterType="java.util.HashMap" resultType="HashMap">
-    ${sql}
-  </select>
-
-  <!--按照表名和主键生成当前最大的序列号；规则为yyyyMMdd+0001-->
-  <select id="getConfigID" parameterType="java.lang.String" resultType="java.lang.String">
-    SELECT to_char(sysdate, 'yyyyMMdd') || LPAD(NVL(MAX(TO_NUMBER(SUBSTR(${primaryKey}, 9))), 0) + 1, 4, '0') ${primaryKey}
-    FROM ${tablName}
-    where instr(${primaryKey}, to_char(sysdate, 'yyyyMMdd')) > 0 and length(${primaryKey})= 12
-  </select>
-
-  <!--按照表名和主键生成当前最大的序列号；规则为yyyyMMdd+0001-->
-  <select id="getConfigIDByFive" parameterType="java.lang.String" resultType="java.lang.String">
-    SELECT to_char(sysdate, 'yyyyMMdd') || LPAD(NVL(MAX(TO_NUMBER(SUBSTR(${primaryKey}, 9))), 0) + 1, 5, '0') ${primaryKey}
-    FROM ${tablName}
-    where instr(${primaryKey}, to_char(sysdate, 'yyyyMMdd')) > 0 and length(${primaryKey})= 13
-  </select>
-</mapper>

src/main/java/com/steerinfo/baseinfo/combaseinfo/model/ComBaseInfo.java

@@ -1,285 +0,0 @@
-package com.steerinfo.baseinfo.combaseinfo.model;
-
-import com.steerinfo.framework.model.IBasePO;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-
-public class ComBaseInfo implements IBasePO<String> {
-    /**
-     * 基础数据编码(BASE_CODE,VARCHAR,20)
-     */
-    @ApiModelProperty(value="基础数据编码",required=true)
-    private String baseCode;
-
-    /**
-     * 基础数据名称(BASE_NAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="基础数据名称",required=true)
-    private String baseName;
-
-    /**
-     * 拼音助记码(MNEMONIC_CODE,VARCHAR,20)
-     */
-    @ApiModelProperty(value="拼音助记码",required=false)
-    private String mnemonicCode;
-
-    /**
-     * 备注(MEMO,VARCHAR,100)
-     */
-    @ApiModelProperty(value="备注",required=false)
-    private String memo;
-
-    /**
-     * 有效标志(VALID_FLAG,VARCHAR,1)
-     */
-    @ApiModelProperty(value="有效标志",required=true)
-    private String validFlag;
-
-    /**
-     * 创建时间(CREATE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="创建时间",required=true)
-    private Date createTime;
-
-    /**
-     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="修改时间",required=false)
-    private Date updateTime;
-
-    /**
-     * 删除时间(DELETE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="删除时间",required=false)
-    private Date deleteTime;
-
-    /**
-     * 快速检索码(P_BASE_CODE,VARCHAR,20)
-     */
-    @ApiModelProperty(value="快速检索码",required=true)
-    private String pBaseCode;
-
-    /**
-     * 是否可编辑(IS_EDIT_FLAG,VARCHAR,1)
-     */
-    @ApiModelProperty(value="是否可编辑",required=true)
-    private String isEditFlag;
-
-    /**
-     * 是否允许添加子类(IS_CREATE_SUBCLASE_FLAG,VARCHAR,1)
-     */
-    @ApiModelProperty(value="是否允许添加子类",required=true)
-    private String isCreateSubclaseFlag;
-
-    /**
-     * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="创建人编号",required=true)
-    private String createManNo;
-
-    /**
-     * 创建人姓名(CREATE_MAN_NAME,VARCHAR,30)
-     */
-    @ApiModelProperty(value="创建人姓名",required=true)
-    private String createManName;
-
-    /**
-     * 修改人编号(UPDATE_MAN_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="修改人编号",required=false)
-    private String updateManNo;
-
-    /**
-     * 修改人姓名(UPDATE_MAN_NAME,VARCHAR,30)
-     */
-    @ApiModelProperty(value="修改人姓名",required=false)
-    private String updateManName;
-
-    /**
-     * 删除人编号(DELETE_MAN_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="删除人编号",required=false)
-    private String deleteManNo;
-
-    /**
-     * 删除人姓名(DELETE_MAN_NAME,VARCHAR,30)
-     */
-    @ApiModelProperty(value="删除人姓名",required=false)
-    private String deleteManName;
-
-    private static final long serialVersionUID = 1L;
-
-    @Override
-    public String getId() {
-        return this.baseCode;
-    }
-
-    @Override
-    public void setId(String baseCode) {
-        this.baseCode = baseCode == null ? null : baseCode.trim();
-    }
-
-    public String getBaseCode() {
-        return baseCode;
-    }
-
-    public void setBaseCode(String baseCode) {
-        this.baseCode = baseCode == null ? null : baseCode.trim();
-    }
-
-    public String getBaseName() {
-        return baseName;
-    }
-
-    public void setBaseName(String baseName) {
-        this.baseName = baseName == null ? null : baseName.trim();
-    }
-
-    public String getpBaseCode() {
-        return pBaseCode;
-    }
-
-    public void setpBaseCode(String pBaseCode) {
-        this.pBaseCode = pBaseCode == null ? null : pBaseCode.trim();
-    }
-
-    public String getIsEditFlag() {
-        return isEditFlag;
-    }
-
-    public void setIsEditFlag(String isEditFlag) {
-        this.isEditFlag = isEditFlag == null ? null : isEditFlag.trim();
-    }
-
-    public String getIsCreateSubclaseFlag() {
-        return isCreateSubclaseFlag;
-    }
-
-    public void setIsCreateSubclaseFlag(String isCreateSubclaseFlag) {
-        this.isCreateSubclaseFlag = isCreateSubclaseFlag == null ? null : isCreateSubclaseFlag.trim();
-    }
-
-    public String getMnemonicCode() {
-        return mnemonicCode;
-    }
-
-    public void setMnemonicCode(String mnemonicCode) {
-        this.mnemonicCode = mnemonicCode == null ? null : mnemonicCode.trim();
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo == null ? null : memo.trim();
-    }
-
-    public String getValidFlag() {
-        return validFlag;
-    }
-
-    public void setValidFlag(String validFlag) {
-        this.validFlag = validFlag == null ? null : validFlag.trim();
-    }
-
-    public String getCreateManNo() {
-        return createManNo;
-    }
-
-    public void setCreateManNo(String createManNo) {
-        this.createManNo = createManNo == null ? null : createManNo.trim();
-    }
-
-    public String getCreateManName() {
-        return createManName;
-    }
-
-    public void setCreateManName(String createManName) {
-        this.createManName = createManName == null ? null : createManName.trim();
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getUpdateManNo() {
-        return updateManNo;
-    }
-
-    public void setUpdateManNo(String updateManNo) {
-        this.updateManNo = updateManNo == null ? null : updateManNo.trim();
-    }
-
-    public String getUpdateManName() {
-        return updateManName;
-    }
-
-    public void setUpdateManName(String updateManName) {
-        this.updateManName = updateManName == null ? null : updateManName.trim();
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getDeleteManNo() {
-        return deleteManNo;
-    }
-
-    public void setDeleteManNo(String deleteManNo) {
-        this.deleteManNo = deleteManNo == null ? null : deleteManNo.trim();
-    }
-
-    public String getDeleteManName() {
-        return deleteManName;
-    }
-
-    public void setDeleteManName(String deleteManName) {
-        this.deleteManName = deleteManName == null ? null : deleteManName.trim();
-    }
-
-    public Date getDeleteTime() {
-        return deleteTime;
-    }
-
-    public void setDeleteTime(Date deleteTime) {
-        this.deleteTime = deleteTime;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", baseCode=").append(baseCode);
-        sb.append(", baseName=").append(baseName);
-        sb.append(", pBaseCode=").append(pBaseCode);
-        sb.append(", isEditFlag=").append(isEditFlag);
-        sb.append(", isCreateSubclaseFlag=").append(isCreateSubclaseFlag);
-        sb.append(", mnemonicCode=").append(mnemonicCode);
-        sb.append(", memo=").append(memo);
-        sb.append(", validFlag=").append(validFlag);
-        sb.append(", createManNo=").append(createManNo);
-        sb.append(", createManName=").append(createManName);
-        sb.append(", createTime=").append(createTime);
-        sb.append(", updateManNo=").append(updateManNo);
-        sb.append(", updateManName=").append(updateManName);
-        sb.append(", updateTime=").append(updateTime);
-        sb.append(", deleteManNo=").append(deleteManNo);
-        sb.append(", deleteManName=").append(deleteManName);
-        sb.append(", deleteTime=").append(deleteTime);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}

src/main/java/com/steerinfo/baseinfo/combaseinfo/service/IComBaseInfoService.java

@@ -1,50 +0,0 @@
-package com.steerinfo.baseinfo.combaseinfo.service;
-
-import com.steerinfo.framework.controller.RESTfulResult;
-import com.steerinfo.framework.service.IBaseService;
-import com.steerinfo.baseinfo.combaseinfo.model.ComBaseInfo;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * ComBaseInfo服务接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2020-06-05 06:15
- * 类描述
- * 修订历史：
- * 日期：2020-06-05
- * 作者：generator
- * 参考：
- * 描述：ComBaseInfo服务接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-public interface IComBaseInfoService extends IBaseService<ComBaseInfo, String>{
-
-     String  checkandadd(ComBaseInfo model)throws  Exception;
-
-     String checkAndUpdate(String id,ComBaseInfo model) throws Exception;
-
-     String Recovery(List<ComBaseInfo> models) throws Exception;
-
-     String abolish(List<ComBaseInfo> models) throws Exception;
-
-    List<ComBaseInfo> selectSpoType();
-
-    List<ComBaseInfo> selectVideoType();
-
-    List<ComBaseInfo> selectVideoMark(String baseName,String baseCode) throws Exception;
-
-    List<ComBaseInfo> queryAll(Map<String, Object> parameters);
-
-    RESTfulResult executeSqlDataWf(String sql);
-
-    /**
-     * 客户端更新数据
-     * @param model
-     * @return
-     */
-    String doUpdateWf(ComBaseInfo model);
-}

src/main/java/com/steerinfo/baseinfo/combaseinfo/service/impl/ComBaseInfoServiceImpl.java

@@ -1,281 +0,0 @@
-package com.steerinfo.baseinfo.combaseinfo.service.impl;
-
-import com.steerinfo.framework.controller.RESTfulResult;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
-import com.steerinfo.baseinfo.combaseinfo.model.ComBaseInfo;
-import com.steerinfo.baseinfo.combaseinfo.mapper.ComBaseInfoMapper;
-import com.steerinfo.baseinfo.combaseinfo.service.IComBaseInfoService;
-import com.steerinfo.meterwork.except.MarkerMetException;
-import com.steerinfo.meterwork.meterworkstoragecalibration.model.MeterWorkStorageCalibration;
-import com.steerinfo.util.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * ComBaseInfo服务实现：
- *
- * @author generator
- * @version 1.0-SNAPSHORT 2020-06-05 06:15
- * 类描述
- * 修订历史：
- * 日期：2020-06-05
- * 作者：generator
- * 参考：
- * 描述：ComBaseInfo服务实现
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- * @see null
- */
-@Service(value = "comBaseInfoService")
-public class ComBaseInfoServiceImpl extends BaseServiceImpl<ComBaseInfo, String> implements IComBaseInfoService {
-
-    @Resource
-    private ComBaseInfoMapper comBaseInfoMapper;
-
-    @Override
-    protected IBaseMapper<ComBaseInfo, String> getMapper() {
-        return comBaseInfoMapper;
-    }
-
-
-    @Override
-    public RESTfulResult executeSqlDataWf(String sql) {
-        RESTfulResult rm = new RESTfulResult();
-        try {
-            HashMap<String, Object> obj = new HashMap<>();
-            obj.put("sql", sql);
-            List<HashMap> list = comBaseInfoMapper.executeSqlData(obj);
-            if (list == null || list.isEmpty()) {
-                rm.setCode("200");
-                rm.setData(null);
-            } else {
-                rm.setCode("200");
-                rm.setData(list);
-            }
-        } catch (Exception e) {
-            rm.setCode("500");
-            rm.setMessage("查询异常：" + e.getMessage());
-        }
-        return rm;
-    }
-
-    /**
-     * 客户端数据更新
-     *
-     * @param model
-     * @return
-     */
-    @Override
-    public String doUpdateWf(ComBaseInfo model) {
-        String str = "";
-        try {
-            if (StringUtils.isEmpty(model.getUpdateManName()) || StringUtils.isEmpty(model.getUpdateManNo())) {
-                return "修改人及修改人编码不允许为空！";
-            }
-            model.setUpdateTime(new Date());
-            comBaseInfoMapper.updateByPrimaryKeySelective(model);
-        } catch (MarkerMetException e) {
-            throw e;
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw ex;
-        }
-        return str;
-    }
-
-    @Transactional
-    @Override
-    public String checkandadd(ComBaseInfo model) {
-        try {
-            ComBaseInfo com1 = comBaseInfoMapper.selectByPrimaryKey(model.getpBaseCode());
-            if (null != com1) {
-                String st = com1.getIsCreateSubclaseFlag();
-                if (st.equals("1")) {
-                    return "该父类不允许添加子类或该类已经创建为父类";
-                }
-            }
-            if (model.getBaseCode() != null && !model.getBaseCode().equals("")) {
-                if (model.getBaseName() != null && !model.getBaseName().equals("")) {
-                    if (model.getIsEditFlag() != null && !model.getIsEditFlag().equals("") && model.getIsEditFlag().length() == 1) {
-                        if (model.getpBaseCode() != null && !model.getpBaseCode().equals("")) {
-                            ComBaseInfo com2 = comBaseInfoMapper.selectByPrimaryKey(model.getBaseCode());
-                            if (null != com2) {
-                                return "数据编码不允许重复！";
-                            }
-                            ComBaseInfo com3 = comBaseInfoMapper.selectByPrimaryKey(model.getpBaseCode());
-                            if (com3 == null) {
-                                return "该父类不存在";
-                            }
-                            if (!model.getBaseCode().substring(0, model.getpBaseCode().length()).equals(model.getpBaseCode())) {
-                                return "快速检索码与数据编码不匹配";
-                            }
-                            model.setCreateTime(new Date());
-                            model.setValidFlag("1");
-                            comBaseInfoMapper.insertSelective(model);
-                        } else {
-                            return "请输入检索码";
-                        }
-                    } else {
-                        return "请确认是否可编辑";
-                    }
-                } else {
-                    return "请输入数据名称";
-                }
-            } else {
-                return "请输入数据编码";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-        return "";
-    }
-
-    public String checkAndUpdate(String id, ComBaseInfo model) throws Exception {
-        try {
-            ComBaseInfo com1 = comBaseInfoMapper.selectByPrimaryKey(model.getpBaseCode());
-            if (null != com1) {
-                String st = com1.getIsCreateSubclaseFlag();
-                if (st.equals("1")) {
-                    return "修改后的检索码不允许添加子类";
-                }
-            }
-            if (model.getBaseCode() != null && !model.getBaseCode().equals("")) {
-                if (model.getBaseName() != null && !model.getBaseName().equals("")) {
-                    if (model.getIsEditFlag() != null && !model.getIsEditFlag().equals("") && model.getIsEditFlag().length() == 1) {
-                        if (model.getpBaseCode() != null && !model.getpBaseCode().equals("")) {
-                            if (!model.getBaseCode().equals(id)) {
-                                return "数据编码不允许修改";
-                            }
-                            ComBaseInfo com2 = comBaseInfoMapper.selectByPrimaryKey(id);
-                            if (com2 == null && com2.getBaseName().equals(model.getBaseName())) {
-                                return "修改后的数据名称已存在";
-                            }
-                            if (com2.getIsEditFlag().equals("1")) {
-                                return "该数据不可编辑";
-                            }
-                            ComBaseInfo com3 = comBaseInfoMapper.selectByPrimaryKey(model.getpBaseCode());
-                            if (com3 == null) {
-                                return "该父类不存在";
-                            }
-                            model.setUpdateTime(new Date());
-                            comBaseInfoMapper.updateByPrimaryKey(model);
-                        } else {
-                            return "请输入检索码";
-                        }
-                    } else {
-                        return "请确认是否可编辑";
-                    }
-                } else {
-                    return "请输入数据名称";
-                }
-            } else {
-                return "请输入数据编码";
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return "操作异常，请联系管理员";
-        }
-        return "";
-    }
-
-    public String Recovery(List<ComBaseInfo> models) throws Exception {
-        try {
-            if (models == null || models.size() < 1) {
-                return "请传入参数!";
-            }
-            for (ComBaseInfo model : models) {
-                model.setBaseCode(model.getBaseCode());
-                model.setValidFlag("1");
-                model.setUpdateManName(model.getUpdateManName());
-                model.setUpdateManNo(model.getUpdateManNo());
-                model.setUpdateTime(new Date());
-                comBaseInfoMapper.updateByPrimaryKey(model);
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return "操作异常，请联系管理员";
-        }
-        return "";
-    }
-
-
-    public String abolish(List<ComBaseInfo> models) throws Exception {
-        try {
-            if (models == null || models.size() < 1) {
-                return "请传入参数!";
-            }
-            for (ComBaseInfo model : models) {
-                HashMap<String, Object> obj = new HashMap<>();
-                obj.put("pBaseCode", model.getBaseCode());
-                //获取子类
-                List<ComBaseInfo> list = comBaseInfoMapper.selectByParameters(obj);
-                for (ComBaseInfo list1 : list) {
-                    list1.setBaseCode(model.getBaseCode());
-                    list1.setValidFlag("0");//无效
-                    list1.setUpdateManName(model.getUpdateManName());
-                    list1.setUpdateManNo(model.getUpdateManNo());
-                    list1.setUpdateTime(new Date());
-                    comBaseInfoMapper.updateByPrimaryKey(list1);
-                }
-                model.setBaseCode(model.getBaseCode());
-                model.setValidFlag("0");
-                model.setUpdateManName(model.getUpdateManName());
-                model.setUpdateManNo(model.getUpdateManNo());
-                model.setUpdateTime(new Date());
-                comBaseInfoMapper.updateByPrimaryKey(model);
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return "操作异常，请联系管理员";
-        }
-        return "";
-    }
-
-
-    public List<ComBaseInfo> selectSpoType() {
-        List<ComBaseInfo> spotype = comBaseInfoMapper.selectSpoType();
-        return spotype;
-    }
-
-    public List<ComBaseInfo> selectVideoType() {
-        List<ComBaseInfo> videotype = comBaseInfoMapper.selectVideoType();
-        return videotype;
-    }
-
-    public List<ComBaseInfo> selectVideoMark(String baseName, String baseCode) {
-        try {
-            if (baseCode == null && "".equals(baseCode)) {
-                throw new MarkerMetException(500, "参数为空");
-            }
-            ComBaseInfo videotype = comBaseInfoMapper.selectByPrimaryKey(baseCode);
-            if (videotype == null) {
-                throw new MarkerMetException(500, "该类型不存在!!");
-            }
-            HashMap<String, Object> obj = new HashMap<>();
-            obj.put("pBaseCode", videotype.getBaseCode());
-            List<ComBaseInfo> videomark = comBaseInfoMapper.selectByParameters(obj);
-            return videomark;
-        } catch (MarkerMetException e) {
-            throw e;
-        }
-
-    }
-
-    @Override
-    public List<ComBaseInfo> queryAll(Map<String, Object> parameters) {
-        return comBaseInfoMapper.selectByParameters(parameters);
-    }
-
-}
-

src/main/java/com/steerinfo/baseinfo/constants/DbConstants.java

@@ -1,33 +0,0 @@
-package com.steerinfo.baseinfo.constants;
-
-/**
- * @ClassName DbConstants
- * @Description: TODO
- * @Author
- * @Date 2020/9/12
- * @Version V1.0
- */
-public class DbConstants {
-
-
-    //供应商
-    public  static  final  String  SUP= "1";
-    //客户
-    public  static  final  String  CUS= "0";
-    //动态轨道衡
-    public  static  final  String  ACT= "001019002";
-    //静态轨道衡
-    public  static  final  String  STATIC= "001019001";
-    //无效
-    public  static  final  String  INVALID= "1";
-    //有效
-    public  static  final  String  VALID= "0";
-    //刷新时间
-    public  static int  num ;
-
-    //检斤类型之采购进厂
-    public  static  final  String  typePurchase = "采购进厂";
-
-    //检斤类型之采销售出厂
-    public  static  final  String  typeSale = "销售出厂";
-}

src/main/java/com/steerinfo/baseinfo/dto/MeterBaseCustomerSupplierDto.java

@@ -1,38 +0,0 @@
-package com.steerinfo.baseinfo.dto;
-
-import com.steerinfo.baseinfo.meterbasecustomersupplier.model.MeterBaseCustomerSupplier;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-
-@Data
-public class MeterBaseCustomerSupplierDto extends MeterBaseCustomerSupplier {
-    /**
-     * 单位编号
-     */
-    @ApiModelProperty(value="单位编号",required=true)
-    private String companyNo;
-
-    /**
-     * 客商名称
-     */
-    @ApiModelProperty(value="单位名称",required=true)
-    private String companyName;
-
-    public String getCompanyNo() {
-        return companyNo;
-    }
-
-    public void setCompanyNo(String companyNo) {
-        this.companyNo = companyNo == null ? null : companyNo.trim();
-    }
-
-    public String getCompanyName() {
-        return companyName;
-    }
-
-    public void setCompanyName(String companyName) {
-        this.companyName = companyName == null ? null : companyName.trim();
-    }
-
-}