后端修改

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

@@ -12,6 +12,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
+import java.util.HashSet;
+
 /**
  * MeterBaseCustomerSupplier RESTful接口：
  * @author generator

src/main/java/com/steerinfo/baseinfo/meterbaserailwaycarriageweight/controller/MeterBaseRailwayCarriageWeightController.java

@@ -3,15 +3,13 @@ package com.steerinfo.baseinfo.meterbaserailwaycarriageweight.controller;
 import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.user.UserPayload;
 import com.steerinfo.framework.utils.collection.ListUtils;
 import com.steerinfo.baseinfo.meterbaserailwaycarriageweight.model.MeterBaseRailwayCarriageWeight;
 import com.steerinfo.baseinfo.meterbaserailwaycarriageweight.service.IMeterBaseRailwayCarriageWeightService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import oracle.ucp.proxy.annotation.Post;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -67,8 +65,12 @@ public class MeterBaseRailwayCarriageWeightController extends BaseRESTfulControl
     @ApiImplicitParam(name = "meterBaseRailwayCarriageWeight", value = "详细实体meterBaseRailwayCarriageWeight", required = true, dataType = "MeterBaseRailwayCarriageWeight")
     //@RequiresPermissions("meterbaserailwaycarriageweight:create")
     @PostMapping(value = "/")
-    public RESTfulResult add(@ModelAttribute MeterBaseRailwayCarriageWeight model){
+    public RESTfulResult add(@RequestBody MeterBaseRailwayCarriageWeight model){
         model.setCarriageWeightNo(meterBaseRailwayCarriageWeightService.creatId());
+        UserPayload payload = UserPayload.getCurrUser();
+        model.setCreateManNo(payload.getUserCode());
+        model.setCreateManName(payload.getUserName());
+        model.setCreateTime(new Date());
         MeterBaseRailwayCarriageWeight meterBaseRailwayCarriageWeight = meterBaseRailwayCarriageWeightService.add(model);
         return success(meterBaseRailwayCarriageWeight);
     }
@@ -91,6 +93,10 @@ public class MeterBaseRailwayCarriageWeightController extends BaseRESTfulControl
     @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
     public RESTfulResult update(@PathVariable String id, @RequestBody MeterBaseRailwayCarriageWeight model){
         model.setId(id);
+        UserPayload payload = UserPayload.getCurrUser();
+        model.setUpdateManNo(payload.getUserCode());
+        model.setUpdateManName(payload.getUserName());
+        model.setUpdateTime(new Date());
         MeterBaseRailwayCarriageWeight meterBaseRailwayCarriageWeight = meterBaseRailwayCarriageWeightService.modify(model);
         return success(meterBaseRailwayCarriageWeight);
     }
@@ -112,7 +118,6 @@ public class MeterBaseRailwayCarriageWeightController extends BaseRESTfulControl
     //@RequiresPermissions("meterbaserailwaycarriageweight:delete")
     @GetMapping(value = "/queryByTime")//String
     public RESTfulResult queryByTime(@RequestParam HashMap<String,Object> map,Integer pageNum, Integer pageSize){
-
         PageList<MeterBaseRailwayCarriageWeight> list = meterBaseRailwayCarriageWeightService.queryByTimeForPage(map,pageNum, pageSize);
         return success(list);
     }

src/main/java/com/steerinfo/baseinfo/meterbaserailwaycarriageweight/mapper/MeterBaseRailwayCarriageWeightMapper.xml

@@ -418,7 +418,7 @@
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
 
   <select id="GetNewID" parameterType="java.lang.String" resultType="java.lang.String">
-    SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(COMPARE_SPOT_ID, LENGTH(COMPARE_SPOT_ID) - 4))),0) + 1,5,'0') COMPARE_SPOT_ID
+    SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(carriage_weight_no, LENGTH(carriage_weight_no) - 4))),0) + 1,5,'0') carriage_weight_no
     FROM METER_BASE_RAILWAY_CARRIAGE_WEIGHT
   </select>
 
@@ -439,10 +439,10 @@
       and SPOT_NAME = #{spotName}
     </if>
     <if test="carriageCode != null and carriageCode != ''" >
-      and CARRIAGE_CODE like #{carriageCode}
+      and CARRIAGE_CODE like '%${carriageCode}%'
     </if>
     <if test="carriageName != null and carriageName != ''" >
-      and CARRIAGE_NAME like #{carriageName}
+      and CARRIAGE_NAME like '%${carriageName}%'
     </if>
     order by CREATE_TIME desc
   </select>

src/main/java/com/steerinfo/baseinfo/meterbaserailwaycarriageweight/service/impl/MeterBaseRailwayCarriageWeightServiceImpl.java

@@ -10,6 +10,7 @@ import com.steerinfo.framework.service.pagehelper.PageList;
 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.math.BigDecimal;
@@ -33,7 +34,7 @@ import java.util.Map;
 @Service(value = "meterBaseRailwayCarriageWeightService")
 public class MeterBaseRailwayCarriageWeightServiceImpl extends BaseServiceImpl<MeterBaseRailwayCarriageWeight, String> implements IMeterBaseRailwayCarriageWeightService {
 
-    @Autowired
+    @Resource
     private MeterBaseRailwayCarriageWeightMapper meterBaseRailwayCarriageWeightMapper;
 
     @Override

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

@@ -152,6 +152,21 @@ throw new MarkerMetException(500, "操作异常！！");
             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")
+    })
+    @GetMapping(value = "/likeDesc/")
+    public RESTfulResult likeDesc(@RequestParam HashMap params, Integer pageNum, Integer pageSize) {
+        try {
+            PageList<MeterWorkCarActual> list = meterWorkCarActualService.likeByDesc(params, pageNum, pageSize);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
 
     @ApiOperation(value = "获取列表", notes = "分页模糊查询")
     @ApiImplicitParams({

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

@@ -3548,6 +3548,336 @@
   <select id="likeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
     <include refid="whereLike"/>
+    <where>
+      1=1
+      <if test="actualNo != null and actualNo != ''">
+        and ACTUAL_NO LIKE '%${actualNo}%'
+      </if>
+      <if test="predictionNo != null and predictionNo != ''">
+        and PREDICTION_NO LIKE '%${predictionNo}%'
+      </if>
+      <if test="noticeNo != null and noticeNo != ''">
+        and NOTICE_NO LIKE '%${noticeNo}%'
+      </if>
+      <if test="carNo != null and carNo != ''">
+        and CAR_NO LIKE '%${carNo}%'
+      </if>
+      <if test="trailerNo != null and trailerNo != ''">
+        and TRAILER_NO LIKE '%${trailerNo}%'
+      </if>
+      <if test="matterNo != null and matterNo != ''">
+        and MATTER_NO LIKE '%${matterNo}%'
+      </if>
+      <if test="matterName != null and matterName != ''">
+        and MATTER_NAME LIKE '%${matterName}%'
+      </if>
+      <if test="contractNo != null and contractNo != ''">
+        and CONTRACT_NO LIKE '%${contractNo}%'
+      </if>
+      <if test="batchNo != null and batchNo != ''">
+        and BATCH_NO LIKE '%${batchNo}%'
+      </if>
+      <if test="customerSupplierNo != null and customerSupplierNo != ''">
+        and CUSTOMER_SUPPLIER_NO LIKE '%${customerSupplierNo}%'
+      </if>
+      <if test="customerSupplierName != null and customerSupplierName != ''">
+        and CUSTOMER_SUPPLIER_NAME LIKE '%${customerSupplierName}%'
+      </if>
+      <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+        and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+      </if>
+      <if test="forwardingUnitName != null and forwardingUnitName != ''">
+        and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+      </if>
+      <if test="receivingUintNo != null and receivingUintNo != ''">
+        and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+      </if>
+      <if test="receivingUintName != null and receivingUintName != ''">
+        and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+      </if>
+      <if test="materialNo != null and materialNo != ''">
+        and MATERIAL_NO LIKE '%${materialNo}%'
+      </if>
+      <if test="materialName != null and materialName != ''">
+        and MATERIAL_NAME LIKE '%${materialName}%'
+      </if>
+      <if test="specNo != null and specNo != ''">
+        and SPEC_NO LIKE '%${specNo}%'
+      </if>
+      <if test="specName != null and specName != ''">
+        and SPEC_NAME LIKE '%${specName}%'
+      </if>
+      <if test="loadPointNo != null and loadPointNo != ''">
+        and LOAD_POINT_NO LIKE '%${loadPointNo}%'
+      </if>
+      <if test="loadPointName != null and loadPointName != ''">
+        and LOAD_POINT_NAME LIKE '%${loadPointName}%'
+      </if>
+      <if test="sampleNo != null and sampleNo != ''">
+        and SAMPLE_NO LIKE '%${sampleNo}%'
+      </if>
+      <if test="sampleVoucher != null and sampleVoucher != ''">
+        and SAMPLE_VOUCHER LIKE '%${sampleVoucher}%'
+      </if>
+      <if test="carrierUnitNo != null and carrierUnitNo != ''">
+        and CARRIER_UNIT_NO LIKE '%${carrierUnitNo}%'
+      </if>
+      <if test="carrierUnitName != null and carrierUnitName != ''">
+        and CARRIER_UNIT_NAME LIKE '%${carrierUnitName}%'
+      </if>
+      <if test="meterTypeNo != null and meterTypeNo != ''">
+        and METER_TYPE_NO LIKE '%${meterTypeNo}%'
+      </if>
+      <if test="meterTypeName != null and meterTypeName != ''">
+        and METER_TYPE_NAME LIKE '%${meterTypeName}%'
+      </if>
+      <if test="meterProcessNo != null and meterProcessNo != ''">
+        and METER_PROCESS_NO LIKE '%${meterProcessNo}%'
+      </if>
+      <if test="meterProcessEditionNo != null and meterProcessEditionNo != ''">
+        and METER_PROCESS_EDITION_NO LIKE '%${meterProcessEditionNo}%'
+      </if>
+      <if test="actualFirst1No != null and actualFirst1No != ''">
+        and ACTUAL_FIRST1_NO LIKE '%${actualFirst1No}%'
+      </if>
+      <if test="grossWeight != null">
+        and GROSS_WEIGHT = #{grossWeight}
+      </if>
+      <if test="grossManNo != null and grossManNo != ''">
+        and GROSS_MAN_NO LIKE '%${grossManNo}%'
+      </if>
+      <if test="grossManName != null and grossManName != ''">
+        and GROSS_MAN_NAME LIKE '%${grossManName}%'
+      </if>
+      <if test="grossTime != null">
+        and TO_CHAR(GROSS_TIME,'yyyy-MM-dd') = #{grossTime}
+      </if>
+      <if test="baseSpot1No != null and baseSpot1No != ''">
+        and BASE_SPOT1_NO LIKE '%${baseSpot1No}%'
+      </if>
+      <if test="baseSpot1Name != null and baseSpot1Name != ''">
+        and BASE_SPOT1_NAME LIKE '%${baseSpot1Name}%'
+      </if>
+      <if test="grossClass != null and grossClass != ''">
+        and GROSS_CLASS LIKE '%${grossClass}%'
+      </if>
+      <if test="grossGroup != null and grossGroup != ''">
+        and GROSS_GROUP LIKE '%${grossGroup}%'
+      </if>
+      <if test="grossMode != null and grossMode != ''">
+        and GROSS_MODE LIKE '%${grossMode}%'
+      </if>
+      <if test="actualFirst2No != null and actualFirst2No != ''">
+        and ACTUAL_FIRST2_NO LIKE '%${actualFirst2No}%'
+      </if>
+      <if test="tareWeight != null">
+        and TARE_WEIGHT = #{tareWeight}
+      </if>
+      <if test="tareManNo != null and tareManNo != ''">
+        and TARE_MAN_NO LIKE '%${tareManNo}%'
+      </if>
+      <if test="tareManName != null and tareManName != ''">
+        and TARE_MAN_NAME LIKE '%${tareManName}%'
+      </if>
+      <if test="tareTime != null">
+        and TO_CHAR(TARE_TIME,'yyyy-MM-dd') = #{tareTime}
+      </if>
+      <if test="baseSpot2No != null and baseSpot2No != ''">
+        and BASE_SPOT2_NO LIKE '%${baseSpot2No}%'
+      </if>
+      <if test="baseSpot2Name != null and baseSpot2Name != ''">
+        and BASE_SPOT2_NAME LIKE '%${baseSpot2Name}%'
+      </if>
+      <if test="tareClass != null and tareClass != ''">
+        and TARE_CLASS LIKE '%${tareClass}%'
+      </if>
+      <if test="tareGroup != null and tareGroup != ''">
+        and TARE_GROUP LIKE '%${tareGroup}%'
+      </if>
+      <if test="tareMode != null and tareMode != ''">
+        and TARE_MODE LIKE '%${tareMode}%'
+      </if>
+      <if test="netWeight != null">
+        and NET_WEIGHT = #{netWeight}
+      </if>
+      <if test="meterNum != null">
+        and METER_NUM = #{meterNum}
+      </if>
+      <if test="netManNo != null and netManNo != ''">
+        and NET_MAN_NO LIKE '%${netManNo}%'
+      </if>
+      <if test="netManName != null and netManName != ''">
+        and NET_MAN_NAME LIKE '%${netManName}%'
+      </if>
+      <if test="netTime != null">
+        and TO_CHAR(NET_TIME,'yyyy-MM-dd') = #{netTime}
+      </if>
+      <if test="netSpot3No != null and netSpot3No != ''">
+        and NET_SPOT3_NO LIKE '%${netSpot3No}%'
+      </if>
+      <if test="netSpot3Name != null and netSpot3Name != ''">
+        and NET_SPOT3_NAME LIKE '%${netSpot3Name}%'
+      </if>
+      <if test="netGroup != null and netGroup != ''">
+        and NET_GROUP LIKE '%${netGroup}%'
+      </if>
+      <if test="netMode != null and netMode != ''">
+        and NET_MODE LIKE '%${netMode}%'
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG LIKE '%${valueFlag}%'
+      </if>
+      <if test="uploadFlag != null and uploadFlag != ''">
+        and UPLOAD_FLAG LIKE '%${uploadFlag}%'
+      </if>
+      <if test="checkManNo != null and checkManNo != ''">
+        and CHECK_MAN_NO LIKE '%${checkManNo}%'
+      </if>
+      <if test="checkManName != null and checkManName != ''">
+        and CHECK_MAN_NAME LIKE '%${checkManName}%'
+      </if>
+      <if test="checkTime != null">
+        and TO_CHAR(CHECK_TIME,'yyyy-MM-dd') = #{checkTime}
+      </if>
+      <if test="uploadManNo != null and uploadManNo != ''">
+        and UPLOAD_MAN_NO LIKE '%${uploadManNo}%'
+      </if>
+      <if test="uploadManName != null and uploadManName != ''">
+        and UPLOAD_MAN_NAME LIKE '%${uploadManName}%'
+      </if>
+      <if test="uploadTime != null">
+        and TO_CHAR(UPLOAD_TIME,'yyyy-MM-dd') = #{uploadTime}
+      </if>
+      <if test="addWeight != null">
+        and ADD_WEIGHT = #{addWeight}
+      </if>
+      <if test="netClass != null and netClass != ''">
+        and NET_CLASS LIKE '%${netClass}%'
+      </if>
+      <if test="tbFlage != null and tbFlage != ''">
+        and TB_FLAGE LIKE '%${tbFlage}%'
+      </if>
+      <if test="railwayNo != null and railwayNo != ''">
+        and RAILWAY_NO LIKE '%${railwayNo}%'
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        and UPDATE_MAN_NO LIKE '%${updateManNo}%'
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        and UPDATE_MAN_NAME LIKE '%${updateManName}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO LIKE '%${memo}%'
+      </if>
+      <if test="heatNo != null and heatNo != ''">
+        and HEAT_NO LIKE '%${heatNo}%'
+      </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="bindCardNo != null and bindCardNo != ''">
+        and BIND_CARD_NO LIKE '%${bindCardNo}%'
+      </if>
+      <if test="predictionType != null and predictionType != ''">
+        and PREDICTION_TYPE LIKE '%${predictionType}%'
+      </if>
+      <if test="predictionCombination != null and predictionCombination != ''">
+        and PREDICTION_COMBINATION LIKE '%${predictionCombination}%'
+      </if>
+      <if test="meterPierName != null and meterPierName != ''">
+        and METER_PIER_NAME LIKE '%${meterPierName}%'
+      </if>
+      <if test="meterPierNo != null and meterPierNo != ''">
+        and METER_PIER_NO LIKE '%${meterPierNo}%'
+      </if>
+      <if test="shipNo != null and shipNo != ''">
+        and SHIP_NO LIKE '%${shipNo}%'
+      </if>
+      <if test="note != null and note != ''">
+        and NOTE LIKE '%${note}%'
+      </if>
+      <if test="voucherIdentity != null and voucherIdentity != ''">
+        and VOUCHER_IDENTITY LIKE '%${voucherIdentity}%'
+      </if>
+      <if test="voucherItem != null and voucherItem != ''">
+        and VOUCHER_ITEM LIKE '%${voucherItem}%'
+      </if>
+      <if test="businessGroup != null and businessGroup != ''">
+        and BUSINESS_GROUP LIKE '%${businessGroup}%'
+      </if>
+      <if test="tempConveyance != null and tempConveyance != ''">
+        and TEMP_CONVEYANCE LIKE '%${tempConveyance}%'
+      </if>
+      <if test="conveyanceType != null and conveyanceType != ''">
+        and CONVEYANCE_TYPE LIKE '%${conveyanceType}%'
+      </if>
+      <if test="resourceSystem != null and resourceSystem != ''">
+        and RESOURCE_SYSTEM LIKE '%${resourceSystem}%'
+      </if>
+      <if test="groupPackageAmount != null">
+        and GROUP_PACKAGE_AMOUNT = #{groupPackageAmount}
+      </if>
+      <if test="groupPackageUnit != null and groupPackageUnit != ''">
+        and GROUP_PACKAGE_UNIT LIKE '%${groupPackageUnit}%'
+      </if>
+      <if test="packageAmount != null">
+        and PACKAGE_AMOUNT = #{packageAmount}
+      </if>
+      <if test="packageUnit != null and packageUnit != ''">
+        and PACKAGE_UNIT LIKE '%${packageUnit}%'
+      </if>
+      <if test="theoryAmount != null">
+        and THEORY_AMOUNT = #{theoryAmount}
+      </if>
+      <if test="measureBatch != null and measureBatch != ''">
+        and MEASURE_BATCH LIKE '%${measureBatch}%'
+      </if>
+      <if test="measureBatchCount != null">
+        and MEASURE_BATCH_COUNT = #{measureBatchCount}
+      </if>
+      <if test="senderType != null and senderType != ''">
+        and SENDER_TYPE LIKE '%${senderType}%'
+      </if>
+      <if test="senderRemark != null and senderRemark != ''">
+        and SENDER_REMARK LIKE '%${senderRemark}%'
+      </if>
+      <if test="receiverType != null and receiverType != ''">
+        and RECEIVER_TYPE LIKE '%${receiverType}%'
+      </if>
+      <if test="receiverRemark != null and receiverRemark != ''">
+        and RECEIVER_REMARK LIKE '%${receiverRemark}%'
+      </if>
+      <if test="amountUnit != null and amountUnit != ''">
+        and AMOUNT_UNIT LIKE '%${amountUnit}%'
+      </if>
+      <if test="measureObjectType != null and measureObjectType != ''">
+        and MEASURE_OBJECT_TYPE LIKE '%${measureObjectType}%'
+      </if>
+      <if test="measureTaskNum != null and measureTaskNum != ''">
+        and MEASURE_TASK_NUM LIKE '%${measureTaskNum}%'
+      </if>
+      <if test="billType != null and billType != ''">
+        and BILL_TYPE LIKE '%${billType}%'
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME LIKE '%${createManName}%'
+      </if>
+      <if test="dataSource != null and dataSource != ''">
+        and DATA_SOURCE LIKE '%${dataSource}%'
+      </if>
+      <if test="isPreScale != null and isPreScale != ''">
+        and IS_PRE_SCALE LIKE '%${isPreScale}%'
+      </if>
+    </where>
     <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
       and  net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
     </if>

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

@@ -136,6 +136,23 @@ 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")
+    @GetMapping(value = "/likeByDescTSDG/")
+    public RESTfulResult likeByDescTSDG(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+        try {
+            PageList<MeterWorkRailwayActFirst> list = meterWorkRailwayActFirstService.likeByDescTSDG(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/meterwork/meterworkrailwayactfirst/mapper/MeterWorkRailwayActFirstMapper.java

@@ -40,6 +40,7 @@ public interface MeterWorkRailwayActFirstMapper extends IBaseMapper<MeterWorkRai
     List<MeterWorkRailwayActFirst> selectSta(HashMap parmas);
 
     List<MeterWorkRailwayActFirst> likeByDesc(HashMap parmas);
+    List<MeterWorkRailwayActFirst> likeByDescTSDG(HashMap parmas);
 
     List<MeterWorkRailwayActFirst> distinctRailwayNo(HashMap<String, Object> obj);
 

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/mapper/MeterWorkRailwayActFirstMapper.xml

@@ -729,6 +729,13 @@
       </if>
     </where>
   </sql>
+  <sql id="whereLikeTSDG">
+    <where>
+      <if test="railwayNo != null and railwayNo != ''">
+        and RAILWAY_NO LIKE '%${railwayNo}%'
+      </if>
+    </where>
+  </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     delete from METER_WORK_RAILWAY_ACT_FIRST
     where ACTUAL_FIRST_NO = #{actualFirstNo,jdbcType=VARCHAR}
@@ -3215,7 +3222,257 @@
 
   <select id="likeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
-    <include refid="whereLike"/>
+    <where>
+      1 = 1
+      <if test="actualFirstNo != null and actualFirstNo != ''">
+        and ACTUAL_FIRST_NO LIKE '%${actualFirstNo}%'
+      </if>
+      <if test="predictionNo != null and predictionNo != ''">
+        and PREDICTION_NO LIKE '%${predictionNo}%'
+      </if>
+      <if test="noticeNo != null and noticeNo != ''">
+        and NOTICE_NO LIKE '%${noticeNo}%'
+      </if>
+      <if test="railwayNo != null and railwayNo != ''">
+        and RAILWAY_NO LIKE '%${railwayNo}%'
+      </if>
+      <if test="railwayCarriageNo != null and railwayCarriageNo != ''">
+        and RAILWAY_CARRIAGE_NO LIKE '%${railwayCarriageNo}%'
+      </if>
+      <if test="railwayWorkNo != null and railwayWorkNo != ''">
+        and RAILWAY_WORK_NO LIKE '%${railwayWorkNo}%'
+      </if>
+      <if test="railwaySpeed != null">
+        and RAILWAY_SPEED = #{railwaySpeed}
+      </if>
+      <if test="matterNo != null and matterNo != ''">
+        and MATTER_NO LIKE '%${matterNo}%'
+      </if>
+      <if test="matterName != null and matterName != ''">
+        and MATTER_NAME LIKE '%${matterName}%'
+      </if>
+      <if test="contractNo != null and contractNo != ''">
+        and CONTRACT_NO LIKE '%${contractNo}%'
+      </if>
+      <if test="batchNo != null and batchNo != ''">
+        and BATCH_NO LIKE '%${batchNo}%'
+      </if>
+      <if test="customerSupplierNo != null and customerSupplierNo != ''">
+        and CUSTOMER_SUPPLIER_NO LIKE '%${customerSupplierNo}%'
+      </if>
+      <if test="customerSupplierName != null and customerSupplierName != ''">
+        and CUSTOMER_SUPPLIER_NAME LIKE '%${customerSupplierName}%'
+      </if>
+      <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+        and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+      </if>
+      <if test="forwardingUnitName != null and forwardingUnitName != ''">
+        and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+      </if>
+      <if test="receivingUintNo != null and receivingUintNo != ''">
+        and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+      </if>
+      <if test="receivingUintName != null and receivingUintName != ''">
+        and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+      </if>
+      <if test="materialNo != null and materialNo != ''">
+        and MATERIAL_NO LIKE '%${materialNo}%'
+      </if>
+      <if test="materialName != null and materialName != ''">
+        and MATERIAL_NAME LIKE '%${materialName}%'
+      </if>
+      <if test="specNo != null and specNo != ''">
+        and SPEC_NO LIKE '%${specNo}%'
+      </if>
+      <if test="specName != null and specName != ''">
+        and SPEC_NAME LIKE '%${specName}%'
+      </if>
+      <if test="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="bindCardNo != null and bindCardNo != ''">
+        and BIND_CARD_NO LIKE '%${bindCardNo}%'
+      </if>
+      <if test="loadPointNo != null and loadPointNo != ''">
+        and LOAD_POINT_NO LIKE '%${loadPointNo}%'
+      </if>
+      <if test="loadPointName != null and loadPointName != ''">
+        and LOAD_POINT_NAME LIKE '%${loadPointName}%'
+      </if>
+      <if test="sampleNo != null and sampleNo != ''">
+        and SAMPLE_NO LIKE '%${sampleNo}%'
+      </if>
+      <if test="sampleVoucher != null and sampleVoucher != ''">
+        and SAMPLE_VOUCHER LIKE '%${sampleVoucher}%'
+      </if>
+      <if test="carrierUnitNo != null and carrierUnitNo != ''">
+        and CARRIER_UNIT_NO LIKE '%${carrierUnitNo}%'
+      </if>
+      <if test="carrierUnitName != null and carrierUnitName != ''">
+        and CARRIER_UNIT_NAME LIKE '%${carrierUnitName}%'
+      </if>
+      <if test="predictionType != null and predictionType != ''">
+        and PREDICTION_TYPE LIKE '%${predictionType}%'
+      </if>
+      <if test="predictionCombination != null and predictionCombination != ''">
+        and PREDICTION_COMBINATION LIKE '%${predictionCombination}%'
+      </if>
+      <if test="meterTypeNo != null and meterTypeNo != ''">
+        and METER_TYPE_NO LIKE '%${meterTypeNo}%'
+      </if>
+      <if test="meterTypeName != null and meterTypeName != ''">
+        and METER_TYPE_NAME LIKE '%${meterTypeName}%'
+      </if>
+      <if test="meterWeight != null">
+        and METER_WEIGHT = #{meterWeight}
+      </if>
+      <if test="weightType != null and weightType != ''">
+        and WEIGHT_TYPE LIKE '%${weightType}%'
+      </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="baseSpotNo != null and baseSpotNo != ''">
+        and BASE_SPOT_NO LIKE '%${baseSpotNo}%'
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        and BASE_SPOT_NAME LIKE '%${baseSpotName}%'
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG LIKE '%${valueFlag}%'
+      </if>
+      <if test="railwayTypeNo != null and railwayTypeNo != ''">
+        and RAILWAY_TYPE_NO LIKE '%${railwayTypeNo}%'
+      </if>
+      <if test="railwayTypeName != null and railwayTypeName != ''">
+        and RAILWAY_TYPE_NAME LIKE '%${railwayTypeName}%'
+      </if>
+
+      <if test="railwayModelNo != null and railwayModelNo != ''">
+        and RAILWAY_MODEL_NO LIKE '%${railwayModelNo}%'
+      </if>
+      <if test="railwayModelName != null and railwayModelName != ''">
+        and RAILWAY_MODEL_NAME LIKE '%${railwayModelName}%'
+      </if>
+      <if test="railwayFactoryWeight != null">
+        and RAILWAY_FACTORY_WEIGHT = #{railwayFactoryWeight}
+      </if>
+      <if test="waterNum != null">
+        and WATER_NUM = #{waterNum}
+      </if>
+      <if test="arrival != null and arrival != ''">
+        and ARRIVAL LIKE '%${arrival}%'
+      </if>
+      <if test="station != null and station != ''">
+        and STATION LIKE '%${station}%'
+      </if>
+      <if test="sourceArea != null and sourceArea != ''">
+        and SOURCE_AREA LIKE '%${sourceArea}%'
+      </if>
+      <if test="voucherIdentity != null and voucherIdentity != ''">
+        and VOUCHER_IDENTITY LIKE '%${voucherIdentity}%'
+      </if>
+      <if test="voucherItem != null and voucherItem != ''">
+        and VOUCHER_ITEM LIKE '%${voucherItem}%'
+      </if>
+      <if test="businessGroup != null and businessGroup != ''">
+        and BUSINESS_GROUP LIKE '%${businessGroup}%'
+      </if>
+      <if test="tempConveyance != null and tempConveyance != ''">
+        and TEMP_CONVEYANCE LIKE '%${tempConveyance}%'
+      </if>
+      <if test="conveyanceType != null and conveyanceType != ''">
+        and CONVEYANCE_TYPE LIKE '%${conveyanceType}%'
+      </if>
+      <if test="resourceSystem != null and resourceSystem != ''">
+        and RESOURCE_SYSTEM LIKE '%${resourceSystem}%'
+      </if>
+      <if test="groupPackageAmount != null">
+        and GROUP_PACKAGE_AMOUNT = #{groupPackageAmount}
+      </if>
+      <if test="groupPackageUnit != null and groupPackageUnit != ''">
+        and GROUP_PACKAGE_UNIT LIKE '%${groupPackageUnit}%'
+      </if>
+      <if test="packageAmount != null">
+        and PACKAGE_AMOUNT = #{packageAmount}
+      </if>
+      <if test="packageUnit != null and packageUnit != ''">
+        and PACKAGE_UNIT LIKE '%${packageUnit}%'
+      </if>
+      <if test="theoryAmount != null">
+        and THEORY_AMOUNT = #{theoryAmount}
+      </if>
+      <if test="measureBatch != null and measureBatch != ''">
+        and MEASURE_BATCH LIKE '%${measureBatch}%'
+      </if>
+      <if test="measureBatchCount != null">
+        and MEASURE_BATCH_COUNT = #{measureBatchCount}
+      </if>
+      <if test="senderType != null and senderType != ''">
+        and SENDER_TYPE LIKE '%${senderType}%'
+      </if>
+      <if test="senderRemark != null and senderRemark != ''">
+        and SENDER_REMARK LIKE '%${senderRemark}%'
+      </if>
+      <if test="receiverType != null and receiverType != ''">
+        and RECEIVER_TYPE LIKE '%${receiverType}%'
+      </if>
+      <if test="receiverRemark != null and receiverRemark != ''">
+        and RECEIVER_REMARK LIKE '%${receiverRemark}%'
+      </if>
+      <if test="amountUnit != null and amountUnit != ''">
+        and AMOUNT_UNIT LIKE '%${amountUnit}%'
+      </if>
+      <if test="measureObjectType != null and measureObjectType != ''">
+        and MEASURE_OBJECT_TYPE LIKE '%${measureObjectType}%'
+      </if>
+      <if test="measureTaskNum != null and measureTaskNum != ''">
+        and MEASURE_TASK_NUM LIKE '%${measureTaskNum}%'
+      </if>
+      <if test="dataSource != null and dataSource != ''">
+        and DATA_SOURCE LIKE '%${dataSource}%'
+      </if>
+      <if test="note != null and note != ''">
+        and NOTE LIKE '%${note}%'
+      </if>
+      <if test="trainNumberNo != null and trainNumberNo != ''">
+        and TRAIN_NUMBER_NO LIKE '%${trainNumberNo}%'
+      </if>
+      <if test="isPreSacale != null and isPreSacale != ''">
+        and IS_PRE_SACALE LIKE '%${isPreSacale}%'
+      </if>
+      <if test="hc15 != null and hc15 != ''">
+        and HC15 LIKE '%${hc15}%'
+      </if>
+      <if test="cancelType != null and cancelType != ''">
+        and CANCEL_TYPE LIKE '%${cancelType}%'
+      </if>
+      <if test="lcNo != null and lcNo != ''">
+        and LC_NO LIKE '%${lcNo}%'
+      </if>
+      <if test="startTime != null and startTime != null and endTime != '' 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>
+  <select id="likeByDescTSDG" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLikeTSDG"/>
+<!--    and matter_no in-->
+<!--    <foreach collection="list" item="id" open="(" close=")" separator=",">-->
+<!--      #{id}-->
+<!--    </foreach>-->
+<!--    and value_flag in ('0', '1')-->
     order by create_time desc
   </select>
   <!-- 查询：根据传入时间和车号，查询给定时间段去重车号 -->

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

@@ -119,5 +119,8 @@ public interface IMeterWorkRailwayActFirstService extends IBaseService<MeterWork
     RESTfulResult batchUpdateLcNo(List<MeterWorkRailwayActFirst> models);
 
     RESTfulResult doIdentifyWeight(MeterWorkRailwayActFirst model);
+
+    PageList<MeterWorkRailwayActFirst> likeByDescTSDG(HashMap<String, Object> parameters, Integer pageNum, Integer pageSize);
+
 }
 

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

@@ -1,6 +1,7 @@
 package com.steerinfo.meterwork.meterworkrailwayactfirst.service.impl;
 
 import com.google.inject.internal.cglib.proxy.$UndeclaredThrowableException;
+import com.steerinfo.baseinfo.combaseinfo.mapper.ComBaseInfoMapper;
 import com.steerinfo.baseinfo.meterbasematterinfo.mapper.MeterBaseMatterInfoMapper;
 import com.steerinfo.baseinfo.meterbaserailwayaiweight.mapper.MeterBaseRailwayAiweightMapper;
 import com.steerinfo.baseinfo.meterbaserailwayaiweight.model.MeterBaseRailwayAiweight;
@@ -93,6 +94,9 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
     @Resource
     private MeterWorkRailwayScheduledHelpMapper meterWorkRailwayScheduledHelpMapper;
 
+    @Resource
+    private ComBaseInfoMapper comBaseInfoMapper;
+
     @Resource
     private MeterBaseRailwayAiweightMapper meterBaseRailwayAiweightMapper;
 
@@ -4963,6 +4967,18 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         return rm;
     }
 
+    @Override
+    public PageList<MeterWorkRailwayActFirst> likeByDescTSDG(HashMap<String, Object> param, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        HashMap<String, Object> obj = new HashMap<>();
+        obj.put("pBaseCode", "001036");
+        List<String> matterList = comBaseInfoMapper.matterNoByBaseCode(obj);
+        param.put("list", matterList);
+        List<MeterWorkRailwayActFirst> rows = meterWorkRailwayActFirstMapper.likeByDescTSDG(param);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
     public static void main(String[] args) {
         BigDecimal a = new BigDecimal(95120);
         BigDecimal b = a.divide(new BigDecimal(1000));

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

@@ -96,6 +96,23 @@ 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")
+    @GetMapping(value = "/likeByDesc/")
+    public RESTfulResult likeByDesc01(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+        try {
+            PageList<MeterWorkRailwayActual> list = meterWorkRailwayActualService.likeByDesc(parmas, pageNum, pageSize);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "创建", notes = "根据MeterWorkRailwayActual对象创建")
     @ApiImplicitParam(name = "meterWorkRailwayActual", value = "详细实体meterWorkRailwayActual", required = true, dataType = "MeterWorkRailwayActual")
     //@RequiresPermissions("meterworkrailwayactual:create")

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

@@ -3826,7 +3826,222 @@
 
   <select id="likeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select" />
-    <include refid="whereLike" />
+    <where>
+      1 = 1
+      <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+        and  net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+      </if>
+      <if test="actualNo != null and actualNo != ''">
+        and ACTUAL_NO LIKE '%${actualNo}%'
+      </if>
+      <if test="predictionNo != null and predictionNo != ''">
+        and PREDICTION_NO LIKE '%${predictionNo}%'
+      </if>
+      <if test="noticeNo != null and noticeNo != ''">
+        and NOTICE_NO LIKE '%${noticeNo}%'
+      </if>
+      <if test="railwayNo != null and railwayNo != ''">
+        and RAILWAY_NO LIKE '%${railwayNo}%'
+      </if>
+      <if test="railwayCarriageNo != null and railwayCarriageNo != ''">
+        and RAILWAY_CARRIAGE_NO LIKE '%${railwayCarriageNo}%'
+      </if>
+      <if test="matterNo != null and matterNo != ''">
+        and MATTER_NO LIKE '%${matterNo}%'
+      </if>
+      <if test="matterName != null and matterName != ''">
+        and MATTER_NAME LIKE '%${matterName}%'
+      </if>
+      <if test="contractNo != null and contractNo != ''">
+        and CONTRACT_NO LIKE '%${contractNo}%'
+      </if>
+      <if test="batchNo != null and batchNo != ''">
+        and BATCH_NO LIKE '%${batchNo}%'
+      </if>
+      <if test="customerSupplierNo != null and customerSupplierNo != ''">
+        and CUSTOMER_SUPPLIER_NO LIKE '%${customerSupplierNo}%'
+      </if>
+      <if test="customerSupplierName != null and customerSupplierName != ''">
+        and CUSTOMER_SUPPLIER_NAME LIKE '%${customerSupplierName}%'
+      </if>
+      <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+        and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+      </if>
+      <if test="forwardingUnitName != null and forwardingUnitName != ''">
+        and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+      </if>
+      <if test="receivingUintNo != null and receivingUintNo != ''">
+        and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+      </if>
+      <if test="receivingUintName != null and receivingUintName != ''">
+        and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+      </if>
+      <if test="materialNo != null and materialNo != ''">
+        and MATERIAL_NO LIKE '%${materialNo}%'
+      </if>
+      <if test="materialName != null and materialName != ''">
+        and MATERIAL_NAME LIKE '%${materialName}%'
+      </if>
+      <if test="specNo != null and specNo != ''">
+        and SPEC_NO LIKE '%${specNo}%'
+      </if>
+      <if test="specName != null and specName != ''">
+        and SPEC_NAME LIKE '%${specName}%'
+      </if>
+      <if test="loadPointNo != null and loadPointNo != ''">
+        and LOAD_POINT_NO LIKE '%${loadPointNo}%'
+      </if>
+      <if test="loadPointName != null and loadPointName != ''">
+        and LOAD_POINT_NAME LIKE '%${loadPointName}%'
+      </if>
+      <if test="sampleVoucher != null and sampleVoucher != ''">
+        and SAMPLE_VOUCHER LIKE '%${sampleVoucher}%'
+      </if>
+      <if test="carrierUnitNo != null and carrierUnitNo != ''">
+        and CARRIER_UNIT_NO LIKE '%${carrierUnitNo}%'
+      </if>
+      <if test="carrierUnitName != null and carrierUnitName != ''">
+        and CARRIER_UNIT_NAME LIKE '%${carrierUnitName}%'
+      </if>
+      <if test="meterTypeNo != null and meterTypeNo != ''">
+        and METER_TYPE_NO LIKE '%${meterTypeNo}%'
+      </if>
+      <if test="meterTypeName != null and meterTypeName != ''">
+        and METER_TYPE_NAME LIKE '%${meterTypeName}%'
+      </if>
+      <if test="meterProcessNo != null and meterProcessNo != ''">
+        and METER_PROCESS_NO LIKE '%${meterProcessNo}%'
+      </if>
+      <if test="meterProcessEditionNo != null and meterProcessEditionNo != ''">
+        and METER_PROCESS_EDITION_NO LIKE '%${meterProcessEditionNo}%'
+      </if>
+      <if test="actualFirst1No != null and actualFirst1No != ''">
+        and ACTUAL_FIRST1_NO LIKE '%${actualFirst1No}%'
+      </if>
+      <if test="grossWeight != null">
+        and GROSS_WEIGHT = #{grossWeight}
+      </if>
+      <if test="grossManNo != null and grossManNo != ''">
+        and GROSS_MAN_NO LIKE '%${grossManNo}%'
+      </if>
+      <if test="grossManName != null and grossManName != ''">
+        and GROSS_MAN_NAME LIKE '%${grossManName}%'
+      </if>
+      <if test="grossTime != null">
+        and TO_CHAR(GROSS_TIME,'yyyy-MM-dd') = #{grossTime}
+      </if>
+      <if test="baseSpot1No != null and baseSpot1No != ''">
+        and BASE_SPOT1_NO LIKE '%${baseSpot1No}%'
+      </if>
+      <if test="baseSpot1Name != null and baseSpot1Name != ''">
+        and BASE_SPOT1_NAME LIKE '%${baseSpot1Name}%'
+      </if>
+      <if test="grossClass != null and grossClass != ''">
+        and GROSS_CLASS LIKE '%${grossClass}%'
+      </if>
+      <if test="grossGroup != null and grossGroup != ''">
+        and GROSS_GROUP LIKE '%${grossGroup}%'
+      </if>
+      <if test="grossMode != null and grossMode != ''">
+        and GROSS_MODE LIKE '%${grossMode}%'
+      </if>
+      <if test="actualFirst2No != null and actualFirst2No != ''">
+        and ACTUAL_FIRST2_NO LIKE '%${actualFirst2No}%'
+      </if>
+      <if test="tareWeight != null">
+        and TARE_WEIGHT = #{tareWeight}
+      </if>
+      <if test="tareManNo != null and tareManNo != ''">
+        and TARE_MAN_NO LIKE '%${tareManNo}%'
+      </if>
+      <if test="tareManName != null and tareManName != ''">
+        and TARE_MAN_NAME LIKE '%${tareManName}%'
+      </if>
+      <if test="tareTime != null">
+        and TO_CHAR(TARE_TIME,'yyyy-MM-dd') = #{tareTime}
+      </if>
+      <if test="baseSpot2No != null and baseSpot2No != ''">
+        and BASE_SPOT2_NO LIKE '%${baseSpot2No}%'
+      </if>
+      <if test="baseSpot2Name != null and baseSpot2Name != ''">
+        and BASE_SPOT2_NAME LIKE '%${baseSpot2Name}%'
+      </if>
+      <if test="tareClass != null and tareClass != ''">
+        and TARE_CLASS LIKE '%${tareClass}%'
+      </if>
+      <if test="tareGroup != null and tareGroup != ''">
+        and TARE_GROUP LIKE '%${tareGroup}%'
+      </if>
+      <if test="tareMode != null and tareMode != ''">
+        and TARE_MODE LIKE '%${tareMode}%'
+      </if>
+      <if test="netWeight != null">
+        and NET_WEIGHT = #{netWeight}
+      </if>
+      <if test="netManNo != null and netManNo != ''">
+        and NET_MAN_NO LIKE '%${netManNo}%'
+      </if>
+      <if test="netManName != null and netManName != ''">
+        and NET_MAN_NAME LIKE '%${netManName}%'
+      </if>
+      <if test="netTime != null">
+        and TO_CHAR(NET_TIME,'yyyy-MM-dd') = #{netTime}
+      </if>
+      <if test="netSpot3No != null and netSpot3No != ''">
+        and NET_SPOT3_NO LIKE '%${netSpot3No}%'
+      </if>
+      <if test="netSpot3Name != null and netSpot3Name != ''">
+        and NET_SPOT3_NAME LIKE '%${netSpot3Name}%'
+      </if>
+      <if test="netMode != null and netMode != ''">
+        and NET_MODE LIKE '%${netMode}%'
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG LIKE '%${valueFlag}%'
+      </if>
+      <if test="uploadFlag != null and uploadFlag != ''">
+        and UPLOAD_FLAG LIKE '%${uploadFlag}%'
+      </if>
+      <if test="sampleNo != null and sampleNo != ''">
+        and SAMPLE_NO LIKE '%${sampleNo}%'
+      </if>
+      <if test="railwayTypeNo != null and railwayTypeNo != ''">
+        and RAILWAY_TYPE_NO LIKE '%${railwayTypeNo}%'
+      </if>
+      <if test="railwayTypeName != null and railwayTypeName != ''">
+        and RAILWAY_TYPE_NAME LIKE '%${railwayTypeName}%'
+      </if>
+      <if test="waterNum != null">
+        and WATER_NUM = #{waterNum}
+      </if>
+      <if test="arrival != null and arrival != ''">
+        and ARRIVAL LIKE '%${arrival}%'
+      </if>
+      <if test="station != null and station != ''">
+        and STATION LIKE '%${station}%'
+      </if>
+      <if test="senderType != null and senderType != ''">
+        and SENDER_TYPE LIKE '%${senderType}%'
+      </if>
+      <if test="senderRemark != null and senderRemark != ''">
+        and SENDER_REMARK LIKE '%${senderRemark}%'
+      </if>
+      <if test="receiverRemark != null and receiverRemark != ''">
+        and RECEIVER_REMARK LIKE '%${receiverRemark}%'
+      </if>
+      <if test="dataSource != null and dataSource != ''">
+        and DATA_SOURCE LIKE '%${dataSource}%'
+      </if>
+      <if test="isPreSacale != null and isPreSacale != ''">
+        and IS_PRE_SACALE LIKE '%${isPreSacale}%'
+      </if>
+      <if test="lcNo != null and lcNo != ''">
+        and LC_NO LIKE '%${lcNo}%'
+      </if>
+      <if test="predictionType != null and predictionType != ''">
+        and PREDICTION_TYPE LIKE '%${predictionType}%'
+      </if>
+    </where>
     and value_flag != '0'
     order by net_time desc
   </select>

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

@@ -649,6 +649,13 @@
       </if>
     </where>
   </sql>
+  <sql id="TSDGwhereLike">
+    <where>
+      <if test="railwayNo != null and railwayNo != ''">
+        and RAILWAY_NO LIKE '%${railwayNo}'
+      </if>
+    </where>
+  </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     delete from PRE_RAILWAY_SCALE
     where PREDICTION_NO = #{predictionNo,jdbcType=VARCHAR}
@@ -3089,7 +3096,7 @@
 
     <select id="likeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
       <include refid="select"/>
-      <include refid="whereLike"/>
+      <include refid="TSDGwhereLike"/>
       and matter_no in
       <foreach collection="list" item="id" open="(" close=")" separator=",">
         #{id}