新增实体类

Edu.Model/Entity/Duty/RB_Duty_Item.cs

@@ -70,5 +70,15 @@ namespace Edu.Model.Entity.Duty
         /// 值班标准图片
         /// </summary>
         public string ItemImg { get; set; }
+
+        /// <summary>
+        /// 值班事项分类(1-工作清单，2-突发事项，3-交接说明)
+        /// </summary>
+        public int DutyCategory { get; set; }
+
+        /// <summary>
+        /// 值班类型(1-规则事项，2-值班事项)
+        /// </summary>
+        public int DutyType { get; set; }
     }
 }

Edu.Model/ViewModel/Duty/RB_Duty_Item_ViewModel.cs

@@ -39,5 +39,42 @@ namespace Edu.Model.ViewModel.Duty
         /// 值班项目图片列表
         /// </summary>
         public List<string> ItemImgList { get; set; }
+
+        /// <summary>
+        /// 值班事项分类字符串
+        /// </summary>
+        public string DutyCategoryStr
+        {
+            get
+            {
+
+                string str = "";
+                switch (this.DutyCategory)
+                {
+                    case 1: str = "工作清单"; break;
+                    case 2: str = "突发事项"; break;
+                    case 3: str = "交接说明"; break;
+                }
+                return str;
+            }
+        }
+
+        /// <summary>
+        /// 值班类型字符串
+        /// </summary>
+        public string DutyTypeStr
+        {
+            get
+            {
+                string str = "";
+                switch (this.DutyType)
+                {
+                    case 1: str = "规则事项"; break;
+                    case 2: str = "值班事项"; break;
+
+                }
+                return str;
+            }
+        }
     }
 }

Edu.Module.Course/ClassModule.cs

@@ -2275,7 +2275,7 @@ namespace Edu.Module.Course
                             subItem.TeacherName,
                             TimeStr = Common.ConvertHelper.GetTimeStr(currentDate),
                             StartTime = subItem.ClassTime,
-                            EndTime =subItem.EndTime,
+                            subItem.EndTime,
                             CompleteProgress=-1,
                             GuestList = visitorList?.Where(qitem => qitem.ReserveClassId == subItem.ReserveClassId)?.Select(qitem => new { GuestName=qitem.VisitorName })
                         });

Edu.Module.Duty/DutyModule.cs

@@ -93,6 +93,8 @@ namespace Edu.Module.Duty
                     { nameof(RB_Duty_Item_ViewModel.UpdateBy),model.UpdateBy},
                     { nameof(RB_Duty_Item_ViewModel.UpdateTime),model.UpdateTime},
                     { nameof(RB_Duty_Item_ViewModel.ItemImg),model.ItemImg},
+                    { nameof(RB_Duty_Item_ViewModel.DutyCategory),model.DutyCategory},
+                    { nameof(RB_Duty_Item_ViewModel.DutyType),model.DutyType},
                 };
                 return dutyItemRepository.Update(fileds, new WhereHelper(nameof(RB_Duty_Item_ViewModel.Id), model.Id));
             }

Edu.Module.Duty/VisitorReserveModule.cs

@@ -287,9 +287,11 @@ namespace Edu.Module.Duty
                         Platform = 2,
                         ReceiveId = (teacherList.Where(qitem => qitem.AccountId == oldModel.TeacherId)?.FirstOrDefault()?.Id ?? 0).ToString(),
                     };
-                    List<PushMessageModel> messageList = new List<PushMessageModel>();
-                    messageList.Add(pushModel);
-                    messageList.Add(pushModel2);
+                    List<PushMessageModel> messageList = new List<PushMessageModel>
+                    {
+                        pushModel,
+                        pushModel2
+                    };
                     Common.Message.MessageHelper.SendMessage(messageList);
                 }
             }

Edu.Module.User/TeacherModule.cs

@@ -267,9 +267,8 @@ namespace Edu.Module.User
         /// 教师端(新增修改讲师)
         /// </summary>
         /// <param name="model"></param>
-        /// <param name="isUpdateBasic">是否更新基础资料</param>
         /// <returns></returns>
-        public bool SetTeacherModule_V2(RB_Teacher_ViewModel model, bool isUpdateBasic = false)
+        public bool SetTeacherModule_V2(RB_Teacher_ViewModel model)
         {
             bool flag;
             if (model.TId > 0)

Edu.WebApi/Controllers/Duty/DutyController.cs

@@ -244,6 +244,8 @@ namespace Edu.WebApi.Controllers.Duty
                 Shifts = base.ParmJObj.GetStringValue("Shifts"),
                 Group_Id = base.UserInfo.Group_Id,
                 Id = base.ParmJObj.GetInt("Id"),
+                DutyCategory = base.ParmJObj.GetInt("DutyCategory"),
+                DutyType = base.ParmJObj.GetInt("DutyType"),
             };
             query.ItemImgList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(base.ParmJObj.GetStringValue("ItemImgList"));
             if (query.ItemImgList != null && query.ItemImgList.Count > 0)
@@ -318,7 +320,9 @@ namespace Edu.WebApi.Controllers.Duty
                     SchoolList,
                     model?.Shifts,
                     ShiftList,
-                    ItemImgList= ImgList
+                    ItemImgList= ImgList,
+                    model?.DutyType,
+                    model?.DutyCategory,
                 };
             }
             return ApiResult.Success(data: obj);