feature 代码提交

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

@@ -30,14 +30,14 @@ public class GanttServiceImpl implements GanttService {
     private ApsProcessOperationProcessEquDao apsProcessOperationProcessEquDao;
     public static final String GANTT_ITEM_NAME ="%s %d卷 %tF";
     public static final String GANTT_ITEM_NAME_PREFIX ="%s %s";
-    public static final String GANTT_DESC_PREFIX=" 计划时间：%s-%s \n" +
-            "实际时间：%s-%s \n" +
-            "设备：%s/%s \n" ;
-    public static final String GANTT_DESC="订单产品：%s \n" +
-            "交货期：%tF\n" +
-            "工序：%s\n" +
-            "计划加工卷数：%d卷\n" +
-            "完成情况：已开工 %d/已报工 %d/已检验 %d/未完工 %d\n" +
+    public static final String GANTT_DESC_PREFIX=" 计划时间：%s-%s </br>" +
+            "实际时间：%s-%s </br>" +
+            "设备：%s/%s </br>" ;
+    public static final String GANTT_DESC="订单产品：%s </br>" +
+            "交货期：%tF </br>" +
+            "工序：%s </br>" +
+            "计划加工卷数：%d卷</br>" +
+            "完成情况：已开工 %d/已报工 %d/已检验 %d/未完工 %d</br>" +
             "作业状态：%s" ;
 
     public static final  SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -85,7 +85,7 @@ public class GanttServiceImpl implements GanttService {
                     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());
-                }).collect(Collectors.joining("/n"));
+                }).collect(Collectors.joining("</br>"));
                 String itemPrefix=String.format(GANTT_DESC_PREFIX,
                         dateFormat(processs.get(0).getPlanstartdate()),
                         dateFormat(processs.get(0).getPlanenddate()),
@@ -97,7 +97,7 @@ public class GanttServiceImpl implements GanttService {
                     return String.format(GANTT_DESC, info.getProductname(),info.getDeliverydate(),
                             info.getProcessname(),info.getPlanprocessrall(),info.getStartingroll(),info.getReportroll(),
                             info.getCheckoutroll(),info.getUnfinishroll(),info.getWorkstatus() );
-                }).collect(Collectors.joining("/n"));
+                }).collect(Collectors.joining("</br>"));
                 processVo.setItemname(itemName);
                 processVo.setItemdesc(itemPrefix+itemDesc);
                 processVos.add(processVo);