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

班组及人员同步，检查汇总重复判断修复

Browse Source
This commit is contained in:
何美荣 2025-11-10 16:06:46 +08:00
parent 8edf84f622
commit 9c25d4b020
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1468,7 +1468,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
{ {
T_FM_TEAM team = new T_FM_TEAM(); T_FM_TEAM team = new T_FM_TEAM();
team.NAME = item.NAME; team.NAME = item.NAME;
team.CHARGE_PERSON_ID = item.USER_ID; team.CHARGE_PERSON_ID = users.FirstOrDefault(t=>t.ID == item.USER_ID)?.PERSON_ID;
team.DEPARTMENT_ID = item.ID; team.DEPARTMENT_ID = item.ID;
team.ORG_ID = orgId; team.ORG_ID = orgId;
teamInfos.Add(team); teamInfos.Add(team);

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

@ -66,7 +66,7 @@ namespace APT.SK.WebApi.Controllers.Api
var groupDetails = details.Where(m => m.CHECK_RESULT == SKCheckResultEnum.Yes && m.IS_DELETED == false).GroupBy(t => new { t.RISK_AREA_ID, t.CHECK_CONTENTS_ID, t.CHECK_QUESTION_ID }).ToList(); var groupDetails = details.Where(m => m.CHECK_RESULT == SKCheckResultEnum.Yes && m.IS_DELETED == false).GroupBy(t => new { t.RISK_AREA_ID, t.CHECK_CONTENTS_ID, t.CHECK_QUESTION_ID }).ToList();
foreach (var group in groupDetails) foreach (var group in groupDetails)
{ {
var haveRecord = details.Where(t => t.RISK_AREA_ID == group.Key.RISK_AREA_ID && t.CHECK_CONTENTS_ID == group.Key.CHECK_CONTENTS_ID && t.CHECK_QUESTION_ID == group.Key.CHECK_QUESTION_ID).ToList(); var haveRecord = details.Where(t => t.RISK_AREA_ID == group.Key.RISK_AREA_ID && t.CHECK_CONTENTS_ID == group.Key.CHECK_CONTENTS_ID && t.CHECK_QUESTION_ID == group.Key.CHECK_QUESTION_ID && t.IS_DELETED == false).ToList();
if (haveRecord.Count > 1) if (haveRecord.Count > 1)
{ {
throw new Exception("检查内容"+haveRecord.FirstOrDefault()?.Nav_Contents?.CHECKCONTENT+"有重复的隐患，请删除重复"); throw new Exception("检查内容"+haveRecord.FirstOrDefault()?.Nav_Contents?.CHECKCONTENT+"有重复的隐患，请删除重复");