1、任务显示状态调整

2、日付智能搜索API编写

OASystem/EntitySync/Program.cs

@@ -1,4 +1,5 @@
 using OASystem.Domain.Entities.Groups;
+using OASystem.Domain.Entities.PersonnelModule;
 using OASystem.Domain.Entities.Resource;
 using SqlSugar;
 
@@ -126,7 +127,7 @@ db.CodeFirst.SetStringDefaultLength(50).BackupTable().InitTables(new Type[]
     //typeof(Dis_City), //城市 
     //typeof(Fin_GroupExtraCost), //超支费用 
     //typeof(Pm_TaskAllocation), //任务分配 
-    //typeof(Pm_TaskRelevanceUser), //任务分配关联人员(完成者) 
+    //typeof(Pm_TaskRelevanceUser) //任务分配关联人员(完成者) 
     //typeof(Pm_TaskJobRelevancy), //任务分配关联人员(完成者) 
     //typeof(Crm_TableOperationRecord), //表操作记录 
     //typeof(Grp_InvertedList), //倒推表 
@@ -177,6 +178,6 @@ db.CodeFirst.SetStringDefaultLength(50).BackupTable().InitTables(new Type[]
     //typeof(Grp_ProcessNode),//流程节点
     //typeof(Grp_VisaProcessSteps_Log),//流程节点 
     //typeof(Grp_ProcessLog),//流程节点 
-    typeof(Grp_FeeEntryAcknowledge),//团组费用录入通知记录表 
+    //typeof(Grp_FeeEntryAcknowledge),//团组费用录入通知记录表 
 });
 Console.WriteLine("数据库结构同步完成!");

OASystem/OASystem.Api/Controllers/BusinessController.cs

@@ -68,7 +68,6 @@ namespace OASystem.API.Controllers
             return Ok(await _groupRep.GetGroupNameList(dto));
         }
 
-
         /// <summary>
         /// 团组信息 团组名称 Page List
         /// </summary>

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -205,6 +205,7 @@ namespace OASystem.API.Controllers
         /// <param name="grpOrderPreInfoRep"></param>
         /// <param name="visaProcessRep"></param>
         /// <param name="processOverviewRep"></param>
+        /// <param name="groupSearchService"></param>
         public GroupsController(
             ILogger<GroupsController> logger,
             ITextFileLogger eec_textLogger,
@@ -1301,6 +1302,10 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostGroupPageList(GroupPageListDto dto)
         {
+            // 创建Stopwatch实例
+            var stopwatch = new Stopwatch();
+            stopwatch.Start();
+
             #region 参数验证
             if (dto.UserId < 1)
                 return Ok(JsonView(false, "员工Id为空"));
@@ -1402,8 +1407,8 @@ namespace OASystem.API.Controllers
                 PageFuncAuth = pageFunAuthView,
                 Data = delegationList
             };
-
-            return Ok(JsonView(true, "查询成功!", resultView, total));
+            stopwatch.Stop();
+            return Ok(JsonView(true, $"查询成功!耗时：{stopwatch.Elapsed.TotalSeconds:F3}s", resultView, total));
         }
 
         /// <summary>
@@ -1471,7 +1476,6 @@ namespace OASystem.API.Controllers
         [HttpPost]
         public async Task<IActionResult> GetGroupListByWhere(GroupListByWhere dto)
         {
-
             #region  参数验证
             if (dto.UserId < 1) return Ok(JsonView(false, "员工Id为空"));
             if (dto.PageId < 1) return Ok(JsonView(false, "页面Id为空"));
@@ -1578,8 +1582,8 @@ namespace OASystem.API.Controllers
                 PageFuncAuth = pageFunAuthView,
                 Data = _DelegationList
             };
-
-            return Ok(JsonView(true, "查询成功!", _view, total));
+           
+            return Ok(JsonView(true, $"查询成功!", _view, total));
         }
 
         /// <summary>

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -19,6 +19,7 @@ using OASystem.Domain.ViewModels.QiYeWeChat;
 using OASystem.Domain.ViewModels.Statistics;
 using OASystem.Infrastructure.Repositories.Groups;
 using OASystem.Infrastructure.Repositories.PersonnelModule;
+using Org.BouncyCastle.Asn1.Tsp;
 using System.Data;
 using System.Diagnostics;
 using System.Globalization;
@@ -1297,26 +1298,27 @@ WHERE
             if (_view.Code == 0)
             {
                 //发送消息
-                var taskData = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskAllocation>().Where(it => it.Id == dto.Id).First();
+                var taskInfo = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskAllocation>().Where(it => it.Id == dto.Id).First();
 
-                if (taskData != null)
+                if (taskInfo != null)
                 {
-                    var userName = _taskAllocationRep._sqlSugar.Queryable<Sys_Users>().Where(it => it.Id == taskData.CreateUserId).Select(it => it.CnName).First();
-
-                    var taskUserIds = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskRelevanceUser>().Where(it => it.TAId == dto.Id).Select(x => x.UserId).ToList();
-                    var taskUserIdStrs = taskUserIds.Select(x => x.ToString()).ToList();
-                    string title = $"[{taskData.TaskName}] 进度更新!";
-                    string conten_createUser = $"[{userName}] 已知晓任务.若需查看,请前往任务页面查看详情!";
-                    string qw_conten_createUser = $"[{userName}] 已知晓任务!";
+                    var taskUserInfos = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskRelevanceUser>().Where(it => it.TAId == dto.Id).ToList();
+                    
+                    var taskUserIds = taskUserInfos.Select(it => it.UserId).ToList();
+                    var taskUserIdStrs = taskUserInfos.Select(x => x.UserId.ToString()).ToList();
 
-                    await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title, conten_createUser, new List<int>() { taskData.CreateUserId }); //创建人发送消息
+                    var userNames = _taskAllocationRep._sqlSugar.Queryable<Sys_Users>().Where(it => taskUserIds.Contains(it.Id)).Select(it => it.CnName).ToList();
+                    var userNamesLabel = string.Join("、", userNames);
+                    string title = $"[{taskInfo.TaskName}] 进度更新!";
+                    string conten_createUser = $"[{userNamesLabel}] 已知晓任务.若需查看,请前往任务页面查看详情!";
+                    string qw_conten_createUser = $"[{userNamesLabel}] 已知晓任务!";
 
-                    await AppNoticeLibrary.SendUserMsg_Task_ToUser(new List<string>() { taskData.CreateUserId.ToString() }, taskData.DiId, qw_conten_createUser, taskData.CreateUserId);
+                    await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title, conten_createUser, new List<int>() { taskInfo.CreateUserId }); //创建人发送消息
 
                     string content = $"请注意任务完成时间！若需查看,请前往任务页面查看详情!";
-                    string yw_content = $"请注意任务完成时间!";
+                    string qw_content = $"{userNamesLabel},已知晓 [{taskInfo.TaskName}] 任务!";
                     await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title, content, taskUserIds); //设置任务人 发送消息
-                    await AppNoticeLibrary.SendUserMsg_Task_ToUser(taskUserIdStrs, taskData.DiId, yw_content, taskData.CreateUserId);
+                    await AppNoticeLibrary.SendUserMsg_Task_ToUser(new List<string>() { taskInfo.CreateUserId.ToString() }, taskInfo.DiId, qw_content, dto.UserId);
 
                 }
 
@@ -1349,10 +1351,10 @@ WHERE
 
                         string title = $"[{taskInfo.TaskName}] 进度更新!";
                         string content = $"任务已完成！若需查看,请前往任务页面查看详情!";
-                        string yw_content = $"任务已完成!";
+                        string yw_content = $"已完成 [{taskInfo.TaskName}] 任务!";
                         await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title, content, userIds); //设置任务人 发送消息
                         var userIdStrs = userIds.Select(x => x.ToString()).ToList();
-                        await AppNoticeLibrary.SendUserMsg_Task_ToUser(userIdStrs, taskInfo.DiId, yw_content, taskInfo.CreateUserId);
+                        await AppNoticeLibrary.SendUserMsg_Task_ToUser(userIdStrs, taskInfo.DiId, yw_content, dto.UserId);
 
                     }
                 }

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -3,6 +3,7 @@ using NPOI.HPSF;
 using NPOI.POIFS.Crypt;
 using OASystem.API.OAMethodLib;
 using OASystem.API.OAMethodLib.DeepSeekAPI;
+using OASystem.API.OAMethodLib.GenericSearch;
 using OASystem.Domain.AesEncryption;
 using OASystem.Domain.Attributes;
 using OASystem.Domain.Entities.Customer;
@@ -45,6 +46,7 @@ namespace OASystem.API.Controllers
         private readonly List<int> _taskTypeList = new() { 6 };//任务通知 TaskNotification
         private readonly ApprovalProcessRepository _approvalProcessRep;
         private readonly IDeepSeekService _deepSeek;
+        private readonly DynamicSearchService<Fin_DailyFeePayment> _dailyFeeSearchService;
 
         public SystemController(
             CompanyRepository syscom,
@@ -63,7 +65,8 @@ namespace OASystem.API.Controllers
             MessageRepository messageRep,
             SetDataTypeRepository setDataTypeRep,
             ApprovalProcessRepository approvalProcessRep,
-            IDeepSeekService deepSeek
+            IDeepSeekService deepSeek,
+            DynamicSearchService<Fin_DailyFeePayment> dailyFeeSearchService
             )
         {
             _syscomRep = syscom;
@@ -84,7 +87,94 @@ namespace OASystem.API.Controllers
             _config = config;
             _approvalProcessRep = approvalProcessRep;
             _deepSeek = deepSeek;
+            _dailyFeeSearchService = dailyFeeSearchService;
         }
+
+        #region ALL OA 多词条搜索
+
+        /// <summary>
+        ///  日付信息列表 关键字输入提示
+        /// </summary>
+        /// <param name="keyword">关键字</param>
+        /// <param name="auditType">审核类型 0 全部 1 张总未审核</param>
+        /// <returns></returns>
+        [HttpGet]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> DailyFeeKeywordSearch(string keyword,int auditType)
+        {
+            try
+            {
+                // 验证请求参数
+                if (string.IsNullOrEmpty(keyword))
+                {
+                    return Ok(JsonView(true, $"暂无数据！"));
+                }
+
+                var searchFilters = new List<SearchFilter>()
+                    {
+                        new(){Field = "IsDel",Operator="eq",Value="0" }
+                    };
+
+                //张总未审核过滤
+                if (auditType == 1)
+                {
+                    searchFilters.Add(new() { Field = "MAudit", Operator = "eq", Value = "0" });
+                }
+
+                var searchRequest = new DynamicSearchRequest
+                {
+                    Keyword = keyword,
+                    RequireAllSingleChars = true,
+                    PageIndex = 1,
+                    PageSize = 999999,
+                    FieldWeights = new Dictionary<string, int>
+                    {
+                        { "Instructions", 10 }
+                    },
+                    Filters = searchFilters,
+                    OrderBy = "CreateTime",
+                    //ReturnFields = new List<string>() { "TeamName", "ClientUnit", "ClientName" }
+                };
+
+                // 验证字段配置
+                var validation = _dailyFeeSearchService.ValidateFieldConfig(
+                    searchRequest.FieldWeights,
+                    searchRequest.ReturnFields);
+
+                if (!validation.IsValid)
+                {
+                    return Ok(JsonView(true, $"暂无数据！{validation.Message}"));
+                }
+
+                var result = await _dailyFeeSearchService.SearchAsync(searchRequest);
+
+                if (result.Success)
+                {
+                    var data = new List<dynamic>();
+
+                    foreach (var item in result.Items)
+                    {
+                        data.Add(new
+                        {
+                            item.Data.Instructions,
+                        });
+                    }
+
+                    return Ok(JsonView(true, result.Message, data, data.Count));
+                }
+
+                return Ok(JsonView(true, result.Message));
+            }
+            catch (Exception ex)
+            {
+                return Ok(JsonView(true, $"搜索服务暂时不可用！"));
+            }
+
+        }
+
+        #endregion
+
+
         #region 消息
 
         /// <summary>

OASystem/OASystem.Api/OAMethodLib/Quartz/Business/TaskAssignment.cs

@@ -36,7 +36,7 @@ namespace OASystem.API.OAMethodLib.Quartz.Business
                                     .Where(it =>
                                                     it.IsDel == 0 &&
                                                     primaryIds.Contains(it.TAId) &&
-                                                    it.TaskStatus <= TaskerEnum.UnderWay
+                                                    it.TaskStatus <= TaskEnum.UnderWay
                                             )
                                     .ToList();
 
@@ -45,7 +45,7 @@ namespace OASystem.API.OAMethodLib.Quartz.Business
                     foreach (var item in subData)
                     {
                         item.OverTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-                        item.TaskStatus = TaskerEnum.UnFinished;
+                        item.TaskStatus = TaskEnum.UnFinished;
                         item.Cause = string.Format(@"任务没有提交完成或者超时，由系统设置任务未完成");
                     }
 

OASystem/OASystem.Api/OAMethodLib/Quartz/Business/TaskNotification.cs

@@ -78,8 +78,8 @@ namespace OASystem.API.OAMethodLib.Quartz.Business
                         }
                         else
                         {
-                            if (subItem.TaskStatus == TaskerEnum.NotStarted) realityStartTime = "未开始";
-                            else if (subItem.TaskStatus == TaskerEnum.HaveKnown) realityStartTime = "已知晓";
+                            if (subItem.TaskStatus == TaskEnum.NotStarted) realityStartTime = "未开始";
+                            else if (subItem.TaskStatus == TaskEnum.UnderWay) realityStartTime = "已知晓";
                         }
 
                         var userData = userDatas.Where(it => it.Id == subItem.UserId).FirstOrDefault();

OASystem/OASystem.Domain/Entities/PersonnelModule/Pm_TaskRelevanceUser.cs

@@ -45,7 +45,7 @@ namespace OASystem.Domain.Entities.PersonnelModule
         /// -1 未开始 0 已知晓 1 进行中 2 待审核 3 未完成  4 已完成 5任务中止
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
-        public TaskerEnum TaskStatus { get; set; } = TaskerEnum.NotStarted;
+        public TaskEnum TaskStatus { get; set; } = TaskEnum.NotStarted;
 
         /// <summary>
         /// 未完成原因

OASystem/OASystem.Domain/Enums/TaskEnum.cs

@@ -47,7 +47,7 @@ namespace OASystem.Domain.Enums
     /// <summary>
     /// 任务者状态
     /// </summary>
-    public enum TaskerEnum : int
+    public enum TaskerEnum1 : int
     {
         /// <summary>
         /// 任务指派状态

OASystem/OASystem.Domain/ViewModels/PersonnelModule/TaskAllocationView.cs

@@ -342,7 +342,7 @@ namespace OASystem.Domain.ViewModels.PersonnelModule
         /// <summary>
         /// 任务状态
         /// </summary>
-        public TaskerEnum TaskStatus { get; set; }
+        public TaskEnum TaskStatus { get; set; }
 
         /// <summary>
         /// 未完成原因

OASystem/OASystem.Infrastructure/Repositories/PersonnelModule/TaskAllocationRepository.cs

@@ -406,7 +406,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
                     _TaskRelevanceUsers.Add(new Pm_TaskRelevanceUser() {
                         TAId = dto.Id,
                         UserId = item,
-                        TaskStatus = TaskerEnum.NotStarted,
+                        TaskStatus = TaskEnum.NotStarted,
                         CreateUserId = dto.UserId,
                     });
                 }
@@ -675,7 +675,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
             _sqlSugar.BeginTran();
 
             var update1 = await _sqlSugar.Updateable<Pm_TaskRelevanceUser>()
-                                         .SetColumns(it => it.TaskStatus == TaskerEnum.HaveKnown)
+                                         .SetColumns(it => it.TaskStatus == TaskEnum.UnderWay)
                                          .ExecuteCommandAsync();
             if (update1 < 1)
             {
@@ -709,7 +709,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
                 _result.Msg = string.Format("该任务不在!");
                 return _result;
             }
-            if (selectData.TaskStatus >= TaskerEnum.UnderWay)
+            if (selectData.TaskStatus >= TaskEnum.UnderWay)
             {
                 _result.Msg = string.Format("该任务已知晓，不可重复设置!");
                 return _result;
@@ -717,7 +717,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
 
             _sqlSugar.BeginTran();
             var update1 = await _sqlSugar.Updateable<Pm_TaskRelevanceUser>()
-                                         .SetColumns(it => it.TaskStatus == TaskerEnum.UnderWay)
+                                         .SetColumns(it => it.TaskStatus == TaskEnum.UnderWay)
                                          .SetColumns(it => it.BeginTime == DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"))
                                          .Where(it => it.TAId == id)
                                          .Where(it => it.UserId == userId )
@@ -768,14 +768,14 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
                 return _result;
             }
             
-            if (selectData.TaskStatus >= TaskerEnum.WaitConfirm)
+            if (selectData.TaskStatus >= TaskEnum.WaitConfirm)
             {
                 _result.Msg = string.Format("该任务已提交待审核状态,不可重复提交!");
                 return _result;
             }
             _sqlSugar.BeginTran();
             var update1 = await _sqlSugar.Updateable<Pm_TaskRelevanceUser>()
-                                         .SetColumns(it => it.TaskStatus == TaskerEnum.WaitConfirm)
+                                         .SetColumns(it => it.TaskStatus == TaskEnum.WaitConfirm)
                                          .SetColumns(it => it.OverTime == DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"))
                                          .Where(it => it.TAId == id)
                                          .Where(it => it.UserId == userId)
@@ -829,7 +829,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
             var taskName = await _sqlSugar.Queryable<Pm_TaskAllocation>().Where(it => it.IsDel == 0 && it.Id == id).Select(it => it.TaskName).FirstAsync();
             var operatorName = await _sqlSugar.Queryable<Sys_Users>().Where(it => it.IsDel == 0 && it.Id == userId).Select(it => it.CnName).FirstAsync();
             var update1 = await _sqlSugar.Updateable<Pm_TaskRelevanceUser>()
-                .SetColumns(it => it.TaskStatus == TaskerEnum.HaveKnown)
+                .SetColumns(it => it.TaskStatus == TaskEnum.UnderWay)
                 .Where(it => it.TAId == id && it.UserId == userId)
                 .ExecuteCommandAsync();
             if (update1 < 1)
@@ -925,7 +925,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
                 //}
 
                 var subTaskUpd = _sqlSugar.Updateable<Pm_TaskRelevanceUser>()
-                    .SetColumns(it => it.TaskStatus == TaskerEnum.Finished)
+                    .SetColumns(it => it.TaskStatus == TaskEnum.Finished)
                     .SetColumns(it => it.OverTime == overTime)
                     .SetColumns(it => it.Remark == remark)
                     .Where(it => it.Id == taskerId)
@@ -965,15 +965,14 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
                 // 计算任务状态统计
                 int totalCount = allRelevanceTasks.Count;
 
-                // 已知晓状态数量
-                int haveCount = allRelevanceTasks.Count(x => x.TaskStatus >= TaskerEnum.HaveKnown);
-                // 未设置已知晓状态数量
-                int noHaveCount = allRelevanceTasks.Count(x => x.TaskStatus < TaskerEnum.HaveKnown);
+                // 未开始 数量
+                int notStartedCount = allRelevanceTasks.Count(x => x.TaskStatus <= TaskEnum.NotStarted);
+                int underWayCount = allRelevanceTasks.Count(x => x.TaskStatus > TaskEnum.NotStarted);
 
-                if (noHaveCount > 0)
+                if (notStartedCount > 0)
                 {
                     //其他人未设置已知晓 不可设置 完成状态
-                    var userIds = allRelevanceTasks.Where(x => x.TaskStatus < TaskerEnum.HaveKnown).Select(x => x.UserId).ToList();
+                    var userIds = allRelevanceTasks.Where(x => x.TaskStatus < TaskEnum.UnderWay).Select(x => x.UserId).ToList();
                     var names = _sqlSugar.Queryable<Sys_Users>()
                         .Where(x => userIds.Contains(x.Id))
                         .Select(x => x.CnName)
@@ -987,19 +986,19 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
                 }
 
                 // 判断是否所有子任务均处于结束状态 是 则更新主任务状态
-                bool allTasksInEndStatus = totalCount == haveCount;
+                bool allTasksInEndStatus = totalCount == underWayCount;
                 if (allTasksInEndStatus)
                 {
                     TaskEnum newMainTaskStatus;
 
-                    if (noHaveCount > 0)
+                    if (notStartedCount > 0)
                     {
                         // 存在未完成的子任务
                         newMainTaskStatus = TaskEnum.UnFinished;
                     }
-                    else if (haveCount == totalCount)
+                    else if (underWayCount == totalCount)
                     {
-                        // 所有子任务都已完成
+                        // 所有子任务都在进行中
                         newMainTaskStatus = TaskEnum.Finished;
                     }
                     else
@@ -1077,7 +1076,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
 
             _sqlSugar.BeginTran();
             var update1 = await _sqlSugar.Updateable<Pm_TaskRelevanceUser>()
-                                         .SetColumns(it => it.TaskStatus == TaskerEnum.UnFinished)
+                                         .SetColumns(it => it.TaskStatus == TaskEnum.UnFinished)
                                          .SetColumns(it => it.Cause == cause)
                                          .Where(it => it.Id == id)
                                          .ExecuteCommandAsync();
@@ -1090,8 +1089,8 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
 
             //设置任务状态
             var data2 = _sqlSugar.Queryable<Pm_TaskRelevanceUser>().Where(it => it.IsDel == 0 && it.TAId == _taId).ToList();
-            var data3 = data2.Where(it => it.TaskStatus == TaskerEnum.Finished && it.Id != id).ToList();
-            var data4 = data2.Where(it => it.TaskStatus == TaskerEnum.UnFinished && it.Id != id).ToList();
+            var data3 = data2.Where(it => it.TaskStatus == TaskEnum.Finished && it.Id != id).ToList();
+            var data4 = data2.Where(it => it.TaskStatus == TaskEnum.UnFinished && it.Id != id).ToList();
            
             if ((data2.Count - 1) == (data3.Count + data4.Count))
             {
@@ -1130,7 +1129,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
                 }
 
                 var data = await _sqlSugar.Queryable<Pm_TaskRelevanceUser>()
-                                          .Where(it => it.IsDel == 0 && it.Id == id && it.TaskStatus <= TaskerEnum.UnFinished)
+                                          .Where(it => it.IsDel == 0 && it.Id == id && it.TaskStatus <= TaskEnum.UnFinished)
                                           .ToListAsync();
                 if (data.Count > 0)
                 {
@@ -1194,7 +1193,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
                     return _result;
                 }
 
-                if (data.TaskStatus != TaskerEnum.Finished)
+                if (data.TaskStatus != TaskEnum.Finished)
                 {
                     _result.Msg = string.Format("本任务尚未由发布人确认任务完成,不可评分!");
                     return _result;
@@ -1259,7 +1258,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
                 return _result;
             }
             var subTaskUpdate = _sqlSugar.Updateable<Pm_TaskRelevanceUser>()
-                .SetColumns(it => it.TaskStatus == TaskerEnum.TaskStop)
+                .SetColumns(it => it.TaskStatus == TaskEnum.TaskStop)
                 .Where(it => it.TAId == taskId)
                 .ExecuteCommand();