后端修改

src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/impl/MeterWorkCarActualServiceImpl.java

@@ -1324,10 +1324,10 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                     rm.setMessage("结净数据中车号和预报中车号不一致，请确认！！");
                     return rm;
                 }
-                if (!scale.getPredictionType().equals("1")) {
-                    rm.setMessage("委托信息不是普通委托不能进行匹配委托，请确认！！");
-                    return rm;
-                }
+//                if (!scale.getPredictionType().equals("1")) {
+//                    rm.setMessage("委托信息不是普通委托不能进行匹配委托，请确认！！");
+//                    return rm;
+//                }
             }
             UserPayload payload = UserPayload.getCurrUser();
             String userId = payload.getUserCode();

src/main/java/com/steerinfo/meterwork/meterworkcarmetertime/controller/MeterWorkCarMeterTimeController.java

@@ -0,0 +1,83 @@
+package com.steerinfo.meterwork.meterworkcarmetertime.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.meterworkcarmetertime.model.MeterWorkCarMeterTime;
+import com.steerinfo.meterwork.meterworkcarmetertime.service.IMeterWorkCarMeterTimeService;
+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.transaction.annotation.Transactional;
+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;
+
+/**
+ * MeterWorkCarMeterTime RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-10-20 09:45
+ * 类描述
+ * 修订历史：
+ * 日期：2022-10-20
+ * 作者：generator
+ * 参考：
+ * 描述：MeterWorkCarMeterTime RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/meterworkcarmetertimes")
+public class MeterWorkCarMeterTimeController extends BaseRESTfulController {
+
+    @Autowired
+    IMeterWorkCarMeterTimeService meterWorkCarMeterTimeService;
+
+
+    @ApiOperation(value="新增汽车衡计量时间")
+    @ApiImplicitParam(name = "meterWorkCarMeterTime", value = "详细实体meterWorkCarMeterTime", required = true, dataType = "MeterWorkCarMeterTime")
+    @PostMapping(value = "/insert")
+    @Transactional
+    public RESTfulResult insert(@RequestBody MeterWorkCarMeterTime meterWorkCarMeterTime){
+        try {
+            MeterWorkCarMeterTime add = meterWorkCarMeterTimeService.add(meterWorkCarMeterTime);
+            return success(add,"新增成功");
+        }catch (Exception e){
+            e.printStackTrace();
+            return success(null,"操作失败");
+        }
+    }
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkcarmetertime:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkCarMeterTime> list = meterWorkCarMeterTimeService.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("meterworkcarmetertime:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkCarMeterTime> list = meterWorkCarMeterTimeService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+
+}

src/main/java/com/steerinfo/meterwork/meterworkcarmetertime/mapper/MeterWorkCarMeterTimeMapper.java

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

src/main/java/com/steerinfo/meterwork/meterworkcarmetertime/mapper/MeterWorkCarMeterTimeMapper.xml

@@ -0,0 +1,419 @@
+<?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.meterworkcarmetertime.mapper.MeterWorkCarMeterTimeMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.meterwork.meterworkcarmetertime.model.MeterWorkCarMeterTime">
+    <id column="ACTUAL_FIRST_NO" jdbcType="VARCHAR" property="actualFirstNo" />
+    <result column="START_TIME" jdbcType="TIMESTAMP" property="startTime" />
+    <result column="METER_START_TIME" jdbcType="TIMESTAMP" property="meterStartTime" />
+    <result column="METER_END_TIME" jdbcType="TIMESTAMP" property="meterEndTime" />
+    <result column="END_TIME" jdbcType="TIMESTAMP" property="endTime" />
+    <result column="TOTAL_NUM" jdbcType="DECIMAL" property="totalNum" />
+    <result column="UP_NUM" jdbcType="DECIMAL" property="upNum" />
+    <result column="METER_NUM" jdbcType="DECIMAL" property="meterNum" />
+    <result column="DOWN_NUM" jdbcType="DECIMAL" property="downNum" />
+    <result column="VALUE_FLAG" jdbcType="VARCHAR" property="valueFlag" />
+    <result column="CREATE_MAN_NO" jdbcType="VARCHAR" property="createManNo" />
+    <result column="CREATE_MAN_NAME" jdbcType="VARCHAR" property="createManName" />
+    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
+  </resultMap>
+  <sql id="columns">
+    ACTUAL_FIRST_NO, START_TIME, METER_START_TIME, METER_END_TIME, END_TIME, TOTAL_NUM, 
+    UP_NUM, METER_NUM, DOWN_NUM, VALUE_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME
+  </sql>
+  <sql id="columns_alias">
+    t.ACTUAL_FIRST_NO, t.START_TIME, t.METER_START_TIME, t.METER_END_TIME, t.END_TIME, 
+    t.TOTAL_NUM, t.UP_NUM, t.METER_NUM, t.DOWN_NUM, t.VALUE_FLAG, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, 
+    t.CREATE_TIME
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_WORK_CAR_METER_TIME
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_WORK_CAR_METER_TIME t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="actualFirstNo != null and actualFirstNo != ''">
+        and ACTUAL_FIRST_NO = #{actualFirstNo}
+      </if>
+      <if test="startTime != null">
+        and TO_CHAR(START_TIME,'yyyy-MM-dd') = #{startTime}
+      </if>
+      <if test="meterStartTime != null">
+        and TO_CHAR(METER_START_TIME,'yyyy-MM-dd') = #{meterStartTime}
+      </if>
+      <if test="meterEndTime != null">
+        and TO_CHAR(METER_END_TIME,'yyyy-MM-dd') = #{meterEndTime}
+      </if>
+      <if test="endTime != null">
+        and TO_CHAR(END_TIME,'yyyy-MM-dd') = #{endTime}
+      </if>
+      <if test="totalNum != null">
+        and TOTAL_NUM = #{totalNum}
+      </if>
+      <if test="upNum != null">
+        and UP_NUM = #{upNum}
+      </if>
+      <if test="meterNum != null">
+        and METER_NUM = #{meterNum}
+      </if>
+      <if test="downNum != null">
+        and DOWN_NUM = #{downNum}
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG = #{valueFlag}
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO = #{createManNo}
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME = #{createManName}
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="actualFirstNo != null and actualFirstNo != ''">
+        and ACTUAL_FIRST_NO LIKE '%${actualFirstNo}%'
+      </if>
+      <if test="startTime != null">
+        and TO_CHAR(START_TIME,'yyyy-MM-dd') = #{startTime}
+      </if>
+      <if test="meterStartTime != null">
+        and TO_CHAR(METER_START_TIME,'yyyy-MM-dd') = #{meterStartTime}
+      </if>
+      <if test="meterEndTime != null">
+        and TO_CHAR(METER_END_TIME,'yyyy-MM-dd') = #{meterEndTime}
+      </if>
+      <if test="endTime != null">
+        and TO_CHAR(END_TIME,'yyyy-MM-dd') = #{endTime}
+      </if>
+      <if test="totalNum != null">
+        and TOTAL_NUM = #{totalNum}
+      </if>
+      <if test="upNum != null">
+        and UP_NUM = #{upNum}
+      </if>
+      <if test="meterNum != null">
+        and METER_NUM = #{meterNum}
+      </if>
+      <if test="downNum != null">
+        and DOWN_NUM = #{downNum}
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG LIKE '%${valueFlag}%'
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO LIKE '%${createManNo}%'
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME LIKE '%${createManName}%'
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_WORK_CAR_METER_TIME
+    where ACTUAL_FIRST_NO = #{actualFirstNo,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_WORK_CAR_METER_TIME
+    where 1!=1 
+      <if test="startTime != null">
+        or TO_CHAR(START_TIME,'yyyy-MM-dd') = '#{startTime}'
+      </if>
+      <if test="meterStartTime != null">
+        or TO_CHAR(METER_START_TIME,'yyyy-MM-dd') = '#{meterStartTime}'
+      </if>
+      <if test="meterEndTime != null">
+        or TO_CHAR(METER_END_TIME,'yyyy-MM-dd') = '#{meterEndTime}'
+      </if>
+      <if test="endTime != null">
+        or TO_CHAR(END_TIME,'yyyy-MM-dd') = '#{endTime}'
+      </if>
+      <if test="totalNum != null">
+        or TOTAL_NUM = #{totalNum}
+      </if>
+      <if test="upNum != null">
+        or UP_NUM = #{upNum}
+      </if>
+      <if test="meterNum != null">
+        or METER_NUM = #{meterNum}
+      </if>
+      <if test="downNum != null">
+        or DOWN_NUM = #{downNum}
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        or VALUE_FLAG = #{valueFlag}
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        or CREATE_MAN_NO = #{createManNo}
+      </if>
+      <if test="createManName != null and createManName != ''">
+        or CREATE_MAN_NAME = #{createManName}
+      </if>
+      <if test="createTime != null">
+        or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkcarmetertime.model.MeterWorkCarMeterTime">
+    insert into METER_WORK_CAR_METER_TIME (ACTUAL_FIRST_NO, START_TIME, METER_START_TIME, 
+      METER_END_TIME, END_TIME, TOTAL_NUM, 
+      UP_NUM, METER_NUM, DOWN_NUM, 
+      VALUE_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, 
+      CREATE_TIME)
+    values (#{actualFirstNo,jdbcType=VARCHAR}, #{startTime,jdbcType=TIMESTAMP}, #{meterStartTime,jdbcType=TIMESTAMP}, 
+      #{meterEndTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, #{totalNum,jdbcType=DECIMAL}, 
+      #{upNum,jdbcType=DECIMAL}, #{meterNum,jdbcType=DECIMAL}, #{downNum,jdbcType=DECIMAL}, 
+      #{valueFlag,jdbcType=VARCHAR}, #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkcarmetertime.model.MeterWorkCarMeterTime">
+    insert into METER_WORK_CAR_METER_TIME
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="actualFirstNo != null">
+        ACTUAL_FIRST_NO,
+      </if>
+      <if test="startTime != null">
+        START_TIME,
+      </if>
+      <if test="meterStartTime != null">
+        METER_START_TIME,
+      </if>
+      <if test="meterEndTime != null">
+        METER_END_TIME,
+      </if>
+      <if test="endTime != null">
+        END_TIME,
+      </if>
+      <if test="totalNum != null">
+        TOTAL_NUM,
+      </if>
+      <if test="upNum != null">
+        UP_NUM,
+      </if>
+      <if test="meterNum != null">
+        METER_NUM,
+      </if>
+      <if test="downNum != null">
+        DOWN_NUM,
+      </if>
+      <if test="valueFlag != null">
+        VALUE_FLAG,
+      </if>
+      <if test="createManNo != null">
+        CREATE_MAN_NO,
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME,
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="actualFirstNo != null">
+        #{actualFirstNo,jdbcType=VARCHAR},
+      </if>
+      <if test="startTime != null">
+        #{startTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="meterStartTime != null">
+        #{meterStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="meterEndTime != null">
+        #{meterEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="endTime != null">
+        #{endTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="totalNum != null">
+        #{totalNum,jdbcType=DECIMAL},
+      </if>
+      <if test="upNum != null">
+        #{upNum,jdbcType=DECIMAL},
+      </if>
+      <if test="meterNum != null">
+        #{meterNum,jdbcType=DECIMAL},
+      </if>
+      <if test="downNum != null">
+        #{downNum,jdbcType=DECIMAL},
+      </if>
+      <if test="valueFlag != null">
+        #{valueFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="createManNo != null">
+        #{createManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkcarmetertime.model.MeterWorkCarMeterTime">
+    update METER_WORK_CAR_METER_TIME
+    set START_TIME = #{startTime,jdbcType=TIMESTAMP},
+      METER_START_TIME = #{meterStartTime,jdbcType=TIMESTAMP},
+      METER_END_TIME = #{meterEndTime,jdbcType=TIMESTAMP},
+      END_TIME = #{endTime,jdbcType=TIMESTAMP},
+      TOTAL_NUM = #{totalNum,jdbcType=DECIMAL},
+      UP_NUM = #{upNum,jdbcType=DECIMAL},
+      METER_NUM = #{meterNum,jdbcType=DECIMAL},
+      DOWN_NUM = #{downNum,jdbcType=DECIMAL},
+      VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
+      CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
+      CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP}
+    where ACTUAL_FIRST_NO = #{actualFirstNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkcarmetertime.model.MeterWorkCarMeterTime">
+    update METER_WORK_CAR_METER_TIME
+    <set>
+      <if test="startTime != null">
+        START_TIME = #{startTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="meterStartTime != null">
+        METER_START_TIME = #{meterStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="meterEndTime != null">
+        METER_END_TIME = #{meterEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="endTime != null">
+        END_TIME = #{endTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="totalNum != null">
+        TOTAL_NUM = #{totalNum,jdbcType=DECIMAL},
+      </if>
+      <if test="upNum != null">
+        UP_NUM = #{upNum,jdbcType=DECIMAL},
+      </if>
+      <if test="meterNum != null">
+        METER_NUM = #{meterNum,jdbcType=DECIMAL},
+      </if>
+      <if test="downNum != null">
+        DOWN_NUM = #{downNum,jdbcType=DECIMAL},
+      </if>
+      <if test="valueFlag != null">
+        VALUE_FLAG = #{valueFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="createManNo != null">
+        CREATE_MAN_NO = #{createManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </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_METER_TIME 
+      (ACTUAL_FIRST_NO, 
+      START_TIME, METER_START_TIME, 
+      METER_END_TIME, END_TIME, TOTAL_NUM, 
+      UP_NUM, METER_NUM, DOWN_NUM, 
+      VALUE_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, 
+      CREATE_TIME)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.actualFirstNo,jdbcType=VARCHAR}, 
+      #{item.startTime,jdbcType=TIMESTAMP}, #{item.meterStartTime,jdbcType=TIMESTAMP}, 
+      #{item.meterEndTime,jdbcType=TIMESTAMP}, #{item.endTime,jdbcType=TIMESTAMP}, #{item.totalNum,jdbcType=DECIMAL}, 
+      #{item.upNum,jdbcType=DECIMAL}, #{item.meterNum,jdbcType=DECIMAL}, #{item.downNum,jdbcType=DECIMAL}, 
+      #{item.valueFlag,jdbcType=VARCHAR}, #{item.createManNo,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR}, 
+      #{item.createTime,jdbcType=TIMESTAMP} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_WORK_CAR_METER_TIME
+     set
+       ACTUAL_FIRST_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.actualFirstNo,jdbcType=VARCHAR}
+       </foreach>
+       ,START_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.startTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,METER_START_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.meterStartTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,METER_END_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.meterEndTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,END_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.endTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,TOTAL_NUM=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.totalNum,jdbcType=DECIMAL}
+       </foreach>
+       ,UP_NUM=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.upNum,jdbcType=DECIMAL}
+       </foreach>
+       ,METER_NUM=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.meterNum,jdbcType=DECIMAL}
+       </foreach>
+       ,DOWN_NUM=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.downNum,jdbcType=DECIMAL}
+       </foreach>
+       ,VALUE_FLAG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.valueFlag,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.createManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+     where ACTUAL_FIRST_NO in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.actualFirstNo,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_WORK_CAR_METER_TIME
+    where ACTUAL_FIRST_NO in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  
+</mapper>

src/main/java/com/steerinfo/meterwork/meterworkcarmetertime/model/MeterWorkCarMeterTime.java

@@ -0,0 +1,227 @@
+package com.steerinfo.meterwork.meterworkcarmetertime.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 MeterWorkCarMeterTime implements IBasePO<String> {
+    /**
+     * 汽车一次计量编号(ACTUAL_FIRST_NO,VARCHAR,55)
+     */
+    @ApiModelProperty(value="汽车一次计量编号",required=true)
+    private String actualFirstNo;
+
+    /**
+     * 上秤时间(START_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="上秤时间",required=false)
+    private Date startTime;
+
+    /**
+     * 计量开始时间(METER_START_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="计量开始时间",required=false)
+    private Date meterStartTime;
+
+    /**
+     * 计量结束时间(METER_END_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="计量结束时间",required=false)
+    private Date meterEndTime;
+
+    /**
+     * 下秤时间(END_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="下秤时间",required=false)
+    private Date endTime;
+
+    /**
+     * 总计量时间(TOTAL_NUM,DECIMAL,0)
+     */
+    @ApiModelProperty(value="总计量时间",required=false)
+    private Short totalNum;
+
+    /**
+     * 上秤到判稳计量时间(UP_NUM,DECIMAL,0)
+     */
+    @ApiModelProperty(value="上秤到判稳计量时间",required=false)
+    private Short upNum;
+
+    /**
+     * 判稳后程序计量时间(METER_NUM,DECIMAL,0)
+     */
+    @ApiModelProperty(value="判稳后程序计量时间",required=false)
+    private Short meterNum;
+
+    /**
+     * 判稳计量到下秤计量时间(DOWN_NUM,DECIMAL,0)
+     */
+    @ApiModelProperty(value="判稳计量到下秤计量时间",required=false)
+    private Short downNum;
+
+    /**
+     * 状态（1：有效；0：无效）(VALUE_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="状态（1：有效；0：无效）",required=false)
+    private String valueFlag;
+
+    /**
+     * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="创建人编号",required=false)
+    private String createManNo;
+
+    /**
+     * 创建人(CREATE_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="创建人",required=false)
+    private String createManName;
+
+    /**
+     * 创建时间(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="创建时间",required=false)
+    private Date createTime;
+
+    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 Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getMeterStartTime() {
+        return meterStartTime;
+    }
+
+    public void setMeterStartTime(Date meterStartTime) {
+        this.meterStartTime = meterStartTime;
+    }
+
+    public Date getMeterEndTime() {
+        return meterEndTime;
+    }
+
+    public void setMeterEndTime(Date meterEndTime) {
+        this.meterEndTime = meterEndTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public Short getTotalNum() {
+        return totalNum;
+    }
+
+    public void setTotalNum(Short totalNum) {
+        this.totalNum = totalNum;
+    }
+
+    public Short getUpNum() {
+        return upNum;
+    }
+
+    public void setUpNum(Short upNum) {
+        this.upNum = upNum;
+    }
+
+    public Short getMeterNum() {
+        return meterNum;
+    }
+
+    public void setMeterNum(Short meterNum) {
+        this.meterNum = meterNum;
+    }
+
+    public Short getDownNum() {
+        return downNum;
+    }
+
+    public void setDownNum(Short downNum) {
+        this.downNum = downNum;
+    }
+
+    public String getValueFlag() {
+        return valueFlag;
+    }
+
+    public void setValueFlag(String valueFlag) {
+        this.valueFlag = valueFlag == null ? null : valueFlag.trim();
+    }
+
+    public String getCreateManNo() {
+        return createManNo;
+    }
+
+    public void setCreateManNo(String createManNo) {
+        this.createManNo = createManNo == null ? null : createManNo.trim();
+    }
+
+    public String getCreateManName() {
+        return createManName;
+    }
+
+    public void setCreateManName(String createManName) {
+        this.createManName = createManName == null ? null : createManName.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    @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(", startTime=").append(startTime);
+        sb.append(", meterStartTime=").append(meterStartTime);
+        sb.append(", meterEndTime=").append(meterEndTime);
+        sb.append(", endTime=").append(endTime);
+        sb.append(", totalNum=").append(totalNum);
+        sb.append(", upNum=").append(upNum);
+        sb.append(", meterNum=").append(meterNum);
+        sb.append(", downNum=").append(downNum);
+        sb.append(", valueFlag=").append(valueFlag);
+        sb.append(", createManNo=").append(createManNo);
+        sb.append(", createManName=").append(createManName);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkcarmetertime/service/IMeterWorkCarMeterTimeService.java

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

src/main/java/com/steerinfo/meterwork/meterworkcarmetertime/service/impl/MeterWorkCarMeterTimeServiceImpl.java

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

src/main/java/com/steerinfo/meterwork/meterworkcarnoidentify/controller/MeterWorkCarnoIdentifyController.java

@@ -68,9 +68,9 @@ public class MeterWorkCarnoIdentifyController extends BaseRESTfulController {
     @ApiImplicitParam(name = "meterWorkCarnoIdentify", value = "详细实体meterWorkCarnoIdentify", required = true, dataType = "MeterWorkCarnoIdentify")
     //@RequiresPermissions("meterworkcarnoidentify:create")
     @PostMapping(value = "/")
-    public RESTfulResult add(@ModelAttribute MeterWorkCarnoIdentify model){
+    public RESTfulResult add(@RequestBody MeterWorkCarnoIdentify model){
         MeterWorkCarnoIdentify meterWorkCarnoIdentify = meterWorkCarnoIdentifyService.add(model);
-        return success(meterWorkCarnoIdentify);
+        return success("1");
     }
 
     @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/controller/MeterWorkRailwayActFirstController.java

@@ -106,16 +106,12 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "获取列表", notes = "分页模糊查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
-    })
+    @ApiOperation(value = "获取列表", notes = "不分页模糊查询")
     //@RequiresPermissions("meterworkrailwayactfirst:view")
     @PostMapping(value = "/likeByDesc")
-    public RESTfulResult likeByDesc(@RequestBody HashMap parmas, Integer pageNum, Integer pageSize) {
+    public RESTfulResult likeByDesc(@RequestBody HashMap parmas) {
         try {
-            PageList<MeterWorkRailwayActFirst> list = meterWorkRailwayActFirstService.likeByDesc(parmas, pageNum, pageSize);
+            List<MeterWorkRailwayActFirst> list = meterWorkRailwayActFirstService.likeByDescNoPage(parmas);
             return success(list);
         } catch (Exception ex) {
             ex.printStackTrace();

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/IMeterWorkRailwayActFirstService.java

@@ -63,6 +63,7 @@ public interface IMeterWorkRailwayActFirstService extends IBaseService<MeterWork
     PageList<MeterWorkRailwayActFirst> selectTa(Map<String, Object> parmas, Integer pageNum, Integer pageSize);
 
     PageList<MeterWorkRailwayActFirst> likeByDesc(HashMap<String, Object> parameters, Integer pageNum, Integer pageSize);
+    List<MeterWorkRailwayActFirst> likeByDescNoPage(HashMap<String, Object> parameters);
     List<MeterWorkRailwayActFirst> webByLikeDesc(HashMap<String, Object> parameters);
 
     List<String> distinctRailwayNo(HashMap<String, Object> param);

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

@@ -611,6 +611,12 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         return pageInfo;
     }
 
+    @Override
+    public List<MeterWorkRailwayActFirst> likeByDescNoPage(HashMap<String, Object> parameters) {
+        List<MeterWorkRailwayActFirst> rows = meterWorkRailwayActFirstMapper.likeByDesc(parameters);
+        return rows;
+    }
+
     @Override
     public List<MeterWorkRailwayActFirst> webByLikeDesc(HashMap<String, Object> parameters) {
         String[] lcNoTemp = parameters.get("lcNoTemp") == null? "".split(",") :parameters.get("lcNoTemp").toString().split(",");
@@ -7368,6 +7374,19 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
                         count++;
                     }
+                    MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+                    logModel.setId(PublicMethod.IdCreate(2));
+                    logModel.setCreateManNo(userId);
+                    logModel.setCreateManName(userName);
+                    logModel.setCreateTime(new Date());
+                    logModel.setOperationPage("C#端-动轨数据维护");
+                    logModel.setOperationFunction("AI标识皮结净");
+                    logModel.setOperationId(grossModel.getActualFirstNo());
+                    logModel.setOperationPredictionNo(grossModel.getPredictionNo());
+                    logModel.setOperationCarnNo(grossModel.getRailwayNo());
+                    logModel.setOperationBeforeFix(receivedModel.toString());
+                    logModel.setOperationAfterFix(grossModel.toString());
+                    meterBaseOperationLogMapper.insertSelective(logModel);
                 }else {
                     carList.add(receivedModel.getRailwayNo());
                 }
@@ -7611,6 +7630,20 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
                         count++;
                     }
+
+                    MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+                    logModel.setId(PublicMethod.IdCreate(2));
+                    logModel.setCreateManNo(userId);
+                    logModel.setCreateManName(userName);
+                    logModel.setCreateTime(new Date());
+                    logModel.setOperationPage("C#端-动轨数据维护");
+                    logModel.setOperationFunction("规则皮结净");
+                    logModel.setOperationId(grossModel.getActualFirstNo());
+                    logModel.setOperationPredictionNo(grossModel.getPredictionNo());
+                    logModel.setOperationCarnNo(grossModel.getRailwayNo());
+                    logModel.setOperationBeforeFix(receivedModel.toString());
+                    logModel.setOperationAfterFix(grossModel.toString());
+                    meterBaseOperationLogMapper.insertSelective(logModel);
                 }else {
                     carList.add(receivedModel.getRailwayNo());
                 }
@@ -7892,7 +7925,19 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
                         count++;
                     }
-
+                    MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+                    logModel.setId(PublicMethod.IdCreate(2));
+                    logModel.setCreateManNo(userId);
+                    logModel.setCreateManName(userName);
+                    logModel.setCreateTime(new Date());
+                    logModel.setOperationPage("C#端-动轨数据维护");
+                    logModel.setOperationFunction("回空皮结净");
+                    logModel.setOperationId(grossModel.getActualFirstNo() + "," + tareModel.getActualFirstNo());
+                    logModel.setOperationPredictionNo(grossModel.getPredictionNo());
+                    logModel.setOperationCarnNo(grossModel.getRailwayNo());
+                    logModel.setOperationBeforeFix(receivedModel.toString());
+                    logModel.setOperationAfterFix(grossModel.toString());
+                    meterBaseOperationLogMapper.insertSelective(logModel);
                 }else {
                     carList.add(receivedModel.getRailwayNo());
                 }
@@ -8199,7 +8244,19 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
                         count++;
                     }
-
+                    MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+                    logModel.setId(PublicMethod.IdCreate(2));
+                    logModel.setCreateManNo(userId);
+                    logModel.setCreateManName(userName);
+                    logModel.setCreateTime(new Date());
+                    logModel.setOperationPage("C#端-动轨数据维护");
+                    logModel.setOperationFunction("从表回空皮结净");
+                    logModel.setOperationId(grossModel.getActualFirstNo() + "," + tareModel.getActualFirstNo());
+                    logModel.setOperationPredictionNo(grossModel.getPredictionNo());
+                    logModel.setOperationCarnNo(grossModel.getRailwayNo());
+                    logModel.setOperationBeforeFix(grossReceived.toString());
+                    logModel.setOperationAfterFix(grossModel.toString());
+                    meterBaseOperationLogMapper.insertSelective(logModel);
                 }else {
                     carList.add(received.getRailwayNo());
                 }
@@ -8444,7 +8501,19 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
                         count++;
                     }
-
+                    MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+                    logModel.setId(PublicMethod.IdCreate(2));
+                    logModel.setCreateManNo(userId);
+                    logModel.setCreateManName(userName);
+                    logModel.setCreateTime(new Date());
+                    logModel.setOperationPage("C#端-动轨数据维护");
+                    logModel.setOperationFunction("从表回空皮结净");
+                    logModel.setOperationId(grossModel.getActualFirstNo());
+                    logModel.setOperationPredictionNo(grossModel.getPredictionNo());
+                    logModel.setOperationCarnNo(grossModel.getRailwayNo());
+                    logModel.setOperationBeforeFix(receivedModel.toString());
+                    logModel.setOperationAfterFix(grossModel.toString());
+                    meterBaseOperationLogMapper.insertSelective(logModel);
                 }else {
                     carList.add(receivedModel.getRailwayNo());
                 }

src/main/java/com/steerinfo/meterwork/meterworkrailwayrecmain/mapper/MeterWorkRailwayRecMainMapper.xml

@@ -13,7 +13,7 @@
     <result column="IS_DISPOSE" jdbcType="VARCHAR" property="isDispose" />
   </resultMap>
   <sql id="columns">
-    ACTUAL_NO, CREATE_TIME, CARRIAGE_NUM, BASE_SPOT_NO, BASE_SPOT_NAME, VIDEO_NAME, SOUND_NAME, 
+    ACTUAL_NO, CREATE_TIME, CARRIAGE_NUM, BASE_SPOT_NO, BASE_SPOT_NAME, VIDEO_NAME, SOUND_NAME,
     TRACK_WAY, IS_DISPOSE
   </sql>
   <sql id="columns_alias">
@@ -27,7 +27,7 @@
     SELECT <include refid="columns_alias" /> FROM METER_WORK_RAILWAY_REC_MAIN t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="actualNo != null and actualNo != ''">
         and ACTUAL_NO = #{actualNo}
       </if>
@@ -58,7 +58,7 @@
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="actualNo != null and actualNo != ''">
         and ACTUAL_NO LIKE '%${actualNo}%'
       </if>
@@ -94,7 +94,7 @@
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from METER_WORK_RAILWAY_REC_MAIN
-    where 1!=1 
+    where 1!=1
       <if test="createTime != null">
         or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
       </if>
@@ -121,12 +121,12 @@
       </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkrailwayrecmain.model.MeterWorkRailwayRecMain">
-    insert into METER_WORK_RAILWAY_REC_MAIN (ACTUAL_NO, CREATE_TIME, CARRIAGE_NUM, 
-      BASE_SPOT_NO, BASE_SPOT_NAME, VIDEO_NAME, 
+    insert into METER_WORK_RAILWAY_REC_MAIN (ACTUAL_NO, CREATE_TIME, CARRIAGE_NUM,
+      BASE_SPOT_NO, BASE_SPOT_NAME, VIDEO_NAME,
       SOUND_NAME, TRACK_WAY, IS_DISPOSE
       )
-    values (#{actualNo,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{carriageNum,jdbcType=DECIMAL}, 
-      #{baseSpotNo,jdbcType=VARCHAR}, #{baseSpotName,jdbcType=VARCHAR}, #{videoName,jdbcType=VARCHAR}, 
+    values (#{actualNo,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{carriageNum,jdbcType=DECIMAL},
+      #{baseSpotNo,jdbcType=VARCHAR}, #{baseSpotName,jdbcType=VARCHAR}, #{videoName,jdbcType=VARCHAR},
       #{soundName,jdbcType=VARCHAR}, #{trackWay,jdbcType=VARCHAR}, #{isDispose,jdbcType=VARCHAR}
       )
   </insert>
@@ -246,17 +246,17 @@
     <include refid="whereLike" />
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into METER_WORK_RAILWAY_REC_MAIN 
-      (ACTUAL_NO, 
-      CREATE_TIME, CARRIAGE_NUM, BASE_SPOT_NO, 
-      BASE_SPOT_NAME, VIDEO_NAME, SOUND_NAME, 
+    insert into METER_WORK_RAILWAY_REC_MAIN
+      (ACTUAL_NO,
+      CREATE_TIME, CARRIAGE_NUM, BASE_SPOT_NO,
+      BASE_SPOT_NAME, VIDEO_NAME, SOUND_NAME,
       TRACK_WAY, IS_DISPOSE)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.actualNo,jdbcType=VARCHAR}, 
-      #{item.createTime,jdbcType=TIMESTAMP}, #{item.carriageNum,jdbcType=DECIMAL}, #{item.baseSpotNo,jdbcType=VARCHAR}, 
-      #{item.baseSpotName,jdbcType=VARCHAR}, #{item.videoName,jdbcType=VARCHAR}, #{item.soundName,jdbcType=VARCHAR}, 
-      #{item.trackWay,jdbcType=VARCHAR}, #{item.isDispose,jdbcType=VARCHAR} from dual  
+    ( <foreach collection="list" item="item" separator="union all">
+   select
+      #{item.actualNo,jdbcType=VARCHAR},
+      #{item.createTime,jdbcType=TIMESTAMP}, #{item.carriageNum,jdbcType=DECIMAL}, #{item.baseSpotNo,jdbcType=VARCHAR},
+      #{item.baseSpotName,jdbcType=VARCHAR}, #{item.videoName,jdbcType=VARCHAR}, #{item.soundName,jdbcType=VARCHAR},
+      #{item.trackWay,jdbcType=VARCHAR}, #{item.isDispose,jdbcType=VARCHAR} from dual
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -298,14 +298,14 @@
        <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.isDispose,jdbcType=VARCHAR}
        </foreach>
-     where ACTUAL_NO in 
+     where ACTUAL_NO in
      <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
     #{item.actualNo,jdbcType=VARCHAR}
-     </foreach> 
+     </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from METER_WORK_RAILWAY_REC_MAIN
-    where ACTUAL_NO in 
+    where ACTUAL_NO in
     <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
     </foreach>
@@ -353,10 +353,19 @@
       <if test="isDispose != null and isDispose != ''">
         and IS_DISPOSE LIKE '%${isDispose}%'
       </if>
+
+      <if test="railway_no != null and railway_no != ''">
+        and SOUND_NAME in
+        (
+            select t2.RAILWAY_WORK_NO from METER_WORK_RAILWAY_RECEIVED t2
+            where t2.RAILWAY_NO LIKE '%${railway_no}%'
+            and t2.railway_work_no=SOUND_NAME
+        )
+      </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>
     order by create_time desc
   </select>
-</mapper>
+</mapper>