Skip to content

E
Education
Commit a7e1c459 authored by liudong1993's avatar liudong1993
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

parents 8a4f7afc 842448a2
Hide whitespace changes
Inline Side-by-side
Showing with 284 additions and 256 deletions
Edu.Common/Plugin/ConvertHelper.cs
View file @ a7e1c459
......@@ -63,8 +63,6 @@ namespace Edu.Common
return timeStr;
}
/// <summary>
/// 获取时间格式
/// </summary>
......@@ -223,6 +221,18 @@ namespace Edu.Common
return weekDay;
}
/// <summary>
/// 计算两个时间相差分钟数
/// </summary>
/// <param name="start"></param>
/// <param name="end"></param>
/// <returns></returns>
public static int CalcMinutes(DateTime start, DateTime end)
{
int minutes=Convert.ToInt32((end - start).TotalMinutes);
return minutes;
}
/// <summary>
/// 是否为时间型字符串
/// </summary>
......
Edu.Model/Entity/Duty/RB_Duty_PlanDetails.cs
View file @ a7e1c459
using Edu.Common.Enum;
using Edu.Common.Enum.Duty;
using System;
using VT.FW.DB;
......@@ -32,9 +33,9 @@ namespace Edu.Model.Entity.Duty
public int DutyMan { get; set; }
/// <summary>
/// 状态(1-打卡，2-交接)
/// 状态
/// </summary>
public int Status { get; set; }
public DutyStatusEnum Status { get; set; }
/// <summary>
/// 打卡时间
......@@ -45,5 +46,15 @@ namespace Edu.Model.Entity.Duty
/// 交接时间
/// </summary>
public DateTime FinishTime { get; set; }
/// <summary>
/// 迟到分钟数
/// </summary>
public int CheckLateTime { get; set; }
/// <summary>
/// 早退分钟数
/// </summary>
public int FinishLateTime { get; set; }
}
}
Edu.Model/ViewModel/Duty/RB_Duty_PlanDetails_ViewModel.cs
View file @ a7e1c459
......@@ -97,6 +97,38 @@ namespace Edu.Model.ViewModel.Duty
/// 交接工作总数
/// </summary>
public int HandoverCount { get; set; }
/// <summary>
/// 上班打卡时间
/// </summary>
public string CheckTimeStr
{
get
{
string str = Common.ConvertHelper.FormatTimeStr(this.CheckTime);
if (str == "")
{
str = "未打卡";
}
return str;
}
}
/// <summary>
/// 下班打卡时间
/// </summary>
public string FinishTimeStr
{
get
{
string str = Common.ConvertHelper.FormatTimeStr(this.FinishTime);
if (str == "")
{
str = "未打卡";
}
return str;
}
}
}
/// <summary>
......
Edu.Model/ViewModel/Duty/RB_Duty_Plan_ViewModel.cs
View file @ a7e1c459
......@@ -47,24 +47,6 @@ namespace Edu.Model.ViewModel.Duty
/// </summary>
public int QShift { get; set; }
/// <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 @ a7e1c459
......@@ -74,22 +74,22 @@ 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.DutyStatus = 0;
if (item.PlanDetails != null && item.PlanDetails.Count > 0)
{
foreach (var subItem in item.PlanDetails)
{
if (subItem.Status == 2)
{
subItem.DutyStatus = DutyStatusEnum.DutyFinished;
}
else
{
subItem.DutyStatus = CalcDutyPlanStatusModule(item.Date, subItem?.StartTime, subItem?.EndTime);
}
}
item.DutyStatus = CalcDutyStatusModule(item.PlanDetails);
}
//item.DutyStatus = 0;
//if (item.PlanDetails != null && item.PlanDetails.Count > 0)
//{
// foreach (var subItem in item.PlanDetails)
// {
// if (subItem.Status == 2)
// {
// subItem.DutyStatus = DutyStatusEnum.DutyFinished;
// }
// else
// {
// subItem.DutyStatus = CalcDutyPlanStatusModule(item.Date, subItem?.StartTime, subItem?.EndTime);
// }
// }
// item.DutyStatus = CalcDutyStatusModule(item.PlanDetails);
//}
}
}
return list;
......@@ -142,78 +142,78 @@ namespace Edu.Module.Duty
foreach (var subItem in item.PlanDetails)
{
subItem.WorkContentList = new List<RB_Duty_PlanWork_ViewModel>();
if (subItem.Status == 2)
{
subItem.DutyStatus = DutyStatusEnum.DutyFinished;
}
else
{
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)
{
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();
int isFinish = 0;
if (dutyItem.ItemType == ItemTypeEnum.Choice)
{
isFinish = dItem.WorkIsFinish;
}
else if (dutyItem.ItemType == ItemTypeEnum.FillIn)
{
if (!string.IsNullOrEmpty(dItem.WorkContent))
{
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
{
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;
}
}
//if (subItem.DutyStatus == DutyStatusEnum.DutyFinished)
//{
// 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();
// int isFinish = 0;
// if (dutyItem.ItemType == ItemTypeEnum.Choice)
// {
// isFinish = dItem.WorkIsFinish;
// }
// else if (dutyItem.ItemType == ItemTypeEnum.FillIn)
// {
// if (!string.IsNullOrEmpty(dItem.WorkContent))
// {
// 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
//{
// 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.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;
}
//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);
......@@ -257,18 +257,18 @@ namespace Edu.Module.Duty
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;
}
//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;
}
......@@ -476,7 +476,7 @@ namespace Edu.Module.Duty
{
dutyStatusEnum = DutyStatusEnum.DutyFinished;
}
item.DutyStatus = dutyStatusEnum;
// item.DutyStatus = dutyStatusEnum;
}
}
}
......@@ -623,70 +623,70 @@ namespace Edu.Module.Duty
}
List<object> pList = new List<object>();
var currentPlanContetList = contentList.Where(qitem => qitem.PlanShift == Shift && qitem.PlanType == 1)?.ToList();
if (currentModel.DutyStatus == DutyStatusEnum.DutyFinished)
{
foreach (var item in currentPlanContetList)
{
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 = workIsFinish,
WorkContent = item?.WorkContent ?? "",
};
//if (currentModel.DutyStatus == DutyStatusEnum.DutyFinished)
//{
// foreach (var item in currentPlanContetList)
// {
// 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 = workIsFinish,
// WorkContent = item?.WorkContent ?? "",
// };
pList.Add(pObj);
}
}
}
else
{
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 = workIsFinish,
WorkContent = c_workModel?.WorkContent ?? "",
};
pList.Add(pObj);
}
}
// pList.Add(pObj);
// }
// }
//}
//else
//{
// 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 = workIsFinish,
// WorkContent = c_workModel?.WorkContent ?? "",
// };
// pList.Add(pObj);
// }
//}
result.Add("WorkList", pList);
//突发事项列表
......@@ -727,35 +727,35 @@ namespace Edu.Module.Duty
List<object> HandoverList = new List<object>();
foreach (var item in model.PlanDetails)
{
if ( item.Id != currentModel.Id)
{
if (item.Status == 2)
{
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)
{
foreach (var subItem in tempHandOverList)
{
subItem.IsOperate = 0;
subItem.CreateByName = empList?.Where(qitem => qitem.Id == subItem.CreateBy)?.FirstOrDefault()?.EmployeeName ?? "";
}
HandoverList.AddRange(tempHandOverList);
}
}
}
else
{
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)
{
foreach (var subItem in tempHandOverList)
{
subItem.IsOperate = 1;
subItem.CreateByName = empList?.Where(qitem => qitem.Id == subItem.CreateBy)?.FirstOrDefault()?.EmployeeName ?? "";
}
HandoverList.AddRange(tempHandOverList);
}
}
//if ( item.Id != currentModel.Id)
//{
// if (item.Status == 2)
// {
// 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)
// {
// foreach (var subItem in tempHandOverList)
// {
// subItem.IsOperate = 0;
// subItem.CreateByName = empList?.Where(qitem => qitem.Id == subItem.CreateBy)?.FirstOrDefault()?.EmployeeName ?? "";
// }
// HandoverList.AddRange(tempHandOverList);
// }
// }
//}
//else
//{
// 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)
// {
// foreach (var subItem in tempHandOverList)
// {
// subItem.IsOperate = 1;
// subItem.CreateByName = empList?.Where(qitem => qitem.Id == subItem.CreateBy)?.FirstOrDefault()?.EmployeeName ?? "";
// }
// HandoverList.AddRange(tempHandOverList);
// }
//}
}
result.Add("HandoverList", HandoverList);
......@@ -763,51 +763,11 @@ namespace Edu.Module.Duty
result.Add("GiveMan", previousModel?.DutyManName ?? "");
}
result.Add("DutyStatus", currentModel?.DutyStatus);
result.Add("DutyStatusStr", (currentModel?.Status==2?Common.Plugin.EnumHelper.ToName(DutyStatusEnum.DutyFinished):currentModel?.DutyStatusStr));
//result.Add("DutyStatus", currentModel?.DutyStatus);
//result.Add("DutyStatusStr", (currentModel?.Status==2?Common.Plugin.EnumHelper.ToName(DutyStatusEnum.DutyFinished):currentModel?.DutyStatusStr));
return result;
}
/// <summary>
/// 计算当前值班人员索引
/// </summary>
/// <param name="planDate">值班日期</param>
/// <param name="PlanDetails">值班班次列表</param>
/// <param name="dutyManId">值班人</param>
/// <returns></returns>
public int CalcCurrentDutyManIndexModule(DateTime planDate, List<RB_Duty_PlanDetails_ViewModel> PlanDetails,int dutyManId)
{
//当前值班人员索引
int currentIndex = 0;
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 currentDayNow = DateTime.Now;
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;
}
}
}
return currentIndex;
}
/// <summary>
/// 计算当前值班人员索引
/// </summary>
......@@ -906,13 +866,35 @@ namespace Edu.Module.Duty
{
{ nameof(RB_Duty_PlanDetails_ViewModel.Status),Status},
};
DateTime dt = DateTime.Now;
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 endTime= Convert.ToDateTime(Common.ConvertHelper.FormatDate(dt) + " " + planModel?.EndTime);
if (Status == 1)
{
fileds.Add(nameof(RB_Duty_PlanDetails_ViewModel.CheckTime), DateTime.Now);
fileds.Add(nameof(RB_Duty_PlanDetails_ViewModel.CheckTime), dt);
int minute= Common.ConvertHelper.CalcMinutes(startTime, dt);
if (minute > 0)
{
fileds.Add(nameof(RB_Duty_PlanDetails_ViewModel.CheckLateTime), minute);
}
else
{
fileds.Add(nameof(RB_Duty_PlanDetails_ViewModel.CheckLateTime), 0);
}
}
if (Status == 2)
{
fileds.Add(nameof(RB_Duty_PlanDetails_ViewModel.FinishTime), DateTime.Now);
fileds.Add(nameof(RB_Duty_PlanDetails_ViewModel.FinishTime), dt);
int minute = Common.ConvertHelper.CalcMinutes(dt,endTime);
if (minute > 0)
{
fileds.Add(nameof(RB_Duty_PlanDetails_ViewModel.FinishLateTime), minute);
}
else
{
fileds.Add(nameof(RB_Duty_PlanDetails_ViewModel.FinishLateTime), 0);
}
}
List<WhereHelper> list = new List<WhereHelper>()
{
......
Edu.Repository/Duty/RB_Duty_PlanDetailsRepository.cs
View file @ a7e1c459
......@@ -39,6 +39,10 @@ WHERE 1=1
{
builder.AppendFormat(@" AND A.{0} IN({1}) ", nameof(RB_Duty_PlanDetails_ViewModel.PlanId), query.QPlanIds);
}
if (query.Shift > 0)
{
builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Duty_PlanDetails_ViewModel.Shift), query.Shift);
}
if (!string.IsNullOrEmpty(query.QDutyMan))
{
builder.AppendFormat(@" AND A.{0} IN({1}) ", nameof(RB_Duty_PlanDetails_ViewModel.DutyMan), query.QDutyMan);
......
Edu.WebApi/Controllers/Duty/DutyPlanController.cs
View file @ a7e1c459
......@@ -77,6 +77,11 @@ namespace Edu.WebApi.Controllers.Duty
qitem.ShiftName,
qitem.DutyStatus,
qitem.DutyStatusStr,
qitem.Status,
qitem.CheckTimeStr,
qitem.FinishTimeStr,
qitem.FinishLateTime,
qitem.CheckLateTime,
})
});
}
......@@ -160,6 +165,8 @@ namespace Edu.WebApi.Controllers.Duty
currentModel.StartTime,
currentModel.EndTime,
PlanList = currentModel?.WorkContentList ?? new List<RB_Duty_PlanWork_ViewModel>(),
currentModel.CheckLateTime,
currentModel.FinishLateTime,
currentModel.BurstCount,
currentModel.HandoverCount,
ReciveMan= jieBanMan,
......
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