dengyj 4 éve
szülő
commit
3ce183133a
16 módosított fájl, 230 hozzáadás és 20 törlés
  1. 26 9
      src/main/java/com/steerinfo/baseinfo/meterbaserailwayaiweight/service/impl/MeterBaseRailwayAiweightServiceImpl.java
  2. 3 1
      src/main/java/com/steerinfo/meterwork/meterworkcaractual/controller/MeterWorkCarActualController.java
  3. 1 1
      src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/impl/MeterWorkCarActualFirstServiceImpl.java
  4. 22 0
      src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/controller/MeterWorkRailwayActFirstController.java
  5. 2 0
      src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/IMeterWorkRailwayActFirstService.java
  6. 127 0
      src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/impl/MeterWorkRailwayActFirstServiceImpl.java
  7. 12 0
      src/main/java/com/steerinfo/meterwork/meterworkrailwayrecmain/controller/MeterWorkRailwayRecMainController.java
  8. 4 0
      src/main/java/com/steerinfo/meterwork/meterworkrailwayrecmain/mapper/MeterWorkRailwayRecMainMapper.java
  9. 8 0
      src/main/java/com/steerinfo/meterwork/meterworkrailwayrecmain/mapper/MeterWorkRailwayRecMainMapper.xml
  10. 3 0
      src/main/java/com/steerinfo/meterwork/meterworkrailwayrecmain/service/IMeterWorkRailwayRecMainService.java
  11. 9 1
      src/main/java/com/steerinfo/meterwork/meterworkrailwayrecmain/service/impl/MeterWorkRailwayRecMainServiceImpl.java
  12. 1 1
      src/main/java/com/steerinfo/pretrack/pretrackscale/controller/PreTrackScaleController.java
  13. 1 1
      src/main/java/com/steerinfo/pretrack/pretrackscale/mapper/PreTrackScaleMapper.java
  14. 8 3
      src/main/java/com/steerinfo/pretrack/pretrackscale/mapper/PreTrackScaleMapper.xml
  15. 1 1
      src/main/java/com/steerinfo/pretrack/pretrackscale/service/IPreTrackScaleService.java
  16. 2 2
      src/main/java/com/steerinfo/pretrack/pretrackscale/service/impl/PreTrackScaleServiceImpl.java

+ 26 - 9
src/main/java/com/steerinfo/baseinfo/meterbaserailwayaiweight/service/impl/MeterBaseRailwayAiweightServiceImpl.java

@@ -6,12 +6,14 @@ import com.steerinfo.baseinfo.meterbaserailwayaiweight.service.IMeterBaseRailway
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import org.apache.shiro.crypto.hash.Hash;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -47,15 +49,30 @@ public class MeterBaseRailwayAiweightServiceImpl extends BaseServiceImpl<MeterBa
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
             String afl = sdf.format(new Date());
             for(MeterBaseRailwayAiweight model: models) {
-                String no = meterBaseRailwayAiweightMapper.getNewID(afl);
-                model.setActualFirstNo(sdf.format(new Date()) + no);
-                model.setValueFlag("0");
-                model.setRailwayTypeNo("001019002");
-                model.setRailwayTypeName("动态轨道衡");
-                model.setCreateManNo("admin");
-                model.setCreateManName("admins");
-                model.setCreateTime(new Date());
-                meterBaseRailwayAiweightMapper.insertSelective(model);
+                HashMap<String, Object> map = new HashMap<>();
+                map.put("railwayNo", model.getRailwayNo());
+                map.put("valueFlag", "0");
+                List<MeterBaseRailwayAiweight> AiModels =  meterBaseRailwayAiweightMapper.selectByParameters(map);
+                if(AiModels.size() >= 1) {
+                    model.setActualFirstNo(AiModels.get(0).getActualFirstNo());
+                    model.setValueFlag("0");
+                    model.setRailwayTypeNo("001019002");
+                    model.setRailwayTypeName("动态轨道衡");
+                    model.setUpdateManNo("admin");
+                    model.setUpdateManName("admins");
+                    model.setUpdateTime(new Date());
+                    meterBaseRailwayAiweightMapper.updateByPrimaryKeySelective(model);
+                }else {
+                    String no = meterBaseRailwayAiweightMapper.getNewID(afl);
+                    model.setActualFirstNo(sdf.format(new Date()) + no);
+                    model.setValueFlag("0");
+                    model.setRailwayTypeNo("001019002");
+                    model.setRailwayTypeName("动态轨道衡");
+                    model.setCreateManNo("admin");
+                    model.setCreateManName("admins");
+                    model.setCreateTime(new Date());
+                    meterBaseRailwayAiweightMapper.insertSelective(model);
+                }
             }
             rm.setSucceed();
             rm.setCode("200");

+ 3 - 1
src/main/java/com/steerinfo/meterwork/meterworkcaractual/controller/MeterWorkCarActualController.java

@@ -110,7 +110,9 @@ throw new MarkerMetException(500, "操作异常!!");
     @PostMapping(value = "/likeByDesc")
     public RESTfulResult likeByDesc(@RequestBody HashMap params, Integer pageNum, Integer pageSize) {
         try {
-            PageList<MeterWorkCarActual> list = meterWorkCarActualService.likeByDesc(params, pageNum, pageSize);
+            int pageNum01 = params.get("pageNum") == null ? 1 : Integer.parseInt(params.get("pageNum").toString());
+            int pageSize01 = params.get("pagesize") == null ? 20 : Integer.parseInt(params.get("pagesize").toString());
+            PageList<MeterWorkCarActual> list = meterWorkCarActualService.likeByDesc(params, pageNum01, pageSize01);
             return success(list);
         } catch (Exception ex) {
             ex.printStackTrace();

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

@@ -1306,7 +1306,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 
 
 
-            rm.setData(afl + no1);
+            rm.setData(secondDb.getActualFirstNo());
             rm.setMessage(flag);
             return rm;
         }

+ 22 - 0
src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/controller/MeterWorkRailwayActFirstController.java

@@ -1,5 +1,6 @@
 package com.steerinfo.meterwork.meterworkrailwayactfirst.controller;
 
+import com.steerinfo.baseinfo.meterbaserailwayaiweight.model.MeterBaseRailwayAiweight;
 import com.steerinfo.baseinfo.meterbaserailwayweight.mapper.MeterBaseRailwayWeightMapper;
 import com.steerinfo.baseinfo.meterbaserailwayweight.model.MeterBaseRailwayWeight;
 import com.steerinfo.framework.controller.BaseRESTfulController;
@@ -1054,6 +1055,27 @@ throw new MarkerMetException(500, "操作异常!!");
         }
     }
 
+    @ApiOperation(value = "动态衡维护界面--毛皮匹配洁净保存", notes = "根据毛皮的List<MeterWorkRailwayActFirst>对象进行批量匹配洁净保存")
+    @PostMapping(value = "/doAddRailAINetWf")
+    public RESTfulResult doAddRailAINetWf(@RequestBody CommonCombination<List<MeterWorkRailwayMotorialReceived>, List<MeterBaseRailwayAiweight>, MeterBaseRailwayWeight,MeterBaseRailwayWeight> com) {
+        RESTfulResult rm = failed();
+        try {
+
+            if(com.getOne().size() >= 1 && com.getTwo().size() >= 1) {
+                rm = meterWorkRailwayActFirstService.doAddRailAINetWf(com.getOne(), com.getTwo());
+            }else if(com.getOne().size() < 1){
+                rm.setMessage("至少需要选择一条毛重数据进行匹配洁净保存,请确认!!!!");
+            }else if(com.getTwo().size() < 1) {
+                rm.setMessage("至少需要选择一条AI标志皮重数据进行匹配洁净保存,请确认!!!!");
+            }
+            return rm;
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常,请确认!>>>>" + e.getMessage());
+            return rm;
+        }
+    }
+
     @ApiOperation(value = "动态衡维护界面--毛皮匹配洁净保存", notes = "根据毛皮的List<MeterWorkRailwayActFirst>对象进行批量匹配洁净保存")
     @PostMapping(value = "/selfServiceMeasurement")
     public RESTfulResult selfServiceMeasurement(@RequestBody MeterWorkRailwayActFirst first) {

+ 2 - 0
src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/IMeterWorkRailwayActFirstService.java

@@ -1,5 +1,6 @@
 package com.steerinfo.meterwork.meterworkrailwayactfirst.service;
 
+import com.steerinfo.baseinfo.meterbaserailwayaiweight.model.MeterBaseRailwayAiweight;
 import com.steerinfo.baseinfo.meterbaserailwayweight.model.MeterBaseRailwayWeight;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.IBaseService;
@@ -109,6 +110,7 @@ public interface IMeterWorkRailwayActFirstService extends IBaseService<MeterWork
     RESTfulResult supplementaryData(MeterWorkRailwayActFirst model);
     RESTfulResult doAddRailWf(List<MeterWorkRailwayActFirst> models);
     RESTfulResult doAddRailNetWf(List<MeterWorkRailwayMotorialReceived> grossModels, List<MeterWorkRailwayActFirst> tareModels);
+    RESTfulResult doAddRailAINetWf(List<MeterWorkRailwayMotorialReceived> grossModels, List<MeterBaseRailwayAiweight> tareModels);
 
     RESTfulResult selfServiceMeasurement(MeterWorkRailwayActFirst first);
     RESTfulResult batchUpdateLcNo(List<MeterWorkRailwayActFirst> models);

+ 127 - 0
src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/impl/MeterWorkRailwayActFirstServiceImpl.java

@@ -3942,6 +3942,133 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         return rm;
     }
 
+    @Override
+    public RESTfulResult doAddRailAINetWf(List<MeterWorkRailwayMotorialReceived> grossModels, List<MeterBaseRailwayAiweight> tareModels) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try{
+            int count = 0;
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+            String afl = sdf.format(new Date());
+            String userId ="",userName="";
+            try {
+                UserPayload payload = UserPayload.getCurrUser();
+                userId = payload.getId();
+                userName = payload.getUserName();
+            }catch (Exception ex){}
+
+            for(MeterWorkRailwayMotorialReceived received: grossModels){
+                for(MeterBaseRailwayAiweight first:tareModels){
+                    //两个车号一样则匹配,否则则不匹配
+                    if(first.getRailwayNo().equals(received.getRailwayNo())){
+                        MeterWorkRailwayActFirst AIFirst = new MeterWorkRailwayActFirst();
+                        //已使用 METER_WORK_RAILWAY_RECEIVED表状态设置为已使用
+                        preRailwayScaleMapper.updateMeterWorkRailwayReceived(received.getActualFirstNo());
+
+                        //将一次表中的皮重设置为已洁净
+                        String firstNo = afl + meterWorkRailwayActFirstMapper.getNewID(afl);
+                        AIFirst.setActualFirstNo(firstNo);
+                        AIFirst.setValueFlag("2");
+                        AIFirst.setRailwayNo(first.getRailwayNo());
+                        AIFirst.setMeterWeight(first.getMeterWeight());
+                        AIFirst.setRailwayTypeNo(first.getRailwayTypeNo());
+                        AIFirst.setRailwayTypeName(first.getRailwayTypeName());
+                        AIFirst.setCreateManNo(first.getCreateManNo());
+                        AIFirst.setCreateManName(first.getCreateManName());
+                        AIFirst.setCreateTime(first.getCreateTime());
+                        AIFirst.setRailwaySpeed(first.getRailwaySpeed());
+                        AIFirst.setConveyanceType(first.getRailwayType());
+                        meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(AIFirst);
+
+                        //新增一条毛重信息
+                        MeterWorkRailwayActFirst second=new MeterWorkRailwayActFirst();
+                        second.setActualFirstNo(received.getActualFirstNo());
+                        second.setValueFlag("2");
+                        second.setRailwayNo(received.getRailwayNo());
+                        second.setRailwayCarriageNo(received.getRailwayCarriageNo());
+                        second.setRailwaySpeed(received.getRailwaySpeed());
+                        second.setMeterWeight(received.getMeterWeight());
+                        second.setCreateTime(received.getCreateTime());
+                        second.setCreateManNo(userId);
+                        second.setCreateManName(userName);
+                        second.setWeightType("0");
+                        second.setRailwayTypeNo(received.getRailwayTypeNo());
+                        second.setRailwayTypeName(received.getRailwayTypeName());
+                        second.setBaseSpotNo(received.getBaseSpotNo());
+                        second.setBaseSpotName(received.getBaseSpotName());
+                        second.setShipmentGrossWeight(received.getShipmentGrossWeight());
+                        second.setShipmentNetWeight(received.getShipmentNetWeight());
+                        second.setRailwayModelName(received.getRailwayModel());
+                        meterWorkRailwayActFirstMapper.insertSelective(second);
+
+
+                        //新增一条洁净数据
+                        MeterWorkRailwayActual netRail=new MeterWorkRailwayActual();
+                        String netNo = meterWorkRailwayActualMapper.getNewID(afl);
+                        netRail.setActualNo(afl + netNo);
+                        netRail.setRailwayNo(received.getRailwayNo());
+                        netRail.setRailwayCarriageNo(received.getRailwayCarriageNo());
+                        netRail.setGrossWeight(received.getMeterWeight());
+                        netRail.setGrossMode("1");
+                        netRail.setGrossManNo(userId);
+                        netRail.setGrossManName(userName);
+                        netRail.setGrossTime(received.getCreateTime());
+                        netRail.setGrossClass(received.getShipmentGrossWeight().doubleValue()+""); //左右偏载
+                        netRail.setGrossGroup(received.getShipmentNetWeight().doubleValue()+"");//前后偏载
+                        netRail.setBaseSpot1No(received.getBaseSpotNo());
+                        netRail.setBaseSpot1Name(received.getBaseSpotName());
+                        netRail.setActualFirst1No(second.getActualFirstNo());
+
+                        netRail.setRailwayTypeNo(received.getRailwayTypeNo());
+                        netRail.setRailwayTypeName(received.getRailwayTypeName());
+                        netRail.setConveyanceType(received.getRailwayModel());
+                        //netRail.setRailwayModelName(received.getRailwayModel());
+
+                        netRail.setTareWeight(AIFirst.getMeterWeight());
+                        netRail.setTareManNo(userId);
+                        netRail.setTareManName(userName);
+                        netRail.setTareTime(AIFirst.getCreateTime());
+                        netRail.setTareMode("1");
+                        netRail.setTareClass(second.getShipmentGrossWeight().doubleValue()+""); //左右偏载
+                        netRail.setTareGroup(second.getShipmentNetWeight().doubleValue()+"");//前后偏载
+                        netRail.setBaseSpot2No(second.getBaseSpotNo());
+                        netRail.setBaseSpot2Name(second.getBaseSpotName());
+                        netRail.setActualFirst2No(second.getActualFirstNo());
+
+                        netRail.setNetMode("1");
+                        netRail.setNetWeight(second.getMeterWeight().subtract(AIFirst.getMeterWeight()));
+                        netRail.setNetTime(new Date());
+                        netRail.setNetManNo(userId);
+                        netRail.setNetManName(userName);
+                        netRail.setNetSpot3No(received.getBaseSpotNo());
+                        netRail.setNetSpot3Name(received.getBaseSpotName());
+
+                        netRail.setValueFlag("0");
+                        netRail.setUploadFlag("0");
+
+                        netRail.setMeterTypeNo(received.getMeterTypeNo());
+                        netRail.setMeterTypeName(received.getMeterTypeName());
+
+                        int i  = meterWorkRailwayActualMapper.insertSelective(netRail);
+
+                        if(i >= 1) {
+                            meterWorkRailwayActFirstMapper.deleteByPrimaryKey(firstNo);
+                            count++;
+                        }
+                        break;
+                    }
+                }
+            }
+            rm.setSucceed();
+            rm.setCode("200");
+            rm.setMessage("操作成功,总共" + count + "条记录匹配AI标志皮洁净成功!!");
+        }catch(Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常,请确认!!!>>>" + e.getMessage());
+        }
+        return rm;
+    }
+
     @Override
     public RESTfulResult selfServiceMeasurement(MeterWorkRailwayActFirst first) {
         RESTfulResult rm = new RESTfulResult();

+ 12 - 0
src/main/java/com/steerinfo/meterwork/meterworkrailwayrecmain/controller/MeterWorkRailwayRecMainController.java

@@ -81,6 +81,18 @@ public class MeterWorkRailwayRecMainController extends BaseRESTfulController {
         PageList<MeterWorkRailwayRecMain> list = meterWorkRailwayRecMainService.queryLikeForPage(parmas, pageNum, pageSize);
         return success(list);
     }
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkrailwayrecmain:view")
+    @PostMapping(value = "/listBynoPage")
+    public RESTfulResult listBynoPage(@RequestBody HashMap parmas){
+        List<MeterWorkRailwayRecMain> list = meterWorkRailwayRecMainService.listBynoPage(parmas);
+        return success(list);
+    }
     
     @ApiOperation(value="创建", notes="根据MeterWorkRailwayRecMain对象创建")
     @ApiImplicitParam(name = "meterWorkRailwayRecMain", value = "详细实体meterWorkRailwayRecMain", required = true, dataType = "MeterWorkRailwayRecMain")

+ 4 - 0
src/main/java/com/steerinfo/meterwork/meterworkrailwayrecmain/mapper/MeterWorkRailwayRecMainMapper.java

@@ -3,10 +3,14 @@ package com.steerinfo.meterwork.meterworkrailwayrecmain.mapper;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.meterwork.meterworkrailwayrecmain.model.MeterWorkRailwayRecMain;
 import java.math.*;
+import java.util.HashMap;
+import java.util.List;
+
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface MeterWorkRailwayRecMainMapper extends IBaseMapper<MeterWorkRailwayRecMain, String> {
     String getNewID(@Param(value="afl")String afl);
+    List<MeterWorkRailwayRecMain> listBynoPage(HashMap<String, Object> params);
 }

+ 8 - 0
src/main/java/com/steerinfo/meterwork/meterworkrailwayrecmain/mapper/MeterWorkRailwayRecMainMapper.xml

@@ -79,6 +79,9 @@
       <if test="trackWay != null and trackWay != ''">
         and TRACK_WAY LIKE '%${trackWay}%'
       </if>
+      <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+        and  CREATE_TIME  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and CREATE_TIME  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -290,4 +293,9 @@
     SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(ACTUAL_NO, LENGTH(ACTUAL_NO) - 3))),0) + 1,4,'0') ACTUAL_NO
     FROM METER_WORK_RAILWAY_REC_MAIN where instr(ACTUAL_NO,#{afl,jdbcType=VARCHAR})>0
   </select>
+
+  <select id="listBynoPage" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
 </mapper>

+ 3 - 0
src/main/java/com/steerinfo/meterwork/meterworkrailwayrecmain/service/IMeterWorkRailwayRecMainService.java

@@ -6,6 +6,8 @@ import com.steerinfo.meterwork.meterworkrailwayreceived.model.MeterWorkRailwayRe
 import com.steerinfo.meterwork.meterworkrailwayrecmain.model.MeterWorkRailwayRecMain;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * MeterWorkRailwayRecMain服务接口:
@@ -22,4 +24,5 @@ import java.math.BigDecimal;
  */
 public interface IMeterWorkRailwayRecMainService extends IBaseService<MeterWorkRailwayRecMain, String>{
     RESTfulResult checkandadd(MeterWorkRailwayRecMain model)  throws Exception;
+    List<MeterWorkRailwayRecMain> listBynoPage(HashMap<String, Object> parmas);
 }

+ 9 - 1
src/main/java/com/steerinfo/meterwork/meterworkrailwayrecmain/service/impl/MeterWorkRailwayRecMainServiceImpl.java

@@ -10,9 +10,12 @@ import com.steerinfo.meterwork.meterworkrailwayrecmain.service.IMeterWorkRailway
 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;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * MeterWorkRailwayRecMain服务实现:
@@ -30,7 +33,7 @@ import java.math.BigDecimal;
 @Service(value = "meterWorkRailwayRecMainService")
 public class MeterWorkRailwayRecMainServiceImpl extends BaseServiceImpl<MeterWorkRailwayRecMain, String> implements IMeterWorkRailwayRecMainService {
 
-    @Autowired
+    @Resource
     private MeterWorkRailwayRecMainMapper meterWorkRailwayRecMainMapper;
 
     @Override
@@ -52,4 +55,9 @@ public class MeterWorkRailwayRecMainServiceImpl extends BaseServiceImpl<MeterWor
             throw e;
         }
     }
+
+    @Override
+    public List<MeterWorkRailwayRecMain> listBynoPage(HashMap<String, Object> parmas) {
+        return meterWorkRailwayRecMainMapper.listBynoPage(parmas);
+    }
 }

+ 1 - 1
src/main/java/com/steerinfo/pretrack/pretrackscale/controller/PreTrackScaleController.java

@@ -465,7 +465,7 @@ public class PreTrackScaleController extends BaseRESTfulController {
             Integer pageNum =model.get("pageNum") == null ?1: Integer.parseInt(model.get("pageNum").toString());
             Integer pageSize =model.get("pageSize") == null ?20: Integer.parseInt(model.get("pageSize").toString());
             PageHelper.startPage(pageNum,pageSize);
-            List<PreTrackScale> rows = preTrackScaleService.selectByCarNo(model.get("carNo").toString());
+            List<PreTrackScale> rows = preTrackScaleService.selectByCarNo(model.get("carNo").toString(), model.get("valueFlag").toString());
             return success(rows);
         } catch (MarkerMetException e) {
             e.printStackTrace();

+ 1 - 1
src/main/java/com/steerinfo/pretrack/pretrackscale/mapper/PreTrackScaleMapper.java

@@ -31,7 +31,7 @@ public interface PreTrackScaleMapper extends IBaseMapper<PreTrackScale, String>
 
     List<PreTrackScale> selectValueFlag(Map<String, Object> parameters);
 
-    List<PreTrackScale> selectByCarNo(@Param( value = "carNo") String carNo);
+    List<PreTrackScale> selectByCarNo(@Param( value = "carNo") String carNo, @Param( value = "valueFlag") String valueFlag);
     List<PreTrackScale> selectByCar(@Param( value = "carNo") String carNo);
 
     PreTrackScale selectBypredictionNo(@Param( value = "predictionNo") String predictionNo);

+ 8 - 3
src/main/java/com/steerinfo/pretrack/pretrackscale/mapper/PreTrackScaleMapper.xml

@@ -3276,9 +3276,14 @@
 
   <select id="selectByCarNo" parameterType="java.lang.String" resultMap="BaseResultMap">
     <include refid="select"/>
-    <where>
-      CAR_NO = #{carNo} and TRUST_AVAILABILITY_TIME > SYSDATE
-    </where>
+    where 1=1
+    <if test="carNo != null and carNo != ''">
+      and CAR_NO = #{carNo}
+    </if>
+    <if test="valueFlag != null and valueFlag != ''">
+      and value_flag = #{valueFlag}
+    </if>
+    and TRUST_AVAILABILITY_TIME &gt; SYSDATE
   </select>
 
   <select id="selectByCar" parameterType="java.lang.String" resultMap="BaseResultMap">

+ 1 - 1
src/main/java/com/steerinfo/pretrack/pretrackscale/service/IPreTrackScaleService.java

@@ -24,7 +24,7 @@ public interface IPreTrackScaleService extends IBaseService<PreTrackScale, Strin
 
     List<PreTrackScale> selectlist(String carNo);
 
-    List<PreTrackScale> selectByCarNo(String carNo);
+    List<PreTrackScale> selectByCarNo(String carNo, String valueFlag);
 
     List<PreTrackScale> selectByCar(String carNo);
 

+ 2 - 2
src/main/java/com/steerinfo/pretrack/pretrackscale/service/impl/PreTrackScaleServiceImpl.java

@@ -740,12 +740,12 @@ public class PreTrackScaleServiceImpl extends BaseServiceImpl<PreTrackScale, Str
     }
 
     @Override
-    public List<PreTrackScale> selectByCarNo(String carNo) {
+    public List<PreTrackScale> selectByCarNo(String carNo, String valueFlag) {
         try {
             if (StringUtils.isEmpty(carNo)) {
                 throw new MarkerMetException(500, "车号为空!!");
             }
-            List<PreTrackScale> list = preTrackScaleMapper.selectByCarNo(carNo);
+            List<PreTrackScale> list = preTrackScaleMapper.selectByCarNo(carNo, valueFlag);
             return list;
         } catch (MarkerMetException e) {
             throw e;