pms 瑞都 工作量汇总 查看队伍数据 不显示项目部数据

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotrddailyreport/IotRdDailyReportServiceImpl.java

@@ -981,7 +981,7 @@ public class IotRdDailyReportServiceImpl implements IotRdDailyReportService {
                             tempTotalMixSand = tempTotalMixSand.add(actualValue);
                             if (cumulativeMixSandPair.containsKey("cumulativeMixSand")) {
                                 BigDecimal tempMixSand = cumulativeMixSandPair.get("cumulativeMixSand");
-                                cumulativeMixSandPair.put("cumulativeMixSand", tempTotalMixSand.add(tempMixSand));
+                                cumulativeMixSandPair.put("cumulativeMixSand", actualValue.add(tempMixSand));
                             } else {
                                 cumulativeMixSandPair.put("cumulativeMixSand", tempTotalMixSand);
                             }
@@ -1507,7 +1507,7 @@ public class IotRdDailyReportServiceImpl implements IotRdDailyReportService {
                                     tempTotalMixSand = tempTotalMixSand.add(actualValue);
                                     if (cumulativeMixSandPair.containsKey(detailDeptId)) {
                                         BigDecimal tempMixSand = cumulativeMixSandPair.get(detailDeptId);
-                                        cumulativeMixSandPair.put(detailDeptId, tempTotalMixSand.add(tempMixSand));
+                                        cumulativeMixSandPair.put(detailDeptId, actualValue.add(tempMixSand));
                                     } else {
                                         cumulativeMixSandPair.put(detailDeptId, tempTotalMixSand);
                                     }
@@ -1520,7 +1520,7 @@ public class IotRdDailyReportServiceImpl implements IotRdDailyReportService {
         }
 
         // 项目部数据
-        projectDeptPair.forEach((projectDeptId, dept) -> {
+        /* projectDeptPair.forEach((projectDeptId, dept) -> {
             IotRdDailyReportStatisticsRespVO statistics = new IotRdDailyReportStatisticsRespVO();
             statistics.setTeamId(projectDeptId);
             statistics.setProjectDeptName(dept.getName());
@@ -1539,7 +1539,7 @@ public class IotRdDailyReportServiceImpl implements IotRdDailyReportService {
             statistics.setCumulativePumpTrips(cumulativePumpTripsPair.get(projectDeptId));
             statistics.setTotalDailyFuel(cumulativeFuelsPair.get(projectDeptId));
             result.add(statistics);
-        });
+        }); */
 
         // 队伍数据  生成返回的数据列表集合
         teamDeptPair.forEach((teamDeptId, dept) -> {
@@ -1778,7 +1778,7 @@ public class IotRdDailyReportServiceImpl implements IotRdDailyReportService {
                             tempTotalMixSand = tempTotalMixSand.add(actualValue);
                             if (dateMixSandPair.containsKey(reportDateStr)) {
                                 BigDecimal tempMixSand = dateMixSandPair.get(reportDateStr);
-                                dateMixSandPair.put(reportDateStr, tempTotalMixSand.add(tempMixSand));
+                                dateMixSandPair.put(reportDateStr, actualValue.add(tempMixSand));
                             } else {
                                 dateMixSandPair.put(reportDateStr, tempTotalMixSand);
                             }