From 428e9b857eed8e6ebfd3f0738595398320af209c 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, 18 Nov 2025 03:10:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E6=B5=81=E7=A8=8B=E5=8F=AF=E8=A7=86?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Api/SecurityInspectionNoticeController.cs | 518 +++++++++++++++++-
 1 file changed, 517 insertions(+), 1 deletion(-)

diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs
index 6c085c5..cb3585c 100644
--- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs
+++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs
@@ -16,10 +16,12 @@ using APT.Utility;
 using Castle.Core.Internal;
 using InfluxData.Net.InfluxDb.Models.Responses;
 using Microsoft.AspNetCore.Mvc;
+using MySqlX.XDevAPI.Common;
 using NPOI.SS.Formula.Functions;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
@@ -84,6 +86,30 @@ namespace APT.SK.WebApi.Controllers.Api
         /// </summary>
         [Description("是否按时")]
         public bool? ISINTTIME { get; set; }
+    }
+    //全流程可视化（检查通知-检查记录-检查汇总-隐患上报-整改通知-整改记录）
+    public class OperateLog
+    {
+        [Description("表单名称")]
+        public string FORM_NAME { get; set; }
+
+        [Description("流程节点")]
+        public List<OperateLogList> logList { get; set; }
+    }
+    public class OperateLogList {
+        [Description("待办名称")]
+        public string NAME { get; set; }
+        [Description("待办人")]
+        public string USER_NAME { get; set; }
+        [Description("处理时间")]
+        public DateTime? DEAL_DATE { get; set; }
+
+        [Description("处理时间")]
+        public DateTime? CREATE_TIME { get; set; }
+
+        [Description("处理状态")]
+        public int STATUS { get; set; }
+
     }
     /// <summary>
     ///  安全检查通知
@@ -1000,7 +1026,7 @@ namespace APT.SK.WebApi.Controllers.Api
                     {
                         approveDetails = GetEntities<T_PF_APPROVE_DETAIL>(e => approveIds.Contains(e.APPROVE_ID), null, null).ToList();
                     }
-                    var tasks = GetEntities<T_FM_NOTIFICATION_TASK>(e => e.SOURCE_DATA_ID != null && (sourceIds.Contains(e.SOURCE_DATA_ID.Value) || approveIds.Contains(e.SOURCE_DATA_ID.Value)), null, null).OrderBy(t => t.CREATE_TIME).ToList();
+                    var tasks = GetEntities<T_FM_NOTIFICATION_TASK>(e => e.SOURCE_DATA_ID != null && (sourceIds.Contains(e.SOURCE_DATA_ID.Value) || approveIds.Contains(e.SOURCE_DATA_ID.Value)), null, null).OrderBy(t => t.CREATE_TIME).ThenBy(m=>m.TASK_DT).ToList();
                     List<OperateLogDto> resultCheck1 = new List<OperateLogDto>();//检查任务
                     List<OperateLogDto> resultCheck2 = new List<OperateLogDto>();//检查记录
                     List<OperateLogDto> resultCheck3 = new List<OperateLogDto>();//检查记录汇总
@@ -1620,6 +1646,496 @@ namespace APT.SK.WebApi.Controllers.Api
                 result.Data = dataList;
             }
             return result;
+        }
+
+        [HttpPost, Route("OperateLogView")]
+        public JsonActionResult<List<OperateLog>> OperateLogView([FromBody] KeywordFilter filter)
+        {
+            return SafeExecute<List<OperateLog>>(() =>
+            {
+                var result = new List<OperateLog>();
+                if (string.IsNullOrEmpty(filter.Keyword))
+                {
+                    return result;
+                }
+                else
+                {
+                    Guid? safeNoticeId = null;
+                    List<Guid> safeRecordIds = new List<Guid>();
+                    Guid? safeRecordSumId = null;
+                    Guid? dangerReportId = null;
+                    Guid? rectifyNoticeId = null;
+                    List<Guid> hidRectifyRecordIds = new List<Guid>();
+                    Guid Keyword = new Guid(filter.Keyword);
+                    var check = GetEntity<T_SK_SECURITY_INSPECTION_NOTICE>(Keyword);
+                    if (check == null)
+                    {
+                        return result;
+                    }
+                    else
+                    {
+                        //ID
+                        var sourceIds = new List<Guid>();
+                        safeNoticeId = check.ID;
+                        sourceIds.Add(check.ID);
+                        T_SK_HIDDEN_DANGER_REPORT dangerReport = null;
+                        var recordIds = GetEntities<T_SK_SECURITY_INSPECTION_RECORD>(e => e.SECURITY_INSPECTION_NOTICE_ID != null && e.SECURITY_INSPECTION_NOTICE_ID == check.ID,new BaseFilter(check.ORG_ID)).Select(m=>m.ID).ToList();
+                        sourceIds.AddRange(recordIds);
+                        safeRecordIds.AddRange(recordIds);
+                        var recordSum= GetEntity<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY>(e => e.SECURITY_INSPECTION_NOTICE_ID != null && e.SECURITY_INSPECTION_NOTICE_ID == check.ID);
+                        if (recordSum != null)
+                        {
+                            safeRecordSumId = recordSum.ID;
+                            sourceIds.Add(recordSum.ID);
+                            dangerReport = GetEntity<T_SK_HIDDEN_DANGER_REPORT>(e => e.SECURITY_INSPECTION_RECORD_SUMMARY_ID != null && e.SECURITY_INSPECTION_RECORD_SUMMARY_ID == recordSum.ID);
+                            if (dangerReport != null)
+                            {
+                                dangerReportId = dangerReport.ID;
+                                sourceIds.Add(dangerReport.ID);
+                                var rectifyNotice = GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE>(e => e.HIDDEN_DANGER_REPORT_ID != null && e.HIDDEN_DANGER_REPORT_ID == dangerReport.ID);
+                                if (rectifyNotice != null)
+                                {
+                                    rectifyNoticeId = rectifyNotice.ID;
+                                    sourceIds.Add(rectifyNotice.ID);
+                                    var rectifyRecordIds = GetEntities<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(e => e.HIDDEN_DANGER_RECTIFY_NOTICE_ID != null && e.HIDDEN_DANGER_RECTIFY_NOTICE_ID == rectifyNotice.ID,new BaseFilter(dangerReport.ORG_ID)).Select(m => m.ID).ToList();
+                                    rectifyRecordIds.AddRange(rectifyRecordIds);
+                                    sourceIds.AddRange(rectifyRecordIds);
+                                }
+                                else
+                                {
+                                    var rectifyRecordIds = GetEntities<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(e => e.HIDDEN_DANGER_REPORT_ID != null && e.HIDDEN_DANGER_REPORT_ID == dangerReport.ID,new BaseFilter(dangerReport.ORG_ID)).Select(m=>m.ID).ToList();
+                                    sourceIds.AddRange(rectifyRecordIds);
+                                    rectifyRecordIds.AddRange(rectifyRecordIds);
+                                }
+                            }
+                        }
+                        var approveIds = new List<Guid>();
+                        var approves = new List<T_PF_APPROVE>();
+                        if (sourceIds != null && sourceIds.Any())
+                        {
+                            approves = GetEntities<T_PF_APPROVE>(e => sourceIds.Contains(e.DATA_ID), null, null).ToList();
+                            approveIds = approves.Select(m => m.ID).ToList();
+                        }
+                        var approveDetails = new List<T_PF_APPROVE_DETAIL>();
+                        if (approveIds != null && approveIds.Any())
+                        {
+                            approveDetails = GetEntities<T_PF_APPROVE_DETAIL>(e => approveIds.Contains(e.APPROVE_ID), new BaseFilter(check.ORG_ID), null).ToList();
+                        }
+                        var tasks = GetEntities<T_FM_NOTIFICATION_TASK>(e => e.SOURCE_DATA_ID != null && (sourceIds.Contains(e.SOURCE_DATA_ID.Value) || approveIds.Contains(e.SOURCE_DATA_ID.Value)), null, null).OrderBy(t => t.CREATE_TIME).ThenBy(m=>m.MODIFY_TIME).ToList();
+                        var users = GetEntities<T_FM_USER>(e => e.ENABLE_STATUS == 0, new BaseFilter(check.ORG_ID), null).ToList();
+                        var checkUser = users.FirstOrDefault(t => t.ID == check.APPLY_USER_ID);
+                        var departs = GetEntities<T_FM_DEPARTMENT>(e => e.ENABLE_STATUS == 0, new BaseFilter(check.ORG_ID), null).ToList();
+                        List<string>formCodes=new List<string> { "SK006","SK014","SK018","SK022"};
+                        var approveTemps = GetEntities<T_PF_APPROVE_TEMP>(e => formCodes.Contains(e.FORM_CODE), new BaseFilter(check.ORG_ID), "Nav_ApproveTempDetails.Nav_ApproveRole").ToList();
+                        #region 安全检查通知
+                        OperateLog noticeLog = new OperateLog();
+                        noticeLog.FORM_NAME = "安全检查通知";
+                        noticeLog.logList = new List<OperateLogList>();
+                        if (safeNoticeId != null)
+                        {
+                            //发起
+                            var temp1 = tasks.FirstOrDefault(t => t.SOURCE_DATA_ID == safeNoticeId && !t.NOTICE_TITLE.Contains("确认"));
+                            OperateLogList start = new OperateLogList();
+                            start.USER_NAME = temp1.USER_NAME;
+                            start.NAME = "安全检查通知";
+                            start.DEAL_DATE = temp1.TASK_DT;
+                            start.CREATE_TIME = temp1.CREATE_TIME;
+                            start.STATUS = temp1.NOTICE_STATUS == 1 ? 5 : temp1.NOTICE_STATUS == 2 ? 10 : temp1.NOTICE_STATUS == 4 ? 15 : 0;
+                            noticeLog.logList.Add(start);
+                            //审批
+                            var approveTemp = approves.FirstOrDefault(t => t.DATA_ID == safeNoticeId);
+                            if (approveTemp == null)
+                            {
+                                //判断发起人层级，取审批模板
+                                var departFirst = departs.FirstOrDefault(t => t.ID == check.APPLY_DEPARTMENT_ID);
+                                var param = Enum.GetName(typeof(SKDepartmentTypeEnum), departFirst.DEPARTMENT_TYPE);
+                                if (departFirst.DEPARTMENT_STATUS != 1)
+                                {
+                                    param = "公司级";
+                                }
+                                var approveTempFirst = approveTemps.FirstOrDefault(t => t.PARAM == param && t.FORM_CODE == "SK006");
+                                if (approveTempFirst != null && approveTempFirst.Nav_ApproveTempDetails != null && approveTempFirst.Nav_ApproveTempDetails.Any())
+                                {
+                                    foreach (var item in approveTempFirst.Nav_ApproveTempDetails.OrderBy(t=>t.NUM))
+                                    {
+                                        OperateLogList start1 = new OperateLogList();
+                                        start1.USER_NAME = item.Nav_ApproveRole.NAME;
+                                        start1.NAME =  "安全检查通知审批";
+                                        start1.DEAL_DATE = null;
+                                        start1.CREATE_TIME = null;
+                                        start1.STATUS = 0;
+                                        noticeLog.logList.Add(start1);
+                                    }
+                                }
+                                else
+                                {
+                                    OperateLogList start1 = new OperateLogList();
+                                    start1.USER_NAME = "审批人";
+                                    start1.NAME = "安全检查通知审批";
+                                    start1.DEAL_DATE = null;
+                                    start1.CREATE_TIME = null;
+                                    start1.STATUS = 0;
+                                    noticeLog.logList.Add(start1);
+                                }
+                            }
+                            else
+                            {
+                                var tempApprove = tasks.Where(t => t.SOURCE_DATA_ID == approveTemp?.ID).OrderBy(t => t.CREATE_TIME).ThenBy(m=>m.MODIFY_TIME).ToList();
+                                if (tempApprove != null && tempApprove.Any())
+                                {
+                                    foreach (var item in tempApprove)
+                                    {
+                                        OperateLogList start1 = new OperateLogList();
+                                        start1.USER_NAME = item.USER_NAME;
+                                        start1.NAME = item.NOTICE_TITLE.Contains("驳回") ? "安全检查通知已被驳回" : item.SOURCE_FORMCODE == "PF119" ? "安全检查通知审批" : item.NOTICE_TITLE.Contains("确认") ? "安全检查通知确认" : "安全检查通知";
+                                        start1.DEAL_DATE = item.TASK_DT;
+                                        start1.CREATE_TIME = item.CREATE_TIME;
+                                        start1.STATUS = item.NOTICE_STATUS == 1 ? 5 : item.NOTICE_STATUS == 2 ? 10 : item.NOTICE_STATUS == 4 ? 15 : 0;
+                                        noticeLog.logList.Add(start1);
+                                    }
+                                }
+                            }
+                            var temp2 = tasks.Where(t => t.SOURCE_DATA_ID == safeNoticeId && t.NOTICE_TITLE.Contains("确认")).OrderBy(m=>m.CREATE_TIME).ThenBy(n=>n.MODIFY_TIME).ToList();
+                            if (temp2 != null && temp2.Any())
+                            {
+                                noticeLog.logList = new List<OperateLogList>();
+                                foreach (var item in temp2)
+                                {
+                                    OperateLogList start1 = new OperateLogList();
+                                    start1.USER_NAME = item.USER_NAME;
+                                    start1.NAME = "安全检查通知确认";
+                                    start1.DEAL_DATE = item.TASK_DT;
+                                    start1.CREATE_TIME = item.CREATE_TIME;
+                                    start1.STATUS = item.NOTICE_STATUS == 1 ? 5 : item.NOTICE_STATUS == 2 ? 10 : item.NOTICE_STATUS == 4 ? 15 : 0;
+                                    noticeLog.logList.Add(start1);
+                                }
+                            }
+                            else
+                            {
+                                OperateLogList start1 = new OperateLogList();
+                                start1.USER_NAME = "检查人";
+                                start1.NAME = "安全检查通知确认";
+                                start1.DEAL_DATE = null;
+                                start1.CREATE_TIME = null;
+                                start1.STATUS = 0;
+                                noticeLog.logList.Add(start1);
+                            }
+                        }
+                        result.Add(noticeLog);
+                        #endregion
+                        #region 安全检查记录
+                        OperateLog recordLog = new OperateLog();
+                        recordLog.FORM_NAME = "安全检查记录";
+                        recordLog.logList = new List<OperateLogList>();
+                        if (safeRecordIds != null && safeRecordIds.Any())
+                        {
+                            //发起
+                            var itemps = tasks.Where(t => t.SOURCE_DATA_ID!=null && safeRecordIds.Contains((Guid)t.SOURCE_DATA_ID)).OrderBy(m=>m.CREATE_TIME).ThenBy(n=>n.MODIFY_TIME).ToList();
+                            if (itemps != null && itemps.Any())
+                            {
+                                foreach (var temp1 in itemps)
+                                {
+                                    OperateLogList start = new OperateLogList();
+                                    start.USER_NAME = temp1.USER_NAME;
+                                    start.NAME = "安全检查记录";
+                                    start.DEAL_DATE = temp1.TASK_DT;
+                                    start.CREATE_TIME = temp1.CREATE_TIME;
+                                    start.STATUS = temp1.NOTICE_STATUS == 1 ? 5 : temp1.NOTICE_STATUS == 2 ? 10 : temp1.NOTICE_STATUS == 4 ? 15 : 0;
+                                    recordLog.logList.Add(start);
+                                }
+                            }
+                            else
+                            {
+                                OperateLogList start1 = new OperateLogList();
+                                start1.USER_NAME = "检查人";
+                                start1.NAME = "安全检查记录";
+                                start1.DEAL_DATE = null;
+                                start1.CREATE_TIME = null;
+                                start1.STATUS = 0;
+                                recordLog.logList.Add(start1);
+                            }
+                        }
+                        else
+                        {
+                            OperateLogList start1 = new OperateLogList();
+                            start1.USER_NAME = "检查人";
+                            start1.NAME = "安全检查记录";
+                            start1.DEAL_DATE = null;
+                            start1.CREATE_TIME = null;
+                            start1.STATUS = 0;
+                            recordLog.logList.Add(start1);
+                        }
+                        result.Add(recordLog);
+                        #endregion
+                        #region 安全检查记录汇总
+                        OperateLog recordSumLog = new OperateLog();
+                        recordSumLog.FORM_NAME = "安全检查记录汇总";
+                        recordSumLog.logList = new List<OperateLogList>();
+                        if (safeRecordSumId != null)
+                        {
+                            //发起
+                            var temp1 = tasks.FirstOrDefault(t => t.SOURCE_DATA_ID == safeRecordSumId && !t.NOTICE_TITLE.Contains("确认"));
+                            OperateLogList start = new OperateLogList();
+                            start.USER_NAME = temp1.USER_NAME;
+                            start.NAME = "安全检查记录汇总";
+                            start.DEAL_DATE = temp1.TASK_DT;
+                            start.CREATE_TIME = temp1.CREATE_TIME;
+                            start.STATUS = temp1.NOTICE_STATUS == 1 ? 5 : temp1.NOTICE_STATUS == 2 ? 10 : temp1.NOTICE_STATUS == 4 ? 15 : 0;
+                            recordSumLog.logList.Add(start);
+                            //确认
+                            var temp2 = tasks.Where(t => t.SOURCE_DATA_ID == safeRecordSumId && t.NOTICE_TITLE.Contains("确认")).OrderBy(m => m.CREATE_TIME).ThenBy(n => n.MODIFY_TIME).ToList();
+                            if (temp2 != null && temp2.Any())
+                            {
+                                foreach (var item in temp2)
+                                {
+                                    OperateLogList start1 = new OperateLogList();
+                                    start1.USER_NAME = item.USER_NAME;
+                                    start1.NAME = "安全检查记录汇总确认";
+                                    start1.DEAL_DATE = item.TASK_DT;
+                                    start1.CREATE_TIME = item.CREATE_TIME;
+                                    start1.STATUS = item.NOTICE_STATUS == 1 ? 5 : item.NOTICE_STATUS == 2 ? 10 : item.NOTICE_STATUS == 4 ? 15 : 0;
+                                    recordSumLog.logList.Add(start1);
+                                }
+                            }
+                            else
+                            {
+                                OperateLogList start1 = new OperateLogList();
+                                start1.USER_NAME = "检查人";
+                                start1.NAME = "安全检查记录汇总确认";
+                                start1.DEAL_DATE = null;
+                                start1.CREATE_TIME = null;
+                                start1.STATUS = 0;
+                                recordSumLog.logList.Add(start1);
+                            }
+                        }
+                        else
+                        {
+                            OperateLogList start = new OperateLogList();
+                            start.USER_NAME = checkUser != null ? checkUser.NAME : "班长/安全员";
+                            start.NAME = "安全检查记录汇总";
+                            start.DEAL_DATE = null;
+                            start.CREATE_TIME = null;
+                            start.STATUS = 0;
+                            recordSumLog.logList.Add(start);
+                            OperateLogList start1 = new OperateLogList();
+                            start1.USER_NAME = "检查人";
+                            start1.NAME = "安全检查记录汇总确认";
+                            start1.DEAL_DATE = null;
+                            start1.CREATE_TIME = null;
+                            start1.STATUS = 0;
+                            recordSumLog.logList.Add(start1);
+                        }
+                        result.Add(recordSumLog);
+                        #endregion
+
+                        #region 隐患上报
+                        OperateLog hiddenReportLog = new OperateLog();
+                        hiddenReportLog.FORM_NAME = "隐患上报";
+                        hiddenReportLog.logList = new List<OperateLogList>();
+                        if (dangerReportId != null)
+                        {
+                            //发起
+                            var temp1 = tasks.FirstOrDefault(t => t.SOURCE_DATA_ID == dangerReportId && !t.NOTICE_TITLE.Contains("确认"));
+                            OperateLogList start = new OperateLogList();
+                            start.USER_NAME = temp1.USER_NAME;
+                            start.NAME = "隐患上报";
+                            start.DEAL_DATE = temp1.TASK_DT;
+                            start.CREATE_TIME = temp1.CREATE_TIME;
+                            start.STATUS = temp1.NOTICE_STATUS == 1 ? 5 : temp1.NOTICE_STATUS == 2 ? 10 : temp1.NOTICE_STATUS == 4 ? 15 : 0;
+                            hiddenReportLog.logList.Add(start);
+                            //审批
+                            var approveTemp = approves.FirstOrDefault(t => t.DATA_ID == dangerReportId);
+                            if (approveTemp == null)
+                            {
+                                //判断发起人层级，取审批模板
+                                var departFirst = departs.FirstOrDefault(t => t.ID == dangerReport.APPLY_DEPARTMENT_ID);
+                                var param = Enum.GetName(typeof(SKDepartmentTypeEnum), departFirst.DEPARTMENT_TYPE);
+                                if (departFirst.DEPARTMENT_STATUS != 1)
+                                {
+                                    param = "公司级";
+                                }
+                                var approveTempFirst = approveTemps.FirstOrDefault(t => t.PARAM == param && t.FORM_CODE == "SK014");
+                                if (approveTempFirst != null && approveTempFirst.Nav_ApproveTempDetails != null && approveTempFirst.Nav_ApproveTempDetails.Any())
+                                {
+                                    foreach (var item in approveTempFirst.Nav_ApproveTempDetails.OrderBy(t => t.NUM))
+                                    {
+                                        OperateLogList start1 = new OperateLogList();
+                                        start1.USER_NAME = item.Nav_ApproveRole.NAME;
+                                        start1.NAME = "隐患上报审批";
+                                        start1.DEAL_DATE = null;
+                                        start1.CREATE_TIME = null;
+                                        start1.STATUS = 0;
+                                        noticeLog.logList.Add(start);
+                                    }
+                                }
+                                else
+                                {
+                                    OperateLogList start1 = new OperateLogList();
+                                    start1.USER_NAME = "审批人";
+                                    start1.NAME = "隐患上报审批";
+                                    start1.DEAL_DATE = null;
+                                    start1.CREATE_TIME = null;
+                                    start1.STATUS = 0;
+                                    hiddenReportLog.logList.Add(start1);
+                                }
+                            }
+                            else
+                            {
+                                var tempApprove = tasks.Where(t => t.SOURCE_DATA_ID == approveTemp?.ID).OrderBy(t => t.CREATE_TIME).ThenBy(m => m.MODIFY_TIME).ToList();
+                                if (tempApprove != null && tempApprove.Any())
+                                {
+                                    foreach (var item in tempApprove)
+                                    {
+                                        OperateLogList start1 = new OperateLogList();
+                                        start1.USER_NAME = item.USER_NAME;
+                                        start1.NAME = item.NOTICE_TITLE.Contains("驳回") ? "隐患上报已被驳回" : item.SOURCE_FORMCODE == "PF119" ? "隐患上报审批" : item.NOTICE_TITLE.Contains("确认") ? "隐患上报确认" : "隐患上报";
+                                        start1.DEAL_DATE = item.TASK_DT;
+                                        start1.CREATE_TIME = item.CREATE_TIME;
+                                        start1.STATUS = item.NOTICE_STATUS == 1 ? 5 : item.NOTICE_STATUS == 2 ? 10 : item.NOTICE_STATUS == 4 ? 15 : 0;
+                                        hiddenReportLog.logList.Add(start1);
+                                    }
+                                }
+                            }
+                            var temp2 = tasks.Where(t => t.SOURCE_DATA_ID == dangerReportId && t.NOTICE_TITLE.Contains("确认"));
+                            if (temp2 != null && temp2.Any())
+                            {
+                                noticeLog.logList = new List<OperateLogList>();
+                                foreach (var item in temp2)
+                                {
+                                    OperateLogList start1 = new OperateLogList();
+                                    start1.USER_NAME = item.USER_NAME;
+                                    start1.NAME = "隐患上报确认";
+                                    start1.DEAL_DATE = item.TASK_DT;
+                                    start1.CREATE_TIME = item.CREATE_TIME;
+                                    start1.STATUS = item.NOTICE_STATUS == 1 ? 5 : item.NOTICE_STATUS == 2 ? 10 : item.NOTICE_STATUS == 4 ? 15 : 0;
+                                    hiddenReportLog.logList.Add(start1);
+                                }
+                            }
+                            else
+                            {
+                                OperateLogList start1 = new OperateLogList();
+                                start1.USER_NAME = "整改责任人";
+                                start1.NAME = "隐患上报确认";
+                                start1.DEAL_DATE = null;
+                                start1.CREATE_TIME = null;
+                                start1.STATUS = 0;
+                                hiddenReportLog.logList.Add(start1);
+                            }
+                        }
+                        else
+                        {
+                            OperateLogList start = new OperateLogList();
+                            start.USER_NAME = checkUser != null ? checkUser.NAME : "上报人";
+                            start.NAME = "隐患上报";
+                            start.DEAL_DATE = null;
+                            start.CREATE_TIME = null;
+                            start.STATUS = 0;
+                            hiddenReportLog.logList.Add(start);
+                            //判断发起人层级，取审批模板
+                            var departFirst = departs.FirstOrDefault(t => t.ID == dangerReport.APPLY_DEPARTMENT_ID);
+                            var param = Enum.GetName(typeof(SKDepartmentTypeEnum), departFirst.DEPARTMENT_TYPE);
+                            if (departFirst.DEPARTMENT_STATUS != 1)
+                            {
+                                param = "公司级";
+                            }
+                            var approveTempFirst = approveTemps.FirstOrDefault(t => t.PARAM == param && t.FORM_CODE == "SK014");
+                            if (approveTempFirst != null && approveTempFirst.Nav_ApproveTempDetails != null && approveTempFirst.Nav_ApproveTempDetails.Any())
+                            {
+                                foreach (var item in approveTempFirst.Nav_ApproveTempDetails.OrderBy(t => t.NUM))
+                                {
+                                    OperateLogList start2 = new OperateLogList();
+                                    start2.USER_NAME = item.Nav_ApproveRole.NAME;
+                                    start2.NAME = "隐患上报审批";
+                                    start2.DEAL_DATE = null;
+                                    start2.CREATE_TIME = null;
+                                    start2.STATUS = 0;
+                                    hiddenReportLog.logList.Add(start2);
+                                }
+                            }
+                            else
+                            {
+                                OperateLogList start2 = new OperateLogList();
+                                start2.USER_NAME = "审批人";
+                                start2.NAME = "隐患上报审批";
+                                start2.DEAL_DATE = null;
+                                start2.CREATE_TIME = null;
+                                start2.STATUS = 0;
+                                hiddenReportLog.logList.Add(start2);
+                            }
+                            OperateLogList start1 = new OperateLogList();
+                            start1.USER_NAME = "整改责任人";
+                            start1.NAME = "隐患上报确认";
+                            start1.DEAL_DATE = null;
+                            start1.CREATE_TIME = null;
+                            start1.STATUS = 0;
+                            hiddenReportLog.logList.Add(start1);
+                        }
+                         result.Add(hiddenReportLog);
+                        #endregion
+
+                        #region 隐患整改通知
+                        OperateLog rectifyNoticeLog = new OperateLog();
+                        rectifyNoticeLog.FORM_NAME = "隐患整改通知";
+                        rectifyNoticeLog.logList = new List<OperateLogList>();
+                        if (rectifyNoticeId != null)
+                        {
+                            //发起
+                            var temp1 = tasks.FirstOrDefault(t => t.SOURCE_DATA_ID == rectifyNoticeId && !t.NOTICE_TITLE.Contains("确认"));
+                            OperateLogList start = new OperateLogList();
+                            start.USER_NAME = temp1.USER_NAME;
+                            start.NAME = "隐患整改通知";
+                            start.DEAL_DATE = temp1.TASK_DT;
+                            start.CREATE_TIME = temp1.CREATE_TIME;
+                            start.STATUS = temp1.NOTICE_STATUS == 1 ? 5 : temp1.NOTICE_STATUS == 2 ? 10 : temp1.NOTICE_STATUS == 4 ? 15 : 0;
+                            rectifyNoticeLog.logList.Add(start);
+                            var temp2 = tasks.Where(t => t.SOURCE_DATA_ID == rectifyNoticeId && t.NOTICE_TITLE.Contains("确认"));
+                            if (temp2 != null && temp2.Any())
+                            {
+                                foreach (var item in temp2)
+                                {
+                                    OperateLogList start1 = new OperateLogList();
+                                    start1.USER_NAME = item.USER_NAME;
+                                    start1.NAME = "隐患整改通知确认";
+                                    start1.DEAL_DATE = item.TASK_DT;
+                                    start1.CREATE_TIME = item.CREATE_TIME;
+                                    start1.STATUS = item.NOTICE_STATUS == 1 ? 5 : item.NOTICE_STATUS == 2 ? 10 : item.NOTICE_STATUS == 4 ? 15 : 0;
+                                    rectifyNoticeLog.logList.Add(start1);
+                                }
+                            }
+                            else
+                            {
+                                OperateLogList start1 = new OperateLogList();
+                                start1.USER_NAME = "整改责任人";
+                                start1.NAME = "隐患整改通知确认";
+                                start1.DEAL_DATE = null;
+                                start1.CREATE_TIME = null;
+                                start1.STATUS = 0;
+                                rectifyNoticeLog.logList.Add(start1);
+                            }
+                        }
+                        else {
+                            OperateLogList start = new OperateLogList();
+                            start.USER_NAME = "安全员";
+                            start.NAME = "隐患整改通知";
+                            start.DEAL_DATE = null;
+                            start.CREATE_TIME = null;
+                            start.STATUS =  0;
+                            rectifyNoticeLog.logList.Add(start);
+                            OperateLogList start1 = new OperateLogList();
+                            start1.USER_NAME = "整改责任人";
+                            start1.NAME = "隐患整改通知确认";
+                            start1.DEAL_DATE = null;
+                            start1.CREATE_TIME = null;
+                            start1.STATUS = 0;
+                            rectifyNoticeLog.logList.Add(start1);
+                        }
+                        result.Add(rectifyNoticeLog);
+                        #endregion
+
+                    }
+                    return result;
+                }
+            });
         }
     }
 }