From 2a64b537e8e3bce9ce030585a3da17d48379c0ad Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期一, 26 五月 2025 15:04:45 +0800
Subject: [PATCH] 修改json类型转换错误

---
 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java
index 55d336c..761f9b4 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamServiceImpl.java
@@ -247,15 +247,13 @@
             });
         }
         List<Map> mapList =apsWeldSeamMapper.weldSeamEcharts(queryDataList);
-        Set monthSet=mapList.stream().map(e->e.get("produce_month").toString()).collect(Collectors.toSet());
+        Set monthSet=mapList.stream().map(e->e.get("produce_month")).collect(Collectors.toSet());
         List monthList = new ArrayList(monthSet);
         Collections.sort(monthList);
 
         List<List<String>> echartsList = new ArrayList<>();
 
         Set<String> titleSet = new HashSet<>();
-        List<String> title = new ArrayList<>(titleSet);
-        title.add("product");
         mapList.forEach(item->{
             StringBuilder sb = new StringBuilder();
             sb.append(item.get("production_base"));
@@ -263,9 +261,11 @@
             sb.append(item.get("work_order_name"));
             sb.append("-");
             sb.append(item.get("classification_name"));
-            title.add(sb.toString());
-
+            titleSet.add(sb.toString());
         });
+        List<String> title = new ArrayList<>();
+        title.add("product");
+        title.addAll(titleSet);
         echartsList.add(title);
         monthList.forEach(month->{
             List<String> table = new ArrayList<>();
@@ -279,7 +279,7 @@
                     sb.append(value.get("work_order_name"));
                     sb.append("-");
                     sb.append(value.get("classification_name"));
-                    if(sb.toString().equals(title.get(i)) && month.equals(value.get("produce_month").toString())){
+                    if(sb.toString().equals(title.get(i)) && month==value.get("produce_month")){
                         table.add(value.get("total_weld_seam").toString());
                     }
                 }

--
Gitblit v1.9.3