后端修改

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

@@ -5387,7 +5387,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     actualRow.setNetMode(DbConstants.TYPE);
                     actualRow.setUploadFlag("1");
                     actualRow.setIsPreScale("1");
-                    actualRow.setValueFlag("2");
+                    actualRow.setValueFlag("1");
                     actualRow.setPredictionNo(scale.getPredictionNo());
                     actualRow.setPredictionType("1");
                     actualRow.setNote("期限皮匹配结净");
@@ -5730,7 +5730,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow01.setNote("内倒双委托期限皮匹配结净");
             actualRow01.setUploadFlag("1");
             actualRow01.setIsPreScale("1");
-            actualRow01.setValueFlag("2");
+            actualRow01.setValueFlag("1");
             actualRow01.setNetSpot3No(grossFirst01.getBaseSpotNo());
             actualRow01.setNetSpot3Name(grossFirst01.getBaseSpotName());
             actualRow01.setNetTime(grossFirst01.getCreateTime());
@@ -5747,7 +5747,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow02.setNote("内倒双委托期限皮匹配结净");
             actualRow02.setUploadFlag("1");
             actualRow02.setIsPreScale("1");
-            actualRow02.setValueFlag("2");
+            actualRow02.setValueFlag("1");
             actualRow02.setNetSpot3No(grossFirst02.getBaseSpotNo());
             actualRow02.setNetSpot3Name(grossFirst02.getBaseSpotName());
             actualRow02.setNetTime(grossFirst02.getCreateTime());
@@ -5934,7 +5934,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow01.setNote("内倒双委托一次匹配结净");
             actualRow01.setUploadFlag("1");
             actualRow01.setIsPreScale("1");
-            actualRow01.setValueFlag("2");
+            actualRow01.setValueFlag("1");
             if(actualRow01.getGrossTime().compareTo(actualRow01.getTareTime()) >= 0) {
                 actualRow01.setNetSpot3No(actualRow01.getBaseSpot1No());
                 actualRow01.setNetSpot3Name(actualRow01.getBaseSpot1Name());
@@ -5963,7 +5963,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow02.setNote("内倒双委托一次匹配结净");
             actualRow02.setUploadFlag("1");
             actualRow02.setIsPreScale("1");
-            actualRow02.setValueFlag("2");
+            actualRow02.setValueFlag("1");
             if(actualRow02.getGrossTime().compareTo(actualRow02.getTareTime()) >= 0) {
                 actualRow02.setNetSpot3No(actualRow02.getBaseSpot1No());
                 actualRow02.setNetSpot3Name(actualRow02.getBaseSpot1Name());
@@ -6359,7 +6359,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 mwca.setNote("内倒多毛一皮匹配委托洁净");
                 mwca.setUploadFlag("1");
                 mwca.setIsPreScale("1");
-                mwca.setValueFlag("2");
+                mwca.setValueFlag("1");
                 if(mwca.getGrossTime().compareTo(mwca.getTareTime()) >= 0) {
                     mwca.setNetSpot3No(mwca.getBaseSpot1No());
                     mwca.setNetSpot3Name(mwca.getBaseSpot1Name());
@@ -6547,7 +6547,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 mwca.setNote("期限皮匹配结净");
                 mwca.setUploadFlag("1");
                 mwca.setIsPreScale("1");
-                mwca.setValueFlag("2");
+                mwca.setValueFlag("1");
                 mwca.setNetManNo("admin");
                 mwca.setNetManName("admin");
                 mwca.setNetSpot3No(model.getBaseSpotNo());

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

@@ -6,6 +6,7 @@ import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
 import com.steerinfo.meterwork.meterworkcaractualfirst.mapper.MeterWorkCarActualFirstMapper;
 import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
 import com.steerinfo.meterwork.meterworkmonitor.mapper.MeterWorkMonitorMapper;
+import com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor;
 import com.steerinfo.meterwork.meterworkparammap.controller.MeterWorkParamMap;
 import com.steerinfo.meterwork.meterworkparammap.mapper.MeterWorkParamMapMapper;
 import com.steerinfo.meterwork.meterworkparammap.service.IMeterWorkParamMapService;
@@ -16,6 +17,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
+import java.util.List;
 
 @Service("MeterWorkParamService")
 public class MeterWorkParamMapService implements IMeterWorkParamMapService {
@@ -43,6 +45,22 @@ public class MeterWorkParamMapService implements IMeterWorkParamMapService {
             String carNo = params.get("carNo") == null ? "": params.get("carNo").toString();
             String predicitonNo = params.get("predicitonNo") == null ? "": params.get("predicitonNo").toString();
 
+            HashMap<String, Object> spotInfoMap = new HashMap<>();
+            spotInfoMap.put("baseSpotNo", baseSpotNo);
+            List<MeterWorkMonitor> spotInfoList = meterWorkMonitorMapper.selectByParameters(spotInfoMap);
+
+            HashMap<String, Object> firstInfoMap = new HashMap<>();
+            firstInfoMap.put("carNo", carNo);
+            List<MeterWorkCarActualFirst> firstInfoList = meterWorkCarActualFirstMapper.likeByDesc(firstInfoMap);
+
+            HashMap<String, Object> scaleInfoMap = new HashMap<>();
+            scaleInfoMap.put("carNo", carNo);
+            List<PreTrackScale> scaleInfoList = preTrackScaleMapper.selectByCar(carNo);
+
+            HashMap<String, Object> actualInfoMap = new HashMap<>();
+            actualInfoMap.put("baseSpotNo", baseSpotNo);
+            List<MeterWorkCarActual> actualInfoList = meterWorkCarActualMapper.selectByParameters(actualInfoMap);
+
 
         }catch(Exception e) {
             e.printStackTrace();