页面修改

Edu.Common/Enum/System/PushMessageCategoryEnum.cs

+using Edu.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Common.Enum.System
+{
+    /// <summary>
+    /// 消息推送类型
+    /// </summary>
+    public enum PushMessageCategoryEnum
+    {
+        /// <summary>
+        /// 老师备案评论
+        /// </summary>
+        [EnumField("老师备案评论")]
+        LessonComment = 1,
+
+        /// <summary>
+        /// 值班信息
+        /// </summary>
+        [EnumField("值班信息")]
+        UserDuty =2,
+    }
+}

Edu.Common/Message/PushMessageModel.cs

-using System;
+using Edu.Common.Enum.System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
@@ -27,7 +28,7 @@ namespace Edu.Common.Message
 		/// <summary>
 		/// 所属分类
 		/// </summary>
-		public int CategoryId { get; set; }
+		public PushMessageCategoryEnum CategoryId { get; set; }
 
 		/// <summary>
 		/// 推送平台[1-手机端，2-Web端，3-短信，4-邮件]

Edu.Model/ViewModel/Duty/RB_Duty_Item_ViewModel.cs

@@ -5,6 +5,9 @@ using Edu.Model.Entity.Duty;
 
 namespace Edu.Model.ViewModel.Duty
 {
+    /// <summary>
+    /// 值班事项视图实体类
+    /// </summary>
     public class RB_Duty_Item_ViewModel : RB_Duty_Item
     {
         /// <summary>
@@ -26,5 +29,10 @@ namespace Edu.Model.ViewModel.Duty
         /// 校区列表
         /// </summary>
         public List<int> ItemSchoolList { get; set; }
+
+        /// <summary>
+        /// 是否完成(1-已完成，0-未完成)
+        /// </summary>
+        public int IsChecked { get; set; }
     }
 }

Edu.Model/ViewModel/Duty/RB_Duty_PlanDetails_ViewModel.cs

@@ -49,7 +49,7 @@ namespace Edu.Model.ViewModel.Duty
         /// <summary>
         /// 工作清单列表
         /// </summary>
-        public List<RB_Duty_Item_ViewModel> DutyItemList { get; set; }
+        public List<RB_Duty_PlanWork_ViewModel> WorkContentList { get; set; }
 
         /// <summary>
         /// 状态字符串
@@ -87,5 +87,53 @@ namespace Edu.Model.ViewModel.Duty
                 return str;
             }
         }
+
+        /// <summary>
+        /// 突发事件总数
+        /// </summary>
+        public int BurstCount { get; set; }
+
+        /// <summary>
+        /// 交接工作总数
+        /// </summary>
+        public int HandoverCount { get; set; }
+    }
+
+    /// <summary>
+    /// 值班班次对应事项列表
+    /// </summary>
+    public class RB_Duty_PlanWork_ViewModel
+    {
+        /// <summary>
+        /// 值班填写事项编号(rb_duty_content表Id)
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 值班事项表中Id(rb_duty_item)
+        /// </summary>
+        public int ItemId { get; set; }
+
+        /// <summary>
+        /// 值班事项名称(rb_duty_item)
+        /// </summary>
+        public string ItemName { get; set; }
+
+        /// <summary>
+        /// 值班事项填写类型(rb_duty_item)
+        /// </summary>
+        public ItemTypeEnum ItemType { get; set; }
+
+        /// <summary>
+        /// 填写事项填写内容(rb_duty_content表WorkContent)
+        /// </summary>
+        public string WorkContent { get; set; }
+
+        /// <summary>
+        /// 填写事项是否完成(rb_duty_content表WorkContent)【1-已完成】
+        /// </summary>
+        public int IsChecked { get; set; }
+
+
     }
 }

Edu.Model/ViewModel/Duty/RB_Duty_Plan_ViewModel.cs

@@ -16,6 +16,12 @@ namespace Edu.Model.ViewModel.Duty
         /// </summary>
         public List<RB_Duty_PlanDetails_ViewModel> PlanDetails { get; set; }
 
+        /// <summary>
+        /// 值班工作清单列表
+        /// </summary>
+        public List<RB_Duty_PlanWork_ViewModel> WorkContentList { get; set; }
+
+
         /// <summary>
         /// 创建人
         /// </summary>
@@ -83,5 +89,15 @@ namespace Edu.Model.ViewModel.Duty
         /// 详情编号
         /// </summary>
         public int DetailId { get; set; }
+
+        /// <summary>
+        /// 突发事件总数
+        /// </summary>
+        public int TotalBurstCount { get; set; }
+
+        /// <summary>
+        /// 交接工作总数
+        /// </summary>
+        public int TotalHandoverCount { get; set; }
     }
 }

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using Edu.Cache.User;
 using Edu.Common.API;
 using Edu.Common.Enum.Course;
+using Edu.Common.Enum.System;
 using Edu.Common.Plugin;
 using Edu.Model.ViewModel.Course;
 using Edu.Module.Course;
@@ -1203,7 +1204,7 @@ namespace Edu.WebApi.Controllers.Course
             {
                 Common.Message.PushMessageModel model = new Common.Message.PushMessageModel()
                 {
-                    CategoryId = 0,
+                    CategoryId = PushMessageCategoryEnum.LessonComment,
                     Content = query.Comment,
                     CoverImg = "",
                     CreateByName = base.UserInfo.AccountName,

Edu.WebApi/Controllers/Duty/DutyPlanController.cs

@@ -159,12 +159,16 @@ namespace Edu.WebApi.Controllers.Duty
                     currentModel.ShiftName,
                     currentModel.StartTime,
                     currentModel.EndTime,
-                    PlanList = currentModel?.DutyItemList ?? new List<RB_Duty_Item_ViewModel>(),
+                    PlanList = currentModel?.WorkContentList ?? new  List<RB_Duty_PlanWork_ViewModel>(),
+                    currentModel.BurstCount,
+                    currentModel.HandoverCount,
                     ReciveMan= jieBanMan,
                     GiveMan= jiaoBanMan,
                     item.CreateByName,
                     currentModel.DutyStatus,
                     currentModel.DutyStatusStr,
+                    item.TotalBurstCount,
+                    item.TotalHandoverCount,
                 });
             }
             pageModel.Count = rowsCount;

Edu.WebApi/Controllers/User/LoginController.cs

@@ -198,53 +198,6 @@ namespace Edu.WebApi.Controllers.User
                         uploadConfig?.UploadDomain
                     };
                 }
-                if (Common.Config.IsPushMessage == 1)
-                {
-                    for (var i = 0; i < 10; i++)
-                    {
-                        Random rd = new Random();
-                        int num = rd.Next(0, 1000);
-                        Common.Message.PushMessageModel model = new Common.Message.PushMessageModel()
-                        {
-                            CategoryId = 0,
-                            Content = DateTime.Now.ToString("yyyyMMdd HH:mm:ss fff") + "推送内容" + i.ToString(),
-                            CoverImg = "",
-                            CreateByName = userInfo.AccountName,
-                            JumpUrl = "",
-                            ReceiveId = userInfo.Id.ToString(),
-                            SendTime = DateTime.Now,
-                            SendType = 0,
-                            Title = DateTime.Now.ToString("yyyyMMdd HH:mm:ss fff") + "推送标题" + i.ToString(),
-                        };
-                        //手机推送
-                        if (num % 4 == 1)
-                        {
-                            model.Platform = 1;
-                        }
-                        //Web推送
-                        else if (num % 4 == 2)
-                        {
-                            model.Platform = 2;
-                            model.ReceiveId = userInfo.Id.ToString();
-                        }
-                        //短信推送
-                        else if (num % 4 == 3)
-                        {
-                            model.Platform = 3;
-                            model.MsgTemplateCode = "短信模板代码";
-                            model.MsgSign = "签名";
-                            model.ReceiveId = "13551126755";
-                        }
-                        //邮件推送
-                        else
-                        {
-                            model.Platform = 4;
-                            model.ReceiveId = "1006186972@qq.com";
-                        }
-                        //Common.Message.MessageHelper.SendMessage(model);
-                    }
-                }
-
                 return ApiResult.Success(data: userInfo);
             }
             else

Edu.WebApi/Controllers/User/UserController.cs

@@ -905,7 +905,7 @@ namespace Edu.WebApi.Controllers.User
         [HttpPost]
         public ApiResult GetEmployee()
         {
-            var Id = base.ParmJObj.GetInt("Id", 0);
+            var Id =0;
             var AccountId = base.ParmJObj.GetInt("AccountId", 0);
             var AccountType = base.ParmJObj.GetInt("AccountType", 0);
             var extModel = employeeModule.GetEmployeeModule(Id, AccountId, AccountType);