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

Compare commits

base: wyw:0d0c0de720ffbbaecae5c8366ee63d81827f23dd
Branches Tags
wyw:master
...
compare: wyw:496f0fa072de87ad9a9ab144fe94c5ce3ad58fca
Branches Tags
wyw:master

2 Commits
0d0c0de720 ... 496f0fa072

Author SHA1 Message Date
何美荣
496f0fa072 Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe 2026-06-11 14:16:57 +08:00
何美荣
21fcff70ab 优化 2026-06-11 14:16:52 +08:00
2 changed files with 2535 additions and 2535 deletions
Show Stats 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();

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

@ -538,6 +538,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
});
}
/// <summary>
/// 查询所有数据
/// </summary>
@ -550,11 +551,11 @@ namespace APT.SC.WebApi.Controllers.Api.BI
{
//按生产单元 获取数据
HomeResult result = new HomeResult();
//if (string.IsNullOrEmpty(filter.Keyword))
//{
// return result;
//}
//int MineType = int.Parse(filter.Keyword);
if (string.IsNullOrEmpty(filter.Keyword))
{
return result;
}
int MineType = int.Parse(filter.Keyword);
//根据 日期 yyyyMMddHH MineType 获取信息 Redis信息
@ -579,7 +580,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
{
foreach (var item in listHomeRedis)
{
//if (item.MineType == MineType)
if (item.MineType == MineType)
{
if (dtNow.ToString("yyyyMMddHH") == item.yyyyMMddHH)
{
@ -607,9 +608,9 @@ namespace APT.SC.WebApi.Controllers.Api.BI
//BaseFilter filterD = new BaseFilter();
//filterD.SelectField = new List<string> { "ID", "NAME", "DEPARTMENT_TYPE", "PARENT_ID", "MineType" };
//var listDep1MineType = GetEntities<T_FM_DEPARTMENT>(t => t.MineType.HasValue && t.MineType == MineType && t.DEPARTMENT_TYPE == 10, filterD, null);
//var listDep1MineType = GetEntities<T_FM_DEPARTMENT>(t => t.MineType.HasValue && t.MineType == MineType && t.DEPARTMENT_TYPE == 10, filterD, null);//部门就可以了 因为都相向 统计了
var listDep1MineType = GetEntities<T_FM_DEPARTMENT>(t =>t.CATEGORY == BaseData.Domain.Enums.FMCATEGORY.ACTURE && t.ENABLE_STATUS == 0, null, null);
var listDep1MineType = GetEntities<T_FM_DEPARTMENT>(t => t.MineType.HasValue && t.MineType == MineType && t.DEPARTMENT_TYPE == 10, null, null);//部门就可以了 因为都相向 统计了
#endregion
@ -1168,7 +1169,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
List<T_BI_HOME_BSRISKREASON> ListSafeCheckYearMonthT = BIHomeService.GetHomeCheckCountMonth(filter.OrgId, listDep.ToList(), befoMonth).ToList();
var listCheckTypeIDT = ListSafeCheckYearMonthT.Select(e => e.SOURCEID).Distinct().ToList();
var enums = GetEntity<T_FM_ENUMS>(e => e.CODE == "BSMineTypeEnum");
var enums = GetEntity<T_FM_ENUMS>(e => e.VALUE == MineType && e.CODE == "BSMineTypeEnum");
if (enums != null)
{
var listTypeMine = GetEntities<MS.Domain.Entities.BS.T_BS_CHECK_TYPE_MINETYPE>(e => e.MINETYPE_ENUMS_ID == enums.ID, null, null);
@ -1275,7 +1276,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
listHomeRedis.Add(new HomeResultMineType()
{
//MineType = MineType,
MineType = MineType,
yyyyMMddHH = dtNow.ToString("yyyyMMddHH"),
result = result
});
@ -1291,7 +1292,6 @@ namespace APT.SC.WebApi.Controllers.Api.BI
});
}
/// <summary>
/// 首页 安全检查次数统计明细(BI054HomeDetail)
/// </summary>
@ -1320,13 +1320,13 @@ namespace APT.SC.WebApi.Controllers.Api.BI
{
return result;
}
List<Guid> listDepIDCJ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 15) .Select(e => e.ID).ToList();//车间ID 用于 统计 每个月各类型的检查数量
List<Guid> listDepIDCJ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 15).Select(e => e.ID).ToList();//车间ID 用于 统计 每个月各类型的检查数量
DateTime dtNow = DateTime.Now;
List<T_FM_DEPARTMENT> listDepCJ = new List<T_FM_DEPARTMENT>();
List<T_FM_DEPARTMENT> listDepBZ = new List<T_FM_DEPARTMENT>();
listDepCJ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM).ToList();
listDepCJ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 15).OrderBy(e => e.NUM).ToList();
listDepBZ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 20).OrderBy(e => e.NUM).ToList();
T_FM_ENUMS enums = null;
@ -1347,7 +1347,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
listDep1MineType = GetEntities<T_FM_DEPARTMENT>(t => listDepID.Contains(t.ID) && (t.DEPARTMENT_TYPE == 15 || t.DEPARTMENT_TYPE == 20), filterD, null);
if (listDep1MineType != null && listDep1MineType.Any())
{
listDepCJ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 15) .ToList();
listDepCJ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 15).ToList();
listDepBZ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 20).ToList();
}
}
@ -1569,7 +1569,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
List<T_FM_DEPARTMENT> listDepCJ = new List<T_FM_DEPARTMENT>();
List<T_FM_DEPARTMENT> listDepBZ = new List<T_FM_DEPARTMENT>();
listDepCJ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 15) .OrderBy(e => e.NUM).ToList();
listDepCJ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 15).OrderBy(e => e.NUM).ToList();
listDepBZ = listDep1MineType.Where(e => e.DEPARTMENT_TYPE == 20).OrderBy(e => e.NUM).ToList();