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

Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe

Browse Source
This commit is contained in:
wyw 2026-06-01 11:09:10 +08:00
commit c649a3ad07
4 changed files with 44 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1952,7 +1952,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
{
var userName = users.FirstOrDefault(t => t.ID == sendUser.USER_ID)?.NAME;
var notice = NotificationTaskService.InsertUserNoticeTaskModel("动火作业现场条件验收", item.ID, item.ORG_ID, (Guid)sendUser.USER_ID, userName, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "FO043");
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "FO043_1");
notices.Add(notice);
}
}

38
APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs
View File

@ -1624,6 +1624,10 @@ namespace APT.PP.WebApi.Controllers.Api
try
{
var dtNow = DateTime.Now;
if (filter.Parameter1 != null)
{
dtNow = DateTime.Parse(filter.Parameter1);
}
var year = dtNow.Year;
var month = dtNow.Month;
var day = dtNow.Day;
@ -1645,7 +1649,7 @@ namespace APT.PP.WebApi.Controllers.Api
var baseFilter = new BaseFilter(filter.GetOrgId());
baseFilter.IgnoreDataRule = true;
baseFilter.SelectField = new string[] { "ID", "START_DATE", "END_DATE" }; //指定字段，包括导航属性
Expression<Func<T_SK_IDENTIFY_EVALUATION_PLAN, bool>> expression = i => i.END_DATE.Value.Date == DateTime.Now.Date && i.STATUS == PFStandardStatus.Archived;
Expression<Func<T_SK_IDENTIFY_EVALUATION_PLAN, bool>> expression = i => i.END_DATE.Value.Date == dtNow.Date && i.STATUS == PFStandardStatus.Archived;
List<T_SK_IDENTIFY_EVALUATION_PLAN> planTemps = this.GetOrderEntities(expression, baseFilter, "Nav_Requires").ToList();
var planIds = planTemps.Select(t => t.ID).ToList();
var newFilter = new BaseFilter(filter.GetOrgId());
@ -2010,14 +2014,21 @@ namespace APT.PP.WebApi.Controllers.Api
}
//车间级和班组级汇总给车间安全员
var shopClass = departs.Where(t => departIds.Contains(t.ID) && t.DEPARTMENT_TYPE == 15).ToList();
if (shopClass.Any())
var shopIds = shopClass.Select(t=>t.ID).ToList();
//可能只有班组，获取所有班组的车间
var classDept = departs.Where(t => departIds.Contains(t.ID) && t.DEPARTMENT_TYPE == 20).ToList();
if (classDept != null && classDept.Any())
{
var tempIds = shopClass.Select(t => t.ID).ToList();
var classTempInfos = departs.Where(t => t.PARENT_ID != null && tempIds.Contains((Guid)t.PARENT_ID) && t.DEPARTMENT_TYPE == 20).ToList();
if (tempIds.Any())
var classIds = classDept.Select(t => t.ID).ToList();
var tempShopIds = departs.Where(t => classIds.Contains(t.ID) && t.PARENT_ID!=null).Select(m=>(Guid)m.PARENT_ID).ToList();
shopIds.AddRange(tempShopIds);
}
shopIds = shopIds.Distinct().ToList();
//var classTempInfos = departs.Where(t => t.PARENT_ID != null && shopIds.Contains((Guid)t.PARENT_ID) && t.DEPARTMENT_TYPE == 20).ToList();
if (shopIds.Any())
{
//每个车间汇总班组和车间
foreach (var de in tempIds)
foreach (var de in shopIds)
{
//车间
var user = users.FirstOrDefault(t => t.DEPARTMENT_ID == de && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
@ -2069,21 +2080,25 @@ namespace APT.PP.WebApi.Controllers.Api
var exsisRecird = identityResults.FirstOrDefault(t => t.IDENTIFY_EVALUATION_PLAN_ID == plan && t.APPLY_DEPARTMENT_ID == user.DEPARTMENT_ID && t.APPLY_USER_ID == user.ID && t.ISCOMPANY == SKIsStoreEnum.No);
if (exsisRecird == null)
{
var classIds = classTempInfos.Where(t => t.PARENT_ID == de).Select(t => t.ID).ToList();
var classIds = departs.Where(t => t.PARENT_ID == de).Select(t => t.ID).ToList();
//departListIds.AddRange(classIds);
var deTemp = ides.FirstOrDefault(t => t.APPLY_DEPARTMENT_ID == de);
if (deTemp == null)
{
deTemp = ides.FirstOrDefault(t => t.APPLY_DEPARTMENT_ID!=null &&classIds.Contains((Guid)t.APPLY_DEPARTMENT_ID));
}
T_SK_RISK_IDENTIFY_RESULT result = new T_SK_RISK_IDENTIFY_RESULT();
result.ORG_ID = filter.OrgId;
result.APPLY_DEPARTMENT_ID = user?.DEPARTMENT_ID;
result.APPLY_USER_ID = user.ID;
result.IDENTIFY_ID = deTemp.ID;
result.IDENTIFY_ID = deTemp?.ID;
result.IDENTIFY_EVALUATION_PLAN_ID = plan;
result.YEAR = DateTime.Now.Year.ToString();
result.ISAUTO = true;
result.ISCOMPANY = SKIsStoreEnum.No;
result.CONTENTS = deTemp.CONTENTS;
result.START_DATE = planTemp.START_DATE;
result.END_DATE = planTemp.END_DATE;
result.CONTENTS = deTemp?.CONTENTS;
result.START_DATE = planTemp?.START_DATE;
result.END_DATE = planTemp?.END_DATE;
result.REQUIRE_ID = requre?.ID;
results.Add(result);
if (planTemp != null && planTemp.Nav_Requires != null && planTemp.Nav_Requires.Any())
@ -2207,7 +2222,6 @@ namespace APT.PP.WebApi.Controllers.Api
}
}
}
}
UnifiedCommit(() =>
{
if (identitys != null && identitys.Any())

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

@ -30,6 +30,7 @@ using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Data;
using System.DirectoryServices.ActiveDirectory;
using System.Linq;
using System.Linq.Expressions;
using static APT.SC.WebApi.Controllers.Api.BI.BIKanBanController;
@ -990,7 +991,16 @@ namespace APT.SC.WebApi.Controllers.Api.BI
riskList.Add(risk);
}
}
result.Data.riskList = riskList.OrderByDescending(t=>t.totalCount).ToList();
var riskListNew = riskList.OrderByDescending(t => t.totalCount).ToList();
RiskList riskTotal = new RiskList();
riskTotal.companyName = "小计";
riskTotal.majorCount = riskList.Sum(t=>t.majorCount);
riskTotal.largerCount = riskList.Sum(t => t.largerCount);
riskTotal.generalCount = riskList.Sum(t => t.generalCount);
riskTotal.lowCount = riskList.Sum(t => t.lowCount);
riskTotal.totalCount = riskList.Sum(t => t.totalCount);
riskListNew.Add(riskTotal);
result.Data.riskList = riskListNew;
result.Data.riskTypeList = riskTypeList;
return result;

4
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs
View File

@ -650,9 +650,9 @@ namespace APT.SK.WebApi.Controllers
{
record.QTY = records.Count(p => p.PRODUCTION_UNIT_ID == record.PRODUCTION_UNIT_ID && p.RISK_AREA_ID == record.RISK_AREA_ID && p.CHECK_CONTENTS_ID == record.CHECK_CONTENTS_ID && p.CHECK_QUESTION_ID == record.CHECK_QUESTION_ID && p.HIDDEN_LEVEL == record.HIDDEN_LEVEL);
}
var data = groupRecords.OrderBy(t => t.PRODUCTION_UNIT_ID).ThenByDescending(m => m.QTY).Skip((pageFilter.PageIndex - 1) * pageFilter.Limit).Take(pageFilter.Limit).ToList();
var data = groupRecords.OrderBy(t => t.PRODUCTION_UNIT_ID).ThenByDescending(m => m.QTY).ToList();//.Skip((pageFilter.PageIndex - 1) * pageFilter.Limit).Take(pageFilter.Limit)
result.Data = data;
result.TotalCount = groupRecords.Count;
result.TotalCount = data.Count;
}
return result;
}