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-05-13 08:53:34 +08:00
commit 596f6e93a6
4 changed files with 14 additions and 10 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

@ -13853,6 +13853,9 @@ namespace APT.BaseData.Services.DomainServices
var details = GetEntities<T_SK_RISK_IDENTIFY_RESULT_DETAIL>(i => resultIds.Contains(i.RISK_IDENTIFY_RESULT_ID) && i.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID));
var resultDetailIds = details.Select(t => t.ID).ToList();
var resultDetailMes = GetEntities<T_SK_RISK_IDENTIFY_DETAIL_RESULT_MEASURE>(i => resultDetailIds.Contains(i.RISK_IDENTIFY_RESULT_DETAIL_ID), new BaseFilter(filter.OrgId)).ToList();
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());
if (detailList.Any())
{
@ -13911,8 +13914,8 @@ namespace APT.BaseData.Services.DomainServices
// }
//}
//辨识部门
var departIdss = results.Where(t => resultIds.Contains(t.ID)).Select(m => m.APPLY_DEPARTMENT_ID).Distinct().ToList();
var userIdss = results.Where(t => resultIds.Contains(t.ID)).Select(m => m.APPLY_USER_ID).Distinct().ToList();
var departIdss = resultDetailDepts.Where(t => ids.Contains(t.RISK_IDENTIFY_RESULT_DETAIL_ID)).Select(m => m.DEPARTMENT_ID).Distinct().ToList();
//var userIdss = results.Where(t => resultIds.Contains(t.ID)).Select(m => m.APPLY_USER_ID).Distinct().ToList();
if (departIdss.Any())
{
var departTemps = departs.Where(t => departIdss.Contains(t.ID)).OrderBy(m => m.DEPARTMENT_TYPE).ToList();
@ -13928,7 +13931,8 @@ namespace APT.BaseData.Services.DomainServices
depart.DEPARTMENT_TYPE = (SKDepartmentTypeEnum)ite.DEPARTMENT_TYPE;
depart.NUM = i;
summaryPosts.Add(depart);
var postIds = users.Where(t => t.DEPARTMENT_ID != null && t.DEPARTMENT_ID == ite.ID && userIdss.Contains(t.ID) && t.Nav_Person != null && t.Nav_Person.POST_ID != null).Select(m => m.Nav_Person?.POST_ID).ToList();
var departTepIds = resultDetailDepts.Where(t => ids.Contains(t.RISK_IDENTIFY_RESULT_DETAIL_ID) && t.DEPARTMENT_ID != null && t.DEPARTMENT_ID == ite.ID).Select(m => m.ID).ToList();
var postIds = resultDetailDeptPosts.Where(t => departTepIds.Contains(t.RISK_IDENTIFY_DETAIL_RESULT_POST_ID) && t.POST_ID != null).Select(m => m.POST_ID).Distinct().ToList();
if (postIds.Any())
{
foreach (var poId in postIds)

2
APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs
View File

@ -243,7 +243,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM
public PagedActionResult<T_FM_USER> OrderPagedNew([FromBody] KeywordPageFilter pageFilter)
{
Expression<Func<T_FM_USER, bool>> express = t => !t.CODE.Contains("admin");
if (!string.IsNullOrEmpty(pageFilter.Parameter1))
if (!string.IsNullOrEmpty(pageFilter.Parameter1))
{
express = express.And(t => t.Nav_BelongRoles.Any(i => i.Nav_BelongRole.NAME.Contains(pageFilter.Parameter1)));
}

4
APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs
View File

@ -113,8 +113,8 @@ namespace APT.FO.WebApi.Controllers
{
throw new Exception("计划结束时间必须填写");
}
entity.ACT_DATE = entity.JOB_DATE;
entity.ACT_END_DATE = entity.JOB_END_DATE;
//entity.ACT_DATE = entity.JOB_DATE;
//entity.ACT_END_DATE = entity.JOB_END_DATE;
if (entity.JOB_END_DATE > entity.JOB_DATE.Value.AddHours(8))
{
throw new Exception("计划开始和计划结束时间不能超过8小时");

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

@ -154,7 +154,7 @@ namespace APT.SK.WebApi.Controllers.Api
}
}
}
var record = this.GetEntity<T_SK_CHECK_SET>(t => t.ID != entity.ID && t.MineType == entity.MineType && t.CHECK_TYPE == entity.CHECK_TYPE && t.CHECK_TYPE_ID == entity.CHECK_TYPE_ID && t.CHECK_CYCLE == entity.CHECK_CYCLE && t.DEPARTMENT_ID == entity.DEPARTMENT_ID && t.POST_ID == entity.POST_ID);
var record = this.GetEntity<T_SK_CHECK_SET>(t => t.ID != entity.ID && t.PRODUCTION_UNIT_ID == entity.PRODUCTION_UNIT_ID && t.CHECK_TYPE == entity.CHECK_TYPE && t.CHECK_TYPE_ID == entity.CHECK_TYPE_ID && t.CHECK_CYCLE == entity.CHECK_CYCLE && t.DEPARTMENT_ID == entity.DEPARTMENT_ID && t.POST_ID == entity.POST_ID);
if (record != null)
{
throw new Exception("相同检查表已存在，请修改检查信息或回到列表页检索");
@ -481,8 +481,8 @@ namespace APT.SK.WebApi.Controllers.Api
this.BantchDeleteEntityNoCommit<T_SK_CHECK_SET_CONTENTS>(detailIds);
if (entity != null)
UpdateEntityNoCommit(entity);
if (checkUsers != null && checkUsers.Any())
BantchSaveEntityNoCommit(checkUsers);
if (checkUserList != null && checkUserList.Any())
BantchSaveEntityNoCommit(checkUserList);
if (details != null && details.Any())
BantchSaveEntityNoCommit(details);
//if (hiddens != null && hiddens.Any())