Lyyyi 1 天之前
父節點
當前提交
cf0e90f338

+ 20 - 20
OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -1105,7 +1105,7 @@ From
       ta.Id,
       ta.TaskName,
       ta.TaskContent,
-      s.Name as 'TaskTyoeName',
+      s.Name as 'TaskTypeName',
       ta.TaskPriority,
       d.DepName,
       di.TeamName,
@@ -1133,25 +1133,25 @@ From
             ''
           )
       ) As Participant
-      //,(
-      //  SELECT
-      //    STUFF(
-      //      (
-      //        Select
-      //          ',' + u.CnName
-      //        From
-      //          Pm_TaskRelevanceUser tra
-      //          Left Join Sys_Users u On tra.UserId = u.Id
-      //        Where
-      //          tra.Isdel = 0
-      //          And tra.TAId = ta.Id
-      //          And tra.TaskStatus = 4 FOR XML PATH('')
-      //      ),
-      //      1,
-      //      1,
-      //      ''
-      //    )
-      //) As Consummator
+      --,(
+      --  SELECT
+      --    STUFF(
+      --      (
+      --        Select
+      --          ',' + u.CnName
+      --        From
+      --          Pm_TaskRelevanceUser tra
+      --          Left Join Sys_Users u On tra.UserId = u.Id
+      --        Where
+      --          tra.Isdel = 0
+      --          And tra.TAId = ta.Id
+      --          And tra.TaskStatus = 4 FOR XML PATH('')
+      --      ),
+      --      1,
+      --      1,
+      --      ''
+      --    )
+      --) As Consummator
     From
       Pm_TaskAllocation ta
       Left Join Sys_Department d On ta.DepId = d.Id

+ 1 - 1
OASystem/OASystem.Domain/Dtos/PersonnelModule/TaskAllocationDto.cs

@@ -44,7 +44,7 @@ namespace OASystem.Domain.Dtos.PersonnelModule
         /// <summary>
         /// 任务类型
         /// </summary>
-        public int TaskType { get; set; }
+        public int TaskType { get; set; } = -1;
 
         /// <summary>
         /// 任务名称

+ 1 - 1
OASystem/OASystem.Domain/ViewModels/PersonnelModule/TaskAllocationView.cs

@@ -130,7 +130,7 @@ namespace OASystem.Domain.ViewModels.PersonnelModule
         /// </summary>
         public string? TaskName { get; set; }
 
-        public string TaskTyoeName { get; set; }
+        public string TaskTypeName { get; set; }
 
         public string TaskContent { get; set; }