wsdw

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -1112,6 +1112,7 @@ From
       ta.CreateUserId,
       u.CnName As CreateUserName,
       ta.CreateTime,
+      ta.Remark,
       (
         SELECT
           STUFF(
@@ -1329,7 +1330,7 @@ WHERE
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostTaskAllocationSetAuditStatus(TaskAllocationSetAuditStatusDto dto)
         {
-            var _view = _taskAllocationRep.TaskSetAuditStatus(dto.Id, dto.UserId, dto.OverTime);
+            var _view = _taskAllocationRep.TaskSetAuditStatus(dto.Id, dto.UserId, dto.OverTime,dto.Remark);
             if (_view.Code == 0)
             {
                 //发送消息

OASystem/OASystem.Domain/Dtos/PersonnelModule/TaskAllocationDto.cs

@@ -204,6 +204,8 @@ namespace OASystem.Domain.Dtos.PersonnelModule
         /// 实际结束时间
         /// </summary>
         public string OverTime { get; set; }
+
+        public string Remark { get; set; }
     }
 
     /// <summary>

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

@@ -198,6 +198,11 @@ namespace OASystem.Domain.ViewModels.PersonnelModule
         /// 已知晓权限
         /// </summary>
         public bool TaskHavePerm { get; set; } = false;
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
     }
 
     /// <summary>

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

@@ -797,7 +797,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        public Result TaskSetAuditStatus(int id,int userId,string overTime)
+        public Result TaskSetAuditStatus(int id,int userId,string overTime,string remark)
         {
             if (id < 1)
             {
@@ -844,15 +844,16 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
                 }
 
                 //不可重复设置状态
-                if (subTaskInfo.TaskStatus == TaskerEnum.Finished)
-                {
-                    _result.Msg = string.Format("“已完成”状态，已设置不可重复操作!");
-                    return _result;
-                }
+                //if (subTaskInfo.TaskStatus == TaskerEnum.Finished)
+                //{
+                //    _result.Msg = string.Format("“已完成”状态，已设置不可重复操作!");
+                //    return _result;
+                //}
 
                 var subTaskUpd = _sqlSugar.Updateable<Pm_TaskRelevanceUser>()
                     .SetColumns(it => it.TaskStatus == TaskerEnum.Finished)
                     .SetColumns(it => it.OverTime == overTime)
+                    .SetColumns(it => it.Remark == remark)
                     .Where(it => it.Id == taskerId)
                     .ExecuteCommand();
                 if (subTaskUpd < 1)
@@ -911,7 +912,8 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
                         .SetColumns(x => new Pm_TaskAllocation
                         {
                             Status = newMainTaskStatus,
-                            OverTime = overTime
+                            OverTime = overTime,
+                            Remark = remark
                         })
                         .Where(x => x.Id == mainTaskId && x.IsDel == 0)
                         .ExecuteCommand();