Skip to content

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

也没修过

parent a7e1c459
Show whitespace changes
Inline Side-by-side
Showing with 200 additions and 271 deletions
Edu.Common/Enum/Duty/DutyStatusEnum.cs
View file @ a64cd6ff
...@@ -20,9 +20,15 @@ namespace Edu.Common.Enum.Duty ...@@ -20,9 +20,15 @@ namespace Edu.Common.Enum.Duty
DutyIng = 1, DutyIng = 1,
/// <summary> /// <summary>
/// 值班完成 /// 已完成
/// </summary> /// </summary>
[EnumField("值班完成")] [EnumField("已完成")]
DutyFinished = 2, DutyFinished = 2,
/// <summary>
/// 未值班
/// </summary>
[EnumField("未值班")]
NoDuty = 3,
} }
} }
Edu.Model/ViewModel/Duty/RB_Duty_PlanDetails_ViewModel.cs
View file @ a64cd6ff
...@@ -58,35 +58,11 @@ namespace Edu.Model.ViewModel.Duty ...@@ -58,35 +58,11 @@ namespace Edu.Model.ViewModel.Duty
{ {
get get
{ {
string str = "未开始"; return Common.Plugin.EnumHelper.ToName(this.Status);
if (this.Status == 1)
{
str = "已打卡";
}
if (this.Status == 2)
{
str = "已交接";
}
return str;
} }
} }
/// <summary>
/// 值班状态(见枚举)
/// </summary>
public DutyStatusEnum DutyStatus { get; set; }
/// <summary>
/// 值班状态字符串
/// </summary>
public string DutyStatusStr
{
get
{
string str = Common.Plugin.EnumHelper.ToName(this.DutyStatus);
return str;
}
}
/// <summary> /// <summary>
/// 突发事件总数 /// 突发事件总数
......
Edu.Module.Duty/DutyPlanModule.cs
View file @ a64cd6ff
...@@ -69,7 +69,7 @@ namespace Edu.Module.Duty ...@@ -69,7 +69,7 @@ namespace Edu.Module.Duty
if (!string.IsNullOrEmpty(ids)) if (!string.IsNullOrEmpty(ids))
{ {
//QDutyMan=query.QDutyMan //QDutyMan=query.QDutyMan
planDetails = GetDutyPlanDetailsListModule(new RB_Duty_PlanDetails_ViewModel() { QPlanIds = ids ,}, IsQueryDutyMan: true); planDetails = GetDutyPlanDetailsListModule(new RB_Duty_PlanDetails_ViewModel() { QPlanIds = ids, }, IsQueryDutyMan: true);
} }
foreach (var item in list) foreach (var item in list)
{ {
...@@ -118,7 +118,7 @@ namespace Edu.Module.Duty ...@@ -118,7 +118,7 @@ namespace Edu.Module.Duty
if (!string.IsNullOrEmpty(ids)) if (!string.IsNullOrEmpty(ids))
{ {
planDetails = GetDutyPlanDetailsListModule(new RB_Duty_PlanDetails_ViewModel() { QPlanIds = ids }, IsQueryDutyMan: true); planDetails = GetDutyPlanDetailsListModule(new RB_Duty_PlanDetails_ViewModel() { QPlanIds = ids }, IsQueryDutyMan: true);
dutyContentList= duty_ContentRepository.GetDutyContentListRepository(new RB_Duty_Content_ViewModel() { QPlanIds = ids }); dutyContentList = duty_ContentRepository.GetDutyContentListRepository(new RB_Duty_Content_ViewModel() { QPlanIds = ids });
} }
if (planDetails != null && planDetails.Count > 0) if (planDetails != null && planDetails.Count > 0)
{ {
...@@ -142,78 +142,67 @@ namespace Edu.Module.Duty ...@@ -142,78 +142,67 @@ namespace Edu.Module.Duty
foreach (var subItem in item.PlanDetails) foreach (var subItem in item.PlanDetails)
{ {
subItem.WorkContentList = new List<RB_Duty_PlanWork_ViewModel>(); subItem.WorkContentList = new List<RB_Duty_PlanWork_ViewModel>();
//if (subItem.Status == 2) if (subItem.Status == DutyStatusEnum.DutyFinished)
//{ {
// subItem.DutyStatus = DutyStatusEnum.DutyFinished; foreach (var dItem in dutyContentList.Where(qitem => qitem.PlanType == 1 && qitem.PlanId == item.Id && qitem.PlanShift == subItem.Shift))
//} {
//else 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;
// subItem.DutyStatus = CalcDutyPlanStatusModule(item.Date, subItem.StartTime, subItem.EndTime); if (dutyItem.ItemType == ItemTypeEnum.Choice)
//} {
isFinish = dItem.WorkIsFinish;
//if (subItem.DutyStatus == DutyStatusEnum.DutyFinished) }
//{ else if (dutyItem.ItemType == ItemTypeEnum.FillIn)
// foreach (var dItem in dutyContentList.Where(qitem => qitem.PlanType==1 && qitem.PlanId == item.Id && qitem.PlanShift == subItem.Shift)) {
// { if (!string.IsNullOrEmpty(dItem.WorkContent))
// 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; isFinish = 1;
// if (dutyItem.ItemType == ItemTypeEnum.Choice) }
// { }
// isFinish = dItem.WorkIsFinish; subItem.WorkContentList.Add(new RB_Duty_PlanWork_ViewModel()
// } {
// else if (dutyItem.ItemType == ItemTypeEnum.FillIn) Id = dItem.Id,
// { ItemId = dutyItem?.Id ?? 0,
// if (!string.IsNullOrEmpty(dItem.WorkContent)) ItemType = dutyItem?.ItemType ?? ItemTypeEnum.Choice,
// { ItemName = dutyItem?.ItemName ?? "",
// isFinish = 1; WorkContent = dItem?.WorkContent ?? "",
// } IsChecked = isFinish
// } });
// subItem.WorkContentList.Add(new RB_Duty_PlanWork_ViewModel() }
// { }
// Id = dItem.Id, else
// ItemId = dutyItem?.Id ?? 0, {
// ItemType = dutyItem?.ItemType ?? ItemTypeEnum.Choice, foreach (var dutyItem in dutyItemList.Where(qitem => qitem.ItemSchools.Contains(item.School_Id.ToString()) && qitem.Shifts.Contains(subItem.Shift.ToString())))
// ItemName = dutyItem?.ItemName ?? "", {
// WorkContent = dItem?.WorkContent ?? "", int isFinish = 0;
// IsChecked=isFinish 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 }
//{ else if (dutyItem.ItemType == ItemTypeEnum.FillIn)
// foreach (var dutyItem in dutyItemList.Where(qitem => qitem.ItemSchools.Contains(item.School_Id.ToString()) && qitem.Shifts.Contains(subItem.Shift.ToString()))) {
// { if (!string.IsNullOrEmpty(dItem?.WorkContent))
// int isFinish = 0; {
// var dItem = dutyContentList.Where(qitem => qitem.PlanType == 1 && qitem.PlanId == item.Id && qitem.PlanShift == subItem.Shift && qitem.ItemId == dutyItem.Id)?.FirstOrDefault(); isFinish = 1;
// if (dutyItem.ItemType == ItemTypeEnum.Choice) }
// { }
// isFinish = dItem?.WorkIsFinish??0; subItem.WorkContentList.Add(new RB_Duty_PlanWork_ViewModel()
// } {
// else if (dutyItem.ItemType == ItemTypeEnum.FillIn) Id = dItem?.Id ?? 0,
// { ItemId = dutyItem?.Id ?? 0,
// if (!string.IsNullOrEmpty(dItem?.WorkContent)) ItemType = dutyItem?.ItemType ?? ItemTypeEnum.Choice,
// { ItemName = dutyItem?.ItemName ?? "",
// isFinish = 1; WorkContent = dItem?.WorkContent ?? "",
// } IsChecked = isFinish
// } });
}
// subItem.WorkContentList.Add(new RB_Duty_PlanWork_ViewModel() }
// { subItem.BurstCount = dutyContentList?.Where(qitem => qitem.PlanType == 3 && qitem.PlanId == item.Id && qitem.CreateBy == subItem.DutyMan)?.Count() ?? 0;
// Id = dItem?.Id??0, if (subItem.Status == DutyStatusEnum.DutyFinished)
// ItemId = dutyItem?.Id ?? 0, {
// ItemType = dutyItem?.ItemType ?? ItemTypeEnum.Choice, subItem.HandoverCount = dutyContentList?.Where(qitem => qitem.PlanType == 2 && qitem.PlanId == item.Id && qitem.CreateBy == subItem.DutyMan)?.Count() ?? 0;
// 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.TotalBurstCount = item.PlanDetails.Sum(qitem => qitem.BurstCount);
...@@ -230,16 +219,17 @@ namespace Edu.Module.Duty ...@@ -230,16 +219,17 @@ namespace Edu.Module.Duty
/// <param name="startTime"></param> /// <param name="startTime"></param>
/// <param name="endTime"></param> /// <param name="endTime"></param>
/// <returns></returns> /// <returns></returns>
public DutyStatusEnum CalcDutyPlanStatusModule(DateTime planDate,string startTime,string endTime) public DutyStatusEnum CalcDutyPlanStatusModule(DateTime planDate, string startTime, string endTime)
{ {
DutyStatusEnum dutyStatus = DutyStatusEnum.NoStart; DutyStatusEnum dutyStatus = DutyStatusEnum.NoStart;
var dutyStartTime = Convert.ToDateTime(Common.ConvertHelper.FormatDate(planDate) + " " + startTime); var dutyStartTime = Convert.ToDateTime(Common.ConvertHelper.FormatDate(planDate) + " " + startTime);
var dutyEndTime = Convert.ToDateTime(Common.ConvertHelper.FormatDate(planDate) + " " + endTime); var dutyEndTime = Convert.ToDateTime(Common.ConvertHelper.FormatDate(planDate) + " " + endTime);
if (DateTime.Now > dutyEndTime) var dt = DateTime.Now.AddMinutes(-30);
if (dt > dutyEndTime)
{ {
dutyStatus = Common.Enum.Duty.DutyStatusEnum.DutyFinished; dutyStatus = Common.Enum.Duty.DutyStatusEnum.DutyFinished;
} }
else if (DateTime.Now >= dutyStartTime && DateTime.Now <= dutyEndTime) else if (dt >= dutyStartTime && DateTime.Now <= dutyEndTime)
{ {
dutyStatus = Common.Enum.Duty.DutyStatusEnum.DutyIng; dutyStatus = Common.Enum.Duty.DutyStatusEnum.DutyIng;
} }
...@@ -250,28 +240,6 @@ namespace Edu.Module.Duty ...@@ -250,28 +240,6 @@ namespace Edu.Module.Duty
return dutyStatus; return dutyStatus;
} }
/// <summary>
/// 计算当天值班是否完成
/// </summary>
/// <returns></returns>
public DutyStatusEnum CalcDutyStatusModule(List<RB_Duty_PlanDetails_ViewModel> PlanDetails)
{
DutyStatusEnum dutyStatus = DutyStatusEnum.NoStart;
//if (PlanDetails.Where(qitem => qitem.DutyStatus == DutyStatusEnum.NoStart).Count() == PlanDetails.Count)
//{
// dutyStatus = DutyStatusEnum.NoStart;
//}
//else if (PlanDetails.Where(qitem => qitem.DutyStatus == DutyStatusEnum.DutyFinished).Count() == PlanDetails.Count)
//{
// dutyStatus = DutyStatusEnum.DutyFinished;
//}
//else
//{
// dutyStatus = DutyStatusEnum.DutyIng;
//}
return dutyStatus;
}
/// <summary> /// <summary>
/// 获取值班班次详情列表 /// 获取值班班次详情列表
/// </summary> /// </summary>
...@@ -456,29 +424,6 @@ namespace Edu.Module.Duty ...@@ -456,29 +424,6 @@ namespace Edu.Module.Duty
if (model != null && model.Id > 0) if (model != null && model.Id > 0)
{ {
model.PlanDetails = GetDutyPlanDetailsListModule(new RB_Duty_PlanDetails_ViewModel() { PlanId = model.Id }); model.PlanDetails = GetDutyPlanDetailsListModule(new RB_Duty_PlanDetails_ViewModel() { PlanId = model.Id });
if (model.PlanDetails != null && model.PlanDetails.Count > 0)
{
foreach (var item in model.PlanDetails)
{
//值班状态
DutyStatusEnum dutyStatusEnum = DutyStatusEnum.NoStart;
var startTime = Convert.ToDateTime(Common.ConvertHelper.FormatDate(model?.Date) + " " + item?.StartTime);
var endTime = Convert.ToDateTime(Common.ConvertHelper.FormatDate(model?.Date) + " " + item?.EndTime);
if (DateTime.Now < startTime)
{
dutyStatusEnum = DutyStatusEnum.NoStart;
}
else if (startTime <= DateTime.Now && DateTime.Now <= endTime)
{
dutyStatusEnum = DutyStatusEnum.DutyIng;
}
else
{
dutyStatusEnum = DutyStatusEnum.DutyFinished;
}
// item.DutyStatus = dutyStatusEnum;
}
}
} }
return model; return model;
} }
...@@ -507,7 +452,7 @@ namespace Edu.Module.Duty ...@@ -507,7 +452,7 @@ namespace Edu.Module.Duty
messageList.Add(new PushMessageModel() messageList.Add(new PushMessageModel()
{ {
CategoryId = PushMessageCategoryEnum.UserDuty, CategoryId = PushMessageCategoryEnum.UserDuty,
Content = string.Format("您在{0}的值班，已被取消!",Common.ConvertHelper.FormatDate(dutyModel.Date)), Content = string.Format("您在{0}的值班，已被取消!", Common.ConvertHelper.FormatDate(dutyModel.Date)),
CoverImg = "", CoverImg = "",
CreateByName = userInfo.AccountName, CreateByName = userInfo.AccountName,
JumpUrl = "", JumpUrl = "",
...@@ -535,7 +480,7 @@ namespace Edu.Module.Duty ...@@ -535,7 +480,7 @@ namespace Edu.Module.Duty
/// <param name="user">用户信息</param> /// <param name="user">用户信息</param>
/// <param name="isQueryWork">是否查询工作内容-TRUE(查询)</param> /// <param name="isQueryWork">是否查询工作内容-TRUE(查询)</param>
/// <returns></returns> /// <returns></returns>
public Dictionary<string,object> OnDutyModule(int Id, int Shift, UserInfo user,bool isQueryWork=false) public Dictionary<string, object> OnDutyModule(int Id, int Shift, UserInfo user, bool isQueryWork = false)
{ {
Dictionary<string, object> result = new Dictionary<string, object>(); Dictionary<string, object> result = new Dictionary<string, object>();
var model = GetMyDutyPlanPageModule(1, 1, out _, new RB_Duty_Plan_ViewModel() { Id = Id, QDutyMan = user.Id.ToString(), QShift = Shift })?.FirstOrDefault(); var model = GetMyDutyPlanPageModule(1, 1, out _, new RB_Duty_Plan_ViewModel() { Id = Id, QDutyMan = user.Id.ToString(), QShift = Shift })?.FirstOrDefault();
...@@ -577,8 +522,10 @@ namespace Edu.Module.Duty ...@@ -577,8 +522,10 @@ namespace Edu.Module.Duty
result.Add("Id", model?.Id); result.Add("Id", model?.Id);
result.Add("PlanDate", Common.ConvertHelper.FormatDate(model?.Date)); result.Add("PlanDate", Common.ConvertHelper.FormatDate(model?.Date));
result.Add("WeekDay", Common.ConvertHelper.GetWeekDay(model?.Date)); result.Add("WeekDay", Common.ConvertHelper.GetWeekDay(model?.Date));
result.Add("CheckTime", Common.ConvertHelper.FormatTime(currentModel?.CheckTime)); result.Add("CheckTime", currentModel?.CheckTimeStr);
result.Add("FinishTime", Common.ConvertHelper.FormatTime(currentModel?.FinishTime)); result.Add("FinishTime", currentModel?.FinishTimeStr);
result.Add("CheckLateTime", currentModel?.CheckLateTime);
result.Add("FinishLateTime", currentModel?.FinishLateTime);
result.Add("SchoolName", model?.SchoolName); result.Add("SchoolName", model?.SchoolName);
result.Add("ShiftName", currentModel?.ShiftName); result.Add("ShiftName", currentModel?.ShiftName);
result.Add("StartTime", currentModel?.StartTime); result.Add("StartTime", currentModel?.StartTime);
...@@ -623,70 +570,70 @@ namespace Edu.Module.Duty ...@@ -623,70 +570,70 @@ namespace Edu.Module.Duty
} }
List<object> pList = new List<object>(); List<object> pList = new List<object>();
var currentPlanContetList = contentList.Where(qitem => qitem.PlanShift == Shift && qitem.PlanType == 1)?.ToList(); var currentPlanContetList = contentList.Where(qitem => qitem.PlanShift == Shift && qitem.PlanType == 1)?.ToList();
//if (currentModel.DutyStatus == DutyStatusEnum.DutyFinished) if (currentModel.Status == DutyStatusEnum.DutyFinished)
//{ {
// foreach (var item in currentPlanContetList) foreach (var item in currentPlanContetList)
// { {
// var c_itemModel = dutyItemList?.Where(qitem => qitem.Id == item.ItemId)?.FirstOrDefault(); var c_itemModel = dutyItemList?.Where(qitem => qitem.Id == item.ItemId)?.FirstOrDefault();
// if (c_itemModel != null) if (c_itemModel != null)
// { {
// var itemType = c_itemModel.ItemType; var itemType = c_itemModel.ItemType;
// int workIsFinish = 0; int workIsFinish = 0;
// if (itemType == ItemTypeEnum.FillIn ) if (itemType == ItemTypeEnum.FillIn)
// { {
// if (!string.IsNullOrEmpty(item?.WorkContent)) if (!string.IsNullOrEmpty(item?.WorkContent))
// { {
// workIsFinish = 1; workIsFinish = 1;
// } }
// } }
// else else
// { {
// workIsFinish = item?.WorkIsFinish ?? 0; workIsFinish = item?.WorkIsFinish ?? 0;
// } }
// var pObj = new var pObj = new
// { {
// Id = item?.Id ?? 0, Id = item?.Id ?? 0,
// ItemId = item.ItemId, item.ItemId,
// ItemName = c_itemModel?.ItemName ?? "", ItemName = c_itemModel?.ItemName ?? "",
// ItemType = c_itemModel?.ItemType ?? ItemTypeEnum.FillIn, ItemType = c_itemModel?.ItemType ?? ItemTypeEnum.FillIn,
// IsChecked = workIsFinish, IsChecked = workIsFinish,
// WorkContent = item?.WorkContent ?? "", WorkContent = item?.WorkContent ?? "",
// }; };
// pList.Add(pObj); pList.Add(pObj);
// } }
// } }
//} }
//else else
//{ {
// foreach (var item in PlanList) foreach (var item in PlanList)
// { {
// var c_workModel = currentPlanContetList?.Where(qitem => qitem.ItemId == item.Id)?.FirstOrDefault(); var c_workModel = currentPlanContetList?.Where(qitem => qitem.ItemId == item.Id)?.FirstOrDefault();
// var itemType = item.ItemType; var itemType = item.ItemType;
// int workIsFinish = 0; int workIsFinish = 0;
// if (itemType == ItemTypeEnum.FillIn) if (itemType == ItemTypeEnum.FillIn)
// { {
// if (!string.IsNullOrEmpty(c_workModel?.WorkContent)) if (!string.IsNullOrEmpty(c_workModel?.WorkContent))
// { {
// workIsFinish = 1; workIsFinish = 1;
// } }
// } }
// else else
// { {
// workIsFinish = c_workModel?.WorkIsFinish ?? 0; workIsFinish = c_workModel?.WorkIsFinish ?? 0;
// } }
// var pObj = new var pObj = new
// { {
// Id = c_workModel?.Id ?? 0, Id = c_workModel?.Id ?? 0,
// ItemId = item.Id, ItemId = item.Id,
// item.ItemName, item.ItemName,
// item.ItemType, item.ItemType,
// IsChecked = workIsFinish, IsChecked = workIsFinish,
// WorkContent = c_workModel?.WorkContent ?? "", WorkContent = c_workModel?.WorkContent ?? "",
// }; };
// pList.Add(pObj); pList.Add(pObj);
// } }
//} }
result.Add("WorkList", pList); result.Add("WorkList", pList);
//突发事项列表 //突发事项列表
...@@ -727,44 +674,40 @@ namespace Edu.Module.Duty ...@@ -727,44 +674,40 @@ namespace Edu.Module.Duty
List<object> HandoverList = new List<object>(); List<object> HandoverList = new List<object>();
foreach (var item in model.PlanDetails) foreach (var item in model.PlanDetails)
{ {
//if ( item.Id != currentModel.Id) if (item.Id != currentModel.Id)
//{ {
// if (item.Status == 2) if (item.Status == DutyStatusEnum.DutyFinished)
// { {
// var tempHandOverList = contentList?.Where(qitem => qitem.PlanType == 2 && qitem.PlanId == item.PlanId && qitem.PlanShift == item.Shift)?.ToList() ?? new List<RB_Duty_Content_ViewModel>(); var tempHandOverList = contentList?.Where(qitem => qitem.PlanType == 2 && qitem.PlanId == item.PlanId && qitem.PlanShift == item.Shift)?.ToList() ?? new List<RB_Duty_Content_ViewModel>();
// if (tempHandOverList != null && tempHandOverList.Count > 0) if (tempHandOverList != null && tempHandOverList.Count > 0)
// { {
// foreach (var subItem in tempHandOverList) foreach (var subItem in tempHandOverList)
// { {
// subItem.IsOperate = 0; subItem.IsOperate = 0;
// subItem.CreateByName = empList?.Where(qitem => qitem.Id == subItem.CreateBy)?.FirstOrDefault()?.EmployeeName ?? ""; subItem.CreateByName = empList?.Where(qitem => qitem.Id == subItem.CreateBy)?.FirstOrDefault()?.EmployeeName ?? "";
// } }
// HandoverList.AddRange(tempHandOverList); HandoverList.AddRange(tempHandOverList);
// } }
// } }
//} }
//else else
//{ {
// var tempHandOverList = contentList?.Where(qitem => qitem.PlanType == 2 && qitem.PlanId == item.PlanId && qitem.PlanShift == item.Shift)?.ToList() ?? new List<RB_Duty_Content_ViewModel>(); var tempHandOverList = contentList?.Where(qitem => qitem.PlanType == 2 && qitem.PlanId == item.PlanId && qitem.PlanShift == item.Shift)?.ToList() ?? new List<RB_Duty_Content_ViewModel>();
// if (tempHandOverList != null && tempHandOverList.Count > 0) if (tempHandOverList != null && tempHandOverList.Count > 0)
// { {
// foreach (var subItem in tempHandOverList) foreach (var subItem in tempHandOverList)
// { {
// subItem.IsOperate = 1; subItem.IsOperate = 1;
// subItem.CreateByName = empList?.Where(qitem => qitem.Id == subItem.CreateBy)?.FirstOrDefault()?.EmployeeName ?? ""; subItem.CreateByName = empList?.Where(qitem => qitem.Id == subItem.CreateBy)?.FirstOrDefault()?.EmployeeName ?? "";
// } }
// HandoverList.AddRange(tempHandOverList); HandoverList.AddRange(tempHandOverList);
// } }
//} }
} }
result.Add("HandoverList", HandoverList); result.Add("HandoverList", HandoverList);
result.Add("ReciveMan", nextModel?.DutyManName ?? ""); result.Add("ReciveMan", nextModel?.DutyManName ?? "");
result.Add("GiveMan", previousModel?.DutyManName ?? ""); result.Add("GiveMan", previousModel?.DutyManName ?? "");
} }
//result.Add("DutyStatus", currentModel?.DutyStatus);
//result.Add("DutyStatusStr", (currentModel?.Status==2?Common.Plugin.EnumHelper.ToName(DutyStatusEnum.DutyFinished):currentModel?.DutyStatusStr));
return result; return result;
} }
...@@ -781,7 +724,7 @@ namespace Edu.Module.Duty ...@@ -781,7 +724,7 @@ namespace Edu.Module.Duty
int currentIndex = 0; int currentIndex = 0;
for (var i = 0; i < model.PlanDetails.Count; i++) for (var i = 0; i < model.PlanDetails.Count; i++)
{ {
if (model.DetailId== model.PlanDetails[i].Id) if (model.DetailId == model.PlanDetails[i].Id)
{ {
currentIndex = i; currentIndex = i;
} }
...@@ -858,7 +801,7 @@ namespace Edu.Module.Duty ...@@ -858,7 +801,7 @@ namespace Edu.Module.Duty
/// <param name="Id"></param> /// <param name="Id"></param>
/// <param name="Shift"></param> /// <param name="Shift"></param>
/// <param name="DutyMan"></param> /// <param name="DutyMan"></param>
/// <param name="Status">Status(1-值班打卡，2-交接打卡)</param> /// <param name="Status">Status(1-值班中，2-已完成)</param>
/// <returns></returns> /// <returns></returns>
public bool DutyCheckModule(int Id, int Shift, int DutyMan, int Status) public bool DutyCheckModule(int Id, int Shift, int DutyMan, int Status)
{ {
...@@ -867,13 +810,13 @@ namespace Edu.Module.Duty ...@@ -867,13 +810,13 @@ namespace Edu.Module.Duty
{ nameof(RB_Duty_PlanDetails_ViewModel.Status),Status}, { nameof(RB_Duty_PlanDetails_ViewModel.Status),Status},
}; };
DateTime dt = DateTime.Now; DateTime dt = DateTime.Now;
var planModel= GetDutyPlanDetailsListModule(new RB_Duty_PlanDetails_ViewModel() { PlanId = Id, Shift = Shift, QDutyMan = DutyMan.ToString() })?.FirstOrDefault(); var planModel = GetDutyPlanDetailsListModule(new RB_Duty_PlanDetails_ViewModel() { PlanId = Id, Shift = Shift, QDutyMan = DutyMan.ToString() })?.FirstOrDefault();
var startTime =Convert.ToDateTime(Common.ConvertHelper.FormatDate(dt) + " " + planModel?.StartTime); var startTime = Convert.ToDateTime(Common.ConvertHelper.FormatDate(dt) + " " + planModel?.StartTime);
var endTime= Convert.ToDateTime(Common.ConvertHelper.FormatDate(dt) + " " + planModel?.EndTime); var endTime = Convert.ToDateTime(Common.ConvertHelper.FormatDate(dt) + " " + planModel?.EndTime);
if (Status == 1) if (Status == 1)
{ {
fileds.Add(nameof(RB_Duty_PlanDetails_ViewModel.CheckTime), dt); fileds.Add(nameof(RB_Duty_PlanDetails_ViewModel.CheckTime), dt);
int minute= Common.ConvertHelper.CalcMinutes(startTime, dt); int minute = Common.ConvertHelper.CalcMinutes(startTime, dt);
if (minute > 0) if (minute > 0)
{ {
fileds.Add(nameof(RB_Duty_PlanDetails_ViewModel.CheckLateTime), minute); fileds.Add(nameof(RB_Duty_PlanDetails_ViewModel.CheckLateTime), minute);
...@@ -886,7 +829,7 @@ namespace Edu.Module.Duty ...@@ -886,7 +829,7 @@ namespace Edu.Module.Duty
if (Status == 2) if (Status == 2)
{ {
fileds.Add(nameof(RB_Duty_PlanDetails_ViewModel.FinishTime), dt); fileds.Add(nameof(RB_Duty_PlanDetails_ViewModel.FinishTime), dt);
int minute = Common.ConvertHelper.CalcMinutes(dt,endTime); int minute = Common.ConvertHelper.CalcMinutes(dt, endTime);
if (minute > 0) if (minute > 0)
{ {
fileds.Add(nameof(RB_Duty_PlanDetails_ViewModel.FinishLateTime), minute); fileds.Add(nameof(RB_Duty_PlanDetails_ViewModel.FinishLateTime), minute);
...@@ -926,7 +869,6 @@ namespace Edu.Module.Duty ...@@ -926,7 +869,6 @@ namespace Edu.Module.Duty
model.ItemId = 0; model.ItemId = 0;
model.WorkIsFinish = 0; model.WorkIsFinish = 0;
} }
if (model.Id > 0) if (model.Id > 0)
{ {
Dictionary<string, object> fileds = new Dictionary<string, object>() Dictionary<string, object> fileds = new Dictionary<string, object>()
......
Edu.WebApi/Controllers/Duty/DutyPlanController.cs
View file @ a64cd6ff
...@@ -63,8 +63,7 @@ namespace Edu.WebApi.Controllers.Duty ...@@ -63,8 +63,7 @@ namespace Edu.WebApi.Controllers.Duty
PlanDate = Common.ConvertHelper.FormatDate(item.Date), PlanDate = Common.ConvertHelper.FormatDate(item.Date),
item.SchoolName, item.SchoolName,
item.School_Id, item.School_Id,
item.DutyStatus,
item.DutyStatusStr,
PlanDetails = item?.PlanDetails?.Select(qitem => new PlanDetails = item?.PlanDetails?.Select(qitem => new
{ {
qitem.Id, qitem.Id,
...@@ -75,8 +74,7 @@ namespace Edu.WebApi.Controllers.Duty ...@@ -75,8 +74,7 @@ namespace Edu.WebApi.Controllers.Duty
qitem.EndTime, qitem.EndTime,
qitem.Shift, qitem.Shift,
qitem.ShiftName, qitem.ShiftName,
qitem.DutyStatus,
qitem.DutyStatusStr,
qitem.Status, qitem.Status,
qitem.CheckTimeStr, qitem.CheckTimeStr,
qitem.FinishTimeStr, qitem.FinishTimeStr,
...@@ -144,6 +142,7 @@ namespace Edu.WebApi.Controllers.Duty ...@@ -144,6 +142,7 @@ namespace Edu.WebApi.Controllers.Duty
nextModel = item.PlanDetails[nextIndex]; nextModel = item.PlanDetails[nextIndex];
} }
} }
string jiaoBanMan = "";//交班人 string jiaoBanMan = "";//交班人
string jieBanMan = "";//接班人 string jieBanMan = "";//接班人
if (nextModel != null&&nextModel.Id>0) if (nextModel != null&&nextModel.Id>0)
...@@ -155,6 +154,10 @@ namespace Edu.WebApi.Controllers.Duty ...@@ -155,6 +154,10 @@ namespace Edu.WebApi.Controllers.Duty
{ {
jiaoBanMan = previousModel?.DutyManName ?? ""; jiaoBanMan = previousModel?.DutyManName ?? "";
} }
if (currentModel.Status == Common.Enum.Duty.DutyStatusEnum.NoStart)
{
currentModel.Status= dutyPlanModule.CalcDutyPlanStatusModule(item.Date, currentModel.StartTime, currentModel.EndTime);
}
result.Add(new result.Add(new
{ {
item.Id, item.Id,
...@@ -165,17 +168,19 @@ namespace Edu.WebApi.Controllers.Duty ...@@ -165,17 +168,19 @@ namespace Edu.WebApi.Controllers.Duty
currentModel.StartTime, currentModel.StartTime,
currentModel.EndTime, currentModel.EndTime,
PlanList = currentModel?.WorkContentList ?? new List<RB_Duty_PlanWork_ViewModel>(), PlanList = currentModel?.WorkContentList ?? new List<RB_Duty_PlanWork_ViewModel>(),
currentModel.CheckLateTime,
currentModel.FinishLateTime,
currentModel.BurstCount, currentModel.BurstCount,
currentModel.HandoverCount, currentModel.HandoverCount,
ReciveMan= jieBanMan, ReciveMan= jieBanMan,
GiveMan= jiaoBanMan, GiveMan= jiaoBanMan,
item.CreateByName, item.CreateByName,
currentModel.DutyStatus, currentModel.Status,
currentModel.DutyStatusStr, currentModel.StatusStr,
item.TotalBurstCount, item.TotalBurstCount,
item.TotalHandoverCount, item.TotalHandoverCount,
currentModel.CheckTimeStr,
currentModel.CheckLateTime,
currentModel.FinishTimeStr,
currentModel.FinishLateTime,
}); });
} }
pageModel.Count = rowsCount; pageModel.Count = rowsCount;
......
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