From 735ae20e44301fb8d3cca67170aa8912138494e9 Mon Sep 17 00:00:00 2001
From: wenwj <‘1106994300@qq.com>
Date: 星期一, 14 四月 2025 16:37:23 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java
index e4e515b..010cb9d 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java
@@ -13,6 +13,7 @@
import com.aps.common.core.web.domain.AjaxResult;
import com.aps.core.domain.ApsPartPlan;
import com.aps.core.domain.ApsResourceDateStat;
+import com.aps.core.domain.ApsResourceGroup;
import com.aps.core.mapper.ApsResourceGroupMapper;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
@@ -47,6 +48,8 @@
private ApsPartRouteStatMapper apsPartRouteStatMapper;
@Autowired
private ApsResourceGroupMapper resourceGroupMapper;
+ @Autowired
+ private ApsResourceGroupMapper apsResourceGroupMapper;
/**
* 鏌ヨ闆朵欢缁熻琛�
@@ -172,6 +175,7 @@
/*鏌ュ嚭鎵�鏈夌粺璁＄殑鏁版嵁*/
AjaxResult result = new AjaxResult(200, "鐢熸垚鎴愬姛");
List<ApsResourceDateStat> list = apsPartRouteStatMapper.selectResourceDateStat();
+ List<ApsResourceGroup> resourceGroupList = apsResourceGroupMapper.selectApsResourceGroupList(new ApsResourceGroup());
if (!list.isEmpty()) {
/*姹傚嚭璁″垝鐨勬渶澶ф椂闂达紝娌℃湁 璁剧疆涓哄綋鍓嶆椂闂�+15澶�*/
ApsResourceDateStat apsResourceDateStat = list.stream().max(Comparator.comparing(ApsResourceDateStat::getPlanDay)).orElse(null);
@@ -188,10 +192,11 @@
startDay = startDay.plus(1, ChronoUnit.DAYS);
}
/*缁勭粐鍑哄垪澶存暟鎹�*/
- List<String> resourceNames =list.stream().map(ApsResourceDateStat::getResourceName).distinct().toList();
+
/*鍑嗗璧勬簮缁勪俊鎭�*/
List<Map<String, List<ApsResourceDateStat>>> targetList = new ArrayList<>();
- resourceNames.forEach(resourceName -> {
+ resourceGroupList.forEach(resourceGroup -> {
+ String resourceName=resourceGroup.getResourceGroupName();
/*鏍规嵁鏃ユ湡琛ㄥご鐨勯『搴忥紝缁勭粐鍑烘瘡涓棩鏈熶笅鐨勭粺璁￠」鐩�*/
Map<String, List<ApsResourceDateStat>> maps = new HashMap<>(Map.of());
List<ApsResourceDateStat> currentDaysResouces=new ArrayList<>();
@@ -208,7 +213,7 @@
else {
ApsResourceDateStat empty = new ApsResourceDateStat();
empty.setPlanDay(LocalDate.parse(planDay, formatter));
- empty.setDesignTimes(0);
+ empty.setDesignTimes(resourceGroup.getDevicesQuantity().intValue()*resourceGroup.getTheoryHours().intValue());
empty.setRequireTimes(0);
empty.setResourceName(resourceName);
empty.setResourceGroupName(resourceName);
--
Gitblit v1.9.3