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:
何美荣 2026-05-13 11:17:37 +08:00
commit 17c6cf4dee
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs
View File

@ -130,14 +130,22 @@ namespace APT.FM.WebApi.Controllers.Api.FM
filterRuleDelete.Value = "false"; filterRuleDelete.Value = "false";
filterRuleDelete.IsSysParamRule = false; filterRuleDelete.IsSysParamRule = false;
filterRuleDelete.Operate = FilterOperate.Equal; filterRuleDelete.Operate = FilterOperate.Equal;
FilterRule filterRuleENABLE = new FilterRule();
filterRuleENABLE.Field = "ENABLE_STATUS";
filterRuleENABLE.Value = "0";
filterRuleENABLE.IsSysParamRule = false;
filterRuleENABLE.Operate = FilterOperate.Equal;
if (pageFilter.FilterGroup.Rules == null) if (pageFilter.FilterGroup.Rules == null)
{ {
pageFilter.FilterGroup.Rules = new List<FilterRule>(); pageFilter.FilterGroup.Rules = new List<FilterRule>();
pageFilter.FilterGroup.Rules.Add(filterRuleDelete); pageFilter.FilterGroup.Rules.Add(filterRuleDelete);
pageFilter.FilterGroup.Rules.Add(filterRuleENABLE);
} }
else else
{ {
pageFilter.FilterGroup.Rules.Add(filterRuleDelete); pageFilter.FilterGroup.Rules.Add(filterRuleDelete);
pageFilter.FilterGroup.Rules.Add(filterRuleENABLE);
} }
return WitOrderPaged(null, pageFilter); return WitOrderPaged(null, pageFilter);
} }

16
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs
View File

@ -179,7 +179,21 @@ namespace APT.SC.WebApi.Controllers.Api.SE
} }
} }
} }
else if (data.Nav_Notify != null && data.Nav_Notify.CHECKTYPE == PlanCheckType.InOffLine)
{
//参加的就要有考核结果
int rowindex = 1;
foreach (var item in joinUsers)
{
if (item.IS_DELETED)
continue;
if (item.STATUS == SETrainRecordUserStatusEnum.参与 && !item.EXAMINATION_RESULTS.HasValue)
{
throw new Exception("请填写行【" + rowindex + "】的考核结果！");
}
rowindex++;
}
}
entity.TRAIN_COUNT = joinUsers.Count(t => t.STATUS == SETrainRecordUserStatusEnum.参与); entity.TRAIN_COUNT = joinUsers.Count(t => t.STATUS == SETrainRecordUserStatusEnum.参与);
var allSendTitles = new List<string>(); var allSendTitles = new List<string>();