Browse Source

导出功能和图表的整合

wutt 5 năm trước cách đây
mục cha
commit
a2c91a16f6

+ 1 - 1
.idea/misc.xml

@@ -12,5 +12,5 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8.0_171" project-jdk-type="JavaSDK" />
 </project>

+ 2 - 1
cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldHistoryServiceImpl.java

@@ -224,10 +224,11 @@ public class MouldHistoryServiceImpl extends ServiceImpl<MouldHistoryMapper, Mou
             }
         }
         Map<String, MouldCycleRuntime> runtimeResult = new LinkedHashMap<>();
+        //给map排序
         set.entrySet().stream().sorted(Map.Entry.<String, MouldCycleRuntime>comparingByKey().reversed())
                     .forEachOrdered(e -> runtimeResult.put(e.getKey(), e.getValue()));
         listMap.put("runtime", runtimeResult);
-        msg.data = map;
+        msg.data = listMap;
         return msg;
     }