后端提交

src/main/java/com/steerinfo/baseinfo/meterbasecar/controller/MeterBaseCarController.java

@@ -209,60 +209,39 @@ public class MeterBaseCarController extends BaseRESTfulController {
     public RESTfulResult appregister(@RequestBody HashMap params) {
         try {
             String msg = "";
-            // sso注册
             SSOUtil ssoUtil = new SSOUtil();
             HashMap ssoMap = ssoUtil.ssoRegister(params);
-
-            // sso注册成功时，增加车辆表
+            // sso注册成功或者没有注册成功都新增车辆和司机信息
             if (ssoMap.get("code").equals("1") && !"账号已被注册".equals(ssoMap.get("msg").toString())) {
                 return failed(null, ssoMap.get("msg").toString());
             } else {
                 // 清除SSO"账号已被注册"
                 msg = "";
-
-                // 查询车辆是否写入车辆表
+                String carNo = params.get("carNo").toString();
                 HashMap queryCar = new HashMap();
-                queryCar.put("carNo", params.get("carNo").toString());
+                queryCar.put("carNo", carNo);
                 queryCar.put("validFlag", "0");
-                String carNo = params.get("carNo").toString();
                 //查询服役状态的车辆信息
                 List<MeterBaseCar> queryList01 = meterBaseCarService.query(queryCar);
                 //查询停役、删除状态的车辆信息
                 List<MeterBaseCar> queryList02 = meterBaseCarMapper.selectByMap(queryCar);
-
-                //meterBaseDriverMapper.batchDeleteSelf(params.get("carNo").toString());
-
-                // 车辆表已存在车辆信息时，跳过
+                // 车辆表未查询到车辆信息，则新增车辆信息和司机信息
                 if (queryList01.size()+queryList02.size() == 0) {
-
                     // 新增车辆
                     MeterBaseCar car = new MeterBaseCar();
                     car.setCarNo(params.get("carNo").toString());
                     car.setValidFlag("0");
-
-                    String unitNo = params.get("unitNo").toString();
                     HashMap<String, Object> unitMap = new HashMap<>();
-                    unitMap.put("unitNo", unitNo);
-
+                    unitMap.put("unitNo", params.get("unitNo").toString());
                     List<MeterBaseSpecialUnit> unitList = meterBaseSpecialUnitMapper.selectByParameters(unitMap);
-                    if(unitList.size() >= 1) {
-                        if(unitNo.equals(unitList.get(0).getUnitNo())) {
-                            car.setIsSpecialunit("1");
-                        }else {
-                            car.setIsSpecialunit("0");
-                        }
-                    }else {
-                        car.setIsSpecialunit("0");
-                    }
+                    //判断使用单位是否为特殊单位
+                    car.setIsSpecialunit(unitList.size() >= 1 ? "1": "0");
                     car.setUsetDepartmentNo(params.get("unitNo").toString());
                     car.setUsetDepartment(params.get("unitName").toString());
-
                     car.setCarTypeNo(params.get("carTypeNo").toString());
                     car.setCarTypeName(params.get("carTypeName").toString());
-                    if (params.get("carCarrierWeight") != null) {
-                        new BigDecimal(params.get("carCarrierWeight").toString());
-                    }
-
+                    car.setCarCarrierWeight(params.get("carCarrierWeight") != null ?
+                            new BigDecimal(params.get("carCarrierWeight").toString()): null);
                     // 将sso id写入车辆表，便于以后删除和重置密码
                     if(!ssoMap.get("code").toString().equals("1")){
                         car.setSsoId(ssoMap.get("data").toString());
@@ -272,9 +251,9 @@ public class MeterBaseCarController extends BaseRESTfulController {
                     car.setCreateManNo("admin");
                     car.setCreateManName("admins");
                     car.setCreateTime(new Date());
-
                     meterBaseCarService.checkandadd(car);
                 }else if(queryList02.size() >= 1){
+                    //将所有的停役车辆或者司机启用服役
                     for (MeterBaseCar model: queryList02) {
                         HashMap map = new HashMap();
                         queryCar.put("carId",model.getCarNo());
@@ -284,41 +263,26 @@ public class MeterBaseCarController extends BaseRESTfulController {
                         //停役或者删除状态的司机信息更新为服役状态
                         meterBaseDriverMapper.updateValidFlagByCarId(map);
                     }
-
-                    // 新增车辆
+                    // 修改车辆
                     queryList01 = meterBaseCarService.query(queryCar);
                     MeterBaseCar car = queryList01.get(0);
                     car.setValidFlag("0");
-
-                    String unitNo = params.get("unitNo").toString();
                     HashMap<String, Object> unitMap = new HashMap<>();
-                    unitMap.put("unitNo", unitNo);
-
+                    unitMap.put("unitNo", params.get("unitNo").toString());
                     List<MeterBaseSpecialUnit> unitList = meterBaseSpecialUnitMapper.selectByParameters(unitMap);
-                    if(unitList.size() >= 1) {
-                        if(unitNo.equals(unitList.get(0).getUnitNo())) {
-                            car.setIsSpecialunit("1");
-                        }else {
-                            car.setIsSpecialunit("0");
-                        }
-                    }else {
-                        car.setIsSpecialunit("0");
-                    }
+                    //判断使用单位是否为特殊单位
+                    car.setIsSpecialunit(unitList.size() >= 1 ? "1": "0");
                     car.setUsetDepartmentNo(params.get("unitNo").toString());
                     car.setUsetDepartment(params.get("unitName").toString());
-
                     car.setCarTypeNo(params.get("carTypeNo").toString());
                     car.setCarTypeName(params.get("carTypeName").toString());
-                    if (params.get("carCarrierWeight") != null) {
-                        new BigDecimal(params.get("carCarrierWeight").toString());
-                    }
-                    ssoUtil.ssoResetPwd(car.getSsoId(), params.get("password").toString(), "");
-
-                    car.setCreateManNo("admin");
-                    car.setCreateManName("admins");
-                    car.setCreateTime(new Date());
-
+                    car.setCarCarrierWeight(params.get("carCarrierWeight") != null ?
+                            new BigDecimal(params.get("carCarrierWeight").toString()): null);
+                    car.setUpdateManNo("admin");
+                    car.setUpdateManName("admins");
+                    car.setUpdateTime(new Date());
                     meterBaseCarMapper.updateByPrimaryKeySelective(car);
+                    ssoUtil.ssoResetPwd(car.getSsoId(), params.get("password").toString(), "");
                 }
                 // 拆分司机list，新增司机表
                 List<MeterBaseDriver> driverList = JSONObject.parseArray(params.get("driverList").toString(), MeterBaseDriver.class);
@@ -357,21 +321,17 @@ public class MeterBaseCarController extends BaseRESTfulController {
                             list1.setValidFlag("0");
                             meterBaseDriverMapper.updateByPrimaryKeySelective(list1);
                         }
-
                     }
-
                     if (com.steerinfo.util.StringUtils.isNotEmpty(msg)) {
                         TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                         break;
                     }
                 }
             }
-
             if (com.steerinfo.util.StringUtils.isNotEmpty(msg)) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return failed(null, msg);
             }
-
         } catch (Exception e) {
             e.printStackTrace();
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -384,61 +344,47 @@ public class MeterBaseCarController extends BaseRESTfulController {
     @Transactional
     @PostMapping(value = "/applogin")
     public RESTfulResult applogin(@RequestBody HashMap params) {
-
         RESTfulResult rm = failed();
         Object ssodata = "";
-
         HashMap<String, Object> info = new HashMap();
         try {
-            if (params.get("carNo") == null || com.steerinfo.util.StringUtils.isEmpty(params.get("carNo").toString())) {
+            if (params.get("carNo") == null || StringUtils.isEmpty(params.get("carNo").toString())) {
                 rm.setMessage("车号不能为空！！");
-                return rm;
-            } else if (params.get("telNum") == null || com.steerinfo.util.StringUtils.isEmpty(params.get("telNum").toString())) {
+            } else if (params.get("telNum") == null || StringUtils.isEmpty(params.get("telNum").toString())) {
                 rm.setMessage("手机号不能为空！！");
-                return rm;
             } else {
-                // 状态（0：服役；1:停役;2:删除）
-                params.put("validFlag", "0");
-
-                // 判断车号，司机手机号是否存在
-                List<MeterBaseCusSupCar> list = meterBaseDriverService.query(params);
-                if (list.size() >= 1) {
-                    // sso登录
-                    SSOUtil ssoUtil = new SSOUtil();
-                    HashMap map = ssoUtil.ssoLogin(params, "");
-
-                    if (map.get("code").toString().equals("0")) {
-                        ssodata = map.get("data").toString();
-                        info.put("ssoData", ssodata);
-                        HashMap<String, Object> carInfoMap = new HashMap<>();
-                        carInfoMap.put("carNo", params.get("carNo"));
-                        List<MeterBaseCar> carInfo = meterBaseCarMapper.selectByParameters(carInfoMap);
-                        if(carInfo.size() >= 1){
-                            info.put("carInfo", carInfo);
-                            HashMap<String, Object> dirverInfoMap = new HashMap();
-                            dirverInfoMap.put("carId", params.get("carNo"));
-                            dirverInfoMap.put("telNum", params.get("telNum"));
-                            List<MeterBaseDriver> driverInfo = meterBaseDriverMapper.selectByParameters(dirverInfoMap);
-                            if(driverInfo.size() >= 1){
-                                info.put("driverInfo", driverInfo);
-                                rm = success();
-                                rm.setData(info);
-                                rm.setMessage("操作成功");
-                                return rm;
-                            }else{
-                                rm.setMessage("司机配置信息表没有此车号和电话号码");
-                                return rm;
-                            }
+                // sso登录
+                SSOUtil ssoUtil = new SSOUtil();
+                HashMap map = ssoUtil.ssoLogin(params, "");
+                if (map.get("code").toString().equals("0")) {
+                    ssodata = map.get("data").toString();
+                    info.put("ssoData", ssodata);
+                    HashMap<String, Object> carInfoMap = new HashMap<>();
+                    carInfoMap.put("validFlag", "0");
+                    carInfoMap.put("carNo", params.get("carNo"));
+                    List<MeterBaseCar> carInfo = meterBaseCarMapper.selectByParameters(carInfoMap);
+                    //车辆配置表是否有服役车辆
+                    if(carInfo.size() >= 1){
+                        info.put("carInfo", carInfo);
+                        HashMap<String, Object> driverInfoMap = new HashMap();
+                        driverInfoMap.put("carId", params.get("carNo"));
+                        driverInfoMap.put("validFlag", "0");
+                        driverInfoMap.put("telNum", params.get("telNum"));
+                        List<MeterBaseDriver> driverInfo = meterBaseDriverMapper.selectByParameters(driverInfoMap);
+                        //司机配置表是否有服役的司机信息
+                        if(driverInfo.size() >= 1){
+                            info.put("driverInfo", driverInfo);
+                            rm = success();
+                            rm.setData(info);
+                            rm.setMessage("操作成功");
                         }else{
-                            rm.setMessage("车辆配置信息表没有此车号");
-                            return rm;
+                            rm.setMessage("司机配置表没有服役的司机信息");
                         }
-
-                    } else {
-                        rm.setMessage(map.get("msg").toString());
+                    }else{
+                        rm.setMessage("车辆配置表没有服役的车辆信息");
                     }
                 } else {
-                    rm.setMessage("没有此车号或手机号");
+                    rm.setMessage(map.get("msg").toString());
                 }
             }
         } catch (Exception e) {
@@ -933,6 +879,24 @@ public class MeterBaseCarController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "根据车辆直接启用", notes = "根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterbasecar:delete")
+    @PostMapping(value = "/enableByCarNo")//String
+    public RESTfulResult enableByCarNo(@RequestBody Map carNo) {
+        try {
+            List<String> list = new ArrayList<>();
+            list.add(carNo.get("carNo").toString());
+            meterBaseDriverMapper.enableCarById(list);
+            meterBaseCarMapper.enableCarById(list);
+            return success();
+        }
+        catch (Exception e){
+            e.printStackTrace();
+            return failed(null,"操作异常，请确认");
+        }
+    }
+
 
     @ApiOperation(value = "批量车辆导入", notes = "批量车辆导入")
 

src/main/java/com/steerinfo/baseinfo/meterbasecar/mapper/MeterBaseCarMapper.java

@@ -15,11 +15,12 @@ import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface MeterBaseCarMapper extends IBaseMapper<MeterBaseCar, String> {
-    String GetNewID();
+    String GetNewID(@Param(value="afl")String afl);
 
     List<MeterBaseCar> selectForUpdate(Map<String, Object> parameters);
 
     void deleteCarById(@Param("list") List<String> driverNos);
+    void enableCarById(@Param("list") List<String> driverNos);
 
     List<MeterBaseCar> selectByMap(Map<String, Object> parameters);
 

src/main/java/com/steerinfo/baseinfo/meterbasecar/mapper/MeterBaseCarMapper.xml

@@ -910,8 +910,10 @@
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
   <select id="GetNewID" parameterType="java.lang.String" resultType="java.lang.String">
-    SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(PK_NO, LENGTH(PK_NO) -4))),0) + 1,5,'0') PK_NO
-    FROM METER_BASE_CAR
+    <!--SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(PK_NO, LENGTH(PK_NO) -4))),0) + 1,5,'0') PK_NO
+        FROM METER_BASE_CAR where instr(PK_NO,#{afl,jdbcType=VARCHAR})>0 -->
+    SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(PK_NO,9))),0) + 1,5,'0') PK_NO
+    FROM METER_BASE_CAR where instr(PK_NO,#{afl,jdbcType=VARCHAR})>0
   </select>
 
   <select id="selectForUpdate" parameterType="java.util.HashMap" resultMap="BaseResultMap">
@@ -934,6 +936,13 @@
     </foreach>
   </update>
 
+  <update id="enableCarById" parameterType="java.util.List">
+    update METER_BASE_CAR set VALID_FLAG = '0' where CAR_NO in
+    <foreach item="carNos" collection="list" open="(" separator="," close=")">
+      #{carNos}
+    </foreach>
+  </update>
+
   <select id="selectByMap" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select" />
     where valid_flag in ('1', '2')

src/main/java/com/steerinfo/baseinfo/meterbasecar/service/impl/MeterBaseCarServiceImpl.java

@@ -18,9 +18,6 @@ import com.steerinfo.util.CommonPage;
 import com.steerinfo.util.FieldsCollector;
 import com.steerinfo.util.SSOUtil;
 import com.steerinfo.util.StringUtils;
-import io.micrometer.core.instrument.Meter;
-import org.apache.shiro.crypto.hash.Hash;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -76,8 +73,10 @@ public class MeterBaseCarServiceImpl extends BaseServiceImpl<MeterBaseCar, Strin
 //        if(!com.isEmpty()){
 //            return "该车号已存在！";
 //        }
-        String no=meterBaseCarMapper.GetNewID();
-        model.setPkNo(new SimpleDateFormat("yyyyMMdd").format(new Date())+no);
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+        String afl = sdf.format(new Date());
+        String no = meterBaseCarMapper.GetNewID(afl);
+        model.setPkNo(afl + no);
         meterBaseCarMapper.insert(model);
         return "";
     }
@@ -223,7 +222,7 @@ public class MeterBaseCarServiceImpl extends BaseServiceImpl<MeterBaseCar, Strin
                         car.setValidFlag("0");
                         // 将sso id写入车辆表，便于以后删除和重置密码
                         car.setSsoId(ssoMap.get("data").toString());
-                        String no=meterBaseCarMapper.GetNewID();
+                        String no=meterBaseCarMapper.GetNewID(new SimpleDateFormat("yyyyMMdd").format(new Date()));
                         car.setId(new SimpleDateFormat("yyyyMMdd").format(new Date())+no);
                         meterBaseCarMapper.insertSelective(car);
                     }

src/main/java/com/steerinfo/baseinfo/meterbasedriver/controller/MeterBaseDriverController.java

@@ -27,6 +27,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.util.*;
 import java.math.BigDecimal;
 
@@ -51,7 +52,7 @@ public class MeterBaseDriverController extends BaseRESTfulController {
     @Autowired
     IMeterBaseDriverService meterBaseDriverService;
 
-    @Autowired
+    @Resource
     MeterBaseDriverMapper meterBaseDriverMapper;
 
     @ApiOperation(value="获取列表", notes="分页查询")

src/main/java/com/steerinfo/baseinfo/meterbasedriver/mapper/MeterBaseDriverMapper.java

@@ -22,6 +22,7 @@ public interface MeterBaseDriverMapper extends IBaseMapper<MeterBaseDriver, Stri
     void deleteDriverById(@Param("list") List<String> driverNos);
 
     void deleteCarById(@Param("list") List<String> carNos);
+    void enableCarById(@Param("list") List<String> carNos);
 
     List<MeterBaseDriver> getDirverBySup(String customerSupplierNo);
 

src/main/java/com/steerinfo/baseinfo/meterbasedriver/mapper/MeterBaseDriverMapper.xml

@@ -535,6 +535,13 @@
     </foreach>
   </update>
 
+  <update id="enableCarById" parameterType="java.util.List">
+    update METER_BASE_DRIVER set VALID_FLAG = '0' where CAR_ID in
+    <foreach item="carNos" collection="list" open="(" separator="," close=")">
+      #{carNos}
+    </foreach>
+  </update>
+
   <select id="getDirverBySup" parameterType="java.lang.String" resultMap="BaseResultMap">
     select * from METER_BASE_DRIVER where CAR_ID in (select CAR_NO from METER_BASE_CAR WHERE CUSTOMER_SUPPLIER_NO = #{customerSupplierNo})
   </select>

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

@@ -1,5 +1,7 @@
 package com.steerinfo.baseinfo.meterbasetermtaredata.service.impl;
 
+import com.steerinfo.baseinfo.meterbasecar.mapper.MeterBaseCarMapper;
+import com.steerinfo.baseinfo.meterbasecar.model.MeterBaseCar;
 import com.steerinfo.baseinfo.meterbasehistaredata.mapper.MeterBaseHisTareDataMapper;
 import com.steerinfo.baseinfo.meterbasehistaredata.model.MeterBaseHisTareData;
 import com.steerinfo.baseinfo.meterbasehistaredetail.mapper.MeterBaseHisTareDetailMapper;
@@ -50,6 +52,9 @@ public class MeterBaseTermTareDataServiceImpl extends BaseServiceImpl<MeterBaseT
     @Resource
     private MeterBaseTermTareDataMapper meterBaseTermTareDataMapper;
 
+    @Resource
+    private MeterBaseCarMapper meterBaseCarMapper;
+
     @Resource
     private MeterBaseTermTareCarMapper meterBaseTermTareCarMapper;
 
@@ -270,6 +275,18 @@ public class MeterBaseTermTareDataServiceImpl extends BaseServiceImpl<MeterBaseT
             rm.setCode("1");
             return rm;
         }
+
+        HashMap<String, Object> ms = new HashMap<>();
+        ms.put("carNo", carNo);
+        ms.put("validFlag", "0");
+        ms.put("carTypeNo", "001004003");
+        List<MeterBaseCar> models = meterBaseCarMapper.selectByParameters(ms);
+        if(models.size() < 1 ) {
+            rm.setMessage("车辆不是内部车辆不能留存期限皮！！");
+            rm.setCode("1");
+            return rm;
+        }
+
         UserPayload payload = UserPayload.getCurrUser();
         String userId = payload.getId();
         String userName = payload.getUserName();
@@ -344,7 +361,7 @@ public class MeterBaseTermTareDataServiceImpl extends BaseServiceImpl<MeterBaseT
         }else if(modelTerm.getCarNo().equals(carNo)){
             //设置上一次皮重、平均皮重
             model.setUpWeight(modelTerm.getMeterWeight().longValue());  //BigDecimal转long类型
-            long avgValue = modelTerm.getAvgWeight() == null? 0: model.getAvgWeight();
+            long avgValue = modelTerm.getAvgWeight() == null? 0: modelTerm.getAvgWeight();
             long avg =avgValue + modelTerm.getMeterWeight().longValue();
             model.setAvgWeight(avg/2);
             model.setDataNo(modelTerm.getDataNo());

src/main/java/com/steerinfo/meterwork/meterworkprewgttype/service/impl/MeterWorkPreWgttypeServiceImpl.java

@@ -126,7 +126,7 @@ public class MeterWorkPreWgttypeServiceImpl extends BaseServiceImpl<MeterWorkPre
                     model.put("carNo", carNo);
                     model.put("valueFlag", "1");
                     model.put("lineDesc", "1");
-                    List<PreTrackScale> scale = preTrackScaleMapper.selectByParameters(model);
+                    List<PreTrackScale> scale = preTrackScaleMapper.selectByMap(model);
                     if (scale.size() >= 1) {
                         preWgtType.put("grossWgt", scale);
                         preWgtType.put("wgtType", modelList01);

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

@@ -1032,7 +1032,6 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model02);
 
                     MeterWorkRailwayActual mwca1 = meterWorkRailwayActualMapper.manualAdd(model01.getActualFirstNo(), model02.getActualFirstNo());
-                    mwca1.setPredictionNo("");
                     BeanUtils.copyProperties(mwca1, actualRow);
                     //保存洁净
                     String no = meterWorkRailwayActualMapper.getNewID(sdf.format(new Date()));
@@ -1117,8 +1116,13 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     first02.setValueFlag("1");
                     meterWorkRailwayActFirstMapper.insertSelective(first02);
                 }else {
-                    first01.setPredictionNo("");
-                    meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(first01);
+                    if(first01.getWeightType().equals("0")) {
+                        first01.setPredictionNo("");
+                        meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(first01);
+                    }else {
+                        first02.setPredictionNo("");
+                        meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(first02);
+                    }
                 }
             /*//6、修改计量监控
             updateMonitor(first02.getBaseSpotNo());

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

@@ -2949,7 +2949,7 @@
   </select>
 
   <select id="manualAdd" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select t1.prediction_no PREDICTION_NO, t1.notice_no NOTICE_NO, t1.railway_no RAILWAY_NO, t1.railway_carriage_no RAILWAY_CARRIAGE_NO, t1.matter_no MATTER_NO,
+    select t1.notice_no NOTICE_NO, t1.railway_no RAILWAY_NO, t1.railway_carriage_no RAILWAY_CARRIAGE_NO, t1.matter_no MATTER_NO,
            t1.matter_name MATTER_NAME, t1.contract_no CONTRACT_NO, t1.batch_no BATCH_NO, t1.customer_supplier_no CUSTOMER_SUPPLIER_NO,
            t1.customer_supplier_name CUSTOMER_SUPPLIER_NAME, t1.forwarding_unit_no FORWARDING_UNIT_NO, t1.forwarding_unit_name FORWARDING_UNIT_NAME,
            t1.receiving_uint_no RECEIVING_UINT_NO, t1.receiving_uint_name RECEIVING_UINT_NAME, t1.material_no MATERIAL_NO,

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

@@ -35,4 +35,5 @@ public interface PreTrackScaleMapper extends IBaseMapper<PreTrackScale, String>
     List<PreTrackScale> selectByCar(@Param( value = "carNo") String carNo);
 
     PreTrackScale selectBypredictionNo(@Param( value = "predictionNo") String predictionNo);
+    List<PreTrackScale> selectByMap(Map<String, Object> var1);
 }

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

@@ -3243,6 +3243,7 @@
       <if test="lineDesc != null and lineDesc != ''">
         and LINE_DESC = #{lineDesc}
       </if>
+      and TRUST_AVAILABILITY_TIME &gt; SYSDATE
     </where>
     order by CREATE_TIME desc
   </select>
@@ -3300,4 +3301,10 @@
       PREDICTION_NO = #{predictionNo}
     </where>
   </select>
+
+  <select id="selectByMap" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+    and TRUST_AVAILABILITY_TIME &gt; SYSDATE
+  </select>
 </mapper>