Skip to content

E
Education
Commit 943de1e6 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 2dfd3918
Hide whitespace changes
Inline Side-by-side
Showing with 209 additions and 71 deletions
Edu.Common/Enum/System/PushMessageCategoryEnum.cs 0 → 100644
View file @ 943de1e6
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
View file @ 943de1e6
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
View file @ 943de1e6
......@@ -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
View file @ 943de1e6
......@@ -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
View file @ 943de1e6
......@@ -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.Module.Duty/DutyPlanModule.cs
View file @ 943de1e6
using Edu.Common.Enum;
using Edu.Common.Enum.Duty;
using Edu.Common.Enum.System;
using Edu.Common.Message;
using Edu.Model.CacheModel;
using Edu.Model.ViewModel.Duty;
......@@ -111,12 +112,13 @@ namespace Edu.Module.Duty
string schoolIds = string.Join(",", list.Select(qitem => qitem.School_Id));
string shiftIds = "";
List<RB_Duty_PlanDetails_ViewModel> planDetails = new List<RB_Duty_PlanDetails_ViewModel>();
List<RB_Duty_Item_ViewModel> dutyItemList = new List<RB_Duty_Item_ViewModel>();
List<RB_Duty_Content_ViewModel> dutyContentList = new List<RB_Duty_Content_ViewModel>();
if (!string.IsNullOrEmpty(ids))
{
planDetails = GetDutyPlanDetailsListModule(new RB_Duty_PlanDetails_ViewModel() { QPlanIds = ids }, IsQueryDutyMan: true);
dutyContentList= duty_ContentRepository.GetDutyContentListRepository(new RB_Duty_Content_ViewModel() { QPlanIds = ids,PlanType=1 });
dutyContentList= duty_ContentRepository.GetDutyContentListRepository(new RB_Duty_Content_ViewModel() { QPlanIds = ids });
}
if (planDetails != null && planDetails.Count > 0)
{
......@@ -134,10 +136,12 @@ namespace Edu.Module.Duty
foreach (var item in list)
{
item.PlanDetails = planDetails?.Where(qitem => qitem.PlanId == item.Id)?.ToList() ?? new List<RB_Duty_PlanDetails_ViewModel>();
item.WorkContentList = new List<RB_Duty_PlanWork_ViewModel>();
if (item.PlanDetails != null && item.PlanDetails.Count > 0)
{
foreach (var subItem in item.PlanDetails)
{
subItem.WorkContentList = new List<RB_Duty_PlanWork_ViewModel>();
if (subItem.Status == 2)
{
subItem.DutyStatus = DutyStatusEnum.DutyFinished;
......@@ -146,27 +150,74 @@ namespace Edu.Module.Duty
{
subItem.DutyStatus = CalcDutyPlanStatusModule(item.Date, subItem.StartTime, subItem.EndTime);
}
if (subItem.DutyStatus == DutyStatusEnum.DutyFinished)
{
subItem.DutyItemList = new List<RB_Duty_Item_ViewModel>();
foreach (var dItem in dutyContentList.Where(qitem => qitem.PlanId == item.Id && qitem.PlanShift == subItem.Shift))
foreach (var dItem in dutyContentList.Where(qitem => qitem.PlanType==1 && qitem.PlanId == item.Id && qitem.PlanShift == subItem.Shift))
{
var dutyItem = dutyItemList?.Where(qitem =>qitem.Shifts.Contains(subItem.Shift.ToString()) && qitem.Id == dItem.ItemId && qitem.ItemSchools.Contains(item.School_Id.ToString()))?.FirstOrDefault();
if (dutyItem != null)
var dutyItem = dutyItemList?.Where(qitem => qitem.Shifts.Contains(subItem.Shift.ToString()) && qitem.Id == dItem.ItemId && qitem.ItemSchools.Contains(item.School_Id.ToString()))?.FirstOrDefault();
int isFinish = 0;
if (dutyItem.ItemType == ItemTypeEnum.Choice)
{
isFinish = dItem.WorkIsFinish;
}
else if (dutyItem.ItemType == ItemTypeEnum.FillIn)
{
subItem.DutyItemList.Add(new RB_Duty_Item_ViewModel
if (!string.IsNullOrEmpty(dItem.WorkContent))
{
ItemName = dutyItem?.ItemName??""
});
isFinish = 1;
}
}
subItem.WorkContentList.Add(new RB_Duty_PlanWork_ViewModel()
{
Id = dItem.Id,
ItemId = dutyItem?.Id ?? 0,
ItemType = dutyItem?.ItemType ?? ItemTypeEnum.Choice,
ItemName = dutyItem?.ItemName ?? "",
WorkContent = dItem?.WorkContent ?? "",
IsChecked=isFinish
});
}
}
else
{
subItem.DutyItemList = dutyItemList.Where(qitem => qitem.ItemSchools.Contains(item.School_Id.ToString()) && qitem.Shifts.Contains(subItem.Shift.ToString()))?.ToList() ?? new List<RB_Duty_Item_ViewModel>();
foreach (var dutyItem in dutyItemList.Where(qitem => qitem.ItemSchools.Contains(item.School_Id.ToString()) && qitem.Shifts.Contains(subItem.Shift.ToString())))
{
int isFinish = 0;
var dItem = dutyContentList.Where(qitem => qitem.PlanType == 1 && qitem.PlanId == item.Id && qitem.PlanShift == subItem.Shift && qitem.ItemId == dutyItem.Id)?.FirstOrDefault();
if (dutyItem.ItemType == ItemTypeEnum.Choice)
{
isFinish = dItem?.WorkIsFinish??0;
}
else if (dutyItem.ItemType == ItemTypeEnum.FillIn)
{
if (!string.IsNullOrEmpty(dItem?.WorkContent))
{
isFinish = 1;
}
}
subItem.WorkContentList.Add(new RB_Duty_PlanWork_ViewModel()
{
Id = dItem?.Id??0,
ItemId = dutyItem?.Id ?? 0,
ItemType = dutyItem?.ItemType ?? ItemTypeEnum.Choice,
ItemName = dutyItem?.ItemName ?? "",
WorkContent = dItem?.WorkContent ?? "",
IsChecked = isFinish
});
}
}
subItem.BurstCount = dutyContentList?.Where(qitem => qitem.PlanType == 3 && qitem.PlanId == item.Id && qitem.CreateBy == subItem.DutyMan)?.Count() ?? 0;
if (subItem.Status == 2)
{
subItem.HandoverCount = dutyContentList?.Where(qitem => qitem.PlanType == 2 && qitem.PlanId == item.Id && qitem.CreateBy == subItem.DutyMan)?.Count() ?? 0;
}
}
}
item.TotalBurstCount = item.PlanDetails.Sum(qitem => qitem.BurstCount);
item.TotalHandoverCount = item.PlanDetails.Sum(qitem => qitem.HandoverCount);
}
}
return list;
......@@ -302,11 +353,11 @@ namespace Edu.Module.Duty
duty_PlanDetailsRepository.Insert(item);
messageList.Add(new PushMessageModel()
{
CategoryId = 0,
CategoryId = PushMessageCategoryEnum.UserDuty,
Content = string.Format("您有{0}的值班信息，请注意查收!", Common.ConvertHelper.FormatDate(model.Date)),
CoverImg = "",
CreateByName = userInfo.AccountName,
JumpUrl = "",
JumpUrl = "/home",
ReceiveId = item.DutyMan.ToString(),
SendTime = DateTime.Now,
SendType = 0,
......@@ -326,7 +377,7 @@ namespace Edu.Module.Duty
{
messageList.Add(new PushMessageModel()
{
CategoryId = 0,
CategoryId = PushMessageCategoryEnum.UserDuty,
Content = string.Format("您在{0}的值班，已被取消!", Common.ConvertHelper.FormatDate(model.Date)),
CoverImg = "",
CreateByName = userInfo.AccountName,
......@@ -349,7 +400,7 @@ namespace Edu.Module.Duty
}
messageList.Add(new PushMessageModel()
{
CategoryId = 0,
CategoryId = PushMessageCategoryEnum.UserDuty,
Content = string.Format("您在{0}的值班，已被取消!", Common.ConvertHelper.FormatDate(model.Date)),
CoverImg = "",
CreateByName = userInfo.AccountName,
......@@ -369,11 +420,11 @@ namespace Edu.Module.Duty
duty_PlanDetailsRepository.Insert(item);
messageList.Add(new PushMessageModel()
{
CategoryId = 0,
CategoryId = PushMessageCategoryEnum.UserDuty,
Content = string.Format("您有{0}的值班信息，请注意查收!", Common.ConvertHelper.FormatDate(model.Date)),
CoverImg = "",
CreateByName = userInfo.AccountName,
JumpUrl = "",
JumpUrl = "/home",
ReceiveId = item.DutyMan.ToString(),
SendTime = DateTime.Now,
SendType = 0,
......@@ -387,6 +438,10 @@ namespace Edu.Module.Duty
}
}
}
if (messageList != null && messageList.Count > 0)
{
Common.Message.MessageHelper.SendMessage(messageList);
}
return flag;
}
......@@ -451,7 +506,7 @@ namespace Edu.Module.Duty
{
messageList.Add(new PushMessageModel()
{
CategoryId = 0,
CategoryId = PushMessageCategoryEnum.UserDuty,
Content = string.Format("您在{0}的值班，已被取消!",Common.ConvertHelper.FormatDate(dutyModel.Date)),
CoverImg = "",
CreateByName = userInfo.AccountName,
......@@ -575,15 +630,29 @@ namespace Edu.Module.Duty
var c_itemModel = dutyItemList?.Where(qitem => qitem.Id == item.ItemId)?.FirstOrDefault();
if (c_itemModel != null)
{
var itemType = c_itemModel.ItemType;
int workIsFinish = 0;
if (itemType == ItemTypeEnum.FillIn )
{
if (!string.IsNullOrEmpty(item?.WorkContent))
{
workIsFinish = 1;
}
}
else
{
workIsFinish = item?.WorkIsFinish ?? 0;
}
var pObj = new
{
Id = item?.Id ?? 0,
ItemId = item.ItemId,
ItemName = c_itemModel?.ItemName ?? "",
ItemType = c_itemModel?.ItemType ?? ItemTypeEnum.FillIn,
IsChecked = item?.WorkIsFinish ?? 0,
IsChecked = workIsFinish,
WorkContent = item?.WorkContent ?? "",
};
pList.Add(pObj);
}
}
......@@ -593,13 +662,26 @@ namespace Edu.Module.Duty
foreach (var item in PlanList)
{
var c_workModel = currentPlanContetList?.Where(qitem => qitem.ItemId == item.Id)?.FirstOrDefault();
var itemType = item.ItemType;
int workIsFinish = 0;
if (itemType == ItemTypeEnum.FillIn)
{
if (!string.IsNullOrEmpty(c_workModel?.WorkContent))
{
workIsFinish = 1;
}
}
else
{
workIsFinish = c_workModel?.WorkIsFinish ?? 0;
}
var pObj = new
{
Id = c_workModel?.Id ?? 0,
ItemId = item.Id,
item.ItemName,
item.ItemType,
IsChecked = c_workModel?.WorkIsFinish ?? 0,
IsChecked = workIsFinish,
WorkContent = c_workModel?.WorkContent ?? "",
};
pList.Add(pObj);
......
Edu.WebApi/Controllers/Course/ClassController.cs
View file @ 943de1e6
......@@ -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
View file @ 943de1e6
......@@ -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
View file @ 943de1e6
......@@ -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
View file @ 943de1e6
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment