From 2f853b74d6b37d0bb2e3301f7417c5f90e307c0b Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 02 四月 2024 16:20:49 +0800
Subject: [PATCH] 设备管理新增，维修保养新增查询
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
index 0bcecbb..f72937e 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
@@ -12,10 +12,8 @@
import org.springframework.stereotype.Service;
import java.sql.Date;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
@Service
@DS("pp")
@@ -29,11 +27,58 @@
this.orderProcessDetailMapper = orderProcessDetailMapper;
}
-
+ //娴佺▼鍗¤繘搴︽柟娉�
public Map<String, Object> processCardProgressSv(String orderId, List<Integer> columns) {
Map<String, Object> map = new HashMap<>();
+ //鑾峰彇琛ㄦ牸鍐呭鏁版嵁
map.put("data", reportMapper.processCardProgressMp(orderId));
- map.put("title", orderProcessDetailMapper.filterOrderProcess(orderId));
+
+ //鑾峰彇琛ㄥご宸ュ簭绛涢�夋暟鎹�
+ List<Map<String,String>> processFilterList = orderProcessDetailMapper.filterOrderProcess(orderId);
+ List<Map<String,String>> processList = processFilterList;
+
+ List<String> filterList = new ArrayList<>();
+ //寰幆閬嶅巻鏁扮粍锛屽垽鏂搴忓彿褰撳墠鐨勫伐搴�
+ for (int i = 1; i < processFilterList.size(); i++) {
+ filterList.add(processFilterList.get(i).get("process"));
+ List<Map<String,String>> lastProcessList =
+ orderProcessDetailMapper.filterLastProcess(
+ orderId,
+ String.valueOf(processFilterList.get(i).get("order_number")),
+ String.valueOf(processFilterList.get(i).get("technology_number")),
+ String.valueOf(processFilterList.get(i).get("id"))
+ );
+ if(!lastProcessList.isEmpty()){
+ int finalI = i;
+ lastProcessList.forEach(lastProcess -> {
+ if(filterList.contains(lastProcess.get("process"))){
+ processList.add(lastProcess);
+ }
+ });
+ }
+
+ }
+ // 浣跨敤HashSet鏉ヨ褰曞凡缁忛亣鍒扮殑value鍊�
+ Set<String> seenValues = new HashSet<>();
+ // 鍒涘缓涓�涓柊鐨凩ist鏉ュ瓨鍌ㄧ粨鏋�
+ List<Map<String, String>> uniqueList = new ArrayList<>();
+
+ // 鍙嶅悜閬嶅巻鍘熷List
+ for (int i = processList.size() - 1; i >= 0; i--) {
+ Map<String, String> maps = processList.get(i);
+ String value = maps.values().iterator().next(); // 鍋囪姣忎釜Map鍙湁涓�涓獀alue
+
+ // 濡傛灉value杩樻病鏈夎鐪嬪埌杩囷紝灏辨坊鍔犲埌缁撴灉List鍜孒ashSet涓�
+ if (!seenValues.contains(value)) {
+ uniqueList.add(0, maps); // 娣诲姞鍒扮粨鏋淟ist鐨勫紑澶达紝浠ヤ繚鎸佸師椤哄簭
+ seenValues.add(value);
+ }
+ }
+ map.put("title", uniqueList );
+
+
+
+
List<Map<String,Integer>> getRowCount = orderProcessDetailMapper.getGlassLRow(orderId);
List<Map<String,Integer>> rowCount = new ArrayList<>();
columns.forEach(col ->{
--
Gitblit v1.8.0