wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2134

Browse Source
This commit is contained in:
wyw 2026-04-28 14:14:30 +08:00
parent b387325bba
commit f13816a171
1 changed files with 34 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs
View File

@ -332,56 +332,52 @@ namespace APT.FO.WebApi.Controllers.Api.FO
T_FO_PRE_SHIFT_MEETING_RECORD modelLast = null; T_FO_PRE_SHIFT_MEETING_RECORD modelLast = null;
if (entity.RATE.Equals("SaveAndNotify")) if (entity.RATE.Equals("SaveAndNotify"))
{ {
try if (finishNotice != null && finishNotice.NOTICE_STATUS == 2)
{ {
if (finishNotice != null && finishNotice.NOTICE_STATUS == 2) //如果班长提交的时候已经超时了 直接单子超时
entity.OVERTIME = FOISOVERTIME.超时;
}
if (entity.TEAM_ID.HasValue)
{
//上一个 班前会 是否超时标记
//entity.OVERTIME = FOISOVERTIME.未统计;
//未统计 = 0, //未超时 = 1, //超时 = 2
BasePageFilter basf = new BasePageFilter(1, 1);
basf.Order = DbOrder.DESC;
basf.Sort = "MEETING_TIME";
basf.OrgId = entity.ORG_ID;
DateTime dtMin = entity.START_TIME.AddMonths(-1);//一个月以内的
var lastRecord = GetOrderPageEntities<T_FO_PRE_SHIFT_MEETING_RECORD>(e => e.TEAM_ID.HasValue && e.TEAM_ID.Value == entity.TEAM_ID.Value && e.START_TIME != e.END_TIME && dtMin <= e.START_TIME && e.START_TIME < entity.START_TIME, basf, null);
if (lastRecord.Data != null && lastRecord.Data.Count() > 0)
modelLast = lastRecord.Data.ToList()[0];
if (modelLast != null && modelLast.OVERTIME == FOISOVERTIME.未统计)
{ {
//如果班长提交的时候已经超时了 直接单子超时 Expression<Func<T_FM_NOTIFICATION_TASK, bool>> expressionCheck = e => !e.IS_DELETED && !e.ISCANCEL && e.SOURCE_DATA_ID.HasValue && e.SOURCE_DATA_ID == modelLast.ID && (e.SOURCE_FORMCODE == "FO003_SHOWPRINT" || e.SOURCE_FORMCODE == "FO003");
entity.OVERTIME = FOISOVERTIME.超时; //if (finishNotice != null)
} //{
if (entity.TEAM_ID.HasValue) // expressionCheck = expressionCheck.And(e => e.CREATE_TIME.HasValue && e.CREATE_TIME < finishNotice.CREATE_TIME);
{ //}
//上一个 班前会 是否超时标记 var listCheckTask = GetEntities(expressionCheck, null, null);
//entity.OVERTIME = FOISOVERTIME.未统计; if (listCheckTask != null)
//未统计 = 0, //未超时 = 1, //超时 = 2
BasePageFilter basf = new BasePageFilter(1, 1);
basf.Order = DbOrder.DESC;
basf.Sort = "MEETING_TIME";
basf.OrgId = entity.ORG_ID;
DateTime dtMin = entity.START_TIME.AddMonths(-1);//一个月以内的
var lastRecord = GetOrderPageEntities<T_FO_PRE_SHIFT_MEETING_RECORD>(e => e.TEAM_ID.HasValue && e.TEAM_ID.Value == entity.TEAM_ID.Value && e.START_TIME != e.END_TIME && dtMin <= e.START_TIME && e.START_TIME < entity.START_TIME, basf, null);
if (lastRecord.Data != null && lastRecord.Data.Count() > 0)
modelLast = lastRecord.Data.ToList()[0];
if (modelLast != null && modelLast.OVERTIME == FOISOVERTIME.未统计)
{ {
Expression<Func<T_FM_NOTIFICATION_TASK, bool>> expressionCheck = e => !e.IS_DELETED && !e.ISCANCEL && e.SOURCE_DATA_ID.HasValue && e.SOURCE_DATA_ID == modelLast.ID && (e.SOURCE_FORMCODE == "FO003_SHOWPRINT" || e.SOURCE_FORMCODE == "FO003"); var checkT = listCheckTask.FirstOrDefault(e => e.NOTICE_STATUS == 2 || e.NOTICE_STATUS == 0);
//if (finishNotice != null) if (checkT != null)
//{
// expressionCheck = expressionCheck.And(e => e.CREATE_TIME.HasValue && e.CREATE_TIME < finishNotice.CREATE_TIME);
//}
var listCheckTask = GetEntities(expressionCheck, null, null);
if (listCheckTask != null)
{ {
var checkT = listCheckTask.FirstOrDefault(e => e.NOTICE_STATUS == 2 || e.NOTICE_STATUS == 0); modelLast.OVERTIME = FOISOVERTIME.超时;
modelLast.MODIFY_TIME = DateTime.Now;
}
else
{
checkT = listCheckTask.FirstOrDefault(e => e.NOTICE_STATUS == 1);
if (checkT != null) if (checkT != null)
{ {
modelLast.OVERTIME = FOISOVERTIME.超时; modelLast.OVERTIME = FOISOVERTIME.未超时;
modelLast.MODIFY_TIME = DateTime.Now; modelLast.MODIFY_TIME = DateTime.Now;
} }
else
{
checkT = listCheckTask.FirstOrDefault(e => e.NOTICE_STATUS == 1);
if (checkT != null)
{
modelLast.OVERTIME = FOISOVERTIME.未超时;
modelLast.MODIFY_TIME = DateTime.Now;
}
}
} }
} }
} }
} }
catch { }
} }
#endregion #endregion