ccy/mh_sms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://47.122.43.22:3000/wjn/mh_sms

Browse Source
This commit is contained in:
wjn 2024-04-08 17:17:56 +08:00
commit 35a28d8199
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
APT.BaseData.Domain/Entities/FM/T_FM_SYNC_TASK.cs
View File

@ -20,7 +20,6 @@ namespace APT.BaseData.Domain.Entities.FM
/// 同步名称 /// 同步名称
/// </summary> /// </summary>
[Description("同步名称")] [Description("同步名称")]
[AcronymField("NAME_ACRONYM")]
public string NAME { get; set; } public string NAME { get; set; }
/// <summary> /// <summary>

1
APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs
View File

@ -5593,7 +5593,6 @@ namespace APT.BS.WebApi.Controllers.Api
{ {
return SafeExecute<bool>(() => return SafeExecute<bool>(() =>
{ {
var files = entity.Nav_Files; var files = entity.Nav_Files;
entity.Nav_Files = null; entity.Nav_Files = null;
//entity.RiskContentState 5 10 需要处理 //entity.RiskContentState 5 10 需要处理

2
APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitDelayApplyController.cs
View File

@ -384,7 +384,7 @@ namespace APT.BS.WebApi.Controllers.Api
userModelNotice = GetEntity<T_FM_USER>(listContent[0].USER_ID.Value); userModelNotice = GetEntity<T_FM_USER>(listContent[0].USER_ID.Value);
} }
var userModel = GetDepartMentLevelMaster(userModelNotice);//隐患通知责任人 var userModel = GetDepartMentLevelMaster(userModelNotice);//隐患通知责任人
if (userModel != null && userModel.ID != Guid.Empty) if (userModel != null && !string.IsNullOrEmpty(userModel.NAME))
{ {
dicApproveUser.Add(3, userModel);//隐患通知责任人 所在的部门级别负责人 dicApproveUser.Add(3, userModel);//隐患通知责任人 所在的部门级别负责人
} }

12
APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs
View File

@ -4225,7 +4225,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
ret.TotalCount = newData.Count(); ret.TotalCount = newData.Count();
ret.doneCount = newData.Where(t => t.NOTICE_STATUS == 1).Count(); ret.doneCount = newData.Where(t => t.NOTICE_STATUS == 1).Count();
ret.timeOverCount = newData.Where(t => t.NOTICE_STATUS == 2).Count(); ret.timeOverCount = newData.Where(t => t.NOTICE_STATUS == 2).Count();
var groupDataTemp = newData.GroupBy(t =>t.MOUDLE_NAME).Select(m => new GroupbyMouldName var groupDataTemp = newData.GroupBy(t => t.MOUDLE_NAME).Select(m => new GroupbyMouldName
{ {
mouldName = m.Key, mouldName = m.Key,
totalCount = m.Count(p => p.MOUDLE_NAME == m.Key), totalCount = m.Count(p => p.MOUDLE_NAME == m.Key),
@ -4234,6 +4234,16 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
}).ToList(); }).ToList();
ret.groupData = groupDataTemp; ret.groupData = groupDataTemp;
} }
else
{
ret.formData = formInfo.ToList();
ret.userData = userInfos.ToList();
ret.newData = new List<T_BI_NOTIFICATION_TASK_NEW>();
ret.TotalCount = 0;
ret.doneCount = 0;
ret.timeOverCount = 0;
ret.groupData = new List<GroupbyMouldName>();
}
return ret; return ret;
}); });
} }