后端修改

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

@@ -3765,16 +3765,17 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         PageHelper.startPage(pageNum, pageSize);
         List<MeterWorkCarActualFirst> rows = meterWorkCarActualFirstMapper.likeByDesc(params);
         //移除所有期限皮数据
-
-        for(int i = 0; i < rows.size(); i++){
-            if(rows.get(0).getWeightType().equals("2")) {
-                rows.remove(i);
+        if(rows.size() >= 1) {
+            for(int i = 0; i < rows.size(); i++){
+                if(rows.get(0).getWeightType().equals("2")) {
+                    rows.remove(i);
+                }
+            }
+            params.put("weightType", "2");
+            List<MeterWorkCarActualFirst> firstList = meterWorkCarActualFirstMapper.likeByDesc(params);
+            if(firstList.size() >= 1) {
+                rows.add(firstList.get(0));
             }
-        }
-        params.put("weightType", "2");
-        List<MeterWorkCarActualFirst> firstList = meterWorkCarActualFirstMapper.likeByDesc(params);
-        rows.add(firstList.get(0));
-
         /*Collections.sort(rows, new Comparator<MeterWorkCarActualFirst>() {
             @Override
             public int compare(MeterWorkCarActualFirst o1, MeterWorkCarActualFirst o2) {
@@ -3783,7 +3784,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 //上面使用的是降序排序，如果正序 直接使用o1-o2即可
             }
         });*/
-
+        }
         PageList pageInfo = new PageList(rows);
         return pageInfo;
     }
@@ -4116,10 +4117,10 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 termData.setBaseSpotName(tareModel.getBaseSpotName());
                 termData.setCarNo(tareModel.getCarNo());
                 termData.setMeterName(tareModel.getCreateManName());
-                termData.setMeterTime(grossModel.getCreateTime());
-                termData.setStartTime(grossModel.getCreateTime());
-                termData.setEndTime(new Date(grossModel.getCreateTime().getTime() + 24 * 60 * 60 * 1000));
-                termData.setWarnTime(new Date(grossModel.getCreateTime().getTime() + 12 * 60 * 60 * 1000));
+                termData.setMeterTime(tareModel.getCreateTime());
+                termData.setStartTime(tareModel.getCreateTime());
+                termData.setEndTime(new Date(tareModel.getCreateTime().getTime() + 24 * 60 * 60 * 1000));
+                termData.setWarnTime(new Date(tareModel.getCreateTime().getTime() + 12 * 60 * 60 * 1000));
                 termData.setValueFlag("0");
                 termData.setCreateManNo(tareModel.getCreateManNo());
                 termData.setCreateManName(tareModel.getCreateManName());
@@ -4141,10 +4142,10 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 termData.setBaseSpotName(tareModel.getBaseSpotName());
                 termData.setCarNo(tareModel.getCarNo());
                 termData.setMeterName(tareModel.getCreateManName());
-                termData.setMeterTime(grossModel.getCreateTime());
-                termData.setStartTime(grossModel.getCreateTime());
-                termData.setEndTime(new Date(grossModel.getCreateTime().getTime() + 24 * 60 * 60 * 1000));
-                termData.setWarnTime(new Date(grossModel.getCreateTime().getTime() + 12 * 60 * 60 * 1000));
+                termData.setMeterTime(tareModel.getCreateTime());
+                termData.setStartTime(tareModel.getCreateTime());
+                termData.setEndTime(new Date(tareModel.getCreateTime().getTime() + 24 * 60 * 60 * 1000));
+                termData.setWarnTime(new Date(tareModel.getCreateTime().getTime() + 12 * 60 * 60 * 1000));
                 termData.setValueFlag("0");
                 termData.setCreateManNo(tareModel.getCreateManNo());
                 termData.setCreateManName(tareModel.getCreateManName());