bugFix解决冲突没有更新的问题

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

@@ -877,12 +877,13 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
             updateProcessEquAfterAddConflictsDesc(afterTheUpdateConflictId, EQ_TIME_CROSS);
             this.updateBatchById(afterTheUpdateConflictId);
         } else {
-            // 更当前工序作业增加新的冲突
+            // 去掉工序作业的冲突
             String newConflictsDesc = removeConflictsDesc(apsProcessOperationProcessEquDo.getConflictdes(), EQ_TIME_CROSS);
             apsProcessOperationProcessEquDo.setConflictdes(newConflictsDesc);
             apsProcessOperationProcessEquDo.setHasconflict(StringUtils.isBlank(apsProcessOperationProcessEquDo.getConflictdes()) &&
                     StringUtils.isBlank(apsProcessOperationProcessEquDo.getSoftconflictdes()) ?
                     LOCKMARK_N : LOCKMARK_Y);
+            this.updateById(apsProcessOperationProcessEquDo);
         }
         return affectedIdList;
     }