feature 修改甘特图描述

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/GanttServiceImpl.java

@@ -38,7 +38,7 @@ public class GanttServiceImpl implements GanttService {
 
     @Autowired
     private ApsProcessOperationProcessEquDao apsProcessOperationProcessEquDao;
-    public static final String GANTT_ITEM_NAME = "%s %d卷 %tF";
+    public static final String GANTT_ITEM_NAME = "%s %d卷 %s %s %tF";
     public static final String GANTT_ITEM_NAME_PREFIX = "%s %s";
     public static final String GANTT_DESC_PREFIX = " 计划时间：%s-%s </br>" +
             "实际时间：%s-%s </br>" +
@@ -148,9 +148,10 @@ public class GanttServiceImpl implements GanttService {
                     LinkedHashMap<String, List<GanttVos>> collect = ganttVos.stream().collect(Collectors.groupingBy(GanttVos::getId, LinkedHashMap::new, Collectors.toList()));
 
                     String itemName = collect.values().stream().map(info -> {
-                        String prefix = info.stream().map(data -> String.format(GANTT_ITEM_NAME_PREFIX, data.getCustomerabbreviation(), data.getProductname()))
-                                .collect(Collectors.joining(","));
-                        return String.format(GANTT_ITEM_NAME, prefix, info.get(0).getPlanprocessrall(), info.get(0).getDeliverydate());
+//                        String prefix = info.stream().map(data -> String.format(GANTT_ITEM_NAME_PREFIX, data.getCustomerabbreviation(), data.getProductname()))
+//                                .collect(Collectors.joining(","));
+                        return String.format(GANTT_ITEM_NAME, info.get(0).getInmatercondition(), info.get(0).getPlanprocessrall(),
+                                info.get(0).getCustomorderno(),info.get(0).getCustomerabbreviation(),info.get(0).getDeliverydate());
                     }).collect(Collectors.joining("</br>"));
                     itemNames.add(itemName);