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-22 10:39:02 +08:00
commit bf009c0236
1 changed files with 694 additions and 694 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -316,7 +316,7 @@ namespace APT.SK.WebApi.Controllers
var UserNames = new List<string>(); var UserNames = new List<string>();
var user = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.ID == record.ACCEPT_USER_ID); var user = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.ID == record.ACCEPT_USER_ID);
//发消息 //发消息
notice = NotificationTaskService.InsertUserNoticeTaskModel("隐患整改记录"+ DateTime.Now.Month.PadLeft(2,'0') + DateTime.Now.Day.PadLeft(2, '0') + "-验收", record.ID, record.ORG_ID, (Guid)record.ACCEPT_USER_ID, user?.NAME, DateTime.Now, notice = NotificationTaskService.InsertUserNoticeTaskModel("隐患整改记录" + DateTime.Now.Month.PadLeft(2, '0') + DateTime.Now.Day.PadLeft(2, '0') + "-验收", record.ID, record.ORG_ID, (Guid)record.ACCEPT_USER_ID, user?.NAME, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK022"); DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK022");
} }
if (entity.TaskID != Guid.Empty) if (entity.TaskID != Guid.Empty)
@ -630,8 +630,8 @@ namespace APT.SK.WebApi.Controllers
var result = new PagedActionResult<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(); var result = new PagedActionResult<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>();
//var areaList = this.GetEntities<T_SK_RISK_AREA>(t => t.IS_DELETED == false, new BaseFilter(pageFilter.OrgId)).ToList(); //var areaList = this.GetEntities<T_SK_RISK_AREA>(t => t.IS_DELETED == false, new BaseFilter(pageFilter.OrgId)).ToList();
//var contentList = this.GetEntities<T_SK_CHECK_CONTENTS>(t => t.IS_DELETED == false, new BaseFilter(pageFilter.OrgId)).ToList(); //var contentList = this.GetEntities<T_SK_CHECK_CONTENTS>(t => t.IS_DELETED == false, new BaseFilter(pageFilter.OrgId)).ToList();
var records = this.GetEntities<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(t => t.IS_DELETED == false && t.CHECK_CONTENTS_ID !=null && t.CHECK_QUESTION_ID !=null, pageFilter, "Nav_ProductionUnit", "Nav_RiskArea", "Nav_Contents", "Nav_Question", "Nav_CheckType"); var records = this.GetEntities<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(t => t.IS_DELETED == false && t.CHECK_CONTENTS_ID != null && t.CHECK_QUESTION_ID != null, pageFilter, "Nav_ProductionUnit", "Nav_RiskArea", "Nav_Contents", "Nav_Question", "Nav_CheckType");
var groupRecords = records.GroupBy(m => new { m.PRODUCTION_UNIT_ID,m.RISK_AREA_ID, m.CHECK_CONTENTS_ID, m.CHECK_QUESTION_ID, m.HIDDEN_LEVEL }) var groupRecords = records.GroupBy(m => new { m.PRODUCTION_UNIT_ID, m.RISK_AREA_ID, m.CHECK_CONTENTS_ID, m.CHECK_QUESTION_ID, m.HIDDEN_LEVEL })
.Select(m => m.FirstOrDefault()).ToList(); .Select(m => m.FirstOrDefault()).ToList();
//.Select(m => new T_SK_HIDDEN_DANGER_RECTIFY_RECORD //.Select(m => new T_SK_HIDDEN_DANGER_RECTIFY_RECORD
//{ //{
@ -727,7 +727,7 @@ namespace APT.SK.WebApi.Controllers
//} //}
pageFilter.FilterGroup.Rules.Remove(filter); pageFilter.FilterGroup.Rules.Remove(filter);
} }
//pageFilter.IgnoreDataRule = true; pageFilter.IgnoreDataRule = true;
//pageFilter.Include.Add("Nav_ApplyDepartment"); //pageFilter.Include.Add("Nav_ApplyDepartment");
//pageFilter.Include.Add("Nav_ApplyUser"); //pageFilter.Include.Add("Nav_ApplyUser");
//pageFilter.Include.Add("Nav_RiskArea"); //pageFilter.Include.Add("Nav_RiskArea");