后端修改

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

@@ -5105,7 +5105,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 model.setNote("期限皮匹配结净");
                 model.setUploadFlag("1");
                 model.setIsPreScale("1");
-                model.setValueFlag("2");
+                model.setValueFlag("1");
                 model.setNetManNo("admin");
                 model.setNetManName("admin");
                 model.setNetSpot3No(tareModel.getBaseSpotNo());

src/main/java/com/steerinfo/meterwork/meterworkparammap/service/impl/MeterWorkParamMapService.java

@@ -43,24 +43,33 @@ public class MeterWorkParamMapService implements IMeterWorkParamMapService {
         try{
             String baseSpotNo = params.get("baseSpotNo") == null ? "": params.get("baseSpotNo").toString();
             String carNo = params.get("carNo") == null ? "": params.get("carNo").toString();
-            String predicitonNo = params.get("predicitonNo") == null ? "": params.get("predicitonNo").toString();
+            String predictionNo = params.get("predicitonNo") == null ? "": params.get("predicitonNo").toString();
 
+            //根据称点查询监控信息
             HashMap<String, Object> spotInfoMap = new HashMap<>();
-            spotInfoMap.put("baseSpotNo", baseSpotNo);
+            spotInfoMap.put("pointNo", baseSpotNo);
             List<MeterWorkMonitor> spotInfoList = meterWorkMonitorMapper.selectByParameters(spotInfoMap);
 
-            HashMap<String, Object> firstInfoMap = new HashMap<>();
-            firstInfoMap.put("carNo", carNo);
-            List<MeterWorkCarActualFirst> firstInfoList = meterWorkCarActualFirstMapper.likeByDesc(firstInfoMap);
+            // VALUE_FLAG 状态（0=作废，1=有效(已匹配)，2=结净，3=未匹配）
+            // 根据车号查询最近的一次计量数据
+            List<MeterWorkCarActualFirst> firstInfoList = meterWorkCarActualFirstMapper.selectByCarNo(carNo);
 
+            // 根据车号查询委托表中未使用和使用中的委托
+            // 状态（0：未配车；1：未使用；2：已使用；3：已作废；4：正使用）
             HashMap<String, Object> scaleInfoMap = new HashMap<>();
             scaleInfoMap.put("carNo", carNo);
-            List<PreTrackScale> scaleInfoList = preTrackScaleMapper.selectByCar(carNo);
+            List<PreTrackScale> scaleInfoList = preTrackScaleMapper.selectBy(scaleInfoMap);
 
+            //计量实绩
             HashMap<String, Object> actualInfoMap = new HashMap<>();
-            actualInfoMap.put("baseSpotNo", baseSpotNo);
-            List<MeterWorkCarActual> actualInfoList = meterWorkCarActualMapper.selectByParameters(actualInfoMap);
+            actualInfoMap.put("carNo", carNo);
+            List<MeterWorkCarActual> actualInfoList = meterWorkCarActualMapper.selectByMap(actualInfoMap);
 
+            // 签发时间比较
+            // 通过上次结净记录，找到该委托的签发时间
+            HashMap<String, Object> scaleNewInfoMap = new HashMap<>();
+            scaleNewInfoMap.put("predictionNo", predictionNo);
+            List<PreTrackScale> scaleNewInfoList = preTrackScaleMapper.selectByParameters(scaleNewInfoMap);
 
         }catch(Exception e) {
             e.printStackTrace();