diff --git a/.vs/SGGL_CD/v17/.wsuo b/.vs/SGGL_CD/v17/.wsuo
index 6f9702ec..c059299b 100644
Binary files a/.vs/SGGL_CD/v17/.wsuo and b/.vs/SGGL_CD/v17/.wsuo differ
diff --git a/SGGL/BLL/API/HSSE/APITrainingTaskService.cs b/SGGL/BLL/API/HSSE/APITrainingTaskService.cs
index fd88f7cb..a49605c9 100644
--- a/SGGL/BLL/API/HSSE/APITrainingTaskService.cs
+++ b/SGGL/BLL/API/HSSE/APITrainingTaskService.cs
@@ -37,6 +37,7 @@ namespace BLL
TrainTypeName = db.Base_TrainType.FirstOrDefault(b => b.TrainTypeId == y.TrainTypeId).TrainTypeName,
TrainLevelName = db.Base_TrainLevel.FirstOrDefault(b => b.TrainLevelId == y.TrainLevelId).TrainLevelName,
PlanStatesName = y.States == "3" ? "已完成" : "培训中",
+ TaskStatesName = x.States == "2" ? "已完成" : "培训中",
TrainingItemCode = getTrainingItemCode(y.PlanId)
}).ToList();
diff --git a/SGGL/Model/APIItem/HSSE/TrainingTaskItem.cs b/SGGL/Model/APIItem/HSSE/TrainingTaskItem.cs
index 92a77ae9..6c3b7eb0 100644
--- a/SGGL/Model/APIItem/HSSE/TrainingTaskItem.cs
+++ b/SGGL/Model/APIItem/HSSE/TrainingTaskItem.cs
@@ -48,6 +48,14 @@ namespace Model
set;
}
///
+ /// 培训任务状态
+ ///
+ public string TaskStatesName
+ {
+ get;
+ set;
+ }
+ ///
/// 培训计划时间
///
public string TrainStartDate