From 824b206a1e400f7e3e0e753ac975610a800359d1 Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Mon, 16 Mar 2026 14:16:44 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=AE=89=E5=85=A8=E6=84=8F=E8=AF=86?= =?UTF-8?q?=E8=B0=83=E6=9F=A5=20=E5=A6=82=E6=9E=9C=E5=88=B0=E4=BA=86?= =?UTF-8?q?=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=20=E5=9B=9E=E6=94=B6?= =?UTF-8?q?=E6=9C=AA=E5=A4=84=E7=90=86=E7=9A=84=E5=BE=85=E5=8A=9E=202?= =?UTF-8?q?=E3=80=81=E5=AE=89=E5=85=A8=E6=84=8F=E8=AF=86=E8=B0=83=E6=9F=A5?= =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E4=BA=86=20=E6=89=8B=E5=8A=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BA=BA=E5=91=98=E7=9A=84=E5=85=A5=E5=8F=A3=20=20?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E9=87=8D=E5=A4=8D=E5=81=9A=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/SEController.cs | 35 ++++++++++++++----- .../Api/LRController/6LawController.cs | 3 +- .../SEController/1SESafeSurveyController.cs | 10 ++++-- 3 files changed, 36 insertions(+), 12 deletions(-) diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs index f6b3e36..f2c8756 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs @@ -1203,10 +1203,13 @@ namespace APT.PP.WebApi.Controllers.Api.PP BantchAddEntityNoCommit(safeSurveyDeps); }); } + /// + /// 安全意识调查 截止日前前3天未完成推送今日提醒给该员工本人 + /// + /// + /// private void CheckSafeSuveyNotAnswered(KeywordFilter filter, DateTime dtNow) { - //截止日前前3天未完成推送今日提醒给该员工本人 - //var dt = DateTime.Now; var lasttime = dtNow.AddDays(3); var surveys = GetEntities(t => t.LAUNCH_TIME.Value.Year == dtNow.Year && t.STATUS == SESafeSurveyStatus.调查中 && t.END_TIME.Value <= lasttime && dtNow < t.END_TIME.Value, new BaseFilter(filter.GetOrgId()), new string[] { "Nav_Papers.Nav_User" }).ToList(); @@ -1343,7 +1346,8 @@ namespace APT.PP.WebApi.Controllers.Api.PP /// /// 更新年度风险评价计划 /// - /// + /// + /// /// public JsonActionResult CheckSafeSuveyDepartReport(KeywordFilter filter, DateTime dt) { @@ -1352,11 +1356,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP //各部门截止时间后生成部门统计报表发送发起人 BaseFilter baseFilter = new BaseFilter(filter.GetOrgId()); baseFilter.Include = new string[] { "Nav_LaunchUser" }; - var surveys = GetEntities( - t => t.LAUNCH_TIME.Value.Year == dt.Year && - t.STATUS == SESafeSurveyStatus.调查中 && - t.END_TIME.Value <= dt, - baseFilter).ToList(); + var surveys = GetEntities(t => t.LAUNCH_TIME.Value.Year == dt.Year && t.STATUS == SESafeSurveyStatus.调查中 && t.END_TIME.Value <= dt, baseFilter).ToList(); if (surveys == null || surveys.Count == 0) { return true; @@ -1385,6 +1385,14 @@ namespace APT.PP.WebApi.Controllers.Api.PP return true; }); } + + /// + /// 安全意识调查汇总 + /// 安全意识调查 未处理待办 处理 + /// + /// + /// + /// private JsonActionResult CheckTrainSuveyFinishByDepartment(KeywordFilter filter, DateTime dt) { return SafeExecute(() => @@ -1426,6 +1434,15 @@ namespace APT.PP.WebApi.Controllers.Api.PP }); } + //wyw 未处理的安全意识调查 转无需办理 + var listTaskDeal = GetEntities(e => e.NOTICE_STATUS == 0 && e.SOURCE_DATA_ID.HasValue && allSendDataIds.Contains(e.SOURCE_DATA_ID.Value), null, null); + if (listTaskDeal != null && listTaskDeal.Any()) + { + foreach (var item in listTaskDeal) + { + item.NOTICE_STATUS = 4;// FMNoticeStatusEnum.超时无需办理; + } + } //待测试会不会有bug BantchSaveEntityNoCommit(surveys); 检查 LAUNCH_USER_ID 报错？ UnifiedCommit(() => { @@ -1435,6 +1452,8 @@ namespace APT.PP.WebApi.Controllers.Api.PP BantchAddEntityNoCommit(sendNotices); if (listTaskStop != null && listTaskStop.Count() > 0) BantchSaveEntityNoCommit(listTaskStop); + if (listTaskDeal != null && listTaskDeal.Count() > 0) + BantchSaveEntityNoCommit(listTaskDeal); }); return true; }); diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/LRController/6LawController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/LRController/6LawController.cs index 27056ac..19ceda2 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/LRController/6LawController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/LRController/6LawController.cs @@ -68,8 +68,7 @@ namespace APT.LR.WebApi.Controllers.Api { entity.LAW_STATUS = 0; entity.VERSION_NUM = lawVersion.Where(t => t.UPDATE_TIME == lawVersion.Max(m => m.UPDATE_TIME)).FirstOrDefault().VERSION_NUM;//现行版本号 - } - else //现行法律 + }else //现行法律 { int versionCount = lawVersion.Count(t => t.VERSION_STATUS == BSLawStatusEnum.现行 && t.IS_DELETED == false); if (versionCount > 1) diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/1SESafeSurveyController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/1SESafeSurveyController.cs index 7a8a6d7..8ba45ba 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/1SESafeSurveyController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/1SESafeSurveyController.cs @@ -84,6 +84,14 @@ namespace APT.SC.WebApi.Controllers.Api.SE { throw new Exception("参与人员不可为空"); } + var allUsersIds = listUsers.Where(e => !e.IS_DELETED).Select(e => e.USER_ID).ToList(); + var allUsersIdsCheck = listUsers.Where(e => !e.IS_DELETED).Select(e => e.USER_ID).Distinct().ToList(); + var UCCheck = allUsersIds.Count - allUsersIdsCheck.Count; + if (UCCheck > 0) + { + //有重复 + throw new Exception("人员不能重复（" + UCCheck + "人）！"); + } entity.Nav_JoinDepartment = null; if (Nav_Points == null) { @@ -136,8 +144,6 @@ namespace APT.SC.WebApi.Controllers.Api.SE var pointIDS = Nav_Points.Where(t => t.IS_DELETED == false).Select(t => (Guid)t.POINT_ID).ToList(); - var allUsersIds = listUsers.Select(e => e.USER_ID).ToList(); - //var allUsersIds = GetDepartmentUsers(Nav_JoinDepartment.Select(t => t.DEPARTMENT_ID).ToList(), entity.ORG_ID); //var currDep = GetEntity(t => t.ID == entity.LAUNCH_DEPARTMENT_ID); //if (currDep != null && (currDep.NAME == "安全环保管理部" || currDep.NAME == "安全环保科" || currDep.NAME == "安全环保部" || currDep.NAME == "安环部"))