diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs index 5de0bdb..2186fd1 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs @@ -57,11 +57,11 @@ namespace APT.FO.WebApi.Controllers var details = this.GetEntities(t => t.FIRE_JOB_ID == entity.ID, new BaseFilter(entity.ORG_ID), "Nav_DetailFiles.Nav_ImgFile.Nav_File").ToList(); entity.Nav_Details = details.OrderBy(t => t.JOB_STEP).ThenBy(m => m.NUM).ToList(); - if (entity.FIRE_STATUS.GetInt() <= 15) + if (entity.FIRE_STATUS.GetInt() == 10 || entity.FIRE_STATUS.GetInt() == 15) { entity.Nav_Details = entity.Nav_Details.Where(t => t.JOB_STEP == FOJobStepEnum.Pre).OrderBy(m => m.NUM).ToList(); } - else if (entity.FIRE_STATUS.GetInt() <= 21) + if (entity.FIRE_STATUS.GetInt() == 18 || entity.FIRE_STATUS.GetInt() == 21) { entity.Nav_Details = entity.Nav_Details.Where(t => t.JOB_STEP != FOJobStepEnum.Pre).OrderBy(t => t.JOB_STEP).ThenBy(m => m.NUM).ToList(); } 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 11f43fd..630ab2d 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs @@ -11207,15 +11207,15 @@ namespace APT.SC.WebApi.Controllers.Api.BIController " 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 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;"; + " WHEN FORM_NAME = '培训效果评估调查表' THEN 72 WHEN FORM_NAME = '新三级安全教育记录' THEN 76 " + + " ELSE 100 END;"; SqlCommand com = new SqlCommand(sql, connection); SqlDataAdapter Data = new SqlDataAdapter(com); Data.Fill(Table); @@ -11277,13 +11277,13 @@ namespace APT.SC.WebApi.Controllers.Api.BIController } var resultTemps = new List(); var skForms = "安全风险辨识与评估计划,安全风险辨识表,安全风险辨识结果表,安全风险辨识结果汇总表,安全风险评估表,安全风险评估汇总表,风险检查关联表" + - ",安全检查通知,安全检查记录,安全检查记录汇总,隐患上报,手动隐患上报完善,隐患确认单,隐患整改通知单,隐患整改记录,延期整改申请"; + ",安全检查通知,安全检查记录,安全检查记录汇总,隐患上报,手动隐患上报,隐患确认单,隐患整改通知单,隐患整改记录,延期整改申请,重大隐患销号表"; var skFormList = skForms.Split(",").ToList(); var foForms = "班前会议,岗位当班记录,交接班记录,班组活动记录,一般作业活动记录,作业方案讨论记录,关键许可工作票" + ",安全技术交底表,关键许可作业活动记录,矿山动火作业工作票,技术交底表,安全交底表,领导带班下井记录"; var foFormList = foForms.Split(",").ToList(); - var seForms = "安全意识调查,培训需求调查,培训通知,培训通知（转训）,培训记录,培训效果评估调查表,三级安全教育培训记录" + - ",新三级安全教育记录,新三级安全教育卡"; + 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()) @@ -11414,7 +11414,21 @@ namespace APT.SC.WebApi.Controllers.Api.BIController } k++; } - result.Data = result.Data.OrderBy(t => t.NUM).ToList(); + result.Data = result.Data.OrderBy(t=>t.MOULD_NAME == "双重预防机制").ThenBy(t => t.MOULD_NAME == "作业现场安全管理").ThenBy(t => t.MOULD_NAME == "安全教育与培训").ThenBy(t => t.NUM).ToList(); + TaskViewInfo infoLast = new TaskViewInfo(); + infoLast.COMPANY_NAME = filter.Keyword; + infoLast.MOULD_NAME = ""; + infoLast.FORM_NAME = "总计"; + infoLast.TOTAL_QTY = result.Data.Sum(t=>t.TOTAL_QTY); + infoLast.NORMAL_FINISH = result.Data.Sum(t => t.NORMAL_FINISH); + infoLast.OVER_FINISH = result.Data.Sum(t => t.OVER_FINISH); + infoLast.DOING = result.Data.Sum(t => t.DOING); + infoLast.UNFINISH = result.Data.Sum(t => t.UNFINISH); + infoLast.OVER_UNFINISH = result.Data.Sum(t => t.OVER_UNFINISH); + infoLast.FINISH_RATE = infoLast.TOTAL_QTY == 0 ? "0" : ((double)(infoLast.NORMAL_FINISH + infoLast.OVER_FINISH) / infoLast.TOTAL_QTY * 100).ToString("0.00"); + infoLast.NORMAL_RATE = infoLast.TOTAL_QTY == 0 ? "0" : ((double)infoLast.NORMAL_FINISH / infoLast.TOTAL_QTY * 100).ToString("0.00"); + infoLast.NUM = k; + result.Data.Add(infoLast); } } return result;