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:
ccy 2025-10-01 17:55:56 +08:00
commit afc11ea268
10 changed files with 520 additions and 486 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12341,8 +12341,15 @@ namespace APT.BaseData.Services.DomainServices
var i = 1;
foreach (var ite in measuresTemp)
{
var temp2 = i + "、" + ite + "；";
var temp2 = i + "、" + ite;
if (i == 1)
{
ideDetail.MEASURE = temp2;
}
else
{
ideDetail.MEASURE = ideDetail.MEASURE + Environment.NewLine + temp2;
}
i++;
}
}

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

@ -1121,8 +1121,15 @@ namespace APT.PP.WebApi.Controllers.Api
var i = 1;
foreach (var ite in measuresTemp)
{
var temp2 = i + "、" + ite + "；";
var temp2 = i + "、" + ite;
if (i == 1)
{
ideDetail.MEASURE = temp2;
}
else
{
ideDetail.MEASURE = ideDetail.MEASURE + Environment.NewLine + temp2;
}
i++;
}
}
@ -1364,8 +1371,15 @@ namespace APT.PP.WebApi.Controllers.Api
var i = 1;
foreach (var ite in measuresTemp)
{
var temp2 = i + "、" + ite + "；";
var temp2 = i + "、" + ite;
if (i == 1)
{
ideDetail.MEASURE = temp2;
}
else
{
ideDetail.MEASURE = ideDetail.MEASURE + Environment.NewLine + temp2;
}
i++;
}
}
@ -4916,9 +4930,9 @@ namespace APT.PP.WebApi.Controllers.Api
var checkTypes = this.GetEntities<T_SK_CHECK_TYPE>(t => t.IS_DELETED == false, new BaseFilter(filter.OrgId));
var checkTypeIds = checkTypes.Where(t => t.NAME == "岗位排查").Select(m => m.ID).ToList();
var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId), "Nav_User");
var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0 && !t.CODE.Contains("admin") && t.Nav_Person != null, new BaseFilter(filter.OrgId), "Nav_Person", "Nav_ApproveRole");
var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0 && t.DEPARTMENT_ID != null && !t.CODE.Contains("admin") && t.Nav_Person != null, new BaseFilter(filter.OrgId), "Nav_Person", "Nav_ApproveRole");
var checkCycles = setList.Select(t => t.CHECK_CYCLE).Distinct().ToList();
var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_ProductionUnit").ToList();
var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_Area").ToList();
var libraryDetails = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId)).ToList();
var contents = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_Contents").ToList();
var contentDeparts = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_CheckType", "Nav_Department").ToList();
@ -4944,13 +4958,12 @@ namespace APT.PP.WebApi.Controllers.Api
foreach (var post in first)
{
//没角色的才取岗位
var userRole = users.FirstOrDefault(t => t.Nav_Person != null && t.Nav_Person.POST_ID == post?.ID).APPROVE_ROLE_ID;
if (userRole == null)
var userRole = users.FirstOrDefault(t => t.Nav_Person != null && t.Nav_Person.POST_ID != null && t.Nav_Person.POST_ID == post?.ID);
if (userRole == null || (userRole != null && userRole.APPROVE_ROLE_ID == null))
{
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART de = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART();
de.POST_NAME = post?.NAME;
de.MineType = item.MineType;
de.MINE_NAME = item.Nav_ProductionUnit?.NAME;
de.AREA_NAME = item.Nav_Area?.NAME;
de.ENTERPRISE_LIBRARY_DETAIL_ID = contentFirst?.ENTERPRISE_LIBRARY_DETAIL_ID;
de.ENTERPRISE_LIBRARY_ID = item.ID;
@ -4971,8 +4984,6 @@ namespace APT.PP.WebApi.Controllers.Api
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART de = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART();
de.POST_NAME = "未配置辨识岗位";
de.MineType = item.MineType;
de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
de.MINE_NAME = item.Nav_ProductionUnit?.NAME;
de.AREA_NAME = item.Nav_Area?.NAME;
de.ENTERPRISE_LIBRARY_DETAIL_ID = contentFirst?.ENTERPRISE_LIBRARY_DETAIL_ID;
de.ENTERPRISE_LIBRARY_ID = item.ID;
@ -5030,14 +5041,14 @@ namespace APT.PP.WebApi.Controllers.Api
}
}
}
var group = detailContents.Where(m => checkCycles.Contains(m.CHECK_CYCLE)).GroupBy(t => new { t.MineType,t.PRODUCTION_UNIT_ID, t.MINE_NAME,t.CHECK_TYPE, t.CHECK_CYCLE, t.DEPART_NAME, t.DEPARTMENT_ID, t.CHECK_TYPE_ID, t.TYPE_NAME, t.POST_NAME, t.POST_ID }).ToList();
var group = detailContents.Where(m => checkCycles.Contains(m.CHECK_CYCLE)).GroupBy(t => new { t.MineType, t.CHECK_TYPE, t.CHECK_CYCLE, t.DEPART_NAME, t.DEPARTMENT_ID, t.CHECK_TYPE_ID, t.TYPE_NAME, t.POST_NAME, t.POST_ID }).ToList();
foreach (var item in group)
{
CheckListNew listNew = new CheckListNew();
listNew.PRODUCTION_UNIT_ID = item.Key.PRODUCTION_UNIT_ID;
listNew.Mine = item.Key.MineType;
listNew.Cycle = item.Key.CHECK_CYCLE;
listNew.DepartType = item.Key.CHECK_TYPE;
listNew.MineType = item.Key.MINE_NAME;
listNew.MineType = item.Key.MineType.GetDescription();
listNew.CheckType = item.Key.TYPE_NAME;
listNew.CheckCycle = item.Key.CHECK_CYCLE.GetDescription();
listNew.CheckLevel = item.Key.CHECK_TYPE.GetDescription();
@ -5068,7 +5079,7 @@ namespace APT.PP.WebApi.Controllers.Api
}
list.Add(listNew);
}
list = list.OrderBy(n => n.MineType).ThenBy(x => x.Num).ThenBy(n => n.CheckDepart).ToList();
list = list.Where(m => m.CheckDepartId != null).OrderBy(y => y.MineType).ThenBy(x => x.Num).ThenBy(n => n.CheckDepart).ToList();
}
DateTime dt = DateTime.Now;
if (filter.Parameter1 != null)
@ -5096,8 +5107,11 @@ namespace APT.PP.WebApi.Controllers.Api
var baseFilter = new BaseFilter(filter.GetOrgId());
baseFilter.IgnoreDataRule = true;
baseFilter.SelectField = new string[] { "MineType", "CHECK_TYPE_ID", "APPLY_DEPARTMENT_ID", "APPLY_USER_ID", "PLANCHECKFREQUENCY", "DEPARTMENT_TYPE" }; //指定字段，包括导航属性
Expression<Func<T_SK_SECURITY_INSPECTION_NOTICE, bool>> expression = i => i.IS_DELETED == false && i.CREATE_TIME.Value.Date == dt.Date;
Expression<Func<T_SK_SECURITY_INSPECTION_NOTICE, bool>> expression = i => i.IS_DELETED == false && i.CREATE_TIME > minTime && i.CREATE_TIME <= maxTime;
List<T_SK_SECURITY_INSPECTION_NOTICE> noticeExsiss = this.GetOrderEntities(expression, baseFilter).ToList();
baseFilter.SelectField = new string[] { "MineType", "CHECK_TYPE_ID", "APPLY_DEPARTMENT_ID", "APPLY_USER_ID", "PLANCHECKFREQUENCY", "DEPARTMENT_TYPE" };
Expression<Func<T_SK_SECURITY_INSPECTION_RECORD, bool>> expressionR = i => i.IS_DELETED == false && i.CREATE_TIME > minTime && i.CREATE_TIME <= maxTime;
List<T_SK_SECURITY_INSPECTION_RECORD> recordExsiss = this.GetOrderEntities(expressionR, baseFilter).ToList();
//取岗位排查表
var postCheckList = list.Where(t => t.CheckTypeId != null && checkTypeIds.Contains((Guid)t.CheckTypeId)).ToList();
if (postCheckList != null && postCheckList.Any())
@ -5105,15 +5119,18 @@ namespace APT.PP.WebApi.Controllers.Api
foreach (var item in postCheckList)
{
//触发安全检查记录给对应的岗位工(有排班才触发)
var userInfo = users.FirstOrDefault(t => t.DEPARTMENT_ID == item.CheckDepartId && teamDepartIds.Contains(t.DEPARTMENT_ID) && t.Nav_Person != null && t.Nav_Person.POST_ID == item.CheckPostId);
var userInfo = users.FirstOrDefault(t => t.DEPARTMENT_ID == item.CheckDepartId && teamDepartIds.Contains(t.DEPARTMENT_ID) && t.PERSON_ID != null && personIds.Contains((Guid)t.PERSON_ID) && t.Nav_Person != null && t.Nav_Person.POST_ID == item.CheckPostId);
if (userInfo != null)
{
//判断是否重复触发
var exist = recordExsiss.FirstOrDefault(t => t.APPLY_USER_ID == userInfo.ID && t.CHECK_TYPE_ID == item.CheckTypeId && t.PLANCHECKFREQUENCY == item.Cycle);
if (exist == null)
{
T_SK_SECURITY_INSPECTION_RECORD record = new T_SK_SECURITY_INSPECTION_RECORD();
record.ORG_ID = filter.OrgId;
record.APPLY_DEPARTMENT_ID = userInfo.DEPARTMENT_ID;
record.APPLY_USER_ID = userInfo.ID;
record.MineType = item.Mine;
record.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
record.CHECK_TYPE_ID = item.CheckTypeId;
record.PLANCHECKFREQUENCY = item.Cycle;
record.DEPARTMENT_TYPE = item.DepartType;
@ -5175,12 +5192,14 @@ namespace APT.PP.WebApi.Controllers.Api
}
}
}
}
//取非岗位排查
var checkList = list.Where(t => t.CheckTypeId != null && !checkTypeIds.Contains((Guid)t.CheckTypeId)).ToList();
if (checkList != null && checkList.Any())
{
foreach (var item in checkList)
{
var setTime = setList.FirstOrDefault(t => t.MineType == item.Mine && t.CHECK_CYCLE == item.Cycle);
var userInfo = users.FirstOrDefault(t => t.DEPARTMENT_ID == item.CheckDepartId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == item.CheckPost);
//触发安全检查通知给对应的审批角色
if (item.CheckPost == "安环部安全员")
@ -5190,25 +5209,23 @@ namespace APT.PP.WebApi.Controllers.Api
if (item.CheckPost == "班组负责人")
{
//判断排班
userInfo = users.FirstOrDefault(t => t.DEPARTMENT_ID == item.CheckDepartId && teamDepartIds.Contains(t.DEPARTMENT_ID) && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == item.CheckPost);
userInfo = users.FirstOrDefault(t => t.DEPARTMENT_ID == item.CheckDepartId && teamDepartIds.Contains(t.DEPARTMENT_ID) && t.PERSON_ID != null && personIds.Contains((Guid)t.PERSON_ID) && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == item.CheckPost);
}
if (userInfo == null)
if (userInfo == null && item.CheckDepartId != null && item.CheckPost != "班组负责人")
{
userInfo = departs.FirstOrDefault(t => t.ID == (Guid)item.CheckDepartId)?.Nav_User;
}
if (userInfo != null)
{
var setTime = setList.FirstOrDefault(t => t.MineType == item.Mine && t.CHECK_CYCLE == item.Cycle && t.CHECKTIME.Value.Hour == dt.Hour);
if (item.CheckPost != "班组负责人" && setTime == null)
//判断是否重复触发
var exist = noticeExsiss.FirstOrDefault(t => t.APPLY_USER_ID == userInfo.ID && t.CHECK_TYPE_ID == item.CheckTypeId && t.PLANCHECKFREQUENCY == item.Cycle);
if ((exist == null && item.CheckPost == "班组负责人") || (exist == null && item.CheckPost != "班组负责人" && setTime != null && dtNow.Hour == setTime.CHECKTIME.Value.Hour))
{
continue;
}
T_SK_SECURITY_INSPECTION_NOTICE safeNotice = new T_SK_SECURITY_INSPECTION_NOTICE();
safeNotice.ORG_ID = filter.OrgId;
safeNotice.APPLY_DEPARTMENT_ID = userInfo.DEPARTMENT_ID;
safeNotice.APPLY_USER_ID = userInfo.ID;
safeNotice.MineType = item.Mine;
safeNotice.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
safeNotice.CHECK_TYPE_ID = item.CheckTypeId;
safeNotice.PLANCHECKFREQUENCY = item.Cycle;
safeNotice.DEPARTMENT_TYPE = item.DepartType;
@ -5264,6 +5281,7 @@ namespace APT.PP.WebApi.Controllers.Api
}
}
}
}
UnifiedCommit(() =>
{
if (notices != null && notices.Any())

9
APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs
View File

@ -2306,6 +2306,8 @@ namespace APT.SK.WebApi.Controllers.Api
public JsonActionResult<List<CheckListNew>> GetCheckListNew([FromBody] KeywordFilter filter)
{
var loginDepart = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var loginUser = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var userInfo = this.GetEntity<T_FM_USER>(t => t.ID == loginUser);
var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId));
List<string> selectMinetype = new List<string>();
var minetype = departs.FirstOrDefault(t => t.ID == loginDepart)?.MineType;
@ -2485,7 +2487,14 @@ namespace APT.SK.WebApi.Controllers.Api
}
list.Add(listNew);
}
if (userInfo != null && userInfo.NAME.Contains("管理员"))
{
checkList.Data = list.OrderBy(n => n.MineType).ThenBy(x => x.Num).ThenBy(n => n.CheckDepart).ToList();
}
else
{
checkList.Data = list.Where(t => selectMinetype.Contains(t.MineType)).OrderBy(n => n.MineType).ThenBy(x => x.Num).ThenBy(n => n.CheckDepart).ToList();
}
checkList.TotalCount = checkList.Data.Count;
}
return checkList;

2
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerConfirmController.cs
View File

@ -109,7 +109,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (hiddenLevel == SKHiddenLevel.General)
{
var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE;
level = Enum.GetName(typeof(FMDepartmentType), departmentType);
level = Enum.GetName(typeof(SKDepartmentTypeEnum), departmentType);
}
//触发审批
entity.STATUS = PFStandardStatus.Approving;

2
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyDelayApplyController.cs
View File

@ -54,7 +54,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (hiddenLevel == SKHiddenLevel.General)
{
var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE;
param = Enum.GetName(typeof(FMDepartmentType), departmentType);
param = Enum.GetName(typeof(SKDepartmentTypeEnum), departmentType);
}
entity.STATUS = PFStandardStatus.Approving;
//取审批流水码

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

@ -178,7 +178,7 @@ namespace APT.SK.WebApi.Controllers
if (entity.HIDDEN_LEVEL == SKHiddenLevel.General)
{
var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE;
param = Enum.GetName(typeof(FMDepartmentType), departmentType);
param = Enum.GetName(typeof(SKDepartmentTypeEnum), departmentType);
}
MFlowPermitService.InsertApprove(serialCode[0], "SK022", param, entity.ID, "SK022_SHOWPRINT", entity.TaskID, true, () =>
{

2
APT.MicroApi/APT.SK.WebApi/Controllers/Api/IdentifyEvaluationPlanController.cs
View File

@ -106,7 +106,7 @@ namespace APT.SK.WebApi.Controllers.Api
var department = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0);
if (department != null)
{
if (department.DEPARTMENT_TYPE == 3 || (department.NAME.Contains("安全环保") && department.DEPARTMENT_TYPE == 0))
if (department.DEPARTMENT_TYPE == 5 || (department.NAME.Contains("安全环保") && department.DEPARTMENT_TYPE == 10))
{ param = "公司"; }
}
entity.STATUS = PFStandardStatus.Approving;

2
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs
View File

@ -167,7 +167,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{
var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE;
var param = Enum.GetName(typeof(FMDepartmentType), departmentType);
var param = Enum.GetName(typeof(SKDepartmentTypeEnum), departmentType);
entity.STATUS = PFStandardStatus.Approving;
//取审批流水码
var sysFilter = new SystemCodeFilter();

6
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs
View File

@ -120,10 +120,10 @@ namespace APT.SK.WebApi.Controllers.Api
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{
var department = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0);
var param = Enum.GetName(typeof(FMDepartmentType), department?.DEPARTMENT_TYPE);
if (department.PARENT_ID != null && param == "公司")
var param = Enum.GetName(typeof(SKDepartmentTypeEnum), department?.DEPARTMENT_TYPE);
if (department.PARENT_ID != null && param == "公司级")
{
param = "部门";
param = "部门级";
}
entity.STATUS = PFStandardStatus.Approving;
//取审批流水码

2
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs
View File

@ -155,7 +155,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{
var departmentType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.DEPARTMENT_TYPE;
var param = Enum.GetName(typeof(FMDepartmentType), departmentType);
var param = Enum.GetName(typeof(SKDepartmentTypeEnum), departmentType);
entity.STATUS = PFStandardStatus.Approving;
//取审批流水码
var sysFilter = new SystemCodeFilter();