From 9b76959e67e5eab5d8f533e0f4e63669276d5092 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Mon, 18 May 2026 17:09:32 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../APT.SK.WebApi/Controllers/Api/CheckSetController.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckSetController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckSetController.cs index dea70f1..06d4b9f 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckSetController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckSetController.cs @@ -134,19 +134,19 @@ namespace APT.SK.WebApi.Controllers.Api } else { - if (departPost.DEPARTMENT_TYPE == 0) + if (departPost.DEPARTMENT_TYPE == 10) { entity.POST_NAME = "部门安全员"; } - if (departPost.DEPARTMENT_TYPE == 1) + if (departPost.DEPARTMENT_TYPE == 15) { entity.POST_NAME = "车间安全员"; } - if (departPost.DEPARTMENT_TYPE == 2) + if (departPost.DEPARTMENT_TYPE == 20) { entity.POST_NAME = "班组负责人"; } - if (departPost.DEPARTMENT_TYPE == 3) + if (departPost.DEPARTMENT_TYPE == 5) { entity.POST_NAME = "安环部安全员"; } From cf40a5fde6596161a321f7b8c87382fe5229df6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Tue, 19 May 2026 16:29:38 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/SKController.cs | 4 +- .../BIStatiscialAnalysisController.cs | 138 +++++++++++++++++- .../HiddenDangerRectifyRecordController.cs | 14 +- 3 files changed, 147 insertions(+), 9 deletions(-) diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs index 23e89a0..e886069 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs @@ -1572,7 +1572,7 @@ namespace APT.PP.WebApi.Controllers.Api var endtime = DateTime.Now.AddHours(24); if (plan.END_DATE != null) { - endtime = Convert.ToDateTime(plan.END_DATE.ToString()); + endtime = Convert.ToDateTime(plan.END_DATE.ToString().ToString().Replace("0:00:00", "23:59:59")); } var noticeTask = NotificationTaskService.InsertUserNoticeTaskModel("安全风险辨识表" + DateTime.Now.Month.PadLeft(2,'0') + DateTime.Now.Day.PadLeft(2, '0'), ide.ID, filter.OrgId, user.ID, user.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK033"); notices.Add(noticeTask); @@ -1670,7 +1670,7 @@ namespace APT.PP.WebApi.Controllers.Api var libPosts = GetEntities(i => libIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(filter.OrgId)).ToList(); var libPostIds = libPosts.Select(t => t.ID).ToList(); var libPostDetails = GetEntities(i => libPostIds.Contains(i.ENTERPRISE_LIBRARY_POST_ID), new BaseFilter(filter.OrgId)).ToList(); - if (planIds != null && planIds.Any() )//&& dtNow.Hour >= 16 && dtNow.Hour <= 20 + if (planIds != null && planIds.Any() && dtNow.Hour >= 23)//&& dtNow.Hour >= 16 && dtNow.Hour <= 20 { //plans.ForEach(t => t.STATUS = PFStandardStatus.Close); identitys.ForEach(m => { m.STATUS = PFStandardStatus.Close; m.END_DATE = DateTime.Now; }); diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs index 128903e..11f43fd 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs @@ -158,7 +158,8 @@ namespace APT.SC.WebApi.Controllers.Api.BIController public int UNFINISH { get; set; } public int OVER_UNFINISH { get; set; } public string FINISH_RATE { get; set; } - public string NORMAL_RATE { get; set; } + public string NORMAL_RATE { get; set; } + public int NUM { get; set; } public List details { get; set; } } public class TaskViewInfoDetail @@ -11200,7 +11201,21 @@ namespace APT.SC.WebApi.Controllers.Api.BIController { connection.Open(); //各公司待办明细 - string sql = "select * from vhome_task_data_form "; + string sql = "select * from vhome_task_data_form order by CASE WHEN MODEL_NAME = '双重预防机制' THEN 1 " + + " WHEN MODEL_NAME = '作业现场安全管理' THEN 2" + + " WHEN MODEL_NAME = '安全教育与培训' THEN 3 ELSE 4 END, CASE WHEN FORM_NAME = '安全风险辨识与评估计划' THEN 2 WHEN FORM_NAME = '安全风险辨识表' THEN 4 " + + " WHEN FORM_NAME = '安全风险辨识结果表' THEN 6 WHEN FORM_NAME = '安全风险辨识结果汇总表' THEN 8" + + " WHEN FORM_NAME = '安全风险评估表' THEN 10 WHEN FORM_NAME = '安全风险评估汇总表' THEN 12 WHEN FORM_NAME = '风险检查关联表' THEN 14" + + " WHEN FORM_NAME = '安全检查通知' THEN 16 WHEN FORM_NAME = '安全检查记录' THEN 18 WHEN FORM_NAME = '安全检查记录汇总' THEN 20 " + + " WHEN FORM_NAME = '隐患上报' THEN 22 WHEN FORM_NAME = '手动隐患上报完善' THEN 24 WHEN FORM_NAME = '隐患确认单' THEN 26 WHEN FORM_NAME = '隐患整改通知单' THEN 28 " + + " WHEN FORM_NAME = '隐患整改记录' THEN 30 WHEN FORM_NAME = '延期整改申请' THEN 32 WHEN FORM_NAME = '班前会议' THEN 34 " + + " WHEN FORM_NAME = '岗位当班记录' THEN 36 WHEN FORM_NAME = '交接班记录' THEN 38 WHEN FORM_NAME = '班组活动记录' THEN 40 WHEN FORM_NAME = '一般作业活动记录' THEN 42 " + + " WHEN FORM_NAME = '作业方案讨论记录' THEN 44 WHEN FORM_NAME = '关键许可工作票' THEN 46 WHEN FORM_NAME = '安全技术交底表' THEN 48 " + + " WHEN FORM_NAME = '关键许可作业活动记录' THEN 50 WHEN FORM_NAME = '矿山动火作业工作票' THEN 52 WHEN FORM_NAME = '技术交底表' THEN 54 WHEN FORM_NAME = '安全交底表' " + + " THEN 56 WHEN FORM_NAME = '领导带班下井记录' THEN 58 WHEN FORM_NAME = '安全意识调查' THEN 60 WHEN FORM_NAME = '培训需求调查' THEN 62" + + " WHEN FORM_NAME = '培训计划' THEN 64 WHEN FORM_NAME = '培训通知' THEN 66 WHEN FORM_NAME = '培训通知（转训）' THEN 68 WHEN FORM_NAME = '培训记录' THEN 70" + + " WHEN FORM_NAME = '培训效果评估调查表' THEN 72 WHEN FORM_NAME = '三级安全教育培训记录' THEN 74 WHEN FORM_NAME = '新三级安全教育记录' THEN 76 " + + " WHEN FORM_NAME = '新三级安全教育卡' THEN 78 ELSE 100 END;"; SqlCommand com = new SqlCommand(sql, connection); SqlDataAdapter Data = new SqlDataAdapter(com); Data.Fill(Table); @@ -11236,6 +11251,40 @@ namespace APT.SC.WebApi.Controllers.Api.BIController { listAddNew = listAddNew.Where(t => t.COMPANY_NAME == filter.Keyword).ToList(); } + if (!string.IsNullOrEmpty(filter.Parameter1)) + { + var startDate = DateTime.Parse(filter.Parameter1); + if (startDate.Year != DateTime.Now.Year) + { + throw new Exception("开始时间必须是本年度"); + } + else + { + listAddNew = listAddNew.Where(t => t.TASK_STARTDT >= startDate).ToList(); + } + } + if (!string.IsNullOrEmpty(filter.Parameter2)) + { + var endDate = DateTime.Parse(filter.Parameter2); + if (endDate.Year != DateTime.Now.Year) + { + throw new Exception("结束时间必须是本年度"); + } + else + { + listAddNew = listAddNew.Where(t => t.TASK_STARTDT <= endDate).ToList(); + } + } + var resultTemps = new List(); + var skForms = "安全风险辨识与评估计划,安全风险辨识表,安全风险辨识结果表,安全风险辨识结果汇总表,安全风险评估表,安全风险评估汇总表,风险检查关联表" + + ",安全检查通知,安全检查记录,安全检查记录汇总,隐患上报,手动隐患上报完善,隐患确认单,隐患整改通知单,隐患整改记录,延期整改申请"; + var skFormList = skForms.Split(",").ToList(); + var foForms = "班前会议,岗位当班记录,交接班记录,班组活动记录,一般作业活动记录,作业方案讨论记录,关键许可工作票" + + ",安全技术交底表,关键许可作业活动记录,矿山动火作业工作票,技术交底表,安全交底表,领导带班下井记录"; + var foFormList = foForms.Split(",").ToList(); + var seForms = "安全意识调查,培训需求调查,培训通知,培训通知（转训）,培训记录,培训效果评估调查表,三级安全教育培训记录" + + ",新三级安全教育记录,新三级安全教育卡"; + var seFormList = seForms.Split(",").ToList(); var taskGroup = listAddNew.GroupBy(t => new { t.COMPANY_NAME, t.MOULD_NAME, t.FORM_NAME }).ToList(); if (taskGroup != null && taskGroup.Any()) { @@ -11256,6 +11305,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController info.OVER_UNFINISH = details.Count(t => t.NOTICE_STATUS == "0" && t.TASK_ENDDT < DateTime.Now); info.FINISH_RATE = info.TOTAL_QTY == 0 ? "0" : ((double)(info.NORMAL_FINISH + info.OVER_FINISH) / info.TOTAL_QTY * 100).ToString("0.00"); info.NORMAL_RATE = info.TOTAL_QTY == 0 ? "0" : ((double)info.NORMAL_FINISH / info.TOTAL_QTY * 100).ToString("0.00"); + info.details = new List(); if (details != null && details.Any()) { info.details = new List(); @@ -11278,9 +11328,93 @@ namespace APT.SC.WebApi.Controllers.Api.BIController } info.details = info.details.OrderBy(t => t.NUM).ToList(); } + //resultTemps.Add(info); result.Data.Add(info); } } + int i = 1; + foreach (var item in skFormList) + { + var temp = result.Data.FirstOrDefault(t => t.MOULD_NAME == "双重预防机制" && t.FORM_NAME == item.ToString().Trim()); + if (temp == null) + { + TaskViewInfo info = new TaskViewInfo(); + info.COMPANY_NAME = filter.Keyword; + info.MOULD_NAME = "双重预防机制"; + info.FORM_NAME = item.ToString().Trim(); + info.TOTAL_QTY = 0; + info.NORMAL_FINISH = 0; + info.OVER_FINISH = 0; + info.DOING = 0; + info.UNFINISH = 0; + info.OVER_UNFINISH = 0; + info.FINISH_RATE = "0.00"; + info.NORMAL_RATE = "0.00"; + info.NUM = i; + result.Data.Add(info); + } + else + { + temp.NUM = i; + } + i++; + } + int j = 1; + foreach (var item in foFormList) + { + var temp = result.Data.FirstOrDefault(t => t.MOULD_NAME == "作业现场安全管理" && t.FORM_NAME == item.ToString().Trim()); + if (temp == null) + { + TaskViewInfo info = new TaskViewInfo(); + info.COMPANY_NAME = filter.Keyword; + info.MOULD_NAME = "作业现场安全管理"; + info.FORM_NAME = item.ToString().Trim(); + info.TOTAL_QTY = 0; + info.NORMAL_FINISH = 0; + info.OVER_FINISH = 0; + info.DOING = 0; + info.UNFINISH = 0; + info.OVER_UNFINISH = 0; + info.FINISH_RATE = "0.00"; + info.NORMAL_RATE = "0.00"; + info.NUM = j; + result.Data.Add(info); + } + else + { + temp.NUM = j; + } + j++; + } + int k = 1; + foreach (var item in seFormList) + { + + var temp = result.Data.FirstOrDefault(t => t.MOULD_NAME == "安全教育与培训" && t.FORM_NAME == item.ToString().Trim()); + if (temp == null) + { + TaskViewInfo info = new TaskViewInfo(); + info.COMPANY_NAME = filter.Keyword; + info.MOULD_NAME = "安全教育与培训"; + info.FORM_NAME = item.ToString().Trim(); + info.TOTAL_QTY = 0; + info.NORMAL_FINISH = 0; + info.OVER_FINISH = 0; + info.DOING = 0; + info.UNFINISH = 0; + info.OVER_UNFINISH = 0; + info.FINISH_RATE = "0.00"; + info.NORMAL_RATE = "0.00"; + info.NUM = k; + result.Data.Add(info); + } + else + { + temp.NUM = k; + } + k++; + } + result.Data = result.Data.OrderBy(t => t.NUM).ToList(); } } return result; diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs index d231c07..3440757 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs @@ -97,10 +97,7 @@ namespace APT.SK.WebApi.Controllers entity.PRODUCTION_UNIT_ID = record.PRODUCTION_UNIT_ID; entity.NOTICE_CODE = record.NOTICE_CODE; } - if (entity.COMPLETE_DATE == null) - { - entity.COMPLETE_DATE = DateTime.Now; - } + var photoas = entity.Nav_RectifyPhotoas; entity.Nav_RectifyPhotoas = null; var photobs = entity.Nav_RectifyPhotobs; @@ -155,6 +152,10 @@ namespace APT.SK.WebApi.Controllers item.HIDDEN_DANGER_RECTIFY_RECORD_ID = entity.ID; item.Nav_Reason = null; } + } + if (entity.COMPLETE_DATE == null) + { + entity.COMPLETE_DATE = DateTime.Now; } T_FM_NOTIFICATION_TASK notice = null; T_FM_NOTIFICATION_TASK task = null; @@ -166,7 +167,10 @@ namespace APT.SK.WebApi.Controllers if (entity.RECITIFY_USER_ID != null) { entity.STATUS = PFStandardStatus.Reading; - entity.COMPLETE_DATE = DateTime.Now; + if (entity.COMPLETE_DATE == null) + { + entity.COMPLETE_DATE = DateTime.Now; + } //var departName = this.GetEntity(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.NAME; var UserNames = new List(); var user = this.GetEntity(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.ID == entity.RECITIFY_USER_ID); From a175b0be1808145fe0a98f3315e579c7c03e1776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Wed, 20 May 2026 09:53:00 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/HiddenDangerRectifyRecordController.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs index 3440757..6084770 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs @@ -690,6 +690,7 @@ namespace APT.SK.WebApi.Controllers pageFilter.Include.Add("Nav_ApplyDepartment"); pageFilter.Include.Add("Nav_RecitifyUser"); pageFilter.Include.Add("Nav_CheckType"); + pageFilter.Include.Add("Nav_RiskArea"); pageFilter.Include.Add("Nav_ProductionUnit"); result = this.GetOrderPageEntities(null, pageFilter); return result; From 5f0c17aaf6092d0fcdf13b797cbe993e133c67ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Wed, 20 May 2026 10:37:36 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=9A=90=E6=82=A3=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Api/HiddenDangerRectifyRecordController.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs index 6084770..19102dd 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs @@ -667,7 +667,10 @@ namespace APT.SK.WebApi.Controllers var entity = this.GetEntity(id); FilterRule ruleArea = new FilterRule(); ruleArea.Field = "RISK_AREA_ID"; - ruleArea.Value = entity.RISK_AREA_ID; + ruleArea.Value = entity.RISK_AREA_ID; + FilterRule rulePro = new FilterRule(); + rulePro.Field = "PRODUCTION_UNIT_ID"; + rulePro.Value = entity.PRODUCTION_UNIT_ID; FilterRule ruleOrg = new FilterRule(); ruleOrg.Field = "ORG_ID"; ruleOrg.Value = entity.ORG_ID; @@ -675,13 +678,14 @@ namespace APT.SK.WebApi.Controllers ruleContent.Field = "CHECK_CONTENTS_ID"; ruleContent.Value = entity.CHECK_CONTENTS_ID; FilterRule ruleName = new FilterRule(); - ruleName.Field = "HIDDEN_DESCRIPTION"; - ruleName.Value = entity.HIDDEN_DESCRIPTION; + ruleName.Field = "CHECK_QUESTION_ID"; + ruleName.Value = entity.CHECK_QUESTION_ID; FilterRule ruleLevel = new FilterRule(); ruleLevel.Field = "HIDDEN_LEVEL"; ruleLevel.Value = entity.HIDDEN_LEVEL; pageFilter = new KeywordPageFilter(); pageFilter.IgnoreDataRule = true; + pageFilter.FilterGroup.Rules.Add(rulePro); pageFilter.FilterGroup.Rules.Add(ruleArea); pageFilter.FilterGroup.Rules.Add(ruleOrg); pageFilter.FilterGroup.Rules.Add(ruleContent);