后端提交

src/main/java/com/steerinfo/baseinfo/meterbasetermtaredata/service/impl/MeterBaseTermTareDataServiceImpl.java

@@ -378,7 +378,7 @@ public class MeterBaseTermTareDataServiceImpl extends BaseServiceImpl<MeterBaseT
         rm.setMessage("操作失败！！");
         try{
             List<MeterBaseTermTareData> models = meterBaseTermTareDataMapper.listBycarNo(parmas);
-            if(models.size() >= 0) {
+            if(models.size() >= 1) {
                 rm.setSucceed();
                 rm.setMessage("操作成功！！");
                 rm.setData(models.get(0));

src/main/java/com/steerinfo/filter/SecurityFilter.java

@@ -50,6 +50,7 @@ public class SecurityFilter implements Filter {
         if(request.getRemoteAddr().equals("10.1.201.188")
                 ||request.getRemoteAddr().equals("10.104.4.105")
                 ||request.getRemoteAddr().equals("0:0:0:0:0:0:0:1")
+                ||request.getRemoteAddr().equals("10.104.0.1")
             ) {
             filterChain.doFilter(servletRequest,servletResponse);
             return;

src/main/java/com/steerinfo/meterwork/meterworkcaractfirstbak/controller/MeterWorkCarActFirstBakController.java

@@ -0,0 +1,113 @@
+package com.steerinfo.meterwork.meterworkcaractfirstbak.controller;
+
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+import com.steerinfo.meterwork.meterworkcaractfirstbak.model.MeterWorkCarActFirstBak;
+import com.steerinfo.meterwork.meterworkcaractfirstbak.service.IMeterWorkCarActFirstBakService;
+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;
+
+/**
+ * MeterWorkCarActFirstBak RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-07-14 08:59
+ * 类描述
+ * 修订历史：
+ * 日期：2022-07-14
+ * 作者：generator
+ * 参考：
+ * 描述：MeterWorkCarActFirstBak RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/meterworkcaractfirstbaks")
+public class MeterWorkCarActFirstBakController extends BaseRESTfulController {
+
+    @Autowired
+    IMeterWorkCarActFirstBakService meterWorkCarActFirstBakService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkcaractfirstbak:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkCarActFirstBak> list = meterWorkCarActFirstBakService.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("meterworkcaractfirstbak:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkCarActFirstBak> list = meterWorkCarActFirstBakService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据MeterWorkCarActFirstBak对象创建")
+    @ApiImplicitParam(name = "meterWorkCarActFirstBak", value = "详细实体meterWorkCarActFirstBak", required = true, dataType = "MeterWorkCarActFirstBak")
+    //@RequiresPermissions("meterworkcaractfirstbak:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute MeterWorkCarActFirstBak model){
+        MeterWorkCarActFirstBak meterWorkCarActFirstBak = meterWorkCarActFirstBakService.add(model);
+        return success(meterWorkCarActFirstBak);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterworkcaractfirstbak:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        MeterWorkCarActFirstBak meterWorkCarActFirstBak = meterWorkCarActFirstBakService.getById(id);
+        return success(meterWorkCarActFirstBak);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的meterWorkCarActFirstBak信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "meterWorkCarActFirstBak", value = "详细实体meterWorkCarActFirstBak", required = true, dataType = "MeterWorkCarActFirstBak")
+    })
+    //@RequiresPermissions("meterworkcaractfirstbak:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody MeterWorkCarActFirstBak model){
+        model.setId(id);
+        MeterWorkCarActFirstBak meterWorkCarActFirstBak = meterWorkCarActFirstBakService.modify(model);
+        return success(meterWorkCarActFirstBak);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterworkcaractfirstbak: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);
+			  meterWorkCarActFirstBakService.delete(ids);
+    	}
+      return success();
+    }
+
+    @ApiOperation(value="批量创建", notes="根据List<MeterWorkCarActFirstBak>对象创建")
+    @PostMapping(value = "/batchCheckAdd")
+    public RESTfulResult batchCheckAdd(@RequestBody List<MeterWorkCarActFirstBak> models){
+        RESTfulResult rm = meterWorkCarActFirstBakService.batchCheckAdd(models);
+        return rm;
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkcaractfirstbak/mapper/MeterWorkCarActFirstBakMapper.java

@@ -0,0 +1,10 @@
+package com.steerinfo.meterwork.meterworkcaractfirstbak.mapper;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.meterwork.meterworkcaractfirstbak.model.MeterWorkCarActFirstBak;
+import feign.Param;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MeterWorkCarActFirstBakMapper extends IBaseMapper<MeterWorkCarActFirstBak, String> {
+}

src/main/java/com/steerinfo/meterwork/meterworkcaractfirstbak/mapper/MeterWorkCarActFirstBakMapper.xml

@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.meterwork.meterworkcaractfirstbak.mapper.MeterWorkCarActFirstBakMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.meterwork.meterworkcaractfirstbak.model.MeterWorkCarActFirstBak">
+    <id column="ACTUAL_FIRST_NO" jdbcType="VARCHAR" property="actualFirstNo" />
+    <result column="CAR_NO" jdbcType="VARCHAR" property="carNo" />
+    <result column="METER_WEIGHT" jdbcType="DECIMAL" property="meterWeight" />
+    <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="BASE_SPOT_NO" jdbcType="VARCHAR" property="baseSpotNo" />
+    <result column="BASE_SPOT_NAME" jdbcType="VARCHAR" property="baseSpotName" />
+  </resultMap>
+  <sql id="columns">
+    ACTUAL_FIRST_NO, CAR_NO, METER_WEIGHT, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+    BASE_SPOT_NO, BASE_SPOT_NAME
+  </sql>
+  <sql id="columns_alias">
+    t.ACTUAL_FIRST_NO, t.CAR_NO, t.METER_WEIGHT, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, 
+    t.CREATE_TIME, t.BASE_SPOT_NO, t.BASE_SPOT_NAME
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns" /> FROM METER_WORK_CAR_ACT_FIRST_BAK
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM METER_WORK_CAR_ACT_FIRST_BAK t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="actualFirstNo != null and actualFirstNo != ''">
+        and ACTUAL_FIRST_NO = #{actualFirstNo}
+      </if>
+      <if test="carNo != null and carNo != ''">
+        and CAR_NO = #{carNo}
+      </if>
+      <if test="meterWeight != null">
+        and METER_WEIGHT = #{meterWeight}
+      </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="baseSpotNo != null and baseSpotNo != ''">
+        and BASE_SPOT_NO = #{baseSpotNo}
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        and BASE_SPOT_NAME = #{baseSpotName}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="actualFirstNo != null and actualFirstNo != ''">
+        and ACTUAL_FIRST_NO LIKE '%${actualFirstNo}%'
+      </if>
+      <if test="carNo != null and carNo != ''">
+        and CAR_NO LIKE '%${carNo}%'
+      </if>
+      <if test="meterWeight != null">
+        and METER_WEIGHT = #{meterWeight}
+      </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="baseSpotNo != null and baseSpotNo != ''">
+        and BASE_SPOT_NO LIKE '%${baseSpotNo}%'
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        and BASE_SPOT_NAME LIKE '%${baseSpotName}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_WORK_CAR_ACT_FIRST_BAK
+    where ACTUAL_FIRST_NO = #{actualFirstNo,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_WORK_CAR_ACT_FIRST_BAK
+    where 1!=1 
+      <if test="carNo != null and carNo != ''">
+        or CAR_NO = #{carNo}
+      </if>
+      <if test="meterWeight != null">
+        or METER_WEIGHT = #{meterWeight}
+      </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="baseSpotNo != null and baseSpotNo != ''">
+        or BASE_SPOT_NO = #{baseSpotNo}
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        or BASE_SPOT_NAME = #{baseSpotName}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkcaractfirstbak.model.MeterWorkCarActFirstBak">
+    insert into METER_WORK_CAR_ACT_FIRST_BAK (ACTUAL_FIRST_NO, CAR_NO, METER_WEIGHT, 
+      CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, 
+      BASE_SPOT_NO, BASE_SPOT_NAME)
+    values (#{actualFirstNo,jdbcType=VARCHAR}, #{carNo,jdbcType=VARCHAR}, #{meterWeight,jdbcType=DECIMAL}, 
+      #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{baseSpotNo,jdbcType=VARCHAR}, #{baseSpotName,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkcaractfirstbak.model.MeterWorkCarActFirstBak">
+    insert into METER_WORK_CAR_ACT_FIRST_BAK
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="actualFirstNo != null">
+        ACTUAL_FIRST_NO,
+      </if>
+      <if test="carNo != null">
+        CAR_NO,
+      </if>
+      <if test="meterWeight != null">
+        METER_WEIGHT,
+      </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="baseSpotNo != null">
+        BASE_SPOT_NO,
+      </if>
+      <if test="baseSpotName != null">
+        BASE_SPOT_NAME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="actualFirstNo != null">
+        #{actualFirstNo,jdbcType=VARCHAR},
+      </if>
+      <if test="carNo != null">
+        #{carNo,jdbcType=VARCHAR},
+      </if>
+      <if test="meterWeight != null">
+        #{meterWeight,jdbcType=DECIMAL},
+      </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="baseSpotNo != null">
+        #{baseSpotNo,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotName != null">
+        #{baseSpotName,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkcaractfirstbak.model.MeterWorkCarActFirstBak">
+    update METER_WORK_CAR_ACT_FIRST_BAK
+    set CAR_NO = #{carNo,jdbcType=VARCHAR},
+      METER_WEIGHT = #{meterWeight,jdbcType=DECIMAL},
+      CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
+      CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      BASE_SPOT_NO = #{baseSpotNo,jdbcType=VARCHAR},
+      BASE_SPOT_NAME = #{baseSpotName,jdbcType=VARCHAR}
+    where ACTUAL_FIRST_NO = #{actualFirstNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkcaractfirstbak.model.MeterWorkCarActFirstBak">
+    update METER_WORK_CAR_ACT_FIRST_BAK
+    <set>
+      <if test="carNo != null">
+        CAR_NO = #{carNo,jdbcType=VARCHAR},
+      </if>
+      <if test="meterWeight != null">
+        METER_WEIGHT = #{meterWeight,jdbcType=DECIMAL},
+      </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="baseSpotNo != null">
+        BASE_SPOT_NO = #{baseSpotNo,jdbcType=VARCHAR},
+      </if>
+      <if test="baseSpotName != null">
+        BASE_SPOT_NAME = #{baseSpotName,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ACTUAL_FIRST_NO = #{actualFirstNo,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select" />
+    where ACTUAL_FIRST_NO = #{actualFirstNo,jdbcType=VARCHAR}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="where" />
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="whereLike" />
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into METER_WORK_CAR_ACT_FIRST_BAK 
+      (ACTUAL_FIRST_NO, 
+      CAR_NO, METER_WEIGHT, CREATE_MAN_NO, 
+      CREATE_MAN_NAME, CREATE_TIME, 
+      BASE_SPOT_NO, BASE_SPOT_NAME)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.actualFirstNo,jdbcType=VARCHAR}, 
+      #{item.carNo,jdbcType=VARCHAR}, #{item.meterWeight,jdbcType=DECIMAL}, #{item.createManNo,jdbcType=VARCHAR}, 
+      #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
+      #{item.baseSpotNo,jdbcType=VARCHAR}, #{item.baseSpotName,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_WORK_CAR_ACT_FIRST_BAK
+     set
+       ACTUAL_FIRST_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_FIRST_NO" separator=" ">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.actualFirstNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CAR_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_FIRST_NO" separator=" ">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.carNo,jdbcType=VARCHAR}
+       </foreach>
+       ,METER_WEIGHT=
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_FIRST_NO" separator=" ">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.meterWeight,jdbcType=DECIMAL}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_FIRST_NO" separator=" ">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_FIRST_NO" separator=" ">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_FIRST_NO" separator=" ">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,BASE_SPOT_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_FIRST_NO" separator=" ">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.baseSpotNo,jdbcType=VARCHAR}
+       </foreach>
+       ,BASE_SPOT_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_FIRST_NO" separator=" ">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.baseSpotName,jdbcType=VARCHAR}
+       </foreach>
+     where ACTUAL_FIRST_NO in 
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.actualFirstNo,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_WORK_CAR_ACT_FIRST_BAK
+    where ACTUAL_FIRST_NO in 
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+</mapper>

src/main/java/com/steerinfo/meterwork/meterworkcaractfirstbak/model/MeterWorkCarActFirstBak.java

@@ -0,0 +1,154 @@
+package com.steerinfo.meterwork.meterworkcaractfirstbak.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 MeterWorkCarActFirstBak implements IBasePO<String> {
+    /**
+     * 计量作业编号(ACTUAL_FIRST_NO,VARCHAR,50)
+     */
+    @ApiModelProperty(value="计量作业编号",required=true)
+    private String actualFirstNo;
+
+    /**
+     * 车号(CAR_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="车号",required=false)
+    private String carNo;
+
+    /**
+     * 计量重量(METER_WEIGHT,DECIMAL,10)
+     */
+    @ApiModelProperty(value="计量重量",required=false)
+    private BigDecimal meterWeight;
+
+    /**
+     * 计量员编号(CREATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="计量员编号",required=false)
+    private String createManNo;
+
+    /**
+     * 计量员(CREATE_MAN_NAME,VARCHAR,40)
+     */
+    @ApiModelProperty(value="计量员",required=false)
+    private String createManName;
+
+    /**
+     * 计量时间(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="计量时间",required=false)
+    private Date createTime;
+
+    /**
+     * 计量点编号(BASE_SPOT_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="计量点编号",required=false)
+    private String baseSpotNo;
+
+    /**
+     * 计量点名称(BASE_SPOT_NAME,VARCHAR,40)
+     */
+    @ApiModelProperty(value="计量点名称",required=false)
+    private String baseSpotName;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.actualFirstNo;
+    }
+
+    @Override
+    public void setId(String actualFirstNo) {
+        this.actualFirstNo = actualFirstNo == null ? null : actualFirstNo.trim();
+    }
+
+    public String getActualFirstNo() {
+        return actualFirstNo;
+    }
+
+    public void setActualFirstNo(String actualFirstNo) {
+        this.actualFirstNo = actualFirstNo == null ? null : actualFirstNo.trim();
+    }
+
+    public String getCarNo() {
+        return carNo;
+    }
+
+    public void setCarNo(String carNo) {
+        this.carNo = carNo == null ? null : carNo.trim();
+    }
+
+    public BigDecimal getMeterWeight() {
+        return meterWeight;
+    }
+
+    public void setMeterWeight(BigDecimal meterWeight) {
+        this.meterWeight = meterWeight;
+    }
+
+    public 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 getBaseSpotNo() {
+        return baseSpotNo;
+    }
+
+    public void setBaseSpotNo(String baseSpotNo) {
+        this.baseSpotNo = baseSpotNo == null ? null : baseSpotNo.trim();
+    }
+
+    public String getBaseSpotName() {
+        return baseSpotName;
+    }
+
+    public void setBaseSpotName(String baseSpotName) {
+        this.baseSpotName = baseSpotName == null ? null : baseSpotName.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", actualFirstNo=").append(actualFirstNo);
+        sb.append(", carNo=").append(carNo);
+        sb.append(", meterWeight=").append(meterWeight);
+        sb.append(", createManNo=").append(createManNo);
+        sb.append(", createManName=").append(createManName);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", baseSpotNo=").append(baseSpotNo);
+        sb.append(", baseSpotName=").append(baseSpotName);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkcaractfirstbak/service/IMeterWorkCarActFirstBakService.java

@@ -0,0 +1,25 @@
+package com.steerinfo.meterwork.meterworkcaractfirstbak.service;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.meterwork.meterworkcaractfirstbak.model.MeterWorkCarActFirstBak;
+
+import java.util.List;
+
+/**
+ * MeterWorkCarActFirstBak服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-07-14 08:59
+ * 类描述
+ * 修订历史：
+ * 日期：2022-07-14
+ * 作者：generator
+ * 参考：
+ * 描述：MeterWorkCarActFirstBak服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IMeterWorkCarActFirstBakService extends IBaseService<MeterWorkCarActFirstBak, String>{
+    RESTfulResult batchCheckAdd(List<MeterWorkCarActFirstBak> models);
+
+}

src/main/java/com/steerinfo/meterwork/meterworkcaractfirstbak/service/impl/MeterWorkCarActFirstBakServiceImpl.java

@@ -0,0 +1,66 @@
+package com.steerinfo.meterwork.meterworkcaractfirstbak.service.impl;
+
+import cn.hutool.core.lang.Assert;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.meterwork.meterworkcaractfirstbak.mapper.MeterWorkCarActFirstBakMapper;
+import com.steerinfo.meterwork.meterworkcaractfirstbak.model.MeterWorkCarActFirstBak;
+import com.steerinfo.meterwork.meterworkcaractfirstbak.service.IMeterWorkCarActFirstBakService;
+import com.steerinfo.util.PublicMethod;
+import net.sf.ehcache.transaction.xa.EhcacheXAException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * MeterWorkCarActFirstBak服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-07-14 08:59
+ * 类描述
+ * 修订历史：
+ * 日期：2022-07-14
+ * 作者：generator
+ * 参考：
+ * 描述：MeterWorkCarActFirstBak服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "meterWorkCarActFirstBakService")
+public class MeterWorkCarActFirstBakServiceImpl extends BaseServiceImpl<MeterWorkCarActFirstBak, String> implements IMeterWorkCarActFirstBakService {
+
+    @Resource
+    private MeterWorkCarActFirstBakMapper meterWorkCarActFirstBakMapper;
+
+    @Override
+    protected IBaseMapper<MeterWorkCarActFirstBak, String> getMapper() {
+        return meterWorkCarActFirstBakMapper;
+    }
+
+    @Override
+    public RESTfulResult batchCheckAdd(List<MeterWorkCarActFirstBak> models) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try {
+            Assert.isTrue(models.size() > 0, "数据为空，不能进行批量保存");
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+            for (MeterWorkCarActFirstBak model: models) {
+                String no = PublicMethod.IdCreate(3);
+                model.setActualFirstNo(no + "bak");
+                meterWorkCarActFirstBakMapper.insertSelective(model);
+            }
+            rm.setSucceed();
+            rm.setData(models);
+            rm.setCode("200");
+            rm.setMessage("操作成功");
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常>>>" + e.getMessage());
+        }
+        return rm;
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkcaractual/controller/MeterWorkCarActualController.java

@@ -493,7 +493,7 @@ throw new MarkerMetException(500, "操作异常！！");
 
     @ApiOperation(value = "匹配委托")
     @PostMapping(value = "/matchPrediction")
-    public RESTfulResult matchPrediction(@RequestParam String actualNo, String predictionNo, String note) {
+    public RESTfulResult matchPrediction(@RequestBody String actualNo, String predictionNo, String note) {
         RESTfulResult rm = failed();
         try {
             rm = meterWorkCarActualService.matchPrediction(actualNo, predictionNo, note);

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/impl/MeterWorkCarActualFirstServiceImpl.java

@@ -2121,18 +2121,20 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             beforeTime.add(Calendar.MINUTE, -5);// 5分钟之前的时间
             Date startTime = sdf.parse(sdf.format(beforeTime.getTime()));
             Date endTime = sdf.parse(sdf.format(new Date()));
-            if(!(date.compareTo(startTime) > 0 && date.compareTo(endTime) < 0)) {
+
+            if(!(date.compareTo(startTime) >= 0 && date.compareTo(endTime) <= 0)) {
                 rm.setMessage("二维码已过期");
                 rm.setCode("1");
                 return rm;
             }
 
-                String carnumRegex = "([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领 A-Z]{1}[A-Z]{1}(([0-9]{5}[DF])|([DF]([A-HJ-NP-Z0-9])[0-9]{4})))|([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领 A-Z]{1}[A-Z]{1}[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9 挂学警港澳]{1})";
+            String carnumRegex = "([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领 A-Z]{1}[A-Z]{1}(([0-9]{5}[DF])|([DF]([A-HJ-NP-Z0-9])[0-9]{4})))|([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领 A-Z]{1}[A-Z]{1}[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9 挂学警港澳]{1})";
             if (!TextUtils.isEmpty(carNo)) {
                 if(carNo.matches(carnumRegex)) {
                     rm.setSucceed();
                     rm.setCode("0");
-                    rm.setMessage(carNo);
+                    rm.setMessage("操作成功");
+                    rm.setData(carNo);
                 }else {
                     rm.setMessage("车号不正确");
                     rm.setCode("2");

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

@@ -4367,6 +4367,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     second.setShipmentGrossWeight(received.getShipmentGrossWeight());
                     second.setShipmentNetWeight(received.getShipmentNetWeight());
                     second.setRailwayModelName(received.getRailwayModel());
+                    second.setLcNo(received.getRailwayWorkNo());
                     meterWorkRailwayActFirstMapper.insertSelective(second);
 
                     MeterWorkRailwayActual netRail = new MeterWorkRailwayActual();
@@ -4395,6 +4396,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     netRail.setGrossGroup(received.getShipmentNetWeight() + "");//前后偏载
                     netRail.setTareClass(second.getShipmentGrossWeight() + ""); //左右偏载
                     netRail.setTareGroup(second.getShipmentNetWeight() + "");//前后偏载
+                    netRail.setLcNo(second.getLcNo());
                     netRail.setCreateTime(new Date());
                     netRail.setGrossMode("1");
                     netRail.setTareMode("1");
@@ -4438,6 +4440,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     second.setShipmentGrossWeight(received.getShipmentGrossWeight());
                     second.setShipmentNetWeight(received.getShipmentNetWeight());
                     second.setRailwayModelName(received.getRailwayModel());
+                    second.setLcNo(received.getRailwayWorkNo());
                     second.setDataSource("1");
                     second.setNote("匹配洁净");
                     meterWorkRailwayActFirstMapper.insertSelective(second);
@@ -4463,6 +4466,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     netRail.setConveyanceType(received.getRailwayModel());
                     //netRail.setRailwayModelName(received.getRailwayModel());
 
+                    netRail.setLcNo(received.getRailwayWorkNo());
                     netRail.setTareWeight(first.getMeterWeight());
                     netRail.setTareManNo(userId);
                     netRail.setTareManName(userName);
@@ -4690,6 +4694,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     second.setRailwaySpeed(received.getRailwaySpeed());
                     second.setMeterWeight(received.getMeterWeight());
                     second.setCreateTime(received.getCreateTime());
+                    second.setLcNo(received.getRailwayWorkNo());
                     second.setCreateManNo(userId);
                     second.setCreateManName(userName);
                     second.setWeightType("0");
@@ -4723,6 +4728,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     netRail.setGrossGroup(received.getShipmentNetWeight() + "");//前后偏载
                     netRail.setTareClass(second.getShipmentGrossWeight() + ""); //左右偏载
                     netRail.setTareGroup(second.getShipmentNetWeight() + "");//前后偏载
+                    netRail.setLcNo(second.getLcNo());
                     netRail.setCreateTime(new Date());
                     netRail.setGrossMode("1");
                     netRail.setTareMode("1");
@@ -4770,6 +4776,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     second.setCreateManNo(userId);
                     second.setCreateManName(userName);
                     second.setWeightType("0");
+                    second.setLcNo(received.getRailwayWorkNo());
                     second.setRailwayTypeNo(received.getRailwayTypeNo());
                     second.setRailwayTypeName(received.getRailwayTypeName());
                     second.setBaseSpotNo(received.getBaseSpotNo());
@@ -4801,6 +4808,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     netRail.setRailwayTypeName("动态轨道衡");
                     netRail.setConveyanceType(received.getRailwayModel());
                     //netRail.setRailwayModelName(received.getRailwayModel());
+                    netRail.setLcNo(second.getLcNo());
                     netRail.setTareWeight(AIFirst.getMeterWeight());
                     netRail.setTareManNo(userId);
                     netRail.setTareManName(userName);
@@ -4897,6 +4905,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     second.setCreateTime(received.getCreateTime());
                     second.setCreateManNo(userId);
                     second.setCreateManName(userName);
+                    second.setLcNo(received.getRailwayWorkNo());
                     second.setWeightType("0");
                     second.setRailwayTypeNo(received.getRailwayTypeNo());
                     second.setRailwayTypeName(received.getRailwayTypeName());
@@ -4929,6 +4938,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     netRail.setTareMode("1");
                     netRail.setTareClass(second.getShipmentGrossWeight() + ""); //左右偏载
                     netRail.setTareGroup(second.getShipmentNetWeight() + "");//前后偏载
+                    netRail.setLcNo(second.getLcNo());
                     netRail.setNetMode("1");
                     netRail.setCreateTime(new Date());
                     netRail.setCreateManName(userName);
@@ -4967,6 +4977,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     second.setCreateManNo(userId);
                     second.setCreateManName(userName);
                     second.setWeightType("0");
+                    second.setLcNo(received.getRailwayWorkNo());
                     second.setRailwayTypeNo(received.getRailwayTypeNo());
                     second.setRailwayTypeName(received.getRailwayTypeName());
                     second.setBaseSpotNo(received.getBaseSpotNo());
@@ -4998,6 +5009,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     netRail.setRailwayTypeName("动态轨道衡");
                     netRail.setConveyanceType(received.getRailwayModel());
                     //netRail.setRailwayModelName(received.getRailwayModel());
+                    netRail.setLcNo(second.getLcNo());
                     netRail.setTareWeight(AIFirst.getMeterWeight());
                     netRail.setTareManNo(userId);
                     netRail.setTareManName(userName);

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/controller/MeterWorkRailwayActualController.java

@@ -286,6 +286,29 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
         return rm;
     }
 
+
+    @ApiOperation(value = "动轨匹配委托")
+    @PostMapping(value = "/matchPredictionD")
+    public RESTfulResult matchPredictionD(@RequestBody HashMap map) {
+        RESTfulResult rm = failed();
+        try {
+            String actualNo = map.get("actualNo") == null ? "": map.get("actualNo").toString();
+            String predictionNo = map.get("predictionNo") == null ? "": map.get("predictionNo").toString();
+            String note = map.get("note") == null ? "": map.get("note").toString();
+            MeterWorkRailwayActual mwca = meterWorkRailwayActualService.matchPrediction(actualNo, predictionNo, note);
+            return success(mwca);
+        } catch (MarkerMetException e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！");
+        } finally {
+
+        }
+        return rm;
+    }
+
     @ApiOperation(value = "解除委托")
     @PostMapping(value = "/removePrediction")
     public RESTfulResult removePrediction(@RequestBody MeterWorkRailwayActual model) {
@@ -802,20 +825,28 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
 
             MeterWorkRailwayActual model = new MeterWorkRailwayActual();
             model.setPredictionNo(map.get("predictionNo").toString());
-            model.setBaseSpot1No(map.get("baseSpot1No").toString());
-            model.setBaseSpot1Name(map.get("baseSpot1Name").toString());
-            model.setGrossManNo(map.get("grossManNo").toString());
-            model.setGrossManName(map.get("grossManName").toString());
+//            model.setBaseSpot1No(map.get("baseSpot1No").toString());
+//            model.setBaseSpot1Name(map.get("baseSpot1Name").toString());
+            model.setBaseSpot1No(meterWorkRailwayActualService.subStr(map.get("baseSpot1No").toString(), "0"));
+            model.setBaseSpot1Name(meterWorkRailwayActualService.subStr(map.get("baseSpot1No").toString(), "1"));
+//            model.setGrossManNo(map.get("grossManNo").toString());
+//            model.setGrossManName(map.get("grossManName").toString());
+            model.setGrossManNo(meterWorkRailwayActualService.subStr(map.get("grossManNo").toString(), "0"));
+            model.setGrossManName(meterWorkRailwayActualService.subStr(map.get("grossManNo").toString(), "1"));
             model.setGrossTime(grossTime);
             model.setTareTime(tareTime);
             model.setNetTime(netTime);
-            model.setBaseSpot2No(map.get("baseSpot2No").toString());
-            model.setBaseSpot2Name(map.get("baseSpot2Name").toString());
+//            model.setBaseSpot2No(map.get("baseSpot2No").toString());
+//            model.setBaseSpot2Name(map.get("baseSpot2Name").toString());
+            model.setBaseSpot2No(meterWorkRailwayActualService.subStr(map.get("baseSpot2No").toString(), "0"));
+            model.setBaseSpot2Name(meterWorkRailwayActualService.subStr(map.get("baseSpot2No").toString(), "1"));
             model.setRailwayNo(map.get("railwayNo").toString());
             model.setGrossWeight(new BigDecimal(map.get("grossWeight").toString()));
             model.setTareWeight(new BigDecimal(map.get("tareWeight").toString()));
-            model.setRailwayTypeNo(map.get("railwayTypeNo").toString());
-            model.setRailwayTypeName(map.get("railwayTypeName").toString());
+//            model.setRailwayTypeNo(map.get("railwayTypeNo").toString());
+//            model.setRailwayTypeName(map.get("railwayTypeName").toString());
+            model.setRailwayTypeNo(meterWorkRailwayActualService.subStr(map.get("railwayTypeNo").toString(), "0"));
+            model.setRailwayTypeName(meterWorkRailwayActualService.subStr(map.get("railwayTypeNo").toString(), "1"));
             rm = meterWorkRailwayActualService.supplementaryData(model);
         } catch (MarkerMetException e) {
             e.printStackTrace();
@@ -829,6 +860,9 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
         return rm;
     }
 
+
+
+
     @ApiOperation(value = "根据实绩id获取一次计量信息和委托信息", notes = "根据实绩id获取一次计量信息和委托信息")
     @PostMapping(value = "/firstAndEntrustById")
     public RESTfulResult firstAndEntrustById(@RequestBody HashMap params) {

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/service/IMeterWorkRailwayActualService.java

@@ -95,4 +95,6 @@ public interface IMeterWorkRailwayActualService extends IBaseService<MeterWorkRa
     RESTfulResult batchUpdateLcNo(List<MeterWorkRailwayActual> models);
     RESTfulResult autoPrintRailway(HashMap<String, Object> map);
 
+    String subStr(String str, String flag);
+
 }

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/service/impl/MeterWorkRailwayActualServiceImpl.java

@@ -482,9 +482,16 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         if (!queryrow.getRailwayNo().equals(prerow.getRailwayNo())) {
             throw new MarkerMetException(500, "洁净数据中车号和预报中车号不一致，不允许进行匹配委托操作");
         }
-        UserPayload payload = UserPayload.getCurrUser();
-        String userId = payload.getId();
-        String userName = payload.getUserName();
+        String userId;
+        String userName;
+        try{
+            UserPayload payload = UserPayload.getCurrUser();
+            userId = payload.getId();
+            userName = payload.getUserName();
+        }catch (Exception e){
+            userId = "admin";
+            userName = "admins";
+        }
 
         // 处理一次计量数据
         // 毛重
@@ -2375,4 +2382,15 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         }
         return rm;
     }
+
+    @Override
+    public String subStr(String str, String flag) {
+        String[] ss = str.split(",");
+        if(flag.equals("0")){
+            return ss[0];
+        }else {
+            return ss[1];
+        }
+
+    }
 }

src/main/java/com/steerinfo/pretrack/prerailwayscale/controller/PreRailwayScaleController.java

@@ -71,6 +71,24 @@ throw new MarkerMetException(500, "操作异常！！");
 throw new MarkerMetException(500, "操作异常！！");
         }
     }
+
+    @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 = "/likeDesc/")
+    public RESTfulResult likeDesc(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+        try {
+            PageList<PreRailwayScale> list = preRailwayScaleService.likeDesc(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"),

src/main/java/com/steerinfo/pretrack/prerailwayscale/mapper/PreRailwayScaleMapper.java

@@ -53,5 +53,6 @@ public interface PreRailwayScaleMapper extends IBaseMapper<PreRailwayScale, Stri
 
     List<PreRailwayScale> selectByRailwayNo(@Param( value = "railwayNo") String railwayNo);
     List<PreRailwayScale> likeByDesc(Map<String, Object> var1);
+    List<PreRailwayScale> likeDesc(Map<String, Object> var1);
     List<PreRailwayScale> noPage(Map<String, Object> var1);
 }

src/main/java/com/steerinfo/pretrack/prerailwayscale/mapper/PreRailwayScaleMapper.xml

@@ -649,8 +649,17 @@
       </if>
     </where>
   </sql>
+  <sql id="whereLikeWeb">
+    <where>
+      1 = 1
+      <if test="railwayNo != null and railwayNo != ''">
+        and RAILWAY_NO LIKE '%${railwayNo}%'
+      </if>
+    </where>
+  </sql>
   <sql id="TSDGwhereLike">
     <where>
+      1 = 1
       <if test="railwayNo != null and railwayNo != ''">
         and RAILWAY_NO LIKE '%${railwayNo}'
       </if>
@@ -3106,6 +3115,14 @@
       order by TRUST_DATE_TIME desc
     </select>
 
+  <select id="likeDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLikeWeb" />
+    and value_flag in ('0', '1')
+    and TRUST_AVAILABILITY_TIME >= sysDate
+    order by TRUST_DATE_TIME desc
+  </select>
+
   <select id="noPage" parameterType="java.util.HashMap" resultMap="BaseResultMap">
       <include refid="select"/>
       where 1 = 1

src/main/java/com/steerinfo/pretrack/prerailwayscale/service/IPreRailwayScaleService.java

@@ -47,5 +47,6 @@ public interface IPreRailwayScaleService extends IBaseService<PreRailwayScale, S
     List<PreRailwayScale> doQueryJLByCar(HashMap param);
 
     PageList<PreRailwayScale> likeByDesc(HashMap param, Integer pageNum, Integer pageSize);
+    PageList<PreRailwayScale> likeDesc(HashMap param, Integer pageNum, Integer pageSize);
     List<PreRailwayScale> noPage(HashMap param);
 }

src/main/java/com/steerinfo/pretrack/prerailwayscale/service/impl/PreRailwayScaleServiceImpl.java

@@ -316,6 +316,14 @@ public class PreRailwayScaleServiceImpl extends BaseServiceImpl<PreRailwayScale,
         return pageInfo;
     }
 
+    @Override
+    public PageList<PreRailwayScale> likeDesc(HashMap param, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<PreRailwayScale> rows = preRailwayScaleMapper.likeDesc(param);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
     @Override
     public List<PreRailwayScale> noPage(HashMap param) {
         List<PreRailwayScale> rows = preRailwayScaleMapper.noPage(param);

src/main/java/com/steerinfo/pretrack/pretrackscale/mapper/PreTrackScaleMapper.xml

@@ -3303,7 +3303,122 @@
 
   <select id="selectByMap" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
-    <include refid="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="railwayNo != null and railwayNo != ''">
+        and RAILWAY_NO = #{railwayNo}
+      </if>
+      <if test="pValueFlag != null and pValueFlag != ''">
+        and P_VALUE_FLAG = #{pValueFlag}
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG = #{valueFlag}
+      </if>
+      <if test="lineDesc != null and lineDesc != ''">
+        and LINE_DESC = #{lineDesc}
+      </if>
+    </where>
     and TRUST_AVAILABILITY_TIME &gt;= SYSDATE
   </select>