feature 甘特图增加强制冲突和非强制冲突

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

@@ -176,9 +176,12 @@ public class GanttServiceImpl implements GanttService {
                     if(conflictdes != null && conflictdes.size()>0){
                         String desc = conflictdes.stream().map(GanttVos::getConflictdes).collect(Collectors.joining(";"));
                         dateVo.setConflictdes(desc);
+                        dateVo.setSoftconflictdes(conflictdes.stream().map(GanttVos::getSoftconflictdes).collect(Collectors.joining(";")));
                         // 有冲突描述时
-                        if(StringUtils.isNotBlank(desc)){
+                        if(StringUtils.isBlank(dateVo.getConflictdes()) && StringUtils.isBlank(dateVo.getSoftconflictdes())){
                             dateVo.setConflict(true);
+                        }else{
+                            dateVo.setConflict(false);
                         }
                     }
 

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

@@ -178,7 +178,7 @@
         or ((a6.PROMISEDELIVERYDATE is null or DATE(a6.SCHEDULEDELIVERYDATE) <= DATE(a6.PROMISEDELIVERYDATE)) and
         DATE(a6.SCHEDULEDELIVERYDATE)> DATE(a6.DELIVERYDATE)
         ),1,0) as conflict,
-        a1.CONFLICTLEVEL
+        a1.SOFTCONFLICTDES
         FROM
         aps_process_operation_process_equ a1
         LEFT JOIN aps_process_operation a2 ON a1.PROCESSID = a2.ID

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

@@ -143,12 +143,12 @@ public class GanttVos {
      */
     private String hasconflict;
     /**
-     *冲突描述
+     *非强制冲突描述
      */
     private String conflictdes;
 
     /**
-     *冲突等级（hard：强制冲突，soft：非强制冲突）
+     * 强制冲突描述
      */
-    private String conflictlevel;
+    private String softconflictdes;
 }

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

@@ -96,9 +96,13 @@ public class ScheduleGanttVo {
      */
     private Boolean conflict;
     /**
-     * 冲突
+     * 非强制冲突描述
      */
     private String conflictdes;
+    /**
+     * 强制冲突描述
+     */
+    private String softconflictdes;
     /**
      * 订单ID
      */