From b0496b57b807044c8d4a866128b1ca42f4b339ad Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期一, 28 四月 2025 16:23:23 +0800
Subject: [PATCH] 【UPDATE-BUGFIX】修改气柜管路产能统计行数据以标准工序为准

---
 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java |   28 +++++++++++++++++-----------
 aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingRouteStatMapper.xml                |    8 ++++++++
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java
index bfc7309..0542ffb 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java
@@ -1,6 +1,5 @@
 package com.aps.core.service.impl;
 
-import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.aps.common.core.utils.DateUtils;
 import com.aps.common.core.utils.uuid.IdUtils;
@@ -11,6 +10,7 @@
 import com.aps.core.mapper.ApsGasPipingRouteStatMapper;
 import com.aps.core.service.IApsGasMaterialUsageService;
 import com.aps.core.service.IApsGasPipingRouteStatService;
+import com.aps.core.service.IApsStandardProcessService;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.*;
@@ -55,6 +55,9 @@
 
     @Autowired
     private IApsGasMaterialUsageService apsGasMaterialUsageService;
+
+    @Autowired
+    private IApsStandardProcessService apsStandardProcessService;
 
     /**
      * 鏌ヨ姘斾綋绠¤矾浜ц兘璐熻浇缁熻
@@ -233,8 +236,19 @@
     public JSONObject getCapacityPlanData(ApsGasPipingRouteStat apsGasPipingRouteStat) {
         JSONObject result = new JSONObject();
         HashSet<String> startPlanTimeSet = new HashSet<>();
-        JSONArray processData = new JSONArray();
+        //宸ュ簭鍒嗙粍缁熻
+        LinkedHashMap<String, List<ApsResourceDateStat>> processMap = new LinkedHashMap<>();
+        List<HashMap<String, List<ApsResourceDateStat>>> processList = new ArrayList<>();
         try {
+            //鑾峰彇鏍囧噯宸ュ簭鍚嶇О
+            List<String> processNameList = new ArrayList<>();
+            ApsStandardProcess apsStandardProcess = new ApsStandardProcess();
+            apsStandardProcess.setMajor(apsGasPipingRouteStat.getMajor().equals("gas")?"姘旀煖":"绠¤矾");
+            List<ApsStandardProcess> apsStandardProcessList = apsStandardProcessService.selectApsStandardProcessList(apsStandardProcess);
+            apsStandardProcessList.sort((a, b)->a.getProcessName().compareTo(b.getProcessName()));
+            for(ApsStandardProcess temp:apsStandardProcessList){
+                processMap.put(temp.getProcessName(), new ArrayList<ApsResourceDateStat>());
+            }
             //鑾峰彇宸ュ簭璁″垝浜ц兘鏁版嵁
             HashMap<String, ApsGasPipelineCapacityPlan> apsGasPipingPlanMap = new HashMap<>();
             List<ApsGasPipelineCapacityPlan> apsGasPipelineCapacityPlanList = apsGasPipelineCapacityPlanMapper.selectApsGasPipelineCapacityPlanList(new ApsGasPipelineCapacityPlan());
@@ -259,9 +273,6 @@
             apsGasPipingRouteStats = apsGasPipingRouteStatMapper.selectApsGasPipingRouteStatList(apsGasPipingRouteStat);
             //鏍规嵁寮�宸ユ棩杩涜鍗囧簭鎺掑簭
             apsGasPipingRouteStats.sort((a, b)->a.getProcessPlanStartDay().compareTo(b.getProcessPlanStartDay()));
-            //宸ュ簭鍒嗙粍缁熻
-            HashMap<String, List<ApsResourceDateStat>> processMap = new HashMap<>();
-            List<HashMap<String, List<ApsResourceDateStat>>> processList = new ArrayList<>();
             //宸ュ簭寮�宸ユ棩鏈�
             String planStartDate = "";
             //缁熻鎵�鏈夊伐搴忓搴旂殑寮�宸ユ椂闂�
@@ -318,16 +329,11 @@
                 dayMap.forEach((key, value) -> {
                     tempList.add(value);
                 });
-//                processMap.put(processName, tempList);
                 HashMap<String, List<ApsResourceDateStat>> temp = new HashMap<>();
                 temp.put(processName, tempList);
+                processNameList.remove(processName);
                 processList.add(temp);
             });
-//            for (String key : processMap.keySet()) {
-//                HashMap<String, List<ApsResourceDateStat>> temp = new HashMap<>();
-//                temp.put(key, processMap.get(key));
-//                processList.add(temp);
-//            }
             //鎺掑簭鏃堕棿鏍囬
             List<String> sortedStartPlanTimeList = new ArrayList<>(startPlanTimeSet);
             Collections.sort(sortedStartPlanTimeList);
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingRouteStatMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingRouteStatMapper.xml
index fae7c5f..94bcc48 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingRouteStatMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingRouteStatMapper.xml
@@ -49,6 +49,14 @@
             <if test="planStartMonth != null and planStartMonth != ''"> and plan_start_month = #{planStartMonth} </if>
             <if test="planStartDay != null and planStartDay != ''"> and plan_start_day = #{planStartDay} </if>
             <if test="searchStartDate != null and searchStartDate != '' and searchEndDate != null and searchEndDate != ''"> and (process_plan_start_day &gt;= #{searchStartDate} and process_plan_start_day &lt;= #{searchEndDate}) </if>
+            <if test="major != null and major != '' and major == 'piping'">
+                <if test="major == 'piping'">
+                    and process_name in (select process_name from aps_standard_process where major='绠¤矾')
+                </if>
+                <if test="major == 'gas'">
+                    and process_name in (select process_name from aps_standard_process where major='姘旀煖')
+                </if>
+            </if>
         </where>
     </select>
     

--
Gitblit v1.9.3