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

优化

Browse Source
This commit is contained in:
何美荣 2026-06-11 14:16:52 +08:00
parent 07d58bc0eb
commit 21fcff70ab
2 changed files with 2535 additions and 2535 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
View File

@ -13456,7 +13456,7 @@ namespace APT.BaseData.Services.DomainServices
var details = GetEntities<T_SK_RISK_IDENTIFY_DETAIL>(i => identityIds.Contains(i.RISK_IDENTIFY_ID), new BaseFilter(filter.OrgId)).ToList();
var identityDetailIds = details.Select(t => t.ID).ToList();
var identityDetailMes = GetEntities<T_SK_RISK_IDENTIFY_DETAIL_MEASURE>(i => identityDetailIds.Contains(i.RISK_IDENTIFY_DETAIL_ID), new BaseFilter(filter.OrgId)).ToList();
var detailList = details.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID, m.ENABLE_STATUS }).Select(g => g.FirstOrDefault());
var detailList = details.OrderByDescending(t => t.ENABLE_STATUS).GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID, m.ENABLE_STATUS }).Select(g => g.FirstOrDefault());
if (detailList.Any())
{
foreach (var item in detailList)
@ -13862,7 +13862,7 @@ namespace APT.BaseData.Services.DomainServices
var resultDetailDepts = GetEntities<T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST>(i => resultDetailIds.Contains(i.RISK_IDENTIFY_RESULT_DETAIL_ID), new BaseFilter(filter.OrgId)).ToList();
var resultDetailDeptIds = resultDetailDepts.Select(t => t.ID).ToList();
var resultDetailDeptPosts = GetEntities<T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST_DETAIL>(i => resultDetailDeptIds.Contains(i.RISK_IDENTIFY_DETAIL_RESULT_POST_ID), new BaseFilter(filter.OrgId)).ToList();
var detailList = details.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID, m.ENABLE_STATUS }).Select(g => g.FirstOrDefault());
var detailList = details.OrderByDescending(t=>t.ENABLE_STATUS).GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID, m.ENABLE_STATUS }).Select(g => g.FirstOrDefault());
if (detailList.Any())
{
foreach (var de in detailList)
@ -14610,7 +14610,7 @@ namespace APT.BaseData.Services.DomainServices
var detailMes = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_MEASURE>(t => detailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(entity.ORG_ID));
//var detailDeparts = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_DEPART>(t => detailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(entity.ORG_ID));
var detailPosts = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_POST>(t => detailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(entity.ORG_ID), "Nav_PostDetails");
var detailList = details.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID }).Select(g => g.FirstOrDefault());
var detailList = details.OrderByDescending(t=>t.ENABLE_STATUS).GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID,m.ENABLE_STATUS }).Select(g => g.FirstOrDefault());
if (detailList.Any())
{
foreach (var de in detailList)
@ -14807,7 +14807,7 @@ namespace APT.BaseData.Services.DomainServices
if(approveTemp.Nav_ApproveTempDetails.Count() == 0)
{
result.STATUS = PFStandardStatus.Archived;
var resultDetailTemps = resultDetails.Where(t => (t.MARK == SKMarkEnum.Add && t.ENABLE_STATUS == SKEnableStatusEnum.Yes) || (t.MARK != SKMarkEnum.Add)).ToList();
var resultDetailTemps = resultDetails.Where(t => t.MARK != SKMarkEnum.Auto).ToList();
if (user != null && resultDetailTemps != null && resultDetailTemps.Any())
{
var productionIds = resultDetailTemps.Where(t => t.PRODUCTION_UNIT_ID != null).Select(m=>m.PRODUCTION_UNIT_ID).Distinct().ToList();
@ -15149,7 +15149,7 @@ namespace APT.BaseData.Services.DomainServices
List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST> douContentPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST>();
//List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_DEPART> douContentDepartPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_DEPART>();
List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_HIDDEN> douContentHiddenss = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_HIDDEN>();
var entityDetails = sumDetails.Where(t => (t.MARK == SKMarkEnum.Add && t.ENABLE_STATUS == SKEnableStatusEnum.Yes) || (t.MARK != SKMarkEnum.Add)).ToList();
var entityDetails = sumDetails.Where(t => t.MARK != SKMarkEnum.Auto).ToList();
if (entity.APPLY_USER_ID != null && entityDetails != null && entityDetails.Any())
{
var sumDetailIds = entityDetails.Select(t => t.ID).ToList();

5060
APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHomeController.cs
View File

File diff suppressed because it is too large Load Diff