Skip to content

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

页面修改

parent 9ef31386
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 19 deletions
Edu.Common/Plugin/ConvertHelper.cs
View file @ 561a6022
......@@ -63,6 +63,8 @@ namespace Edu.Common
return timeStr;
}
/// <summary>
/// 获取时间格式
/// </summary>
......
Edu.Model/ViewModel/Duty/RB_Duty_Content_ViewModel.cs
View file @ 561a6022
......@@ -25,5 +25,15 @@ namespace Edu.Model.ViewModel.Duty
/// 是否可以修改和删除(1-可修改可删除)
/// </summary>
public int IsOperate { get; set; }
/// <summary>
/// 创建人
/// </summary>
public string CreateByName { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public string CreateTimeStr { get { return Common.ConvertHelper.FormatTimeStr(this.CreateTime); } }
}
}
Edu.Module.Duty/DutyPlanModule.cs
View file @ 561a6022
......@@ -78,7 +78,14 @@ namespace Edu.Module.Duty
{
foreach (var subItem in item.PlanDetails)
{
subItem.DutyStatus = CalcDutyPlanStatusModule(item.Date, subItem?.StartTime, subItem?.EndTime);
if (subItem.Status == 2)
{
subItem.DutyStatus = DutyStatusEnum.DutyFinished;
}
else
{
subItem.DutyStatus = CalcDutyPlanStatusModule(item.Date, subItem?.StartTime, subItem?.EndTime);
}
}
item.DutyStatus = CalcDutyStatusModule(item.PlanDetails);
}
......@@ -131,7 +138,14 @@ namespace Edu.Module.Duty
{
foreach (var subItem in item.PlanDetails)
{
subItem.DutyStatus = CalcDutyPlanStatusModule(item.Date, subItem.StartTime, subItem.EndTime);
if (subItem.Status == 2)
{
subItem.DutyStatus = DutyStatusEnum.DutyFinished;
}
else
{
subItem.DutyStatus = CalcDutyPlanStatusModule(item.Date, subItem.StartTime, subItem.EndTime);
}
if (subItem.DutyStatus == DutyStatusEnum.DutyFinished)
{
subItem.DutyItemList = new List<RB_Duty_Item_ViewModel>();
......@@ -529,6 +543,15 @@ namespace Edu.Module.Duty
var PlanList = dutyItemList ?? new List<RB_Duty_Item_ViewModel>();
//获取所有的值班内容
var contentList = duty_ContentRepository.GetDutyContentListRepository(new RB_Duty_Content_ViewModel() { PlanId = model.Id });
List<Employee_ViewModel> empList = new List<Employee_ViewModel>();
if (contentList != null)
{
string accountIdStr = string.Join(",", contentList.Select(qitem => qitem.CreateBy));
if (!string.IsNullOrEmpty(accountIdStr))
{
empList = accountRepository.GetEmployeeListRepository(new Model.ViewModel.User.Employee_ViewModel() { QIds = accountIdStr });
}
}
foreach (var item in contentList)
{
if (!string.IsNullOrEmpty(item.FileURL))
......@@ -594,6 +617,11 @@ namespace Edu.Module.Duty
if (tempEmergenciesList != null && tempEmergenciesList.Count > 0)
{
tempEmergenciesList.ForEach(item => item.IsOperate = 0);
foreach (var subItem in tempEmergenciesList)
{
subItem.IsOperate = 0;
subItem.CreateByName = empList?.Where(qitem => qitem.Id == subItem.CreateBy)?.FirstOrDefault()?.EmployeeName ?? "";
}
EmergenciesList.AddRange(tempEmergenciesList);
}
}
......@@ -602,7 +630,11 @@ namespace Edu.Module.Duty
var tempEmergenciesList = contentList?.Where(qitem => qitem.PlanType == 3 && qitem.PlanId == item.PlanId && qitem.PlanShift == item.Shift)?.ToList() ?? new List<RB_Duty_Content_ViewModel>();
if (tempEmergenciesList != null && tempEmergenciesList.Count > 0)
{
tempEmergenciesList.ForEach(item => item.IsOperate = 1);
foreach (var subItem in tempEmergenciesList)
{
subItem.IsOperate = 1;
subItem.CreateByName = empList?.Where(qitem => qitem.Id == subItem.CreateBy)?.FirstOrDefault()?.EmployeeName ?? "";
}
EmergenciesList.AddRange(tempEmergenciesList);
}
}
......@@ -620,7 +652,11 @@ namespace Edu.Module.Duty
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)
{
tempHandOverList.ForEach(item => item.IsOperate = 0);
foreach (var subItem in tempHandOverList)
{
subItem.IsOperate = 0;
subItem.CreateByName = empList?.Where(qitem => qitem.Id == subItem.CreateBy)?.FirstOrDefault()?.EmployeeName ?? "";
}
HandoverList.AddRange(tempHandOverList);
}
}
......@@ -630,7 +666,11 @@ namespace Edu.Module.Duty
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)
{
tempHandOverList.ForEach(item => item.IsOperate = 1);
foreach (var subItem in tempHandOverList)
{
subItem.IsOperate = 1;
subItem.CreateByName = empList?.Where(qitem => qitem.Id == subItem.CreateBy)?.FirstOrDefault()?.EmployeeName ?? "";
}
HandoverList.AddRange(tempHandOverList);
}
}
......@@ -642,7 +682,7 @@ namespace Edu.Module.Duty
}
result.Add("DutyStatus", currentModel?.DutyStatus);
result.Add("DutyStatusStr", currentModel?.DutyStatusStr);
result.Add("DutyStatusStr", (currentModel?.Status==2?Common.Plugin.EnumHelper.ToName(DutyStatusEnum.DutyFinished):currentModel?.DutyStatusStr));
return result;
}
......@@ -657,14 +697,30 @@ namespace Edu.Module.Duty
{
//当前值班人员索引
int currentIndex = 0;
var currentDayNow = Convert.ToDateTime(Common.ConvertHelper.FormatDate(planDate) + " " + DateTime.Now.ToString("HH:mm:ss"));
for (var i = 0; i < PlanDetails.Count; i++)
if (Common.ConvertHelper.FormatDate(planDate) == Common.ConvertHelper.FormatDate(DateTime.Now))
{
var currentDayNow = Convert.ToDateTime(Common.ConvertHelper.FormatDate(planDate) + " " + DateTime.Now.ToString("HH:mm:ss"));
for (var i = 0; i < PlanDetails.Count; i++)
{
var sStartTime = Convert.ToDateTime(Common.ConvertHelper.FormatDate(planDate) + " " + PlanDetails[i].StartTime);
var sEndTime = Convert.ToDateTime(Common.ConvertHelper.FormatDate(planDate) + " " + PlanDetails[i].EndTime);
if (currentDayNow >= sStartTime && currentDayNow <= sEndTime && PlanDetails[i].DutyMan == dutyManId)
{
currentIndex = i;
}
}
}
else
{
var sStartTime = Convert.ToDateTime(Common.ConvertHelper.FormatDate(planDate) + " " + PlanDetails[i].StartTime);
var sEndTime = Convert.ToDateTime(Common.ConvertHelper.FormatDate(planDate) + " " + PlanDetails[i].EndTime);
if (currentDayNow >= sStartTime && currentDayNow <= sEndTime && PlanDetails[i].DutyMan == dutyManId)
var currentDayNow = DateTime.Now;
for (var i = 0; i < PlanDetails.Count; i++)
{
currentIndex = i;
var sStartTime = Convert.ToDateTime(Common.ConvertHelper.FormatDate(planDate) + " " + PlanDetails[i].StartTime);
var sEndTime = Convert.ToDateTime(Common.ConvertHelper.FormatDate(planDate) + " " + PlanDetails[i].EndTime);
if (currentDayNow >= sStartTime && currentDayNow <= sEndTime && PlanDetails[i].DutyMan == dutyManId)
{
currentIndex = i;
}
}
}
return currentIndex;
......
Edu.WebApi/Controllers/Duty/DutyPlanController.cs
View file @ 561a6022
......@@ -110,17 +110,18 @@ namespace Edu.WebApi.Controllers.Duty
{
item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
}
//当前班次
var currentModel = new RB_Duty_PlanDetails_ViewModel();
//上一个班次
//上一个班次(交班)
var previousModel = new RB_Duty_PlanDetails_ViewModel();
//下一个班次
//下一个班次(接班)
var nextModel = new RB_Duty_PlanDetails_ViewModel();
//当前值班人员索引
int currentIndex = 0;
if (item.PlanDetails != null && item.PlanDetails.Count > 0)
{
//当前值班人员索引
int currentIndex = dutyPlanModule.CalcCurrentDutyManIndexModule(item.Date,item.PlanDetails,base.UserInfo.Id);
currentIndex = dutyPlanModule.CalcCurrentDutyManIndexModule(item.Date,item.PlanDetails,base.UserInfo.Id);
//上一个班次索引
int previousIndex = currentIndex - 1;
//下一个班次索引
......@@ -139,6 +140,17 @@ namespace Edu.WebApi.Controllers.Duty
nextModel = item.PlanDetails[nextIndex];
}
}
string GiveMan = "";//交班人
string ReciveMan = "";//接班人
if (currentIndex != 0)
{
GiveMan = previousModel?.DutyManName ?? "";
}
if (currentIndex != item.PlanDetails.Count-1)
{
ReciveMan = nextModel?.DutyManName ?? "";
}
result.Add(new
{
item.Id,
......@@ -149,8 +161,8 @@ namespace Edu.WebApi.Controllers.Duty
currentModel.StartTime,
currentModel.EndTime,
PlanList = currentModel?.DutyItemList ?? new List<RB_Duty_Item_ViewModel>(),
ReciveMan = nextModel?.DutyManName ?? "",
GiveMan = previousModel?.DutyManName ?? "",
ReciveMan,
GiveMan,
item.CreateByName,
currentModel.DutyStatus,
currentModel.DutyStatusStr,
......
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