Commit c61157e8 authored by 黄奎's avatar 黄奎

页面修改

parent 438fddb8
......@@ -775,6 +775,17 @@ namespace Edu.Module.Duty
{
//查找当前人员索引
int currentIndex = CalcCurrentDutyManIndexModule_V2(model);
if (currentIndex == 0)
{
var yestoday = model.Date.AddDays(-1);
var yestodayList= GetMyDutyPlanPageModule(1, 1, out _, new RB_Duty_Plan_ViewModel()
{
QStartDate = Common.ConvertHelper.FormatDate(yestoday),
QEndDate = Common.ConvertHelper.FormatDate(yestoday),
Group_Id = model.Group_Id
});
}
//当前班次
currentModel = model.PlanDetails[currentIndex];
......
......@@ -432,10 +432,10 @@ namespace Edu.WebApi.Controllers.Duty
{
model.FileURL = "";
}
if (model.PlanType == 1 && string.IsNullOrEmpty(model.WorkContent))
{
return ApiResult.Failed(message: "请填写完成内容!");
}
//if (model.PlanType == 1 && string.IsNullOrEmpty(model.WorkContent))
//{
// return ApiResult.Failed(message: "请填写完成内容!");
//}
model.Group_Id = base.UserInfo.Group_Id;
model.Status = Common.Enum.DateStateEnum.Normal;
model.CreateBy = base.UserInfo.Id;
......
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