From 68c83358600cf5ecb59ddcb34e5c834537f0cf47 Mon Sep 17 00:00:00 2001
From: zhangbin <460190368@qq.com>
Date: Fri, 29 Nov 2024 15:07:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=8B=E5=8A=A8=E5=8F=91?=
=?UTF-8?q?=E5=B8=83=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
OpenAuth.App/ServiceApp/AdminTaskManageApp.cs | 44 ++++++++++++++++++-
.../AdminTaskManageController.cs | 21 +++++++++
2 files changed, 63 insertions(+), 2 deletions(-)
diff --git a/OpenAuth.App/ServiceApp/AdminTaskManageApp.cs b/OpenAuth.App/ServiceApp/AdminTaskManageApp.cs
index 942e901..42aaf2f 100644
--- a/OpenAuth.App/ServiceApp/AdminTaskManageApp.cs
+++ b/OpenAuth.App/ServiceApp/AdminTaskManageApp.cs
@@ -52,7 +52,7 @@ namespace OpenAuth.App.ServiceApp
insTaskInfo.CreateUser = user == null ? "" : user.Id.ToString();
insTaskInfo.UpdateTime = DateTime.Now;
insTaskInfo.UpdateUser = user == null ? "" : user.Id.ToString();
- insTaskInfo.State = 0;
+ insTaskInfo.State = 3;//未发布
insTaskInfo.IsCompleted = false;
insTaskInfo.CreateUserName = user == null ? "" : user.Name;
insTaskInfo.UpdateUserName = user == null ? "" : user.Name;
@@ -282,7 +282,7 @@ namespace OpenAuth.App.ServiceApp
{
var insTaskInfo = await db.InsTask.GetFirstAsync(r => r.Id == req.Id);
//判断是否存在或者是否已被领取
- if (insTaskInfo == null || insTaskInfo.State != 0)
+ if (insTaskInfo == null || insTaskInfo.State != 3)
throw new Exception("任务已被领取,无法修改");
var user = _auth.GetCurrentUser().User;
//删除任务分组表,任务前后时相表
@@ -382,6 +382,46 @@ namespace OpenAuth.App.ServiceApp
}
}
///
+ /// 手动发布任务
+ ///
+ ///
+ ///
+ ///
+ public async Task> ReleaseTask(string id)
+ {
+ using (var db = base.UnitWork.CreateContext())
+ {
+ var insTaskInfo = await db.InsTask.GetFirstAsync(r => r.Id == id);
+ //判断是否存在或者是否已被领取
+ if (insTaskInfo == null || insTaskInfo.State != 3)
+ throw new Exception("任务已发布");
+ var user = _auth.GetCurrentUser().User;
+
+ // 插入任务和任务组以及前后时相
+ await db.InsTask.UpdateAsync(r => new InsTask
+ {
+ State = 0,
+ UpdateTime = DateTime.Now,
+ UpdateUser = user.Id.ToString(),
+ UpdateUserName = user.Name,
+
+ }, r => r.Id == id); ;
+ // 提交事务
+ if (db.Commit())
+ {
+ return new Response
+ {
+ Result = "发布成功",
+ Message = "发布成功"
+ };
+ }
+ else
+ {
+ throw new Exception("发布失败");
+ }
+ }
+ }
+ ///
/// 获取单个任务信息
///
///
diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/AdminTaskManageController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/AdminTaskManageController.cs
index baef88e..b688d7b 100644
--- a/OpenAuth.WebApi/Controllers/ServiceControllers/AdminTaskManageController.cs
+++ b/OpenAuth.WebApi/Controllers/ServiceControllers/AdminTaskManageController.cs
@@ -102,6 +102,27 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
}
return response;
}
+ ///
+ /// 手动发布任务
+ ///
+ ///
+ ///
+ [HttpPost]
+ public async Task> ReleaseTask(string id)
+ {
+ Response response = new Response();
+ try
+ {
+ return await _app.ReleaseTask(id);
+ }
+ catch (Exception ex)
+ {
+ response.Code = 500;
+ response.Message = ex.InnerException?.Message ?? ex.Message;
+ }
+ return response;
+ }
+
///
/// 获取单个任务信息
///