Compare commits

..

2 Commits

Author SHA1 Message Date
何美荣
5b1e349f4a Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe 2026-07-27 18:20:29 +08:00
何美荣
5d3ea581f7 1 2026-07-27 18:20:23 +08:00

View File

@ -9004,7 +9004,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
var activityCount = GetCount<T_FO_TEAM_ACTIVITY>(s => !s.IS_DELETED && s.CREATE_TIME >= startTime && s.CREATE_TIME <= endTime, filter);
var postCount = GetCount<T_FO_CURRENT_CLASS_RECORD>(s => !s.IS_DELETED && s.CREATE_TIME >= startTime && s.CREATE_TIME <= endTime, filter);
var postChangeCount = GetCount<T_FO_CHANGE_SHIFT_RECORD>(s => !s.IS_DELETED && s.CREATE_TIME >= startTime && s.CREATE_TIME <= endTime, filter);
var taskCount = GetCount<T_HM_OPERATION_LINK>(s => !s.IS_DELETED && s.CREATE_TIME >= startTime && s.CREATE_TIME <= endTime, filter);
//var taskCount = GetCount<T_HM_OPERATION_LINK>(s => !s.IS_DELETED && s.CREATE_TIME >= startTime && s.CREATE_TIME <= endTime, filter);
var shiftMeetingCount = GetCount<T_FO_PRE_SHIFT_MEETING_RECORD>(s => !s.IS_DELETED && s.CREATE_TIME >= startTime && s.CREATE_TIME <= endTime, filter);
var shiftMeetingFinishCount = GetCount<T_FO_PRE_SHIFT_MEETING_RECORD>(s => !s.IS_DELETED && s.CREATE_TIME >= startTime && s.CREATE_TIME <= endTime && s.PRE_MEETING_STATUS == FOPreMeetingStatusEnum., filter);
var postChangeFinishCount = GetCount<T_FO_CHANGE_SHIFT_RECORD>(s => !s.IS_DELETED && s.CREATE_TIME >= startTime && s.CREATE_TIME <= endTime && s.SHIFT_STATUS == (int)FOChangeShiftStatusEnum., filter);
@ -9014,7 +9014,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
ret.activityCount = activityCount;
ret.postCount = postCount;
ret.postChangeCount = postChangeCount;
ret.taskCount = taskCount;
ret.taskCount = shiftMeetingCount;
ret.shiftMeetingFinishRate = shiftMeetingCount == 0 ? "0" : ((double)shiftMeetingFinishCount / shiftMeetingCount * 100).ToString("0");
ret.postFinishRate = postCount == 0 ? "0" : ((double)postFinishCount / postCount * 100).ToString("0");
ret.postChangeFinishRate = postChangeCount == 0 ? "0" : ((double)postChangeFinishCount / postChangeCount * 100).ToString("0");