'提交'

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

@@ -170,6 +170,24 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
+    @ApiOperation(value = "web端分页降序获取列表", notes = "分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    @PostMapping(value = "/likeDesc/")
+    public RESTfulResult likeDescPost(@RequestBody(required = false) HashMap params) {
+        try {
+            PageList<MeterWorkCarActual> list = meterWorkCarActualService.likeByDesc(params,
+                    Integer.parseInt(params.get("pageNum").toString()),
+                    Integer.parseInt(params.get("pageSize").toString()));
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "获取列表", notes = "不分页分页模糊查询")
     @PostMapping(value = "/likeByValueFlag/")
     public RESTfulResult likeByValueFlag(@RequestBody HashMap params) {

src/main/java/com/steerinfo/meterwork/meterworkcaractual/mapper/MeterWorkCarActualMapper.xml

@@ -4232,6 +4232,7 @@
     <if test="groupId != null and groupId != ''">
       and NET_SPOT3_NO in (SELECT METER_BASE_GROUP_SPOT.SPOT_ID FROM METER_BASE_GROUP_SPOT WHERE METER_BASE_GROUP_SPOT.GROUP_ID = #{groupId})
     </if>
+
     order by net_time desc
   </select>
 

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/controller/MeterWorkCarActualFirstController.java

@@ -117,6 +117,26 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "获取列表", notes = "分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkcaractualfirst:view")
+    @PostMapping(value = "/likeByDesc/")
+    public RESTfulResult likePost(@RequestBody HashMap parmas) {
+        try {
+
+            PageList<MeterWorkCarActualFirst> list = meterWorkCarActualFirstService.likeByDesc(parmas,
+                    Integer.parseInt(parmas.get("pageNum").toString()),
+                    Integer.parseInt(parmas.get("pageSize").toString()));
+            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/meterwork/meterworkrailwayactfirst/controller/MeterWorkRailwayActFirstController.java

@@ -148,6 +148,24 @@ 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("meterworkrailwayactfirst:view")
+    @PostMapping(value = "/likeByDesc/")
+    public RESTfulResult likeDescPost(@RequestBody(required = false) HashMap parmas) {
+        try {
+            PageList<MeterWorkRailwayActFirst> list = meterWorkRailwayActFirstService.likeByDesc(parmas,
+                    Integer.parseInt(parmas.get("pageNum").toString()),Integer.parseInt(parmas.get("pageSize").toString()));
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "C#动轨倒序获取列表", notes = "不分页模糊查询")
     //@RequiresPermissions("meterworkrailwayactfirst:view")
     @PostMapping(value = "/noPage")
@@ -1667,6 +1685,23 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
+    @ApiOperation(value = "铁水吊钩秤web端--降序获取列表", notes = "分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    @PostMapping(value = "/hookFirstPageList/")
+    public RESTfulResult hookFirstPageListPost(@RequestBody(required = false) HashMap parmas) {
+        try {
+            PageList<MeterWorkRailwayActFirst> list = meterWorkRailwayActFirstService.hookFirstPageList(parmas,
+                    Integer.parseInt(parmas.get("pageNum").toString()),Integer.parseInt(parmas.get("pageSize").toString()));
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "计量统计明细-获取列表", notes = "不分页模糊查询")
     //@RequiresPermissions("meterworkcaractualfirst:view")
     @PostMapping(value = "/carFirstDataDetail")

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

@@ -145,6 +145,24 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "获取列表", notes = "分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkrailwayactual:view")
+    @PostMapping(value = "/likeByDesc/")
+    public RESTfulResult likeByDesc01Post(@RequestBody(required = false) HashMap parmas) {
+        try {
+            PageList<MeterWorkRailwayActual> list = meterWorkRailwayActualService.likeByDesc(parmas,
+                    Integer.parseInt(parmas.get("pageNum").toString()),Integer.parseInt(parmas.get("pageSize").toString()));
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "轨道衡打印配置获取轨道衡打印数据", notes = "分页模糊查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
@@ -1271,6 +1289,24 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "铁水吊钩秤web端--降序获取列表", notes = "web端分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkrailwayactual:view")
+    @PostMapping(value = "/hookActualPageList/")
+    public RESTfulResult hookActualPageListPost(@RequestBody(required = false) HashMap parmas) {
+        try {
+            PageList<MeterWorkRailwayActual> list = meterWorkRailwayActualService.hookActualPageList(parmas,
+                    Integer.parseInt(parmas.get("pageNum").toString()),Integer.parseInt(parmas.get("pageSize").toString()));
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "铁水吊钩秤web端--根据实绩id获取一次计量信息和委托信息", notes = "根据实绩id获取一次计量信息和委托信息")
     @PostMapping(value = "/hookFirstAndEntrustById")
     public RESTfulResult hookFirstAndEntrustById(@RequestBody HashMap params) {

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/mapper/MeterWorkRailwayActualMapper.xml

@@ -4572,6 +4572,12 @@
       <if test="flag != null and flag !=''">
         and ( lc_no is null or lc_no = '无列次' )
       </if>
+      <if test="baseSpotNames != null and baseSpotNames.size() != 0">
+        and NET_SPOT3_NAME in
+        <foreach collection="baseSpotNames" item="id" open="(" close=")" separator=",">
+          #{id}
+        </foreach>
+      </if>
     </where>
     and value_flag != '0'
     order by net_time desc

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/mapper/MeterWorkRailwayReceivedMapper.xml

@@ -81,37 +81,37 @@
     <result column="CHECK_FLAG2" jdbcType="VARCHAR" property="checkFlag2" />
   </resultMap>
   <sql id="columns">
-    ACTUAL_FIRST_NO, PREDICTION_NO, NOTICE_NO, RAILWAY_NO, RAILWAY_CARRIAGE_NO, RAILWAY_WORK_NO, 
-    RAILWAY_SPEED, RAILWAY_MODEL, MATTER_NO, MATTER_NAME, CONTRACT_NO, BATCH_NO, CUSTOMER_SUPPLIER_NO, 
-    CUSTOMER_SUPPLIER_NAME, FORWARDING_UNIT_NO, FORWARDING_UNIT_NAME, RECEIVING_UINT_NO, 
-    RECEIVING_UINT_NAME, MATERIAL_NO, MATERIAL_NAME, SPEC_NO, SPEC_NAME, SHIPMENT_GROSS_WEIGHT, 
-    SHIPMENT_NET_WEIGHT, SHIPMENT_NUM, BIND_CARD_NO, LOAD_POINT_NO, LOAD_POINT_NAME, 
-    SAMPLE_NO, SAMPLE_VOUCHER, CARRIER_UNIT_NO, CARRIER_UNIT_NAME, PREDICTION_TYPE, PREDICTION_COMBINATION, 
-    METER_TYPE_NO, METER_TYPE_NAME, METER_PROCESS_NO, METER_PROCESS_EDITION_NO, METER_WEIGHT, 
-    WEIGHT_TYPE, METER_SORT_WEIGHT, METER_BALANCE_WEIGHT, CREATE_MAN_NO, CREATE_MAN_NAME, 
-    CREATE_TIME, BASE_SPOT_NO, BASE_SPOT_NAME, METER_CLASS, METER_GROUP, MEMO, VALUE_FLAG, 
-    UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, CHECK_FLAG, CHECK_MAN_NO, CHECK_MAN_NAME, 
-    CHECK_TIME, METER_MODE, RAILWAY_TYPE_NO, RAILWAY_TYPE_NAME, IS_CHEMICAL, LIMIT_WEIGHT, 
-    RAILWAY_MODEL_NO, RAILWAY_MODEL_NAME, IS_AUTO_OPERATION, CHECK_MEMO, CHECK_MAN1_NO, 
-    CHECK_MAN1_NAME, CHECK_TIME1, CHECK_MEMO1, CHECK_MAN2_NO, CHECK_MAN2_NAME, CHECK_TIME2, 
+    ACTUAL_FIRST_NO, PREDICTION_NO, NOTICE_NO, RAILWAY_NO, RAILWAY_CARRIAGE_NO, RAILWAY_WORK_NO,
+    RAILWAY_SPEED, RAILWAY_MODEL, MATTER_NO, MATTER_NAME, CONTRACT_NO, BATCH_NO, CUSTOMER_SUPPLIER_NO,
+    CUSTOMER_SUPPLIER_NAME, FORWARDING_UNIT_NO, FORWARDING_UNIT_NAME, RECEIVING_UINT_NO,
+    RECEIVING_UINT_NAME, MATERIAL_NO, MATERIAL_NAME, SPEC_NO, SPEC_NAME, SHIPMENT_GROSS_WEIGHT,
+    SHIPMENT_NET_WEIGHT, SHIPMENT_NUM, BIND_CARD_NO, LOAD_POINT_NO, LOAD_POINT_NAME,
+    SAMPLE_NO, SAMPLE_VOUCHER, CARRIER_UNIT_NO, CARRIER_UNIT_NAME, PREDICTION_TYPE, PREDICTION_COMBINATION,
+    METER_TYPE_NO, METER_TYPE_NAME, METER_PROCESS_NO, METER_PROCESS_EDITION_NO, METER_WEIGHT,
+    WEIGHT_TYPE, METER_SORT_WEIGHT, METER_BALANCE_WEIGHT, CREATE_MAN_NO, CREATE_MAN_NAME,
+    CREATE_TIME, BASE_SPOT_NO, BASE_SPOT_NAME, METER_CLASS, METER_GROUP, MEMO, VALUE_FLAG,
+    UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, CHECK_FLAG, CHECK_MAN_NO, CHECK_MAN_NAME,
+    CHECK_TIME, METER_MODE, RAILWAY_TYPE_NO, RAILWAY_TYPE_NAME, IS_CHEMICAL, LIMIT_WEIGHT,
+    RAILWAY_MODEL_NO, RAILWAY_MODEL_NAME, IS_AUTO_OPERATION, CHECK_MEMO, CHECK_MAN1_NO,
+    CHECK_MAN1_NAME, CHECK_TIME1, CHECK_MEMO1, CHECK_MAN2_NO, CHECK_MAN2_NAME, CHECK_TIME2,
     CHECK_MEMO2, CHECK_FLAG1, CHECK_FLAG2
   </sql>
   <sql id="columns_alias">
-    t.ACTUAL_FIRST_NO, t.PREDICTION_NO, t.NOTICE_NO, t.RAILWAY_NO, t.RAILWAY_CARRIAGE_NO, 
-    t.RAILWAY_WORK_NO, t.RAILWAY_SPEED, t.RAILWAY_MODEL, t.MATTER_NO, t.MATTER_NAME, 
-    t.CONTRACT_NO, t.BATCH_NO, t.CUSTOMER_SUPPLIER_NO, t.CUSTOMER_SUPPLIER_NAME, t.FORWARDING_UNIT_NO, 
-    t.FORWARDING_UNIT_NAME, t.RECEIVING_UINT_NO, t.RECEIVING_UINT_NAME, t.MATERIAL_NO, 
-    t.MATERIAL_NAME, t.SPEC_NO, t.SPEC_NAME, t.SHIPMENT_GROSS_WEIGHT, t.SHIPMENT_NET_WEIGHT, 
-    t.SHIPMENT_NUM, t.BIND_CARD_NO, t.LOAD_POINT_NO, t.LOAD_POINT_NAME, t.SAMPLE_NO, 
-    t.SAMPLE_VOUCHER, t.CARRIER_UNIT_NO, t.CARRIER_UNIT_NAME, t.PREDICTION_TYPE, t.PREDICTION_COMBINATION, 
-    t.METER_TYPE_NO, t.METER_TYPE_NAME, t.METER_PROCESS_NO, t.METER_PROCESS_EDITION_NO, 
-    t.METER_WEIGHT, t.WEIGHT_TYPE, t.METER_SORT_WEIGHT, t.METER_BALANCE_WEIGHT, t.CREATE_MAN_NO, 
-    t.CREATE_MAN_NAME, t.CREATE_TIME, t.BASE_SPOT_NO, t.BASE_SPOT_NAME, t.METER_CLASS, 
-    t.METER_GROUP, t.MEMO, t.VALUE_FLAG, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME, 
-    t.CHECK_FLAG, t.CHECK_MAN_NO, t.CHECK_MAN_NAME, t.CHECK_TIME, t.METER_MODE, t.RAILWAY_TYPE_NO, 
-    t.RAILWAY_TYPE_NAME, t.IS_CHEMICAL, t.LIMIT_WEIGHT, t.RAILWAY_MODEL_NO, t.RAILWAY_MODEL_NAME, 
-    t.IS_AUTO_OPERATION, t.CHECK_MEMO, t.CHECK_MAN1_NO, t.CHECK_MAN1_NAME, t.CHECK_TIME1, 
-    t.CHECK_MEMO1, t.CHECK_MAN2_NO, t.CHECK_MAN2_NAME, t.CHECK_TIME2, t.CHECK_MEMO2, 
+    t.ACTUAL_FIRST_NO, t.PREDICTION_NO, t.NOTICE_NO, t.RAILWAY_NO, t.RAILWAY_CARRIAGE_NO,
+    t.RAILWAY_WORK_NO, t.RAILWAY_SPEED, t.RAILWAY_MODEL, t.MATTER_NO, t.MATTER_NAME,
+    t.CONTRACT_NO, t.BATCH_NO, t.CUSTOMER_SUPPLIER_NO, t.CUSTOMER_SUPPLIER_NAME, t.FORWARDING_UNIT_NO,
+    t.FORWARDING_UNIT_NAME, t.RECEIVING_UINT_NO, t.RECEIVING_UINT_NAME, t.MATERIAL_NO,
+    t.MATERIAL_NAME, t.SPEC_NO, t.SPEC_NAME, t.SHIPMENT_GROSS_WEIGHT, t.SHIPMENT_NET_WEIGHT,
+    t.SHIPMENT_NUM, t.BIND_CARD_NO, t.LOAD_POINT_NO, t.LOAD_POINT_NAME, t.SAMPLE_NO,
+    t.SAMPLE_VOUCHER, t.CARRIER_UNIT_NO, t.CARRIER_UNIT_NAME, t.PREDICTION_TYPE, t.PREDICTION_COMBINATION,
+    t.METER_TYPE_NO, t.METER_TYPE_NAME, t.METER_PROCESS_NO, t.METER_PROCESS_EDITION_NO,
+    t.METER_WEIGHT, t.WEIGHT_TYPE, t.METER_SORT_WEIGHT, t.METER_BALANCE_WEIGHT, t.CREATE_MAN_NO,
+    t.CREATE_MAN_NAME, t.CREATE_TIME, t.BASE_SPOT_NO, t.BASE_SPOT_NAME, t.METER_CLASS,
+    t.METER_GROUP, t.MEMO, t.VALUE_FLAG, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME,
+    t.CHECK_FLAG, t.CHECK_MAN_NO, t.CHECK_MAN_NAME, t.CHECK_TIME, t.METER_MODE, t.RAILWAY_TYPE_NO,
+    t.RAILWAY_TYPE_NAME, t.IS_CHEMICAL, t.LIMIT_WEIGHT, t.RAILWAY_MODEL_NO, t.RAILWAY_MODEL_NAME,
+    t.IS_AUTO_OPERATION, t.CHECK_MEMO, t.CHECK_MAN1_NO, t.CHECK_MAN1_NAME, t.CHECK_TIME1,
+    t.CHECK_MEMO1, t.CHECK_MAN2_NO, t.CHECK_MAN2_NAME, t.CHECK_TIME2, t.CHECK_MEMO2,
     t.CHECK_FLAG1, t.CHECK_FLAG2
   </sql>
   <sql id="select">
@@ -121,7 +121,7 @@
     SELECT <include refid="columns_alias" /> FROM METER_WORK_RAILWAY_RECEIVED t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="actualFirstNo != null and actualFirstNo != ''">
         and ACTUAL_FIRST_NO = #{actualFirstNo}
       </if>
@@ -356,7 +356,7 @@
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="actualFirstNo != null and actualFirstNo != ''">
         and ACTUAL_FIRST_NO LIKE '%${actualFirstNo}%'
       </if>
@@ -596,7 +596,7 @@
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from METER_WORK_RAILWAY_RECEIVED
-    where 1!=1 
+    where 1!=1
       <if test="predictionNo != null and predictionNo != ''">
         or PREDICTION_NO = #{predictionNo}
       </if>
@@ -827,59 +827,59 @@
       </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkrailwayreceived.model.MeterWorkRailwayReceived">
-    insert into METER_WORK_RAILWAY_RECEIVED (ACTUAL_FIRST_NO, PREDICTION_NO, NOTICE_NO, 
-      RAILWAY_NO, RAILWAY_CARRIAGE_NO, RAILWAY_WORK_NO, 
-      RAILWAY_SPEED, RAILWAY_MODEL, MATTER_NO, 
-      MATTER_NAME, CONTRACT_NO, BATCH_NO, 
-      CUSTOMER_SUPPLIER_NO, CUSTOMER_SUPPLIER_NAME, 
-      FORWARDING_UNIT_NO, FORWARDING_UNIT_NAME, RECEIVING_UINT_NO, 
-      RECEIVING_UINT_NAME, MATERIAL_NO, MATERIAL_NAME, 
-      SPEC_NO, SPEC_NAME, SHIPMENT_GROSS_WEIGHT, 
-      SHIPMENT_NET_WEIGHT, SHIPMENT_NUM, BIND_CARD_NO, 
-      LOAD_POINT_NO, LOAD_POINT_NAME, SAMPLE_NO, 
-      SAMPLE_VOUCHER, CARRIER_UNIT_NO, CARRIER_UNIT_NAME, 
-      PREDICTION_TYPE, PREDICTION_COMBINATION, 
-      METER_TYPE_NO, METER_TYPE_NAME, METER_PROCESS_NO, 
-      METER_PROCESS_EDITION_NO, METER_WEIGHT, WEIGHT_TYPE, 
-      METER_SORT_WEIGHT, METER_BALANCE_WEIGHT, CREATE_MAN_NO, 
-      CREATE_MAN_NAME, CREATE_TIME, BASE_SPOT_NO, 
-      BASE_SPOT_NAME, METER_CLASS, METER_GROUP, 
-      MEMO, VALUE_FLAG, UPDATE_MAN_NO, 
-      UPDATE_MAN_NAME, UPDATE_TIME, CHECK_FLAG, 
-      CHECK_MAN_NO, CHECK_MAN_NAME, CHECK_TIME, 
-      METER_MODE, RAILWAY_TYPE_NO, RAILWAY_TYPE_NAME, 
-      IS_CHEMICAL, LIMIT_WEIGHT, RAILWAY_MODEL_NO, 
-      RAILWAY_MODEL_NAME, IS_AUTO_OPERATION, CHECK_MEMO, 
-      CHECK_MAN1_NO, CHECK_MAN1_NAME, CHECK_TIME1, 
-      CHECK_MEMO1, CHECK_MAN2_NO, CHECK_MAN2_NAME, 
-      CHECK_TIME2, CHECK_MEMO2, CHECK_FLAG1, 
+    insert into METER_WORK_RAILWAY_RECEIVED (ACTUAL_FIRST_NO, PREDICTION_NO, NOTICE_NO,
+      RAILWAY_NO, RAILWAY_CARRIAGE_NO, RAILWAY_WORK_NO,
+      RAILWAY_SPEED, RAILWAY_MODEL, MATTER_NO,
+      MATTER_NAME, CONTRACT_NO, BATCH_NO,
+      CUSTOMER_SUPPLIER_NO, CUSTOMER_SUPPLIER_NAME,
+      FORWARDING_UNIT_NO, FORWARDING_UNIT_NAME, RECEIVING_UINT_NO,
+      RECEIVING_UINT_NAME, MATERIAL_NO, MATERIAL_NAME,
+      SPEC_NO, SPEC_NAME, SHIPMENT_GROSS_WEIGHT,
+      SHIPMENT_NET_WEIGHT, SHIPMENT_NUM, BIND_CARD_NO,
+      LOAD_POINT_NO, LOAD_POINT_NAME, SAMPLE_NO,
+      SAMPLE_VOUCHER, CARRIER_UNIT_NO, CARRIER_UNIT_NAME,
+      PREDICTION_TYPE, PREDICTION_COMBINATION,
+      METER_TYPE_NO, METER_TYPE_NAME, METER_PROCESS_NO,
+      METER_PROCESS_EDITION_NO, METER_WEIGHT, WEIGHT_TYPE,
+      METER_SORT_WEIGHT, METER_BALANCE_WEIGHT, CREATE_MAN_NO,
+      CREATE_MAN_NAME, CREATE_TIME, BASE_SPOT_NO,
+      BASE_SPOT_NAME, METER_CLASS, METER_GROUP,
+      MEMO, VALUE_FLAG, UPDATE_MAN_NO,
+      UPDATE_MAN_NAME, UPDATE_TIME, CHECK_FLAG,
+      CHECK_MAN_NO, CHECK_MAN_NAME, CHECK_TIME,
+      METER_MODE, RAILWAY_TYPE_NO, RAILWAY_TYPE_NAME,
+      IS_CHEMICAL, LIMIT_WEIGHT, RAILWAY_MODEL_NO,
+      RAILWAY_MODEL_NAME, IS_AUTO_OPERATION, CHECK_MEMO,
+      CHECK_MAN1_NO, CHECK_MAN1_NAME, CHECK_TIME1,
+      CHECK_MEMO1, CHECK_MAN2_NO, CHECK_MAN2_NAME,
+      CHECK_TIME2, CHECK_MEMO2, CHECK_FLAG1,
       CHECK_FLAG2)
-    values (#{actualFirstNo,jdbcType=VARCHAR}, #{predictionNo,jdbcType=VARCHAR}, #{noticeNo,jdbcType=VARCHAR}, 
-      #{railwayNo,jdbcType=VARCHAR}, #{railwayCarriageNo,jdbcType=VARCHAR}, #{railwayWorkNo,jdbcType=VARCHAR}, 
-      #{railwaySpeed,jdbcType=DECIMAL}, #{railwayModel,jdbcType=VARCHAR}, #{matterNo,jdbcType=VARCHAR}, 
-      #{matterName,jdbcType=VARCHAR}, #{contractNo,jdbcType=VARCHAR}, #{batchNo,jdbcType=VARCHAR}, 
-      #{customerSupplierNo,jdbcType=VARCHAR}, #{customerSupplierName,jdbcType=VARCHAR}, 
-      #{forwardingUnitNo,jdbcType=VARCHAR}, #{forwardingUnitName,jdbcType=VARCHAR}, #{receivingUintNo,jdbcType=VARCHAR}, 
-      #{receivingUintName,jdbcType=VARCHAR}, #{materialNo,jdbcType=VARCHAR}, #{materialName,jdbcType=VARCHAR}, 
-      #{specNo,jdbcType=VARCHAR}, #{specName,jdbcType=VARCHAR}, #{shipmentGrossWeight,jdbcType=DECIMAL}, 
-      #{shipmentNetWeight,jdbcType=DECIMAL}, #{shipmentNum,jdbcType=DECIMAL}, #{bindCardNo,jdbcType=VARCHAR}, 
-      #{loadPointNo,jdbcType=VARCHAR}, #{loadPointName,jdbcType=VARCHAR}, #{sampleNo,jdbcType=VARCHAR}, 
-      #{sampleVoucher,jdbcType=VARCHAR}, #{carrierUnitNo,jdbcType=VARCHAR}, #{carrierUnitName,jdbcType=VARCHAR}, 
-      #{predictionType,jdbcType=VARCHAR}, #{predictionCombination,jdbcType=VARCHAR}, 
-      #{meterTypeNo,jdbcType=VARCHAR}, #{meterTypeName,jdbcType=VARCHAR}, #{meterProcessNo,jdbcType=VARCHAR}, 
-      #{meterProcessEditionNo,jdbcType=VARCHAR}, #{meterWeight,jdbcType=DECIMAL}, #{weightType,jdbcType=VARCHAR}, 
-      #{meterSortWeight,jdbcType=DECIMAL}, #{meterBalanceWeight,jdbcType=DECIMAL}, #{createManNo,jdbcType=VARCHAR}, 
-      #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{baseSpotNo,jdbcType=VARCHAR}, 
-      #{baseSpotName,jdbcType=VARCHAR}, #{meterClass,jdbcType=VARCHAR}, #{meterGroup,jdbcType=VARCHAR}, 
-      #{memo,jdbcType=VARCHAR}, #{valueFlag,jdbcType=VARCHAR}, #{updateManNo,jdbcType=VARCHAR}, 
-      #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{checkFlag,jdbcType=VARCHAR}, 
-      #{checkManNo,jdbcType=VARCHAR}, #{checkManName,jdbcType=VARCHAR}, #{checkTime,jdbcType=TIMESTAMP}, 
-      #{meterMode,jdbcType=VARCHAR}, #{railwayTypeNo,jdbcType=VARCHAR}, #{railwayTypeName,jdbcType=VARCHAR}, 
-      #{isChemical,jdbcType=VARCHAR}, #{limitWeight,jdbcType=DECIMAL}, #{railwayModelNo,jdbcType=VARCHAR}, 
-      #{railwayModelName,jdbcType=VARCHAR}, #{isAutoOperation,jdbcType=VARCHAR}, #{checkMemo,jdbcType=VARCHAR}, 
-      #{checkMan1No,jdbcType=VARCHAR}, #{checkMan1Name,jdbcType=VARCHAR}, #{checkTime1,jdbcType=TIMESTAMP}, 
-      #{checkMemo1,jdbcType=VARCHAR}, #{checkMan2No,jdbcType=VARCHAR}, #{checkMan2Name,jdbcType=VARCHAR}, 
-      #{checkTime2,jdbcType=TIMESTAMP}, #{checkMemo2,jdbcType=VARCHAR}, #{checkFlag1,jdbcType=VARCHAR}, 
+    values (#{actualFirstNo,jdbcType=VARCHAR}, #{predictionNo,jdbcType=VARCHAR}, #{noticeNo,jdbcType=VARCHAR},
+      #{railwayNo,jdbcType=VARCHAR}, #{railwayCarriageNo,jdbcType=VARCHAR}, #{railwayWorkNo,jdbcType=VARCHAR},
+      #{railwaySpeed,jdbcType=DECIMAL}, #{railwayModel,jdbcType=VARCHAR}, #{matterNo,jdbcType=VARCHAR},
+      #{matterName,jdbcType=VARCHAR}, #{contractNo,jdbcType=VARCHAR}, #{batchNo,jdbcType=VARCHAR},
+      #{customerSupplierNo,jdbcType=VARCHAR}, #{customerSupplierName,jdbcType=VARCHAR},
+      #{forwardingUnitNo,jdbcType=VARCHAR}, #{forwardingUnitName,jdbcType=VARCHAR}, #{receivingUintNo,jdbcType=VARCHAR},
+      #{receivingUintName,jdbcType=VARCHAR}, #{materialNo,jdbcType=VARCHAR}, #{materialName,jdbcType=VARCHAR},
+      #{specNo,jdbcType=VARCHAR}, #{specName,jdbcType=VARCHAR}, #{shipmentGrossWeight,jdbcType=DECIMAL},
+      #{shipmentNetWeight,jdbcType=DECIMAL}, #{shipmentNum,jdbcType=DECIMAL}, #{bindCardNo,jdbcType=VARCHAR},
+      #{loadPointNo,jdbcType=VARCHAR}, #{loadPointName,jdbcType=VARCHAR}, #{sampleNo,jdbcType=VARCHAR},
+      #{sampleVoucher,jdbcType=VARCHAR}, #{carrierUnitNo,jdbcType=VARCHAR}, #{carrierUnitName,jdbcType=VARCHAR},
+      #{predictionType,jdbcType=VARCHAR}, #{predictionCombination,jdbcType=VARCHAR},
+      #{meterTypeNo,jdbcType=VARCHAR}, #{meterTypeName,jdbcType=VARCHAR}, #{meterProcessNo,jdbcType=VARCHAR},
+      #{meterProcessEditionNo,jdbcType=VARCHAR}, #{meterWeight,jdbcType=DECIMAL}, #{weightType,jdbcType=VARCHAR},
+      #{meterSortWeight,jdbcType=DECIMAL}, #{meterBalanceWeight,jdbcType=DECIMAL}, #{createManNo,jdbcType=VARCHAR},
+      #{createManName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{baseSpotNo,jdbcType=VARCHAR},
+      #{baseSpotName,jdbcType=VARCHAR}, #{meterClass,jdbcType=VARCHAR}, #{meterGroup,jdbcType=VARCHAR},
+      #{memo,jdbcType=VARCHAR}, #{valueFlag,jdbcType=VARCHAR}, #{updateManNo,jdbcType=VARCHAR},
+      #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{checkFlag,jdbcType=VARCHAR},
+      #{checkManNo,jdbcType=VARCHAR}, #{checkManName,jdbcType=VARCHAR}, #{checkTime,jdbcType=TIMESTAMP},
+      #{meterMode,jdbcType=VARCHAR}, #{railwayTypeNo,jdbcType=VARCHAR}, #{railwayTypeName,jdbcType=VARCHAR},
+      #{isChemical,jdbcType=VARCHAR}, #{limitWeight,jdbcType=DECIMAL}, #{railwayModelNo,jdbcType=VARCHAR},
+      #{railwayModelName,jdbcType=VARCHAR}, #{isAutoOperation,jdbcType=VARCHAR}, #{checkMemo,jdbcType=VARCHAR},
+      #{checkMan1No,jdbcType=VARCHAR}, #{checkMan1Name,jdbcType=VARCHAR}, #{checkTime1,jdbcType=TIMESTAMP},
+      #{checkMemo1,jdbcType=VARCHAR}, #{checkMan2No,jdbcType=VARCHAR}, #{checkMan2Name,jdbcType=VARCHAR},
+      #{checkTime2,jdbcType=TIMESTAMP}, #{checkMemo2,jdbcType=VARCHAR}, #{checkFlag1,jdbcType=VARCHAR},
       #{checkFlag2,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkrailwayreceived.model.MeterWorkRailwayReceived">
@@ -1678,75 +1678,75 @@
     <include refid="whereLike" />
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into METER_WORK_RAILWAY_RECEIVED 
-      (ACTUAL_FIRST_NO, 
-      PREDICTION_NO, NOTICE_NO, RAILWAY_NO, 
-      RAILWAY_CARRIAGE_NO, RAILWAY_WORK_NO, 
-      RAILWAY_SPEED, RAILWAY_MODEL, MATTER_NO, 
-      MATTER_NAME, CONTRACT_NO, BATCH_NO, 
-      CUSTOMER_SUPPLIER_NO, CUSTOMER_SUPPLIER_NAME, 
-      FORWARDING_UNIT_NO, FORWARDING_UNIT_NAME, 
-      RECEIVING_UINT_NO, RECEIVING_UINT_NAME, 
-      MATERIAL_NO, MATERIAL_NAME, SPEC_NO, 
-      SPEC_NAME, SHIPMENT_GROSS_WEIGHT, 
-      SHIPMENT_NET_WEIGHT, SHIPMENT_NUM, 
-      BIND_CARD_NO, LOAD_POINT_NO, LOAD_POINT_NAME, 
-      SAMPLE_NO, SAMPLE_VOUCHER, CARRIER_UNIT_NO, 
-      CARRIER_UNIT_NAME, PREDICTION_TYPE, 
-      PREDICTION_COMBINATION, METER_TYPE_NO, 
-      METER_TYPE_NAME, METER_PROCESS_NO, 
-      METER_PROCESS_EDITION_NO, METER_WEIGHT, 
-      WEIGHT_TYPE, METER_SORT_WEIGHT, 
-      METER_BALANCE_WEIGHT, CREATE_MAN_NO, 
-      CREATE_MAN_NAME, CREATE_TIME, 
-      BASE_SPOT_NO, BASE_SPOT_NAME, METER_CLASS, 
-      METER_GROUP, MEMO, VALUE_FLAG, 
-      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, 
-      CHECK_FLAG, CHECK_MAN_NO, CHECK_MAN_NAME, 
-      CHECK_TIME, METER_MODE, RAILWAY_TYPE_NO, 
-      RAILWAY_TYPE_NAME, IS_CHEMICAL, 
-      LIMIT_WEIGHT, RAILWAY_MODEL_NO, 
-      RAILWAY_MODEL_NAME, IS_AUTO_OPERATION, 
-      CHECK_MEMO, CHECK_MAN1_NO, CHECK_MAN1_NAME, 
-      CHECK_TIME1, CHECK_MEMO1, CHECK_MAN2_NO, 
-      CHECK_MAN2_NAME, CHECK_TIME2, 
+    insert into METER_WORK_RAILWAY_RECEIVED
+      (ACTUAL_FIRST_NO,
+      PREDICTION_NO, NOTICE_NO, RAILWAY_NO,
+      RAILWAY_CARRIAGE_NO, RAILWAY_WORK_NO,
+      RAILWAY_SPEED, RAILWAY_MODEL, MATTER_NO,
+      MATTER_NAME, CONTRACT_NO, BATCH_NO,
+      CUSTOMER_SUPPLIER_NO, CUSTOMER_SUPPLIER_NAME,
+      FORWARDING_UNIT_NO, FORWARDING_UNIT_NAME,
+      RECEIVING_UINT_NO, RECEIVING_UINT_NAME,
+      MATERIAL_NO, MATERIAL_NAME, SPEC_NO,
+      SPEC_NAME, SHIPMENT_GROSS_WEIGHT,
+      SHIPMENT_NET_WEIGHT, SHIPMENT_NUM,
+      BIND_CARD_NO, LOAD_POINT_NO, LOAD_POINT_NAME,
+      SAMPLE_NO, SAMPLE_VOUCHER, CARRIER_UNIT_NO,
+      CARRIER_UNIT_NAME, PREDICTION_TYPE,
+      PREDICTION_COMBINATION, METER_TYPE_NO,
+      METER_TYPE_NAME, METER_PROCESS_NO,
+      METER_PROCESS_EDITION_NO, METER_WEIGHT,
+      WEIGHT_TYPE, METER_SORT_WEIGHT,
+      METER_BALANCE_WEIGHT, CREATE_MAN_NO,
+      CREATE_MAN_NAME, CREATE_TIME,
+      BASE_SPOT_NO, BASE_SPOT_NAME, METER_CLASS,
+      METER_GROUP, MEMO, VALUE_FLAG,
+      UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME,
+      CHECK_FLAG, CHECK_MAN_NO, CHECK_MAN_NAME,
+      CHECK_TIME, METER_MODE, RAILWAY_TYPE_NO,
+      RAILWAY_TYPE_NAME, IS_CHEMICAL,
+      LIMIT_WEIGHT, RAILWAY_MODEL_NO,
+      RAILWAY_MODEL_NAME, IS_AUTO_OPERATION,
+      CHECK_MEMO, CHECK_MAN1_NO, CHECK_MAN1_NAME,
+      CHECK_TIME1, CHECK_MEMO1, CHECK_MAN2_NO,
+      CHECK_MAN2_NAME, CHECK_TIME2,
       CHECK_MEMO2, CHECK_FLAG1, CHECK_FLAG2
       )
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.actualFirstNo,jdbcType=VARCHAR}, 
-      #{item.predictionNo,jdbcType=VARCHAR}, #{item.noticeNo,jdbcType=VARCHAR}, #{item.railwayNo,jdbcType=VARCHAR}, 
-      #{item.railwayCarriageNo,jdbcType=VARCHAR}, #{item.railwayWorkNo,jdbcType=VARCHAR}, 
-      #{item.railwaySpeed,jdbcType=DECIMAL}, #{item.railwayModel,jdbcType=VARCHAR}, #{item.matterNo,jdbcType=VARCHAR}, 
-      #{item.matterName,jdbcType=VARCHAR}, #{item.contractNo,jdbcType=VARCHAR}, #{item.batchNo,jdbcType=VARCHAR}, 
-      #{item.customerSupplierNo,jdbcType=VARCHAR}, #{item.customerSupplierName,jdbcType=VARCHAR}, 
-      #{item.forwardingUnitNo,jdbcType=VARCHAR}, #{item.forwardingUnitName,jdbcType=VARCHAR}, 
-      #{item.receivingUintNo,jdbcType=VARCHAR}, #{item.receivingUintName,jdbcType=VARCHAR}, 
-      #{item.materialNo,jdbcType=VARCHAR}, #{item.materialName,jdbcType=VARCHAR}, #{item.specNo,jdbcType=VARCHAR}, 
-      #{item.specName,jdbcType=VARCHAR}, #{item.shipmentGrossWeight,jdbcType=DECIMAL}, 
-      #{item.shipmentNetWeight,jdbcType=DECIMAL}, #{item.shipmentNum,jdbcType=DECIMAL}, 
-      #{item.bindCardNo,jdbcType=VARCHAR}, #{item.loadPointNo,jdbcType=VARCHAR}, #{item.loadPointName,jdbcType=VARCHAR}, 
-      #{item.sampleNo,jdbcType=VARCHAR}, #{item.sampleVoucher,jdbcType=VARCHAR}, #{item.carrierUnitNo,jdbcType=VARCHAR}, 
-      #{item.carrierUnitName,jdbcType=VARCHAR}, #{item.predictionType,jdbcType=VARCHAR}, 
-      #{item.predictionCombination,jdbcType=VARCHAR}, #{item.meterTypeNo,jdbcType=VARCHAR}, 
-      #{item.meterTypeName,jdbcType=VARCHAR}, #{item.meterProcessNo,jdbcType=VARCHAR}, 
-      #{item.meterProcessEditionNo,jdbcType=VARCHAR}, #{item.meterWeight,jdbcType=DECIMAL}, 
-      #{item.weightType,jdbcType=VARCHAR}, #{item.meterSortWeight,jdbcType=DECIMAL}, 
-      #{item.meterBalanceWeight,jdbcType=DECIMAL}, #{item.createManNo,jdbcType=VARCHAR}, 
-      #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
-      #{item.baseSpotNo,jdbcType=VARCHAR}, #{item.baseSpotName,jdbcType=VARCHAR}, #{item.meterClass,jdbcType=VARCHAR}, 
-      #{item.meterGroup,jdbcType=VARCHAR}, #{item.memo,jdbcType=VARCHAR}, #{item.valueFlag,jdbcType=VARCHAR}, 
-      #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
-      #{item.checkFlag,jdbcType=VARCHAR}, #{item.checkManNo,jdbcType=VARCHAR}, #{item.checkManName,jdbcType=VARCHAR}, 
-      #{item.checkTime,jdbcType=TIMESTAMP}, #{item.meterMode,jdbcType=VARCHAR}, #{item.railwayTypeNo,jdbcType=VARCHAR}, 
-      #{item.railwayTypeName,jdbcType=VARCHAR}, #{item.isChemical,jdbcType=VARCHAR}, 
-      #{item.limitWeight,jdbcType=DECIMAL}, #{item.railwayModelNo,jdbcType=VARCHAR}, 
-      #{item.railwayModelName,jdbcType=VARCHAR}, #{item.isAutoOperation,jdbcType=VARCHAR}, 
-      #{item.checkMemo,jdbcType=VARCHAR}, #{item.checkMan1No,jdbcType=VARCHAR}, #{item.checkMan1Name,jdbcType=VARCHAR}, 
-      #{item.checkTime1,jdbcType=TIMESTAMP}, #{item.checkMemo1,jdbcType=VARCHAR}, #{item.checkMan2No,jdbcType=VARCHAR}, 
-      #{item.checkMan2Name,jdbcType=VARCHAR}, #{item.checkTime2,jdbcType=TIMESTAMP}, 
+    ( <foreach collection="list" item="item" separator="union all">
+   select
+      #{item.actualFirstNo,jdbcType=VARCHAR},
+      #{item.predictionNo,jdbcType=VARCHAR}, #{item.noticeNo,jdbcType=VARCHAR}, #{item.railwayNo,jdbcType=VARCHAR},
+      #{item.railwayCarriageNo,jdbcType=VARCHAR}, #{item.railwayWorkNo,jdbcType=VARCHAR},
+      #{item.railwaySpeed,jdbcType=DECIMAL}, #{item.railwayModel,jdbcType=VARCHAR}, #{item.matterNo,jdbcType=VARCHAR},
+      #{item.matterName,jdbcType=VARCHAR}, #{item.contractNo,jdbcType=VARCHAR}, #{item.batchNo,jdbcType=VARCHAR},
+      #{item.customerSupplierNo,jdbcType=VARCHAR}, #{item.customerSupplierName,jdbcType=VARCHAR},
+      #{item.forwardingUnitNo,jdbcType=VARCHAR}, #{item.forwardingUnitName,jdbcType=VARCHAR},
+      #{item.receivingUintNo,jdbcType=VARCHAR}, #{item.receivingUintName,jdbcType=VARCHAR},
+      #{item.materialNo,jdbcType=VARCHAR}, #{item.materialName,jdbcType=VARCHAR}, #{item.specNo,jdbcType=VARCHAR},
+      #{item.specName,jdbcType=VARCHAR}, #{item.shipmentGrossWeight,jdbcType=DECIMAL},
+      #{item.shipmentNetWeight,jdbcType=DECIMAL}, #{item.shipmentNum,jdbcType=DECIMAL},
+      #{item.bindCardNo,jdbcType=VARCHAR}, #{item.loadPointNo,jdbcType=VARCHAR}, #{item.loadPointName,jdbcType=VARCHAR},
+      #{item.sampleNo,jdbcType=VARCHAR}, #{item.sampleVoucher,jdbcType=VARCHAR}, #{item.carrierUnitNo,jdbcType=VARCHAR},
+      #{item.carrierUnitName,jdbcType=VARCHAR}, #{item.predictionType,jdbcType=VARCHAR},
+      #{item.predictionCombination,jdbcType=VARCHAR}, #{item.meterTypeNo,jdbcType=VARCHAR},
+      #{item.meterTypeName,jdbcType=VARCHAR}, #{item.meterProcessNo,jdbcType=VARCHAR},
+      #{item.meterProcessEditionNo,jdbcType=VARCHAR}, #{item.meterWeight,jdbcType=DECIMAL},
+      #{item.weightType,jdbcType=VARCHAR}, #{item.meterSortWeight,jdbcType=DECIMAL},
+      #{item.meterBalanceWeight,jdbcType=DECIMAL}, #{item.createManNo,jdbcType=VARCHAR},
+      #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP},
+      #{item.baseSpotNo,jdbcType=VARCHAR}, #{item.baseSpotName,jdbcType=VARCHAR}, #{item.meterClass,jdbcType=VARCHAR},
+      #{item.meterGroup,jdbcType=VARCHAR}, #{item.memo,jdbcType=VARCHAR}, #{item.valueFlag,jdbcType=VARCHAR},
+      #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
+      #{item.checkFlag,jdbcType=VARCHAR}, #{item.checkManNo,jdbcType=VARCHAR}, #{item.checkManName,jdbcType=VARCHAR},
+      #{item.checkTime,jdbcType=TIMESTAMP}, #{item.meterMode,jdbcType=VARCHAR}, #{item.railwayTypeNo,jdbcType=VARCHAR},
+      #{item.railwayTypeName,jdbcType=VARCHAR}, #{item.isChemical,jdbcType=VARCHAR},
+      #{item.limitWeight,jdbcType=DECIMAL}, #{item.railwayModelNo,jdbcType=VARCHAR},
+      #{item.railwayModelName,jdbcType=VARCHAR}, #{item.isAutoOperation,jdbcType=VARCHAR},
+      #{item.checkMemo,jdbcType=VARCHAR}, #{item.checkMan1No,jdbcType=VARCHAR}, #{item.checkMan1Name,jdbcType=VARCHAR},
+      #{item.checkTime1,jdbcType=TIMESTAMP}, #{item.checkMemo1,jdbcType=VARCHAR}, #{item.checkMan2No,jdbcType=VARCHAR},
+      #{item.checkMan2Name,jdbcType=VARCHAR}, #{item.checkTime2,jdbcType=TIMESTAMP},
       #{item.checkMemo2,jdbcType=VARCHAR}, #{item.checkFlag1,jdbcType=VARCHAR}, #{item.checkFlag2,jdbcType=VARCHAR}
-       from dual  
+       from dual
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -2060,14 +2060,14 @@
        <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_FIRST_NO" separator=" ">
           when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.checkFlag2,jdbcType=VARCHAR}
        </foreach>
-     where ACTUAL_FIRST_NO in 
+     where ACTUAL_FIRST_NO in
      <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
     #{item.actualFirstNo,jdbcType=VARCHAR}
-     </foreach> 
+     </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from METER_WORK_RAILWAY_RECEIVED
-    where ACTUAL_FIRST_NO in 
+    where ACTUAL_FIRST_NO in
     <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
     </foreach>
@@ -2442,8 +2442,14 @@
           and railway_work_no is not null)
         </if>
       </if>
+      <if test="baseSpotNames != null and baseSpotNames.size() != 0">
+        and BASE_SPOT_NAME in
+        <foreach collection="baseSpotNames" item="id" open="(" close=")" separator=",">
+          #{id}
+        </foreach>
+      </if>
     </where>
     order by CREATE_TIME desc
   </select>
-  
-</mapper>
+
+</mapper>