aps-增加冲突：与前道间隔时间大于作业最大流转时间

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

@@ -814,11 +814,11 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                     if (betweenPrevious > maxReturnTime) {
                         apsConflictLogService.recordLog(nextProcessEqu.getId(),
                                 "与前道工序作业间隔时间:" + betweenPrevious + ",作业最大流转时间：" + maxReturnTime, BIG_THAN_MAX_RETURN_TIME, 1, null);
-                        newConflictdes = addNewConflictsDesc(newConflictdes, BIG_THAN_MAX_RETURN_TIME);
+                        nextNewConflictdes = addNewConflictsDesc(nextNewConflictdes, BIG_THAN_MAX_RETURN_TIME);
                     } else {
                         apsConflictLogService.recordLog(nextProcessEqu.getId(),
                                 "与前道工序作业间隔时间:" + betweenPrevious + ",作业最大流转时间：" + maxReturnTime, BIG_THAN_MAX_RETURN_TIME, 2, null);
-                        newConflictdes = removeConflictsDesc(newConflictdes, BIG_THAN_MAX_RETURN_TIME);
+                        nextNewConflictdes = removeConflictsDesc(nextNewConflictdes, BIG_THAN_MAX_RETURN_TIME);
                     }
                 }
                 this.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()