提交app接口代码

Edu.Common/Enum/App/MsgTypeEnum.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Edu.Common.Plugin;
+
+namespace Edu.Common.Enum.App
+{
+    public enum MsgTypeEnum
+    {
+        /// <summary>
+        /// 系统消息
+        /// </summary>
+        [EnumField("系统消息")]
+        System = 1,
+
+        /// <summary>
+        /// 活动通知
+        /// </summary>
+        [EnumField("活动通知")]
+        Activity = 2,
+        /// <summary>
+        /// 学习提醒
+        /// </summary>
+        [EnumField("学习提醒")]
+        Study = 3,
+    }
+}

Edu.Common/Enum/App/StudentTypeEnum.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Edu.Common.Plugin;
+
+namespace Edu.Common.Enum.App
+{
+    public enum StudentTypeEnum
+    {
+        /// <summary>
+        /// 考试
+        /// </summary>
+        [EnumField("考试")]
+        Exam = 1,
+
+        /// <summary>
+        /// 作业
+        /// </summary>
+        [EnumField("作业")]
+        Task = 2,
+
+
+    }
+}

Edu.Model/Entity/App/RB_Student_SystemMsg.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Edu.Common.Enum;
+using Edu.Common.Enum.App;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.App
+{
+
+    /// <summary>
+    /// 学生app系统消息
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Student_SystemMsg
+    {
+
+        public int MsgId { get; set; }
+
+        /// <summary>
+        /// 集团编号
+        /// </summary>
+        public int Group_Id { get; set; }
+
+        /// <summary>
+        /// 学校编号
+        /// </summary>
+        public int School_Id { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public int CreateBy { get; set; }
+
+
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+
+
+
+        /// <summary>
+        /// 删除状态(0-正常,1-禁用)
+        /// </summary>
+        public DateStateEnum Status { get; set; }
+
+
+        /// <summary>
+        /// 账户id（表RB_Account的id）
+        /// </summary>
+        public int Student_Id { get; set; }
+        /// <summary>
+        /// 是否已读，0-未读，1-已读
+        /// </summary>
+        public int IsRead { get; set; }
+        /// <summary>
+        /// 阅读时间
+        /// </summary>
+        public DateTime? ReadTime { get; set; }
+
+        /// <summary>
+        /// 消息类型
+        /// </summary>
+        public MsgTypeEnum? MsgType { get; set; }
+
+        /// <summary>
+        /// 消息标题
+        /// </summary>
+        public string Title { get; set; }
+
+        /// <summary>
+        /// 学校提醒的的类型
+        /// </summary>
+        public StudentTypeEnum? StudentType { get; set; }
+
+
+        /// <summary>
+        /// 图片
+        /// </summary>
+        public string Pic { get; set; }
+
+        /// <summary>
+        /// 内容
+        /// </summary>
+        public string Content { get; set; }
+    }
+}

Edu.Model/ViewModel/App/RB_Student_SystemMsg_ViewModel.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Edu.Model.Entity.App;
+
+namespace Edu.Model.ViewModel.App
+{
+    public class RB_Student_SystemMsg_ViewModel : RB_Student_SystemMsg
+    {
+        public string CreateByName { get; set; }
+
+
+        /// <summary>
+        /// 批量增加系统消息的学生ids
+        /// </summary>
+        public string StudentIds { get; set; }
+    }
+}

Edu.Model/ViewModel/Course/RB_Class_Plan_ViewModel.cs

@@ -6,7 +6,7 @@ namespace Edu.Model.ViewModel.Course
     /// <summary>
     /// 班级上课计划视图实体类
     /// </summary>
-    public class RB_Class_Plan_ViewModel: RB_Class_Plan
+    public class RB_Class_Plan_ViewModel : RB_Class_Plan
     {
         /// <summary>
         /// 班级编号【查询使用,逗号分隔】
@@ -87,5 +87,10 @@ namespace Edu.Model.ViewModel.Course
         /// 老师备课次数>0已备课
         /// </summary>
         public int LessonPlanNum { get; set; }
+
+        /// <summary>
+        /// 学生id
+        /// </summary>
+        public int StuId { get; set; }
     }
 }

Edu.Model/ViewModel/Course/RB_Class_ViewModel.cs

@@ -176,5 +176,7 @@ namespace Edu.Model.ViewModel.Course
         /// 课程分类编号
         /// </summary>
         public int CateId { get; set; }
+
+      
     }
 }
\ No newline at end of file

Edu.Model/ViewModel/User/RB_Student_ViewModel.cs

@@ -70,5 +70,10 @@ namespace Edu.Model.ViewModel.User
         /// 学生账号
         /// </summary>
         public string StudentAccount { get; set; }
+
+        /// <summary>
+        /// 班级名称
+        /// </summary>
+        public string ClassName { get; set; }
     }
 }
\ No newline at end of file

Edu.Module.Course/ClassModule.cs

@@ -1474,6 +1474,43 @@ namespace Edu.Module.Course
             }
             return list;
         }
+
+
+
+        /// <summary>
+        /// 获取老师计划列表
+        /// </summary>
+        /// <param name="classId">班级编号</param>
+        /// <param name="monthStr">月份</param>
+        /// <returns></returns>
+        public List<RB_Class_Plan_ViewModel> GetStudentPlanModule(RB_Class_Plan_ViewModel model)
+        {
+            var timeList = new List<RB_Class_Time_ViewModel>();
+            var planList = class_PlanRepository.GetStudentPlanListRepository(model);
+            if (planList != null && planList.Any())
+            {
+                string Ids = string.Join(",", planList.Select(qitem => qitem.ClassPlanId));
+                if (!string.IsNullOrEmpty(Ids))
+                {
+                    timeList = class_TimeRepository.GetClassTimeListRepository(new RB_Class_Time_ViewModel() { QClassPlanIds = Ids });
+                }
+                string ClassIds = string.Join(",", planList.GroupBy(x => x.ClassId).Select(x => x.Key));
+                //var orderStudentList = order_GuestRepository.GetList(new RB_Order_Guest_ViewModel()
+                //{
+                //    ClassIds = ClassIds,
+                //    Group_Id = model.Group_Id,
+                //    School_Id = model.School_Id
+                //}).Where(x => x.GuestState == 1).ToList();
+                foreach (var item in planList)
+                {
+                    item.PlanTimeList = new List<RB_Class_Time_ViewModel>();
+                    item.PlanTimeList = timeList.Where(x => x.ClassPlanId == item.ClassPlanId).ToList();
+                    //item.GuestList = new List<RB_Order_Guest_ViewModel>();
+                    //item.GuestList = orderStudentList.Where(x => x.ClassId == item.ClassId).ToList();
+                }
+            }
+            return planList;
+        }
         #endregion
     }
 }

Edu.Module.System/AppSystemMsgModule.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Edu.Model.ViewModel.App;
+using Edu.Repository.App;
+using VT.FW.DB;
+
+namespace Edu.Module.System
+{
+    public class AppSystemMsgModule
+    {
+
+
+        /// <summary>
+        /// app学生系统消息仓储层对象
+        /// </summary>
+        private readonly RB_Student_SystemMsgRepository studentSystemMsgRepository = new RB_Student_SystemMsgRepository();
+        #region 学生app系统消息
+        /// <summary>
+        /// 获取学生app系统消息
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Student_SystemMsg_ViewModel> GetStudentSystemMsgList(RB_Student_SystemMsg_ViewModel query)
+        {
+            return studentSystemMsgRepository.GetStudentSystemMsgList(query);
+        }
+
+
+
+        /// <summary>
+        /// 新增系统消息
+        /// </summary>
+        /// <param name="list"></param>
+        /// <returns></returns>
+        //[TransactionCallHandler]
+        public bool SetStudentSystemMsg(RB_Student_SystemMsg_ViewModel model)
+        {
+            bool flag = false;
+            if (model.MsgId == 0)
+            {
+                return studentSystemMsgRepository.Insert(model) > 0;
+            }
+            return flag;
+        }
+        /// <summary>
+        /// 批量新增系统消息
+        /// </summary>
+        /// <param name="list"></param>
+        /// <returns></returns>
+        //[TransactionCallHandler]
+        public bool BatchSetStudentSystemMsg(List<RB_Student_SystemMsg_ViewModel> list)
+        {
+
+            return studentSystemMsgRepository.InsertBatch(list);
+        }
+
+
+        /// <summary>
+        /// 批量删除消息
+        /// </summary>
+        /// <param name="MsgType"></param>
+        /// <param name="Group_Id"></param>
+        /// <param name="AccountId"></param>
+        /// <returns></returns>
+        public bool DelStudentMsgById(string MsgIds, int Group_Id)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    {nameof(RB_Student_SystemMsg_ViewModel.Status),1 }
+
+                };
+            List<WhereHelper> wheres = new List<WhereHelper>() {
+                    new WhereHelper(){
+                         FiledName=nameof(RB_Student_SystemMsg_ViewModel.MsgId),
+                          FiledValue=MsgIds,
+                           OperatorEnum=OperatorEnum.IN
+                    },
+                     new WhereHelper(){
+                         FiledName=nameof(RB_Student_SystemMsg_ViewModel.Group_Id),
+                          FiledValue=Group_Id,
+                           OperatorEnum=OperatorEnum.Equal
+                    }
+                };
+            return studentSystemMsgRepository.Update(fileds, wheres);
+        }
+
+
+        /// <summary>
+        /// 批量更新未读消息
+        /// </summary>
+        /// <param name="MsgType"></param>
+        /// <param name="Group_Id"></param>
+        /// <param name="AccountId"></param>
+        /// <returns></returns>
+        public bool UpdateStudentMsgById(int MsgId, int Group_Id, int AccountId)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    {nameof(RB_Student_SystemMsg_ViewModel.IsRead),1 },
+                    {nameof(RB_Student_SystemMsg_ViewModel.ReadTime),DateTime.Now}
+
+                };
+            List<WhereHelper> wheres = new List<WhereHelper>() {
+                    new WhereHelper(){
+                         FiledName=nameof(RB_Student_SystemMsg_ViewModel.MsgId),
+                          FiledValue=MsgId,
+                           OperatorEnum=OperatorEnum.Equal
+                    },
+                     new WhereHelper(){
+                         FiledName=nameof(RB_Student_SystemMsg_ViewModel.Group_Id),
+                          FiledValue=Group_Id,
+                           OperatorEnum=OperatorEnum.Equal
+                    }
+                     , new WhereHelper(){
+                         FiledName=nameof(RB_Student_SystemMsg_ViewModel.Student_Id),
+                          FiledValue=AccountId,
+                           OperatorEnum=OperatorEnum.Equal
+                    }
+                };
+            return studentSystemMsgRepository.Update(fileds, wheres);
+        }
+
+        /// <summary>
+        /// 批量更新未读消息
+        /// </summary>
+        /// <param name="MsgType"></param>
+        /// <param name="Group_Id"></param>
+        /// <param name="AccountId"></param>
+        /// <returns></returns>
+        public bool UpdateStudentMsg(int MsgType, int Group_Id, int AccountId)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    {nameof(RB_Student_SystemMsg_ViewModel.IsRead),1 },
+                    {nameof(RB_Student_SystemMsg_ViewModel.ReadTime),DateTime.Now}
+
+                };
+            List<WhereHelper> wheres = new List<WhereHelper>() {
+                    new WhereHelper(){
+                         FiledName=nameof(RB_Student_SystemMsg_ViewModel.MsgType),
+                          FiledValue=MsgType,
+                           OperatorEnum=OperatorEnum.Equal
+                    },
+                     new WhereHelper(){
+                         FiledName=nameof(RB_Student_SystemMsg_ViewModel.Group_Id),
+                          FiledValue=Group_Id,
+                           OperatorEnum=OperatorEnum.Equal
+                    }
+                     , new WhereHelper(){
+                         FiledName=nameof(RB_Student_SystemMsg_ViewModel.Student_Id),
+                          FiledValue=AccountId,
+                           OperatorEnum=OperatorEnum.Equal
+                    }
+                };
+            return studentSystemMsgRepository.Update(fileds, wheres);
+        }
+
+
+        /// <summary>
+        /// 获取学生app系统分页列表
+        /// </summary>
+        /// <param name="pageIndex">当前页</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowsCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Student_SystemMsg_ViewModel> GetStudentSystemMsgPageList(int pageIndex, int pageSize, out long rowsCount, RB_Student_SystemMsg_ViewModel query)
+        {
+            return studentSystemMsgRepository.GetStudentSystemMsgPageListRepository(pageIndex, pageSize, out rowsCount, query);
+        }
+        #endregion
+    }
+}

Edu.Module.User/ManagerModule.cs

@@ -405,5 +405,17 @@ namespace Edu.Module.User
             }
             return flag;
         }
-    }
+
+
+
+        /// <summary>
+        /// 根据学生id获取学生对应的销售
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Manager_ViewModel> GetManagerListByStuId(int Student_Id, int Group_Id)
+        {
+            return managerRepository.GetManagerListByStuId(Student_Id, Group_Id);
+        }
+        }
 }
\ No newline at end of file

Edu.Module.User/StudentModule.cs

@@ -32,7 +32,7 @@ namespace Edu.Module.User
         /// </summary>
         private readonly AccountModule accountModule = new AccountModule();
 
-    
+
 
         /// <summary>
         /// 获取学生列表
@@ -255,5 +255,17 @@ namespace Edu.Module.User
             }
         }
         #endregion
+
+
+
+        /// <summary>
+        /// 根据学生id获取同班账户,必须是未开班/学习中的
+        /// </summary>
+        /// <param name="teacherIds"></param>
+        /// <returns></returns>
+        public List<RB_Student_ViewModel> GetListByStudentId(int Student_Id, int Group_Id)
+        {
+            return studentRepository.GetListByStudentId(Student_Id, Group_Id);
+        }
     }
 }

Edu.Module.User/TeacherModule.cs

@@ -520,7 +520,6 @@ namespace Edu.Module.User
 
 
 
-
         /// <summary>
         /// 根据学生id获取教师账户
         /// </summary>
@@ -531,9 +530,5 @@ namespace Edu.Module.User
             return teacherRepository.GetListByStudentId(Student_Id, Group_Id);
         }
 
-
-
-
-
     }
 }

Edu.Repository/App/RB_Student_SystemMsgRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Edu.Common.Enum;
+using Edu.Model.Entity.App;
+using Edu.Model.ViewModel.App;
+
+namespace Edu.Repository.App
+{
+    /// <summary>
+    /// 学生app系统消息
+    /// </summary>
+    public class RB_Student_SystemMsgRepository : BaseRepository<RB_Student_SystemMsg>
+    {
+        /// <summary>
+        /// 获取学生app系统消息
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Student_SystemMsg_ViewModel> GetStudentSystemMsgList(RB_Student_SystemMsg_ViewModel query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@" SELECT *  FROM RB_Student_SystemMsg  WHERE 1=1  ");
+            builder.AppendFormat(" AND {0}={1} ", nameof(RB_Student_SystemMsg.Status), (int)DateStateEnum.Normal);
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Student_SystemMsg.Group_Id), query.Group_Id);
+                }
+                if (query.School_Id > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Student_SystemMsg.School_Id), query.School_Id);
+                }
+                if (query.Student_Id > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Student_SystemMsg.Student_Id), query.Student_Id);
+                }
+                if (query.MsgId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Student_SystemMsg.MsgId), query.MsgId);
+                }
+                if (query.IsRead > -1)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Student_SystemMsg.IsRead), query.IsRead);
+                }
+                if (query.MsgType.HasValue && query.MsgType.Value > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Student_SystemMsg.MsgType), (int)query.MsgType);
+                }
+                if (query.StudentType.HasValue && query.StudentType.Value > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Student_SystemMsg.StudentType), (int)query.StudentType);
+                }
+            }
+            return Get<RB_Student_SystemMsg_ViewModel>(builder.ToString()).ToList();
+        }
+
+
+        /// <summary>
+        /// 获取学生app系统分页列表
+        /// </summary>
+        /// <param name="pageIndex">当前页</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowsCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Student_SystemMsg_ViewModel> GetStudentSystemMsgPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_Student_SystemMsg_ViewModel query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@" SELECT *  FROM RB_Student_SystemMsg WHERE 1=1 ");
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Student_SystemMsg.Group_Id), query.Group_Id);
+                }
+                if (query.School_Id > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Student_SystemMsg.School_Id), query.School_Id);
+                }
+                if (query.Student_Id > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Student_SystemMsg.Student_Id), query.Student_Id);
+                }
+                if (query.IsRead > -1)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Student_SystemMsg.IsRead), query.IsRead);
+                }
+                if (query.MsgType.HasValue && query.MsgType.Value > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Student_SystemMsg.MsgType), (int)query.MsgType);
+                }
+                if (query.StudentType.HasValue && query.StudentType.Value > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Student_SystemMsg.StudentType), (int)query.StudentType);
+                }
+            }
+            builder.Append(" ORDER BY MsgId DESC ");
+            return GetPage<RB_Student_SystemMsg_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
+        }
+    }
+}

Edu.Repository/Course/RB_Class_PlanRepository.cs

@@ -312,6 +312,66 @@ LEFT JOIN rb_class as class on a.ClassId=class.ClassId
      LEFT JOIN rb_teacher AS T ON A.TeacherId=T.TId
 LEFT JOIN (SELECT ClassPlanId,COUNT(*) as LessonPlanNum from rb_class_lessonplan where `Status`=0  GROUP BY ClassPlanId)as lp on a.ClassPlanId=lp.ClassPlanId
 WHERE 1=1
+");
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Status), (int)DateStateEnum.Normal);
+            if (query != null)
+            {
+                if (query.ClassId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.ClassId), query.ClassId);
+                }
+                if (query.ClassPlanId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.ClassPlanId), query.ClassPlanId);
+                }
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Group_Id), query.Group_Id);
+                }
+                if (query.School_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.School_Id), query.School_Id);
+                }
+                if (query.Teacher_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Teacher_Id), query.Teacher_Id);
+                }
+                if (!string.IsNullOrEmpty(query.QClassIds))
+                {
+                    builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Class_Plan_ViewModel.ClassId), query.QClassIds);
+                }
+                if (!string.IsNullOrEmpty(query.QMonth))
+                {
+                    builder.AppendFormat(" AND DATE_FORMAT(A.{0},'%y/%m')= DATE_FORMAT('{1}-01','%y/%m') ", nameof(RB_Class_Plan_ViewModel.ClassDate), query.QMonth);
+                }
+                if (!string.IsNullOrEmpty(query.StartTime))
+                {
+                    builder.AppendFormat(" AND DATE_FORMAT(A.{0},'%y-%m-%d')>=DATE_FORMAT('{1}','%y-%m-%d') ", nameof(RB_Class_Plan_ViewModel.ClassDate), query.StartTime);
+                }
+                if (!string.IsNullOrEmpty(query.EndTime))
+                {
+                    builder.AppendFormat(" AND DATE_FORMAT(A.{0},'%y-%m-%d')<=DATE_FORMAT('{1}','%y-%m-%d') ", nameof(RB_Class_Plan_ViewModel.ClassDate), query.EndTime);
+                }
+            }
+            return Get<RB_Class_Plan_ViewModel>(builder.ToString()).ToList();
+        }
+
+
+
+        /// <summary>
+        /// 获取学生上课计划列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Class_Plan_ViewModel> GetStudentPlanListRepository(RB_Class_Plan_ViewModel query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat($@"SELECT a.*,c.ClassName,lp.LessonPlanNum,c.ClassHours,b.RoomName,IFNULL(T.TeacherHead,'') AS UserIcon,IFNULL(T.TeacherName,'') AS TeacherName FROM rb_class_plan as a  LEFT JOIN rb_class as c on a.ClassId=c.ClassId
+LEFT JOIN rb_class_room as b on a.ClassRoomId=b.RoomId
+ LEFT JOIN rb_teacher AS T ON c.Teacher_Id=T.TId 
+LEFT JOIN rb_student_orderguest as sog on sog.ClassId=c.ClassId
+LEFT JOIN (SELECT ClassPlanId,COUNT(*) as LessonPlanNum from rb_class_lessonplan where `Status`=0  GROUP BY ClassPlanId)as lp on a.ClassPlanId=lp.ClassPlanId
+where sog.Account_Id={query.StuId} and c.ClassStatus in(1,2) and c.`Status`=0 and sog.`Status`=0  
 ");
             builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Status), (int)DateStateEnum.Normal);
             if (query != null)

Edu.Repository/User/RB_ManagerRepository.cs

@@ -55,5 +55,33 @@ WHERE 1=1
             return Get<RB_Manager_ViewModel>(builder.ToString(), parameters).ToList();
         }
 
+
+
+
+        /// <summary>
+        /// 根据学生id获取学生对应的销售
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Manager_ViewModel> GetManagerListByStuId(int Student_Id, int Group_Id)
+        {
+            var parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat($@"
+SELECT * from rb_manager where MId in(
+SELECT b.AccountId from 
+rb_account as b 
+LEFT JOIN rb_order as o on o.EnterID=b.Id
+LEFT JOIN rb_class as c on o.ClassId=c.ClassId
+LEFT JOIN rb_student_orderguest as sog on sog.ClassId=c.ClassId
+WHERE 1=1  and o.OrderState=1 and sog.Account_Id={Student_Id} and c.ClassStatus in(1,2) and c.Status =0 and sog.Status=0 ");
+
+            if (Group_Id > 0)
+            {
+                builder.AppendFormat(" AND b.{0}={1} ", nameof(RB_Manager_ViewModel.Group_Id), Group_Id);
+            }
+            builder.AppendFormat(")");
+            return Get<RB_Manager_ViewModel>(builder.ToString(), parameters).ToList();
+        }
     }
 }
\ No newline at end of file

Edu.Repository/User/RB_StudentRepository.cs

@@ -129,5 +129,27 @@ WHERE 1=1
             }
             return GetPage<RB_Student_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }
+
+
+
+        /// <summary>
+        /// 根据学生id获取同班账户,必须是未开班/学习中的
+        /// </summary>
+        /// <param name="teacherIds"></param>
+        /// <returns></returns>
+        public List<RB_Student_ViewModel> GetListByStudentId(int Student_Id, int Group_Id)
+        {
+            var parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat($@"SELECT c.*,rbc.ClassName from rb_student as c 
+LEFT JOIN rb_student_orderguest as sog  on sog.Student_Id=c.StuId
+LEFT JOIN rb_class as rbc  on rbc.ClassId=sog.ClassId
+where sog.ClassId in(SELECT a.ClassId from rb_student_orderguest as a LEFT JOIN rb_class as b on a.ClassId=b.ClassId 
+LEFT JOIN rb_student as c  on c.StuId =a.Student_Id
+LEFT JOIN rb_order as o on a.OrderId=o.OrderId
+where b.`Status`=0 and b.ClassStatus in(1,2) and  a.status=0 and  a.Account_Id={Student_Id} and o.OrderState=1 AND c.Group_Id={Group_Id} )  and sog.Account_Id!={Student_Id}
+ AND c.Group_Id={Group_Id}");
+            return Get<RB_Student_ViewModel>(builder.ToString(), parameters).ToList();
+        }
     }
 }
\ No newline at end of file

Edu.Repository/User/RB_TeacherRepository.cs

@@ -183,7 +183,7 @@ WHERE 1=1
 
 
         /// <summary>
-        /// 根据学生id获取教师账户
+        /// 根据学生id获取教师账户,必须是未开班/学习中的
         /// </summary>
         /// <param name="teacherIds"></param>
         /// <returns></returns>
@@ -196,10 +196,13 @@ SELECT t.* from rb_teacher as t
  LEFT JOIN (SELECT ClassId,TeacherId from rb_class_plan where `Status`=0 GROUP BY ClassId,TeacherId) as cp on t.TId=cp.TeacherId
 LEFT JOIN rb_class as c on cp.ClassId=c.ClassId
 LEFT JOIN rb_student_orderguest as sog on sog.ClassId=c.ClassId
-where t.`Status`=0 and c.`Status`=0 and sog.`Status`=0  AND c.Group_Id={Group_Id}");
-            builder.AppendFormat(" AND sog.Student_Id={0} ", Student_Id);
+where t.`Status`=0 and c.`Status`=0 and sog.`Status`=0  and c.ClassStatus in(1,2) AND c.Group_Id={Group_Id}");
+            builder.AppendFormat(" AND sog.Account_Id={0} ", Student_Id);
             builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Teacher_ViewModel.Group_Id), Group_Id);
             return Get<RB_Teacher_ViewModel>(builder.ToString(), parameters).ToList();
         }
+
+
+
     }
 }
\ No newline at end of file

Edu.WebApi/Controllers/APP/AppIndexController.cs

@@ -26,6 +26,7 @@ namespace Edu.WebApi.Controllers.APP
         private readonly StudentModule studentModule = new StudentModule();
         private readonly ClassModule classModule = new ClassModule();
         private readonly TeacherModule teacherModule = new TeacherModule();
+        private readonly ManagerModule managerModule = new ManagerModule();
         private readonly AppHomePageModule appHomePageModule = AOP.AOPHelper.CreateAOPObject<AppHomePageModule>();
 
         #region 首次登录后填写兴趣爱好
@@ -44,7 +45,7 @@ namespace Edu.WebApi.Controllers.APP
                 StuIcon = base.ParmJObj.GetStringValue("StuIcon"),
                 Group_Id = base.AppUserInfo.Group_Id,
                 School_Id = base.AppUserInfo.School_Id,
-                StuId = base.AppUserInfo.AccountId,
+                StuId = base.AppUserInfo.Id,
             };
             bool result = studentModule.SetStudentInterest(query);
             if (result)
@@ -68,9 +69,9 @@ namespace Edu.WebApi.Controllers.APP
                 Group_Id = base.AppUserInfo.Group_Id,
             };
             var list = appHomePageModule.GetHomePageBannerList(query).OrderBy(x => x.Sort);//banner图
-            var teacherList = teacherModule.GetListByStudentId(base.AppUserInfo.AccountId, base.AppUserInfo.Group_Id);//老师
+            var teacherList = teacherModule.GetListByStudentId(base.AppUserInfo.Id, base.AppUserInfo.Group_Id);//老师
             //课程信息
-            var planList = classModule.GetListByStudentId(base.AppUserInfo.AccountId, base.AppUserInfo.Group_Id);
+            var planList = classModule.GetListByStudentId(base.AppUserInfo.Id, base.AppUserInfo.Group_Id);
             DateTime NextClassTime = System.DateTime.Now;
             foreach (var item in planList)
             {
@@ -83,7 +84,7 @@ namespace Edu.WebApi.Controllers.APP
             var result = new
             {
                 BannerList = list.Select(x => new { x.BannerId, x.BannerPic, x.BannerUrl }),
-                TeacherList = teacherList.Select(x => new { x.TeacherName, x.TId, x.TeacherIcon, TeachTag=string.IsNullOrWhiteSpace(x.TeachTag)?new List<string>(): JsonHelper.DeserializeObject<List<string>>(x.TeachTag), x.Nationality, x.ForeignersUrl }),
+                TeacherList = teacherList.Select(x => new { x.TeacherName, x.TId, x.TeacherIcon, TeachTag = string.IsNullOrWhiteSpace(x.TeachTag) ? new List<string>() : JsonHelper.DeserializeObject<List<string>>(x.TeachTag), x.Nationality, x.ForeignersUrl }),
                 ClassName = (planList != null && planList.Any()) ? planList.FirstOrDefault()?.ClassName : "",
                 CompleteProgress = (planList != null && planList.Any()) ? planList.FirstOrDefault()?.CompleteProgress ?? 0 : 0,
                 NextClassTime = (planList != null && planList.Any()) ? NextClassTime.ToString("yyyy-MM-dd HH:mm:ss") : ""
@@ -105,5 +106,112 @@ namespace Edu.WebApi.Controllers.APP
             return ApiResult.Success("", list);
         }
         #endregion
+
+
+
+        #region 获取通讯录
+        public ApiResult GetMailList()
+        {
+
+            var teacherList = teacherModule.GetListByStudentId(base.AppUserInfo.Id, base.AppUserInfo.Group_Id);//老师
+
+            var saleList = managerModule.GetManagerListByStuId(base.AppUserInfo.Id, base.AppUserInfo.Group_Id);//销售
+
+            var stuList = studentModule.GetListByStudentId(base.AppUserInfo.Id, base.AppUserInfo.Group_Id);//获取同班同学信息
+
+            //账号类型(1-管理端，2,-教师端，3-助教，4-学生)
+            var retult = new
+            {
+                TeacherList = teacherList.Select(x => new { Name = x.TeacherName, Head = x.TeacherHead, Tel = x.TeacherTel, Id = x.TId, AccountType = 2 }),
+                SaleList = saleList.Select(x => new { Name = x.MName, Head = x.MHead, Tel = x.MTel, x.Sex, Id = x.MId, AccountType = 1 }),
+                StuList = stuList.Select(x => new { Name = x.StuName, Head = x.StuIcon, Tel = x.StuTel, Sex = x.StuSex, Id = x.StuId, AccountType = 4 }),
+            };
+
+            return ApiResult.Success("", data: retult);
+        }
+        #endregion
+
+
+        #region 课表
+        /// <summary>
+        /// 获取上课计划
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetStudentPlan()
+        {
+
+            var query = new Model.ViewModel.Course.RB_Class_Plan_ViewModel()
+            {
+                Group_Id = base.AppUserInfo.Group_Id,
+                
+                StuId = base.AppUserInfo.Id,
+                StartTime = base.ParmJObj.GetStringValue("StartTime"),
+                EndTime = base.ParmJObj.GetStringValue("EndTime"),
+            };
+           
+            var data = classModule.GetStudentPlanModule(query);
+
+            List<object> result = new List<object>();
+            DateTime startTime = Convert.ToDateTime(query.StartTime);
+            DateTime endTime = Convert.ToDateTime(query.EndTime);
+
+            TimeSpan sp = endTime.Subtract(startTime);
+
+            for (int i = 0; i <= sp.Days; i++)
+            {
+                int IsLessonStatus = 0;//0-没课，1-有课
+                List<object> planList = new List<object>();
+                var plan = data.Where(x => x.ClassDate.ToString("yyyy-MM-dd") == startTime.AddDays(i).ToString("yyyy-MM-dd"));
+                string DayTime = string.Empty;
+                foreach (var item in plan)
+                {
+                    foreach (var itemTime in item.PlanTimeList)
+                    {
+                        planList.Add(new
+                        {
+                            item.ClassPlanId,
+                            item.ClassId,
+                            item.TeacherId,
+                            item.LessonPlanNum,
+                            item.School_Id,
+                            item.ClassName,
+                            itemTime.StartTime,
+                            itemTime.EndTime,
+                            item.TeacherName,
+                            item.UserIcon,
+                           // GuestStr = (item.GuestList != null && item.GuestList.Any()) ? string.Join(",", item.GuestList.Select(x => x.GuestName)) : ""
+                        });
+                    }
+                    if (plan.Where(x => x.LessonPlanNum > 0).Count() < plan.Count() && plan.Where(x => x.LessonPlanNum > 0).Count() > 0)
+                    {
+                        IsLessonStatus = 1;
+                    }
+                   
+                    else
+                    {
+                        IsLessonStatus = 0;
+                    }
+                    if (item.PlanTimeList != null && item.PlanTimeList.Any())
+                    {
+                        item.PlanTimeList.ForEach(x => x.NewPlanDateTime = item.ClassDate.ToString("yyyy-MM-dd") + " " + x.StartTime);
+                        DayTime = item.PlanTimeList.Min(x => Convert.ToDateTime(x.NewPlanDateTime)).ToString("HH:ss");
+                        item.PlanTimeList.ForEach(x => x.NewPlanDateTime = item.ClassDate.ToString("yyyy-MM-dd") + " " + x.EndTime);
+                        DayTime = DayTime + "~" + item.PlanTimeList.Max(x => Convert.ToDateTime(x.NewPlanDateTime)).ToString("HH:ss");
+                    }
+                }
+                result.Add(new
+                {
+                    IsLessonStatus = (planList != null && planList.Any()) ? IsLessonStatus : -1,
+                    DayTime,
+                    DateYear = startTime.AddDays(i).ToString("yyyy"),
+                    DateMonth = startTime.AddDays(i).ToString("MM"),
+                    DateDay = startTime.AddDays(i).ToString("dd"),
+                    WeekStr = StringHelper.GetJapanWeekChar(startTime.AddDays(i)),
+                    PlanList = planList
+                });
+            }
+            return ApiResult.Success(data: result);
+        }
+        #endregion
     }
 }

Edu.WebApi/Controllers/APP/StudentSystemMsgController.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Edu.Common.API;
+using Edu.Common.Enum.App;
+using Edu.Common.Plugin;
+using Edu.Model.ViewModel.App;
+using Edu.Model.ViewModel.System;
+using Edu.Module.System;
+using Edu.WebApi.Filter;
+using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Edu.WebApi.Controllers.APP
+{
+    [Route("api/[controller]/[action]")]
+    [ApiExceptionFilter]
+    [ApiController]
+    [EnableCors("AllowCors")]
+    public class StudentSystemMsgController : AppBaseController
+    {
+        private readonly AppSystemMsgModule appSystemMsgModule = new AppSystemMsgModule();
+
+        /// <summary>
+        /// 获取系统消息总数
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetSystemLogList()
+        {
+            var query = new RB_Student_SystemMsg_ViewModel()
+            {
+                IsRead = base.ParmJObj.GetInt("IsRead", 0),
+            };
+            query.Group_Id = base.AppUserInfo.Group_Id;
+            query.Student_Id = base.AppUserInfo.Id;
+            var list = appSystemMsgModule.GetStudentSystemMsgList(query);
+            var msgTypeList = Common.Plugin.EnumHelper.EnumToList(typeof(MsgTypeEnum));
+            List<object> retult = new List<object>();
+            foreach (var item in msgTypeList)
+            {
+                var nowModel = list.Where(x => (int)x.MsgType == item.Id).OrderByDescending(x => x.CreateTime).FirstOrDefault();
+                retult.Add(new
+                {
+                    MsgType = item.Id,
+                    Count = list.Where(x => (int)x.MsgType == item.Id).Count(),
+                    Title = nowModel?.Title ?? "暂无消息",
+                    CreateTiemStr = (nowModel != null && nowModel.MsgId > 0) ? StringHelper.DateFormatToString(nowModel.CreateTime) : ""
+                });
+            }
+            return ApiResult.Success(data: retult);
+        }
+
+
+        /// <summary>
+        /// 获取系统消息分页
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetSystemMsgPageList()
+        {
+            var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
+            var query = new RB_Student_SystemMsg_ViewModel()
+            {
+                IsRead = base.ParmJObj.GetInt("IsRead", -1),
+                MsgType = (MsgTypeEnum)base.ParmJObj.GetInt("MsgType", 0),
+                StudentType = (StudentTypeEnum)base.ParmJObj.GetInt("StudentType", 0),
+            };
+            query.Group_Id = base.AppUserInfo.Group_Id;
+            query.Student_Id = base.AppUserInfo.Id;
+            var list = appSystemMsgModule.GetStudentSystemMsgPageList(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
+            var retult = list.Select(x => new
+            {
+                x.MsgId,
+                x.IsRead,
+                x.Title,
+                x.Content,
+                x.Pic,
+                CreateTimeStr = x.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
+                MsgTypeStr = (x.MsgType.HasValue && x.MsgType.Value > 0) ? Common.Plugin.EnumHelper.ToName(x.MsgType) : "",
+                StudentTypeStr = (x.StudentType.HasValue && x.StudentType.Value > 0) ? Common.Plugin.EnumHelper.ToName(x.StudentType) : "",
+                x.MsgType,
+                x.StudentType
+            });
+            pageModel.Count = rowsCount;
+            pageModel.PageData = retult;
+            return ApiResult.Success(data: pageModel);
+        }
+
+
+
+        /// <summary>
+        /// 获取自己的系统消息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult UpdateStudentMsg()
+        {
+            var msgType = base.ParmJObj.GetInt("MsgType", 0);
+            if (msgType == 0)
+            {
+                return ApiResult.Failed("请传入消息类型");
+            }
+
+            var retult = appSystemMsgModule.UpdateStudentMsg(msgType, base.AppUserInfo.Group_Id, base.AppUserInfo.Id);
+            return retult ? ApiResult.Success("更新成功") : ApiResult.Failed("更新失败");
+        }
+
+
+
+        /// <summary>
+        /// 获取系统消息详情
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetSystemMsgDetails()
+        {
+            var msgId = base.ParmJObj.GetInt("MsgId", 0);
+            if (msgId == 0)
+            {
+                return ApiResult.Failed("参数错误");
+            }
+            var query = new RB_Student_SystemMsg_ViewModel()
+            {
+                MsgId = msgId
+            };
+            query.Group_Id = base.AppUserInfo.Group_Id;
+            query.Student_Id = base.AppUserInfo.Id;
+            var model = appSystemMsgModule.GetStudentSystemMsgList(query).FirstOrDefault();
+            if (model == null || model.MsgId == 0)
+            {
+                return ApiResult.Failed("消息不存在");
+            }
+            if (model.IsRead == 0)//更新当前的系统消息为已读
+            {
+                try
+                {
+                    appSystemMsgModule.UpdateStudentMsgById(model.MsgId, model.Group_Id, model.Student_Id);
+                }
+                catch (Exception ex)
+                {
+                }
+            }
+            var retult = new
+            {
+                model.MsgId,
+                model.IsRead,
+                model.Title,
+                model.Content,
+                model.Pic,
+                CreateTimeStr = model.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
+                MsgTypeStr = (model.MsgType.HasValue && model.MsgType.Value > 0) ? Common.Plugin.EnumHelper.ToName(model.MsgType) : "",
+                StudentTypeStr = (model.StudentType.HasValue && model.StudentType.Value > 0) ? Common.Plugin.EnumHelper.ToName(model.StudentType) : "",
+                model.MsgType,
+                model.StudentType
+            };
+            return ApiResult.Success(data: retult);
+        }
+
+    }
+}

Edu.WebApi/Controllers/APP/SystemLogController.cs

@@ -34,7 +34,7 @@ namespace Edu.WebApi.Controllers.APP
                 SelectSendState = 1
             };
             query.Group_Id = base.AppUserInfo.Group_Id;
-            query.Student_Id = base.AppUserInfo.AccountId;
+            query.Student_Id = base.AppUserInfo.Id;
             List<object> result = new List<object>();
             var list = msgLogModule.GetSystemLogPageListRepository(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
             foreach (var item in list)
@@ -80,7 +80,7 @@ namespace Edu.WebApi.Controllers.APP
                 SelectSendState = 1
             };
             query.Group_Id = base.AppUserInfo.Group_Id;
-            query.Student_Id = base.AppUserInfo.AccountId;
+            query.Student_Id = base.AppUserInfo.Id;
 
             var msgCount = msgLogModule.GetSystemLogListRepository(query).Count();
 

Edu.WebApi/Controllers/Public/AppPublicController.cs

@@ -3,12 +3,16 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Edu.Common.API;
+using Edu.Common.Enum.App;
 using Edu.Common.Plugin;
 using Edu.Model.Entity.App;
 using Edu.Model.Entity.System;
+using Edu.Model.ViewModel.App;
 using Edu.Model.ViewModel.System;
 using Edu.Module.System;
+using Edu.Repository.App;
 using Edu.WebApi.Filter;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
 
@@ -28,7 +32,10 @@ namespace Edu.WebApi.Controllers.Public
         /// 短信处理类对象
         /// </summary>
         private readonly AppHomePageModule appHomePageModule = AOP.AOPHelper.CreateAOPObject<AppHomePageModule>();
-
+        /// <summary>
+        /// app学生系统消息处理类对象
+        /// </summary>
+        private readonly AppSystemMsgModule appSystemMsgModule = new AppSystemMsgModule();
 
 
         #region 首页轮播图
@@ -118,5 +125,177 @@ namespace Edu.WebApi.Controllers.Public
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
         #endregion
+
+
+        #region app 系统消息
+        /// <summary>
+        /// 获取系统消息分页
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetSystemMsgPageList()
+        {
+            var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
+            var query = new RB_Student_SystemMsg_ViewModel()
+            {
+                IsRead = base.ParmJObj.GetInt("IsRead", -1),
+                MsgType = (MsgTypeEnum)base.ParmJObj.GetInt("MsgType", 0),
+                StudentType = (StudentTypeEnum)base.ParmJObj.GetInt("StudentType", 0),
+            };
+            query.Group_Id = base.UserInfo.Group_Id;
+            query.Student_Id = base.UserInfo.Id;
+            var list = appSystemMsgModule.GetStudentSystemMsgPageList(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
+            var retult = list.Select(x => new
+            {
+                x.MsgId,
+                x.IsRead,
+                x.Title,
+                x.Content,
+                x.Pic,
+                CreateTimeStr = x.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
+                MsgTypeStr = (x.MsgType.HasValue && x.MsgType.Value > 0) ? Common.Plugin.EnumHelper.ToName(x.MsgType) : "",
+                StudentTypeStr = (x.StudentType.HasValue && x.StudentType.Value > 0) ? Common.Plugin.EnumHelper.ToName(x.StudentType) : "",
+                x.MsgType,
+                x.StudentType
+            });
+            pageModel.Count = rowsCount;
+            pageModel.PageData = retult;
+            return ApiResult.Success(data: pageModel);
+        }
+
+
+
+
+        public ApiResult SetSystemMsg()
+        {
+            var query = new RB_Student_SystemMsg_ViewModel()
+            {
+                Title = base.ParmJObj.GetStringValue("Title"),
+                Content = base.ParmJObj.GetStringValue("Content"),
+                Pic = base.ParmJObj.GetStringValue("Pic"),
+                StudentIds = base.ParmJObj.GetStringValue("StudentIds"),
+                MsgType = (MsgTypeEnum)base.ParmJObj.GetInt("MsgType", 0),
+                StudentType = (StudentTypeEnum)base.ParmJObj.GetInt("StudentType", 0),
+            };
+
+            if (string.IsNullOrWhiteSpace(query.StudentIds))
+            {
+                return ApiResult.Failed("请选择您要发送的学生");
+            }
+
+            List<RB_Student_SystemMsg_ViewModel> list = new List<RB_Student_SystemMsg_ViewModel>();
+            foreach (var item in query.StudentIds.Split(","))
+            {
+                if (!string.IsNullOrWhiteSpace(item))
+                {
+                    list.Add(new RB_Student_SystemMsg_ViewModel
+                    {
+                        MsgId = 0,
+                        Group_Id = base.UserInfo.Group_Id,
+                        School_Id = base.UserInfo.School_Id,
+                        CreateBy = base.UserInfo.Id,
+                        CreateTime = System.DateTime.Now,
+                        Status = Common.Enum.DateStateEnum.Normal,
+                        Student_Id = Convert.ToInt32(item),
+                        IsRead = 0,
+                        MsgType = query.MsgType,
+                        Title = query.Title,
+                        StudentType = query.StudentType,
+                        Pic = query.Pic,
+                        Content = query.Content
+                    });
+                }
+            }
+            if (list == null || !list.Any())
+            {
+                return ApiResult.Failed("请选择您要发送的学生");
+            }
+
+            var retult = appSystemMsgModule.BatchSetStudentSystemMsg(list);
+
+            return retult ? ApiResult.Success("新增系统消息成功") : ApiResult.Failed("新增系统消息失败");
+        }
+
+        /// <summary>
+        /// 系统消息枚举类型
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AllowAnonymous]
+        public ApiResult GetMsgTypeEnumList()
+        {
+            var list = Common.Plugin.EnumHelper.EnumToList(typeof(MsgTypeEnum));
+
+            return ApiResult.Success(data: list);
+        }
+
+        /// <summary>
+        /// 学校提醒枚举类型
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AllowAnonymous]
+        public ApiResult GetStudentTypeEnumList()
+        {
+            var list = Common.Plugin.EnumHelper.EnumToList(typeof(StudentTypeEnum));
+
+            return ApiResult.Success(data: list);
+        }
+
+        /// <summary>
+        /// 批量删除系统消息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult DelStudentMsg()
+        {
+            var msgIds = base.ParmJObj.GetStringValue("MsgIds");
+            if (string.IsNullOrWhiteSpace(msgIds))
+            {
+                return ApiResult.Failed("请传入您要删除的消息id");
+            }
+            var retult = appSystemMsgModule.DelStudentMsgById(msgIds, base.UserInfo.Group_Id);
+            return retult ? ApiResult.Success("删除成功") : ApiResult.Failed("删除失败");
+        }
+
+        /// <summary>
+        /// 获取系统消息详情
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetSystemMsgDetails()
+        {
+            var msgId = base.ParmJObj.GetInt("MsgId", 0);
+            if (msgId == 0)
+            {
+                return ApiResult.Failed("参数错误");
+            }
+            var query = new RB_Student_SystemMsg_ViewModel()
+            {
+                MsgId = msgId
+            };
+            query.Group_Id = base.UserInfo.Group_Id;
+            var model = appSystemMsgModule.GetStudentSystemMsgList(query).FirstOrDefault();
+            if (model == null || model.MsgId == 0)
+            {
+                return ApiResult.Failed("消息不存在");
+            }
+            var retult = new
+            {
+                model.MsgId,
+                model.IsRead,
+                model.Title,
+                model.Content,
+                model.Pic,
+                CreateTimeStr = model.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
+                MsgTypeStr = (model.MsgType.HasValue && model.MsgType.Value > 0) ? Common.Plugin.EnumHelper.ToName(model.MsgType) : "",
+                StudentTypeStr = (model.StudentType.HasValue && model.StudentType.Value > 0) ? Common.Plugin.EnumHelper.ToName(model.StudentType) : "",
+                model.MsgType,
+                model.StudentType
+            };
+            return ApiResult.Success(data: retult);
+        }
+
+        #endregion
     }
 }