diff --git a/VOL.Business/Services/HomeWork/S_HomeWorkService.cs b/VOL.Business/Services/HomeWork/S_HomeWorkService.cs
index 7db6144..d18585a 100644
--- a/VOL.Business/Services/HomeWork/S_HomeWorkService.cs
+++ b/VOL.Business/Services/HomeWork/S_HomeWorkService.cs
@@ -52,6 +52,7 @@ namespace VOL.Business.Services.Norm
         public async Task<PageDataDto<HomeWorkListModel>> GetHomeWorkPageList(HomeWorkPageListParam paramDto)
         {
             var res = new PageDataDto<HomeWorkListModel>();
+            var currentTime = DateTime.Now;
 
             var query = from s in _homeWorkRepository.FindAsIQueryable(x => x.SchoolCode == UserContext.Current.TenantId)
                         select new HomeWorkListModel()
@@ -59,11 +60,13 @@ namespace VOL.Business.Services.Norm
                             WorkId = s.Id,
                             TeacherId = s.TeacherId,
                             StudentScope = s.StudentScope,
-                            WorkStatus = s.WorkStatus,
+                            WorkStatus = s.EndTime < currentTime ? HomeWorkStatus.Ended : (s.StartTime > currentTime ? HomeWorkStatus.NotStarted : HomeWorkStatus.Afoot),
                             TeacherName = s.TeacherName,
                             WorkName = s.WorkName,
                             WorkText = s.WorkText,
                             WorkType = s.WorkType,
+                            WorkModeType = s.WorkModeType,
+                            WorkModeTypeName = s.WorkModeType.GetDescription(),
                             StartTime = s.StartTime,
                             EndTime = s.EndTime,
                             StudentScopeStr = s.StudentScope.GetDescription(),
diff --git a/VOL.Entity/Enum/HomeWorkStatus.cs b/VOL.Entity/Enum/HomeWorkStatus.cs
index 9cc6549..89b720c 100644
--- a/VOL.Entity/Enum/HomeWorkStatus.cs
+++ b/VOL.Entity/Enum/HomeWorkStatus.cs
@@ -12,16 +12,21 @@ namespace VOL.Entity.Enum
     /// </summary>
     public enum HomeWorkStatus
     {
+        /// <summary>
+        /// 未开始
+        /// </summary>
+        [Description("未开始")]
+        NotStarted = 1,
         /// <summary>
         /// 进行中
         /// </summary>
         [Description("进行中")]
-        Afoot = 1,
+        Afoot = 2,
         /// <summary>
         /// 已结束
         /// </summary>
         [Description("已结束")]
-        Ended = 2
+        Ended = 3
     }
 
 
diff --git a/VOL.Entity/Enum/HomeWorkType.cs b/VOL.Entity/Enum/HomeWorkType.cs
index 3f214c3..2bf966f 100644
--- a/VOL.Entity/Enum/HomeWorkType.cs
+++ b/VOL.Entity/Enum/HomeWorkType.cs
@@ -23,6 +23,4 @@ namespace VOL.Entity.Enum
         [Description("体育作业")]
         Sports = 2
     }
-
-
 }
diff --git a/VOL.Model/HomeWork/Response/HomeWorkListModel.cs b/VOL.Model/HomeWork/Response/HomeWorkListModel.cs
index dba0684..47c3b2c 100644
--- a/VOL.Model/HomeWork/Response/HomeWorkListModel.cs
+++ b/VOL.Model/HomeWork/Response/HomeWorkListModel.cs
@@ -39,6 +39,16 @@ namespace VOL.Model.HomeWork
         /// </summary>
         public string WorkTypeStr { get; set; }
 
+        /// <summary>
+        /// 模式类型
+        /// </summary>
+        public WorkModeType WorkModeType { get; set; }
+
+        /// <summary>
+        /// 模式类型名称
+        /// </summary>
+        public string WorkModeTypeName { get; set; }
+
         /// <summary>
         /// 作业状态
         /// </summary>
diff --git a/VOL.WebApi/Startup.cs b/VOL.WebApi/Startup.cs
index 23bafd3..eb9a982 100644
--- a/VOL.WebApi/Startup.cs
+++ b/VOL.WebApi/Startup.cs
@@ -318,18 +318,18 @@ namespace VOL.WebApi
             //配置HttpContext
             app.UseStaticHttpContext();
 
-            //app.UseSwagger();
-            //app.UseSwaggerUI(c =>
-            //{
-            //    //2个下拉框选项  选择对应的文档
-            //    c.SwaggerEndpoint("/swagger/v1/swagger.json", "VOL.Core后台Api");
-            //    c.SwaggerEndpoint("/swagger/v2/swagger.json", "测试第三方Api");
-            //    c.SwaggerEndpoint("/swagger/v3/swagger.json", "SmartSportsServer-Api");
-            //    c.SwaggerEndpoint("/swagger/v4/swagger.json", "物联网-Api");
-            //    c.SwaggerEndpoint("/swagger/v5/swagger.json", "Ai-Api");
-            //    c.SwaggerEndpoint("/swagger/v6/swagger.json", "AiApp-Api");
-            //    c.RoutePrefix = "";
-            //});
+            app.UseSwagger();
+            app.UseSwaggerUI(c =>
+            {
+                //2个下拉框选项  选择对应的文档
+                c.SwaggerEndpoint("/swagger/v1/swagger.json", "VOL.Core后台Api");
+                c.SwaggerEndpoint("/swagger/v2/swagger.json", "测试第三方Api");
+                c.SwaggerEndpoint("/swagger/v3/swagger.json", "SmartSportsServer-Api");
+                c.SwaggerEndpoint("/swagger/v4/swagger.json", "物联网-Api");
+                c.SwaggerEndpoint("/swagger/v5/swagger.json", "Ai-Api");
+                c.SwaggerEndpoint("/swagger/v6/swagger.json", "AiApp-Api");
+                c.RoutePrefix = "";
+            });
 
             app.UseRouting();
             app.UseCors();
diff --git a/VOL.WebApi/appsettings.json b/VOL.WebApi/appsettings.json
index dd2af90..a64d7c6 100644
--- a/VOL.WebApi/appsettings.json
+++ b/VOL.WebApi/appsettings.json
@@ -19,8 +19,8 @@
     //"DbConnectionString": "Data Source=DESKTOP-JJQM2OL\\SQLEXPRESS;Initial Catalog=netcoredev;Persist Security Info=True;User ID=sa;Password=123456;Connect Timeout=500;",
 
     //mysql连接字符串(升级EFCore3.1到时已将mysql连接字符串修改,2019-12-20)
-    //"DbConnectionString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB_QA;User ID=yd;Password=Admin@123456;Connect Timeout=500;",
-    "DbConnectionString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB;User ID=yd;Password=Admin@123456;Connect Timeout=500;",
+    "DbConnectionString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB_QA;User ID=yd;Password=Admin@123456;Connect Timeout=500;",
+    //"DbConnectionString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB;User ID=yd;Password=Admin@123456;Connect Timeout=500;",
 
     //"DbConnectionString": "Server=192.168.10.230;Port=3306;Database=dachentradedb;Uid=root;Pwd=123456;AllowLoadLocalInfile=true;Command Timeout=120;",  
     //"DbConnectionString": "Server=47.101.60.251;Port=3306;Database=smartsports;Uid=root;Pwd=Admin@123;AllowLoadLocalInfile=true;Command Timeout=120;",