甘特图查询冲突以及冲突描述

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

@@ -149,6 +149,17 @@ public class GanttServiceImpl implements GanttService {
                     dateVo.setLockmark(ganttVos.stream().map(GanttVos::getLockmark).distinct().collect(Collectors.joining(",")));
                     dateVo.setConflict(ganttVos.get(0).getConflict());
                     dateVo.setProductionorderid(ganttVos.stream().map(GanttVos::getProductionorderid).collect(Collectors.joining(",")));
+                    // 冲突描述
+                    List<GanttVos> conflictdes = ganttVos.stream().filter(v -> StringUtils.isNotBlank(v.getConflictdes())).collect(Collectors.toList());
+                    if(conflictdes != null && conflictdes.size()>0){
+                        String desc = conflictdes.stream().map(GanttVos::getConflictdes).collect(Collectors.joining(";"));
+                        dateVo.setConflictdes(desc);
+                        // 有冲突描述时
+                        if(StringUtils.isNotBlank(desc)){
+                            dateVo.setConflict(true);
+                        }
+                    }
+
                     resultVo.add(dateVo);
                 }
             }

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsProcessOperationProcessEquDao.xml

@@ -158,6 +158,8 @@
         a1.UNFINISHROLL,
         a1.WORKSTATUS,
         a1.LOCKMARK,
+        a1.HASCONFLICT,
+        a1.CONFLICTDES,
         (select CUSTOMERABBREVIATION from aps_customer_management where ID =
         IF(IFNULL(a5.MERGEORDERNUMBER,'')='',a6.CUSTOMID,(select CUSTOMID from aps_production_merge_order where
         ORDERNO=a5.MERGEORDERNUMBER ) )

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/vo/GanttVos.java

@@ -121,4 +121,8 @@ public class GanttVos {
      * 冲突
      */
     private Boolean conflict;
+
+    private String hasconflict;
+
+    private String conflictdes;
 }

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/vo/ScheduleGanttVo.java

@@ -95,6 +95,10 @@ public class ScheduleGanttVo {
      * 冲突
      */
     private Boolean conflict;
+    /**
+     * 冲突
+     */
+    private String conflictdes;
     /**
      * 订单ID
      */