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

1

Browse Source
This commit is contained in:
何美荣 2025-12-07 12:14:46 +08:00
parent 1ef81ea6a9
commit c5c2e39ab1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs
View File

@ -2100,7 +2100,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
{ {
var firstRecord = records.FirstOrDefault(t => t.CLASS_ID == item.CLASS_ID); var firstRecord = records.FirstOrDefault(t => t.CLASS_ID == item.CLASS_ID);
var firstTime = classFisrt.Nav_ClassDetail.OrderBy(t => t.NUM).FirstOrDefault(); var firstTime = classFisrt.Nav_ClassDetail.OrderBy(t => t.NUM).FirstOrDefault();
if (firstTime.ENDTIME.Hour == DateTime.Now.AddHours(1).Hour && firstRecord == null) if (firstTime.ENDTIME.Hour == dt.AddHours(1).Hour && firstRecord == null)
{ {
var userIds = preClassUsers.Where(t => t.PRE_SHIFT_MEETING_RECORD_ID == item.ID).Select(m => m.USER_ID).Distinct().ToList(); var userIds = preClassUsers.Where(t => t.PRE_SHIFT_MEETING_RECORD_ID == item.ID).Select(m => m.USER_ID).Distinct().ToList();
var sendUsers = users.Where(t => userIds.Contains(t.ID) && t.Nav_Person != null).ToList(); var sendUsers = users.Where(t => userIds.Contains(t.ID) && t.Nav_Person != null).ToList();
@ -2111,9 +2111,9 @@ namespace APT.PP.WebApi.Controllers.Api.PP
var depart = departs.FirstOrDefault(t => t.ID == user.DEPARTMENT_ID); var depart = departs.FirstOrDefault(t => t.ID == user.DEPARTMENT_ID);
T_FO_CURRENT_CLASS_RECORD record = new T_FO_CURRENT_CLASS_RECORD(); T_FO_CURRENT_CLASS_RECORD record = new T_FO_CURRENT_CLASS_RECORD();
record.ORG_ID = item.ORG_ID; record.ORG_ID = item.ORG_ID;
record.NAME = DateTime.Now.ToShortDateString() + depart?.NAME + "-" + user?.Nav_Person?.Nav_Post?.NAME + "当班工作记录"; record.NAME = dt.ToShortDateString() + depart?.NAME + "-" + user?.Nav_Person?.Nav_Post?.NAME + "当班工作记录";
record.EDITOR_ID = user.ID; record.EDITOR_ID = user.ID;
record.RECORD_DATE = Convert.ToDateTime(DateTime.Now.Date.ToShortDateString() + firstTime.ENDTIME.ToShortTimeString()); record.RECORD_DATE = Convert.ToDateTime(dt.Date.ToShortDateString() +" "+ firstTime.ENDTIME.ToShortTimeString());
record.CLASS_ID = item.CLASS_ID; record.CLASS_ID = item.CLASS_ID;
record.DEPARTMENT_ID = user.DEPARTMENT_ID; record.DEPARTMENT_ID = user.DEPARTMENT_ID;
record.DEPARTMENT_POST_ID = user?.Nav_Person?.POST_ID; record.DEPARTMENT_POST_ID = user?.Nav_Person?.POST_ID;