From f6f822448fbfeae03c50243f551b355b3eb93bda Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Wed, 13 May 2026 08:53:13 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=BA=BF=E4=B8=8B=E8=80=83=E6=A0=B8?= =?UTF-8?q?=EF=BC=8C=E8=80=83=E6=A0=B8=E7=BB=93=E6=9E=9C=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Api/SEController/6SETrainRecordController.cs | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs index e27628e..1d3b4b8 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs @@ -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.参与); var allSendTitles = new List(); From 2f7312daf425ec32f357290711125fb96855fa10 Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Wed, 13 May 2026 09:11:07 +0800 Subject: [PATCH 2/4] =?UTF-8?q?FM/Department/OrderPaged=20=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=B7=BB=E5=8A=A0=20=20ENABLE=5FSTATUS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../APT.FM.WebApi/Controllers/Api/DepartmentController.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs index 9e6399a..b8b8fda 100644 --- a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs +++ b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs @@ -130,14 +130,22 @@ namespace APT.FM.WebApi.Controllers.Api.FM filterRuleDelete.Value = "false"; filterRuleDelete.IsSysParamRule = false; filterRuleDelete.Operate = FilterOperate.Equal; + + FilterRule filterRuleENABLE = new FilterRule(); + filterRuleENABLE.Field = "ENABLE_STATUS"; + filterRuleENABLE.Value = "true"; + filterRuleENABLE.IsSysParamRule = false; + filterRuleENABLE.Operate = FilterOperate.Equal; if (pageFilter.FilterGroup.Rules == null) { pageFilter.FilterGroup.Rules = new List(); pageFilter.FilterGroup.Rules.Add(filterRuleDelete); + pageFilter.FilterGroup.Rules.Add(filterRuleENABLE); } else { pageFilter.FilterGroup.Rules.Add(filterRuleDelete); + pageFilter.FilterGroup.Rules.Add(filterRuleENABLE); } return WitOrderPaged(null, pageFilter); } From 7d6fbe160f4447e2b5580c7bddf4be18cf01356f Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Wed, 13 May 2026 09:13:42 +0800 Subject: [PATCH 3/4] 123 --- .../APT.FM.WebApi/Controllers/Api/DepartmentController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs index b8b8fda..6bfbef1 100644 --- a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs +++ b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs @@ -133,7 +133,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM FilterRule filterRuleENABLE = new FilterRule(); filterRuleENABLE.Field = "ENABLE_STATUS"; - filterRuleENABLE.Value = "true"; + filterRuleENABLE.Value = "1"; filterRuleENABLE.IsSysParamRule = false; filterRuleENABLE.Operate = FilterOperate.Equal; if (pageFilter.FilterGroup.Rules == null) From be9f3debc14752e4568442fcb05219298e6a1284 Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Wed, 13 May 2026 09:16:22 +0800 Subject: [PATCH 4/4] 21345 --- .../APT.FM.WebApi/Controllers/Api/DepartmentController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs index 6bfbef1..b272e94 100644 --- a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs +++ b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs @@ -133,7 +133,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM FilterRule filterRuleENABLE = new FilterRule(); filterRuleENABLE.Field = "ENABLE_STATUS"; - filterRuleENABLE.Value = "1"; + filterRuleENABLE.Value = "0"; filterRuleENABLE.IsSysParamRule = false; filterRuleENABLE.Operate = FilterOperate.Equal; if (pageFilter.FilterGroup.Rules == null)