From b9c44c6ae2fa346ce72e4c8fff95f9689d8774d8 Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Wed, 27 May 2026 10:55:28 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=9F=B9=E8=AE=AD=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=8F=96=E6=B6=88=20=E6=B7=BB=E5=8A=A0=E7=8A=B6=E6=80=81=20=20?= =?UTF-8?q?=202=E3=80=81=E5=AE=89=E5=85=A8=E6=95=99=E8=82=B2=E4=B8=8E?= =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E7=BB=9F=E8=AE=A1=E5=88=86=E6=9E=90=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=20=E9=80=9A=E8=BF=87=E7=8E=87=E5=8F=96=20=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E8=80=83=E6=A0=B8=E7=BB=93=E6=9E=9C=20=203=E3=80=81?= =?UTF-8?q?=E6=95=88=E6=9E=9C=E8=AF=84=E4=BC=B0=20=E4=BC=98=E8=89=AF?= =?UTF-8?q?=E7=8E=87=20=20=E4=B8=8D=E9=9C=80=E8=A6=81=E6=95=88=E6=9E=9C?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=9A=84=E6=AF=94=E4=BE=8B=E4=B8=BA=20-?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APT.MS.Domain/Enums/SC/SEEnum.cs | 1 + .../Api/BIController/BIController.cs | 103 +++++++++++------- .../SEController/6SETrainRecordController.cs | 1 + 3 files changed, 67 insertions(+), 38 deletions(-) diff --git a/APT.MS.Domain/Enums/SC/SEEnum.cs b/APT.MS.Domain/Enums/SC/SEEnum.cs index c0be214..87bd994 100644 --- a/APT.MS.Domain/Enums/SC/SEEnum.cs +++ b/APT.MS.Domain/Enums/SC/SEEnum.cs @@ -134,6 +134,7 @@ namespace APT.MS.Domain.Enums public enum SETrainRecordStatus { + 已取消 = -1, 草稿 = 0, 签到中 = 1, 审阅中 = 2, diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIController.cs index c21caa2..4db80ac 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIController.cs @@ -801,7 +801,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI #region 3 var productionUnits = this.GetEntities(t => t.IS_DELETED == false, new BaseFilter(filter.OrgId)); - var productIds = productionUnits.OrderBy(m=>m.ID).Select(t => t.ID).ToList(); + var productIds = productionUnits.OrderBy(m => m.ID).Select(t => t.ID).ToList(); PerformanceModel modelMineType = new PerformanceModel(); foreach (var id in productIds) { @@ -842,13 +842,13 @@ namespace APT.SC.WebApi.Controllers.Api.BI #region 5 //抓管控层级子表 riskFilter.SelectField = new string[] { "ENTERPRISE_LIBRARY_ID", "DEPARTMENT_TYPE", "DEPARTMENT_ID", "USER_ID", "APPROVE_ROLE_ID", "ID" }; - var libMeasures = GetEntities(t => t.IS_DELETED ==false, riskFilter); + var libMeasures = GetEntities(t => t.IS_DELETED == false, riskFilter); var departIds = libMeasures.Select(t => t.DEPARTMENT_ID).Distinct().ToList(); var distinctDepartment = departments.Where(t => departIds.Contains(t.ID)).ToList(); PerformanceModel modelZRDY = new PerformanceModel(); foreach (var department in distinctDepartment) { - var libIds = libMeasures.Where(t => t.DEPARTMENT_ID == department.ID).Select(m=>m.ENTERPRISE_LIBRARY_ID).Distinct().ToList(); + var libIds = libMeasures.Where(t => t.DEPARTMENT_ID == department.ID).Select(m => m.ENTERPRISE_LIBRARY_ID).Distinct().ToList(); var countLevel1 = allrisk.Count(t => libIds.Contains(t.ID) && t.EVALUATE_LEVEL == SKEvaluateLevelEnum.重大风险); var countLevel2 = allrisk.Count(t => libIds.Contains(t.ID) && t.EVALUATE_LEVEL == SKEvaluateLevelEnum.较大风险); var countLevel3 = allrisk.Count(t => libIds.Contains(t.ID) && t.EVALUATE_LEVEL == SKEvaluateLevelEnum.一般风险); @@ -1125,7 +1125,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI /// /// 安全培训教育统计分析 /// - /// 返回系统用户数 + /// 返回系统用户数 /// [HttpPost, Route("getSafeTrainData")] public JsonActionResult getSafeTrainData([FromBody] KeywordFilter filter) @@ -1135,13 +1135,11 @@ namespace APT.SC.WebApi.Controllers.Api.BI var riskFilter = new BaseFilter(filter.GetOrgId()); riskFilter.Include = new string[] { "Nav_Notify.Nav_TrainUserList", "Nav_Users", "Nav_Notify" }; DateTime time = DateTime.Parse(filter.Parameter1); - DateTime currYear = DateTime.Parse(time.Year + " 01-01"); + DateTime currYear = DateTime.Parse(time.Year + " 01-01 00:00:00"); var startTime = time.AddDays(1 - time.Day); var endTime = time.AddDays(1 - time.Day).AddMonths(1); - var records = GetEntities(t => t.CREATE_TIME > currYear, riskFilter); - var testCount = GetCount(t => t.IS_DELETED == false, new BaseFilter(filter.GetOrgId())); - var threeLevelCount = GetCount(t => t.IS_DELETED == false, new BaseFilter(filter.GetOrgId())); - var currMonthrecords = records.Where(t => t.CREATE_TIME > startTime && t.CREATE_TIME < endTime).OrderBy(t => t.Nav_Notify.TRAIN_START_TIME); + var records = GetEntities(t => t.CREATE_TIME >= currYear && !t.IS_DELETED && t.STATUS != SETrainRecordStatus.已取消, riskFilter); + var currMonthrecords = records.Where(t => t.CREATE_TIME > startTime && t.CREATE_TIME < endTime).OrderByDescending(t => t.Nav_Notify.TRAIN_START_TIME);//.OrderBy var recordids = currMonthrecords.Select(t => t.ID); var examFilter = new BaseFilter(filter.GetOrgId()); examFilter.SelectField = new string[] { "USER_ID", "RECORD_ID", "SCORE" }; @@ -1152,38 +1150,67 @@ namespace APT.SC.WebApi.Controllers.Api.BI var effects = GetEntities(t => notifyIds.Contains((Guid)t.SURVEY_ID), effectFilter); List trainRecords = new List(); + int countPer = 0; + int countPass = 0; foreach (var item in currMonthrecords) { trainRecords trainRecord = new trainRecords(); trainRecord.NAME = item.Nav_Notify.NAME; - trainRecord.TIMERANGE = item.Nav_Notify.TRAIN_START_TIME + "-" + item.Nav_Notify.TRAIN_END_TIME; - trainRecord.SHOULD_TRAINER = item.Nav_Notify.Nav_TrainUserList.Count(); - trainRecord.ACTUAL_TRAINER = item.Nav_Users.Count(); + if (item.Nav_Notify.TRAIN_START_TIME.HasValue && item.Nav_Notify.TRAIN_END_TIME.HasValue && item.Nav_Notify.TRAIN_START_TIME.Value.Date == item.Nav_Notify.TRAIN_END_TIME.Value.Date) + { + trainRecord.TIMERANGE = item.Nav_Notify.TRAIN_START_TIME + " - " + item.Nav_Notify.TRAIN_END_TIME.Value.ToString("HH:mm:ss"); + } + else + { + trainRecord.TIMERANGE = item.Nav_Notify.TRAIN_START_TIME + "-" + item.Nav_Notify.TRAIN_END_TIME; + } + trainRecord.SHOULD_TRAINER = item.Nav_Notify.Nav_TrainUserList.Where(e => !e.IS_DELETED).Count();// + trainRecord.ACTUAL_TRAINER = item.Nav_Users.Where(e => !e.IS_DELETED && e.OK).Count();//有签到 //trainRecord.METHOD = item.Nav_Notify.Nav_TrainCheckType.NAME; //if (item.Nav_Notify.Nav_TrainCheckType.NAME == "笔试") - trainRecord.METHOD = item.Nav_Notify.CHECKTYPE.GetDescription(); - if (item.Nav_Notify.CHECKTYPE == PlanCheckType.InOnLine) - { - var currExams = exams.Where(t => t.RECORD_ID == item.ID); - var currCount = currExams.Count(); - if (currCount > 0) - { - var passExams = currExams.Where(t => t.SCORE >= 80); - var passCount = passExams.Count(); - var rate = (passCount * 1.0 / currCount); - trainRecord.PASS_RATE = rate.ToString(); - } - else - { - trainRecord.PASS_RATE = "0"; - } - } - else - { - trainRecord.PASS_RATE = "1"; - } + trainRecord.METHOD = item.Nav_Notify.CHECKTYPE.GetDescription(); + + + #region 考试通过率 //T_SE_TRAIN_RECORD_USER SEExaminationResultsEnum? EXAMINATION_RESULTS { get; set; } + + countPer = item.Nav_Users.Where(e => !e.IS_DELETED).Count(); + countPass = item.Nav_Users.Where(e => !e.IS_DELETED && e.EXAMINATION_RESULTS.HasValue && e.EXAMINATION_RESULTS.Value == SEExaminationResultsEnum.合格).Count(); + if (countPer == 0) + { + trainRecord.PASS_RATE = "1"; + } + else + { + trainRecord.PASS_RATE = (countPass * 1.00 / countPer).ToString(); + } + + //if (item.Nav_Notify.CHECKTYPE == PlanCheckType.InOnLine) + //{ + // var currExams = exams.Where(t => t.RECORD_ID == item.ID); + // //var currCount = currExams.Count(); + // var currCount = trainRecord.ACTUAL_TRAINER;//分母应该是 有参加培训的人数 + // if (currCount > 0) + // { + // var passExams = currExams.Where(t => t.SCORE >= 80); + // var passCount = passExams.Count(); + // var rate = (passCount * 1.0 / currCount); + // trainRecord.PASS_RATE = rate.ToString(); + // var ccc = (3 * 1.00 / 10).ToString(); + // } + // else + // { + // trainRecord.PASS_RATE = "0"; + // } + //} + //else + //{ + // trainRecord.PASS_RATE = "1"; + //} + + #endregion + if (item.Nav_Notify.NEED_EVALUATION == SETrainNeedSuvey.是) { var effect = effects.FirstOrDefault(t => t.SURVEY_ID == item.NOTIFY_ID); @@ -1198,7 +1225,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI sumTotal += num1; sumTotal += num2; } - trainRecord.EFFORT_RATE = (sumTotal / effectResult.Count()).ToString(); + trainRecord.EFFORT_RATE = (1.00 * sumTotal / effectResult.Count()).ToString(); } else { @@ -1207,7 +1234,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI } else { - trainRecord.EFFORT_RATE = "100"; + trainRecord.EFFORT_RATE = "-"; } trainRecords.Add(trainRecord); @@ -1220,17 +1247,17 @@ namespace APT.SC.WebApi.Controllers.Api.BI DateTime endTime1 = new DateTime(today.Year, i, 1).AddMonths(1).AddSeconds(-1); dateCountModel riskDate = new dateCountModel(); riskDate.DATE = startTime1; - riskDate.COUNT = records.Count(t => t.CREATE_TIME > startTime1 && t.CREATE_TIME < endTime1); + riskDate.COUNT = records.Count(t => t.CREATE_TIME >= startTime1 && t.CREATE_TIME <= endTime1); item3s.Add(riskDate); } safeTrainData safeTrainData = new safeTrainData(); safeTrainData.NUM1 = 1; safeTrainData.NUM2 = records.Count(); - safeTrainData.NUM3 = threeLevelCount; + safeTrainData.NUM3 = GetCount(t => t.IS_DELETED == false, new BaseFilter(filter.GetOrgId())); safeTrainData.NUM4 = 13; safeTrainData.NUM5 = 14; safeTrainData.NUM6 = 15; - safeTrainData.NUM7 = testCount; + safeTrainData.NUM7 = GetCount(t => t.IS_DELETED == false, new BaseFilter(filter.GetOrgId())); safeTrainData.trainRecords = trainRecords; safeTrainData.dateCountModel = item3s; return safeTrainData; 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 a4e7666..8d1b836 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs @@ -169,6 +169,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE entity.ISSTOPSIGN = true;//停止签到 entity.MODIFY_TIME = DateTime.Now; + entity.STATUS = SETrainRecordStatus.已取消; UnifiedCommit(() => { UpdateEntityNoCommit(entity);