支持设置下一轮开始

BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs

@@ -303,26 +303,28 @@ namespace BBWY.Server.Business
             if (pt == null)
                 throw new BusinessException($"{request.TaskId}任务不存在");
 
-            var prpt = fsql.Select<PromotionTask>(request.PreTaskId).ToOne();
+            if (request.PreTaskId != -1)
-            if (prpt == null)
+            {
-                throw new BusinessException($"{request.PreTaskId}前置任务不存在");
+                var prpt = fsql.Select<PromotionTask>(request.PreTaskId).ToOne();
+                if (prpt == null)
+                    throw new BusinessException($"{request.PreTaskId}前置任务不存在");
 
-            if (pt.Id == prpt.Id)
+                if (pt.Id == prpt.Id)
-                throw new BusinessException("前置任务不能设置为自己");
+                    throw new BusinessException("前置任务不能设置为自己");
 
-            if (pt.Status != Enums.PromitionTaskStatus.等待)
+                if (pt.Status != Enums.PromitionTaskStatus.等待)
-                throw new BusinessException("任务状态必须为等待");
+                    throw new BusinessException("任务状态必须为等待");
 
-            if (prpt.Status != Enums.PromitionTaskStatus.等待 && prpt.Status != Enums.PromitionTaskStatus.进行中)
+                if (prpt.Status != Enums.PromitionTaskStatus.等待 && prpt.Status != Enums.PromitionTaskStatus.进行中)
-                throw new BusinessException("前置任务状态必须为等待或进行中");
+                    throw new BusinessException("前置任务状态必须为等待或进行中");
 
-            var nextPromotionTaskList = fsql.Select<PromotionTask>().Where(pt1 => pt1.PreTaskId == request.PreTaskId).ToList();
+                var nextPromotionTaskList = fsql.Select<PromotionTask>().Where(pt1 => pt1.PreTaskId == request.PreTaskId).ToList();
-            if (nextPromotionTaskList.Count() > 0)
+                if (nextPromotionTaskList.Count() > 0)
-            {
+                {
-                CheckSkuRepeat(pt, nextPromotionTaskList);
+                    CheckSkuRepeat(pt, nextPromotionTaskList);
+                }
             }
 
-
             #region 清空后代
             var waitList = fsql.Select<PromotionTask>().Where(pt1 => pt1.ShopId == pt.ShopId &&
                                                                      pt1.Id != pt.Id &&

BBWY.Server.Model/Dto/Request/PromotionTask/EditPreTaskRequest.cs

@@ -8,7 +8,7 @@
         public long TaskId { get; set; }
 
         /// <summary>
-        /// 前置任务Id
+        /// 前置任务Id -1代表下一轮开始
         /// </summary>
         public long PreTaskId { get; set; }
     }