From 41ba702346349240ed2b85a156e92aea72a6b2d9 Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Fri, 18 Jul 2025 11:07:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?IDP=E8=AE=BE=E8=AE=A1=E5=9B=BE=E7=BA=B8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignDrawing/DesignDrawingService.cs     | 222 +++++++++++++++---
 SGGL/BLL/IDP/IDPDataService.cs                |  41 +---
 .../CQMS/DesignDrawing/ArchivesLib.aspx       | 147 +++++++++---
 .../CQMS/DesignDrawing/ArchivesLib.aspx.cs    | 168 ++++++++++++-
 .../ArchivesLib.aspx.designer.cs              | 171 ++++++++++++++
 SGGL/Model/IDP/SessionItem.cs                 |  19 ++
 SGGL/Model/Model.csproj                       |   1 +
 SGGL/WebAPI/Controllers/IDP/IDPController.cs  |  12 +-
 .../PublishProfiles/FolderProfile.pubxml.user |  22 +-
 SGGL/WebAPI/WebAPI.csproj.user                |   2 +-
 10 files changed, 686 insertions(+), 119 deletions(-)
 create mode 100644 SGGL/Model/IDP/SessionItem.cs

diff --git a/SGGL/BLL/CQMS/DesignDrawing/DesignDrawingService.cs b/SGGL/BLL/CQMS/DesignDrawing/DesignDrawingService.cs
index 4f724174..edd26fbd 100644
--- a/SGGL/BLL/CQMS/DesignDrawing/DesignDrawingService.cs
+++ b/SGGL/BLL/CQMS/DesignDrawing/DesignDrawingService.cs
@@ -114,7 +114,7 @@ namespace BLL
         public static List<string> GetWbsFullPathDropDownList(string projectId)
         {
             var list = (from x in Funs.DB.IDP_DesignDrawing
-                        where x.ProjectId == projectId && x.WbsFullPath != null 
+                        where x.ProjectId == projectId && x.WbsFullPath != null && x.WbsFullPath != ""
                         select x.WbsFullPath).Distinct().OrderBy(x => x).ToList();
             return list;
         }
@@ -146,7 +146,7 @@ namespace BLL
         public static List<string> GetFileVersionDropDownList(string projectId)
         {
             var list = (from x in Funs.DB.IDP_DesignDrawing
-                        where x.ProjectId == projectId && x.FileVersion != null
+                        where x.ProjectId == projectId && x.FileVersion != null && x.FileVersion != ""
                         select x.FileVersion).Distinct().OrderBy(x => x).ToList();
             return list;
         }
@@ -178,7 +178,7 @@ namespace BLL
         public static List<string> GetMajorNoDropDownList(string projectId)
         {
             var list = (from x in Funs.DB.IDP_DesignDrawing
-                        where x.ProjectId == projectId && x.MajorNo != null
+                        where x.ProjectId == projectId && x.MajorNo != null && x.MajorNo != ""
                         select x.MajorNo).Distinct().OrderBy(x => x).ToList();
             return list;
         }
@@ -209,7 +209,7 @@ namespace BLL
         public static List<string> GetMajorNameDropDownList(string projectId)
         {
             var list = (from x in Funs.DB.IDP_DesignDrawing
-                        where x.ProjectId == projectId && x.MajorName != null
+                        where x.ProjectId == projectId && x.MajorName != null && x.MajorName != ""
                         select x.MajorName).Distinct().OrderBy(x => x).ToList();
             return list;
         }
@@ -241,41 +241,195 @@ namespace BLL
         public static List<string> GetStatusDropDownList(string projectId)
         {
             var list = (from x in Funs.DB.IDP_DesignDrawing
-                        where x.ProjectId == projectId && x.Status != null
+                        where x.ProjectId == projectId && x.Status != null && x.Status != ""
                         select x.Status).Distinct().OrderBy(x => x).ToList();
             return list;
         }
 
-        ///// <summary>
-        // /// 装工主名称下拉框
-        // /// </summary>
-        // /// <param name="projectId">项目id</param>
-        // /// <returns></returns>
-        //public static List<string> GetWbsFullPathDropDownList(string projectId)
-        //{
-        //    var list = (from x in Funs.DB.Transfer_PunchlistFrom
-        //                where x.ProjectId == projectId
-        //                select x.Action_By).Distinct().OrderBy(x => x).ToList();
-        //    return list;
-        //}
 
-        ///// <summary>
-        /////  装工主名称下拉框
-        ///// </summary>
-        ///// <param name="projectId">项目id</param>
-        ///// <param name="dropName">下拉框名字</param>
-        ///// <param name="isShowPlease">是否显示请选择</param>
-        //public static void InitActionByUnitDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease)
-        //{
-        //    dropName.DataValueField = "string";
-        //    dropName.DataTextField = "string";
-        //    dropName.DataSource = GetActionByUnitDropDownList(projectId);
-        //    dropName.DataBind();
-        //    if (isShowPlease)
-        //    {
-        //        Funs.FineUIPleaseSelect(dropName);
-        //    }
-        //}
+        /// <summary>
+        ///  保密等级下拉框
+        /// </summary>
+        /// <param name="projectId">项目id</param>
+        /// <param name="dropName">下拉框名字</param>
+        /// <param name="isShowPlease">是否显示请选择</param>
+        public static void InitClassDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease)
+        {
+            dropName.DataValueField = "string";
+            dropName.DataTextField = "string";
+            dropName.DataSource = GetClassDropDownList(projectId);
+            dropName.DataBind();
+            if (isShowPlease)
+            {
+                Funs.FineUIPleaseSelect(dropName);
+            }
+        }
 
+        /// <summary>
+        /// 保密等级下拉框
+        /// </summary>
+        /// <param name="projectId">项目id</param>
+        /// <returns></returns>
+        public static List<string> GetClassDropDownList(string projectId)
+        {
+            var list = (from x in Funs.DB.IDP_DesignDrawing
+                        where x.ProjectId == projectId && x.ClassificationLevelInProject != null && x.ClassificationLevelInProject != ""
+                        select x.ClassificationLevelInProject).Distinct().OrderBy(x => x).ToList();
+            return list;
+        }
+
+        /// <summary>
+        ///  设计人下拉框
+        /// </summary>
+        /// <param name="projectId">项目id</param>
+        /// <param name="dropName">下拉框名字</param>
+        /// <param name="isShowPlease">是否显示请选择</param>
+        public static void InitDesignUserNameDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease)
+        {
+            dropName.DataValueField = "string";
+            dropName.DataTextField = "string";
+            dropName.DataSource = GetDesignUserNameDropDownList(projectId);
+            dropName.DataBind();
+            if (isShowPlease)
+            {
+                Funs.FineUIPleaseSelect(dropName);
+            }
+        }
+
+        /// <summary>
+        /// 设计人下拉框
+        /// </summary>
+        /// <param name="projectId">项目id</param>
+        /// <returns></returns>
+        public static List<string> GetDesignUserNameDropDownList(string projectId)
+        {
+            var list = (from x in Funs.DB.IDP_DesignDrawing
+                        where x.ProjectId == projectId && x.DesignUserName != null && x.DesignUserName != ""
+                        select x.DesignUserName).Distinct().OrderBy(x => x).ToList();
+            return list;
+        }
+
+        /// <summary>
+        ///  校核人下拉框
+        /// </summary>
+        /// <param name="projectId">项目id</param>
+        /// <param name="dropName">下拉框名字</param>
+        /// <param name="isShowPlease">是否显示请选择</param>
+        public static void InitJiaoheUserNameDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease)
+        {
+            dropName.DataValueField = "string";
+            dropName.DataTextField = "string";
+            dropName.DataSource = GetJiaoheUserNameDropDownList(projectId);
+            dropName.DataBind();
+            if (isShowPlease)
+            {
+                Funs.FineUIPleaseSelect(dropName);
+            }
+        }
+
+        /// <summary>
+        /// 校核人下拉框
+        /// </summary>
+        /// <param name="projectId">项目id</param>
+        /// <returns></returns>
+        public static List<string> GetJiaoheUserNameDropDownList(string projectId)
+        {
+            var list = (from x in Funs.DB.IDP_DesignDrawing
+                        where x.ProjectId == projectId && x.JiaoheUserName != null && x.JiaoheUserName != ""
+                        select x.JiaoheUserName).Distinct().OrderBy(x => x).ToList();
+            return list;
+        }
+
+        /// <summary>
+        ///  审核人下拉框
+        /// </summary>
+        /// <param name="projectId">项目id</param>
+        /// <param name="dropName">下拉框名字</param>
+        /// <param name="isShowPlease">是否显示请选择</param>
+        public static void InitShenheUserNameDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease)
+        {
+            dropName.DataValueField = "string";
+            dropName.DataTextField = "string";
+            dropName.DataSource = GetShenheUserNameDropDownList(projectId);
+            dropName.DataBind();
+            if (isShowPlease)
+            {
+                Funs.FineUIPleaseSelect(dropName);
+            }
+        }
+
+        /// <summary>
+        /// 审核人下拉框
+        /// </summary>
+        /// <param name="projectId">项目id</param>
+        /// <returns></returns>
+        public static List<string> GetShenheUserNameDropDownList(string projectId)
+        {
+            var list = (from x in Funs.DB.IDP_DesignDrawing
+                        where x.ProjectId == projectId && x.ShenheUserName != null && x.ShenheUserName != ""
+                        select x.ShenheUserName).Distinct().OrderBy(x => x).ToList();
+            return list;
+        }
+        /// <summary>
+        ///  审定人下拉框
+        /// </summary>
+        /// <param name="projectId">项目id</param>
+        /// <param name="dropName">下拉框名字</param>
+        /// <param name="isShowPlease">是否显示请选择</param>
+        public static void InitShendingUserNameDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease)
+        {
+            dropName.DataValueField = "string";
+            dropName.DataTextField = "string";
+            dropName.DataSource = GetShendingUserNameDropDownList(projectId);
+            dropName.DataBind();
+            if (isShowPlease)
+            {
+                Funs.FineUIPleaseSelect(dropName);
+            }
+        }
+
+        /// <summary>
+        /// 审定人下拉框
+        /// </summary>
+        /// <param name="projectId">项目id</param>
+        /// <returns></returns>
+        public static List<string> GetShendingUserNameDropDownList(string projectId)
+        {
+            var list = (from x in Funs.DB.IDP_DesignDrawing
+                        where x.ProjectId == projectId && x.ShendingUserName != null && x.ShendingUserName != ""
+                        select x.ShendingUserName).Distinct().OrderBy(x => x).ToList();
+            return list;
+        }
+
+        /// <summary>
+        ///  专业负责人下拉框
+        /// </summary>
+        /// <param name="projectId">项目id</param>
+        /// <param name="dropName">下拉框名字</param>
+        /// <param name="isShowPlease">是否显示请选择</param>
+        public static void InitMajorResponsibleUserNameDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease)
+        {
+            dropName.DataValueField = "string";
+            dropName.DataTextField = "string";
+            dropName.DataSource = GetMajorResponsibleUserNameDropDownList(projectId);
+            dropName.DataBind();
+            if (isShowPlease)
+            {
+                Funs.FineUIPleaseSelect(dropName);
+            }
+        }
+
+        /// <summary>
+        /// 专业负责人下拉框
+        /// </summary>
+        /// <param name="projectId">项目id</param>
+        /// <returns></returns>
+        public static List<string> GetMajorResponsibleUserNameDropDownList(string projectId)
+        {
+            var list = (from x in Funs.DB.IDP_DesignDrawing
+                        where x.ProjectId == projectId && x.MajorResponsibleUserName != null && x.MajorResponsibleUserName != ""
+                        select x.MajorResponsibleUserName).Distinct().OrderBy(x => x).ToList();
+            return list;
+        }
     }
 }
diff --git a/SGGL/BLL/IDP/IDPDataService.cs b/SGGL/BLL/IDP/IDPDataService.cs
index e3d21101..c4e3800e 100644
--- a/SGGL/BLL/IDP/IDPDataService.cs
+++ b/SGGL/BLL/IDP/IDPDataService.cs
@@ -1,21 +1,13 @@
-using Apache.NMS.ActiveMQ.Commands;
-using Aspose.Words.Lists;
-using Microsoft.SqlServer.Dts.Runtime;
-using Model;
+using Model;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using Org.BouncyCastle.Ocsp;
-using SgManager.AI;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
 using System.Linq;
 using System.Net;
 using System.Security.Cryptography;
-using System.Security.Policy;
-using System.ServiceModel.Channels;
 using System.Text;
 
 namespace BLL
@@ -25,15 +17,15 @@ namespace BLL
     /// </summary>
     public static class IDPDataService
     {
-        /// <summary>
-        /// 测试环境api地址
-        /// </summary>
-        private static readonly string IDPApiUrl = "http://10.5.6.151:8100/";
         ///// <summary>
-        ///// 正式环境api地址
+        ///// 测试环境api地址
         ///// </summary>
+        //private static readonly string IDPApiUrl = "http://10.5.6.151:8100/";
+        /// <summary>
+        /// 正式环境api地址
+        /// </summary>
         //private static readonly string IDPApiUrl = "https://idp.cwcec.com/";
-        //private static readonly string IDPApiUrl = SysConstSetService.WuHuanIDPPath;
+        private static readonly string IDPApiUrl = SysConstSetService.WuHuanIDPPath;
 
         #region 接口授权认证
 
@@ -142,7 +134,7 @@ namespace BLL
         /// 质量管理设计图纸
         /// </summary>
         /// <param name="projectId">项目Id</param>
-        /// <param name="startDate">获取指定日期之后到现在的异动数据</param>
+        /// <param name="startDate">获取指定时间之后到现在的异动数据</param>
         public static void GetIDPProjectDesignDrawingData(string projectId = "", string startDate = "")
         {
             try
@@ -214,6 +206,7 @@ namespace BLL
                             newItem.DisplayProjectName = item.displayProjectName;
                             newItem.ProjectDeviceProcedureSubjectCode = item.projectDeviceProcedureSubjectCode;
                             newItem.WbsFullPath = item.wbsFullPath;
+                            newItem.FormatFileCode = item.formatFileCode;
                             newItem.FormatFileName = item.formatFileName;
                             newItem.FileVersion = item.fileVersion;
                             newItem.MajorNo = item.majorNo;
@@ -246,7 +239,6 @@ namespace BLL
                     }
                 }
 
-
                 if (listAdd.Any())
                 {
                     AddIDP_DesignDrawing(listAdd);
@@ -292,6 +284,7 @@ namespace BLL
                     newItem.DisplayProjectName = obj.DisplayProjectName;
                     newItem.ProjectDeviceProcedureSubjectCode = obj.ProjectDeviceProcedureSubjectCode;
                     newItem.WbsFullPath = obj.WbsFullPath;
+                    newItem.FormatFileCode = obj.FormatFileCode;
                     newItem.FormatFileName = obj.FormatFileName;
                     newItem.FileVersion = obj.FileVersion;
                     newItem.MajorNo = obj.MajorNo;
@@ -317,7 +310,7 @@ namespace BLL
         /// <summary>
         /// 接收保存数据
         /// </summary>
-        /// <param name="newItem"></param>
+        /// <param name="items"></param>
         public static string SaveDesignDrawingData(List<OADesignDrawingDataItem> items)
         {
             try
@@ -431,16 +424,4 @@ namespace BLL
         #endregion
     }
 
-
-    public class SessionItem
-    {
-        /// <summary>
-        /// value
-        /// </summary>
-        public string value { get; set; }
-        /// <summary>
-        /// name
-        /// </summary>
-        public string name { get; set; }
-    }
 }
diff --git a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx
index b2a7c7fd..232bb8ed 100644
--- a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx
@@ -9,7 +9,7 @@
     <script src="../../Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
     <title>档案文件库</title>
     <style type="text/css">
-        .labcenter {
+        /* .labcenter {
             text-align: center;
         }
 
@@ -43,41 +43,77 @@
         .f-grid-colheader-text {
             white-space: normal;
             word-break: break-all;
-        }
+        }*/
     </style>
 </head>
 <body>
     <form id="form1" runat="server">
-        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
         <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
             ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="档案文件库" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true"
-                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="updateTime"
-                    SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" ForceFit="true"
-                    AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableRowDoubleClickEvent="true"  AllowFilters="true"
-                    OnFilterChange="Grid1_FilterChange"  EnableTextSelection="True">
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" Title="档案文件库"
+                    runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
+                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="updateTime" SortDirection="DESC" OnSort="Grid1_Sort"
+                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                    EnableRowDoubleClickEvent="true" EnableTextSelection="true">
                     <Toolbars>
                         <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:DropDownList ID="ddlWbsFullPath" runat="server" Label="装工名称" AutoPostBack="true" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelWidth="80px">
+                                <f:DropDownList ID="ddlWbsFullPath" runat="server" Label="装工名称" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
                                 </f:DropDownList>
-                                <f:DropDownList ID="ddlFileVersion" runat="server" Label="版次" AutoPostBack="true" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelWidth="80px">
+                                <f:DropDownList ID="ddlFileVersion" runat="server" Label="版次" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
                                 </f:DropDownList>
-                                <f:DropDownList ID="ddlMajorName" runat="server" Label="专业" AutoPostBack="true" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelWidth="80px">
+                                <f:DropDownList ID="ddlMajorName" runat="server" Label="专业" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
                                 </f:DropDownList>
-                                <f:DropDownList ID="ddlStatus" runat="server" Label="发布状态" AutoPostBack="true" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelWidth="80px">
+                                <f:DropDownList ID="ddlStatus" runat="server" Label="发布状态" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
+                                </f:DropDownList>
+                                <f:DropDownList ID="ddlClass" runat="server" Label="保密等级" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
+                                </f:DropDownList>
+                                <f:DropDownList ID="ddlIfmail" runat="server" Label="蓝图寄出" Width="220px" LabelAlign="Right" LabelWidth="80px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
+                                    <f:ListItem Value="是" Text="是"></f:ListItem>
+                                    <f:ListItem Value="否" Text="否"></f:ListItem>
                                 </f:DropDownList>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
                                 <f:Button ID="btnQuery" OnClick="btnQuery_Click" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" runat="server">
                                 </f:Button>
-                                <%--<f:Button ID="btnRset" OnClick="btnRset_Click" ToolTip="重置" Icon="ArrowUndo" EnablePostBack="true" runat="server">
-                                </f:Button>
-                                <f:Button ID="btnNew" ToolTip="新增" Icon="Add" EnablePostBack="false" runat="server"
-                                    Hidden="true">
-                                </f:Button>--%>
+                            </Items>
+                        </f:Toolbar>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:DropDownList ID="ddlDesignUserName" runat="server" Label="设计人" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
+                                </f:DropDownList>
+                                <f:DropDownList ID="ddlJiaoheUserName" runat="server" Label="校核人" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
+                                </f:DropDownList>
+                                <f:DropDownList ID="ddlShenheUserName" runat="server" Label="审核人" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
+                                </f:DropDownList>
+                                <f:DropDownList ID="ddlShendingUserName" runat="server" Label="审定人" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
+                                </f:DropDownList>
+                                <f:DropDownList ID="ddlMajorResponsibleUserName" runat="server" Label="专业负责" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" Width="220px" LabelAlign="Right" LabelWidth="80px">
+                                </f:DropDownList>
+                            </Items>
+                        </f:Toolbar>
+                        <f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:DatePicker runat="server" Label="入库日期" ID="txtStartUpdateTime" LabelAlign="Right" LabelWidth="80px" Width="220px">
+                                </f:DatePicker>
+                                <f:Label ID="Label1" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker runat="server" ID="txtEndUpdateTime" LabelAlign="Right" LabelWidth="80px" Width="110px">
+                                </f:DatePicker>
+                                <f:DatePicker runat="server" Label="验收日期" ID="txtStartSendTime" LabelAlign="Right" LabelWidth="80px" Width="220px">
+                                </f:DatePicker>
+                                <f:Label ID="Label2" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker runat="server" ID="txtEndSendTime" LabelAlign="Right" LabelWidth="80px" Width="110px">
+                                </f:DatePicker>
+                                <f:DatePicker runat="server" Label="打印日期" ID="txtStartPrintTime" LabelAlign="Right" LabelWidth="80px" Width="220px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker runat="server" ID="txtEndPrintTime" LabelAlign="Right" LabelWidth="80px" Width="110px">
+                                </f:DatePicker>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
@@ -88,37 +124,70 @@
                                 <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                        <f:RenderField Width="120px" ColumnID="projectDeviceProcedureSubjectCode" DataField="projectDeviceProcedureSubjectCode"
-                            SortField="UnitWorkName" FieldType="String" HeaderText="装工主编码" TextAlign="Center"
-                            HeaderTextAlign="Center">
+                        <f:RenderField Width="120px" ColumnID="projectDeviceProcedureSubjectCode" DataField="projectDeviceProcedureSubjectCode" SortField="projectDeviceProcedureSubjectCode"
+                            FieldType="String" HeaderText="装工主编码" TextAlign="Center" HeaderTextAlign="Center">
                         </f:RenderField>
-                        <f:RenderField Width="120px" ColumnID="wbsFullPath" DataField="wbsFullPath"
-                             FieldType="String" HeaderText="装工主名称" TextAlign="Left"
-                            HeaderTextAlign="Center">
+                        <f:RenderField Width="200px" ColumnID="wbsFullPath" DataField="wbsFullPath" SortField="wbsFullPath"
+                            FieldType="String" HeaderText="装工主名称" TextAlign="Left" HeaderTextAlign="Center">
                         </f:RenderField>
-                        <f:RenderField Width="80px" ColumnID="formatFileCode" DataField="formatFileCode" 
-                            FieldType="String" HeaderText="文件编码" TextAlign="Center" HeaderTextAlign="Center">
+                        <f:RenderField Width="200px" ColumnID="formatFileCode" DataField="formatFileCode" SortField="formatFileCode"
+                            FieldType="String" HeaderText="文件编码" TextAlign="Left" HeaderTextAlign="Center">
                         </f:RenderField>
-                        <f:RenderField Width="120px" ColumnID="formatFileName" DataField="formatFileName"
-                            FieldType="String" HeaderText="文件名称" TextAlign="Center" HeaderTextAlign="Center">
+                        <f:RenderField Width="150px" ColumnID="formatFileName" DataField="formatFileName"
+                            FieldType="String" HeaderText="文件名称" TextAlign="Left" HeaderTextAlign="Center">
                         </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="majorNo" DataField="majorNo"
-                            FieldType="String" HeaderText="专业" TextAlign="Center" HeaderTextAlign="Center">
+                        <f:RenderField Width="100px" ColumnID="majorNo" DataField="majorNo" SortField="majorNo"
+                            FieldType="String" HeaderText="专业编码" TextAlign="Center" HeaderTextAlign="Center">
                         </f:RenderField>
-                        <f:RenderField Width="120px" ColumnID="majorName" DataField="majorName"
+                        <f:RenderField Width="120px" ColumnID="majorName" DataField="majorName" SortField="majorName"
                             FieldType="String" HeaderText="专业名称" TextAlign="Center" HeaderTextAlign="Center">
                         </f:RenderField>
-                        <f:RenderField Width="120px" ColumnID="fileVersion" DataField="fileVersion"
+                        <f:RenderField Width="80px" ColumnID="fileVersion" DataField="fileVersion" SortField="fileVersion"
                             FieldType="String" HeaderText="版次" TextAlign="Center" HeaderTextAlign="Center">
                         </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="status" DataField="status"
-                            FieldType="String" HeaderText="发布状态" TextAlign="Center" HeaderTextAlign="Center">
+                        <f:RenderField Width="100px" ColumnID="designUserName" DataField="designUserName"
+                            FieldType="String" HeaderText="设计人" TextAlign="Center" HeaderTextAlign="Center">
                         </f:RenderField>
-                        <f:RenderField Width="140px" ColumnID="updateTime" DataField="updateTime" 
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm:ss" HeaderText="入库日期" TextAlign="Center" HeaderTextAlign="Center">
+                        <f:RenderField Width="100px" ColumnID="jiaoheUserName" DataField="jiaoheUserName"
+                            FieldType="String" HeaderText="校核人" TextAlign="Center" HeaderTextAlign="Center">
                         </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="shenheUserName" DataField="shenheUserName"
+                            FieldType="String" HeaderText="审核人" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="shendingUserName" DataField="shendingUserName"
+                            FieldType="String" HeaderText="审定人" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="majorResponsibleUserName" DataField="majorResponsibleUserName"
+                            FieldType="String" HeaderText="专业负责人" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="classificationLevelInProject" DataField="classificationLevelInProject" SortField="classificationLevelInProject"
+                            FieldType="String" HeaderText="保密等级" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="remark" DataField="remark"
+                            FieldType="String" HeaderText="备注" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="140px" ColumnID="updateTime" DataField="updateTime" SortField="updateTime"
+                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="入库日期" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="archnumber" DataField="archnumber"
+                            FieldType="String" HeaderText="入库档案号" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="140px" ColumnID="sendtime" DataField="sendtime" SortField="sendtime"
+                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="档案室验收日期" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="140px" ColumnID="printtime" DataField="printtime" SortField="printtime"
+                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="蓝图打印日期" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="ifmail" DataField="ifmail" SortField="ifmail"
+                            FieldType="String" HeaderText="蓝图寄出" TextAlign="Center" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="文件" HeaderTextAlign="Center" TextAlign="Left">
+                            <ItemTemplate>
+                                <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" Text='<%# GetFileUrl(Eval("fileid"),Eval("maintitle")) %>' ToolTip="文件查看"></asp:LinkButton>
+                            </ItemTemplate>
+                        </f:TemplateField>
                     </Columns>
-                   <%-- <Listeners>
+                    <%-- <Listeners>
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
                     </Listeners>--%>
                     <PageItems>
@@ -145,7 +214,7 @@
             Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
             Width="1300px" Height="660px">
         </f:Window>
-       <%-- <f:Menu ID="Menu1" runat="server">
+        <%-- <f:Menu ID="Menu1" runat="server">
             <Items>
                 <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true" Text="修改" Icon="Pencil"
                     OnClick="btnMenuModify_Click">
diff --git a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx.cs b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx.cs
index a492dca5..41a4aad3 100644
--- a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx.cs
@@ -9,6 +9,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using NPOI.SS.UserModel;
+using System.Security.Policy;
 
 namespace FineUIPro.Web.CQMS.DesignDrawing
 {
@@ -73,6 +74,13 @@ namespace FineUIPro.Web.CQMS.DesignDrawing
             BLL.DesignDrawingService.InitMajorNameDropDownList(this.ddlMajorName, this.CurrUser.LoginProjectId, false);
             //BLL.DesignDrawingService.InitMajorNoDropDownList(this.ddlMajorNo, this.CurrUser.LoginProjectId, false);
             BLL.DesignDrawingService.InitStatusNameDropDownList(this.ddlStatus, this.CurrUser.LoginProjectId, false);
+            BLL.DesignDrawingService.InitClassDropDownList(this.ddlClass, this.CurrUser.LoginProjectId, false);
+
+            BLL.DesignDrawingService.InitDesignUserNameDropDownList(this.ddlDesignUserName, this.CurrUser.LoginProjectId, false);
+            BLL.DesignDrawingService.InitJiaoheUserNameDropDownList(this.ddlJiaoheUserName, this.CurrUser.LoginProjectId, false);
+            BLL.DesignDrawingService.InitShenheUserNameDropDownList(this.ddlShenheUserName, this.CurrUser.LoginProjectId, false);
+            BLL.DesignDrawingService.InitShendingUserNameDropDownList(this.ddlShendingUserName, this.CurrUser.LoginProjectId, false);
+            BLL.DesignDrawingService.InitMajorResponsibleUserNameDropDownList(this.ddlMajorResponsibleUserName, this.CurrUser.LoginProjectId, false);
         }
 
         #endregion
@@ -88,10 +96,37 @@ namespace FineUIPro.Web.CQMS.DesignDrawing
             //ORDER BY lib.updatetime DESC
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
-            //strSql += " AND (chec.CheckDate>=@startTime or @startTime='') and (chec.CheckDate<=@endTime or @endTime='') ";
-            //listStr.Add(new SqlParameter("@startTime", !string.IsNullOrEmpty(txtStartTime.Text.Trim()) ? txtStartTime.Text.Trim() + " 00:00:00" : ""));
-            //listStr.Add(new SqlParameter("@endTime", !string.IsNullOrEmpty(txtEndTime.Text.Trim()) ? txtEndTime.Text.Trim() + "  23:59:59" : ""));
 
+            if (!string.IsNullOrEmpty(txtStartUpdateTime.Text.Trim()))
+            {
+                strSql += " AND UpdateTime >= @startUpdateTime  ";
+                listStr.Add(new SqlParameter("@startUpdateTime", Funs.GetNewDateTime(txtStartUpdateTime.Text.Trim())));
+            }
+            if (!string.IsNullOrEmpty(txtEndUpdateTime.Text.Trim()))
+            {
+                strSql += " AND UpdateTime <= @endUpdatTime  ";
+                listStr.Add(new SqlParameter("@endUpdatTime", $"{Funs.GetNewDateTime(txtEndUpdateTime.Text.Trim())} 23:59:59"));
+            }
+            if (!string.IsNullOrEmpty(txtStartSendTime.Text.Trim()))
+            {
+                strSql += " AND Sendtime >= @startSendTime  ";
+                listStr.Add(new SqlParameter("@startSendTime", Funs.GetNewDateTime(txtStartSendTime.Text.Trim())));
+            }
+            if (!string.IsNullOrEmpty(txtEndSendTime.Text.Trim()))
+            {
+                strSql += " AND Sendtime <= @endSendTime  ";
+                listStr.Add(new SqlParameter("@endSendTime", $"{Funs.GetNewDateTime(txtEndSendTime.Text.Trim())} 23:59:59"));
+            }
+            if (!string.IsNullOrEmpty(txtStartPrintTime.Text.Trim()))
+            {
+                strSql += " AND Printtime >= @startPrintTime  ";
+                listStr.Add(new SqlParameter("@startPrintTime", Funs.GetNewDateTime(txtStartPrintTime.Text.Trim())));
+            }
+            if (!string.IsNullOrEmpty(txtEndPrintTime.Text.Trim()))
+            {
+                strSql += " AND Printtime <= @endPrintTime  ";
+                listStr.Add(new SqlParameter("@endPrintTime", $"{Funs.GetNewDateTime(txtEndPrintTime.Text.Trim())} 23:59:59"));
+            }
             if (this.ddlWbsFullPath.SelectedItemArray.Count() > 1 || (this.ddlWbsFullPath.SelectedValue != BLL.Const._Null && this.ddlWbsFullPath.SelectedItemArray.Count() == 1))
             {
                 strSql += " AND (1=2 ";
@@ -152,6 +187,101 @@ namespace FineUIPro.Web.CQMS.DesignDrawing
                 }
                 strSql += ")";
             }
+            if (this.ddlClass.SelectedItemArray.Count() > 1 || (this.ddlClass.SelectedValue != BLL.Const._Null && this.ddlClass.SelectedItemArray.Count() == 1))
+            {
+                strSql += " AND (1=2 ";
+                int i = 0;
+                foreach (var item in this.ddlClass.SelectedValueArray)
+                {
+                    if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null)
+                    {
+                        strSql += " OR ClassificationLevelInProject = @Class" + i.ToString();
+                        listStr.Add(new SqlParameter("@Class" + i.ToString(), item));
+                    }
+                    i++;
+                }
+                strSql += ")";
+            }
+            if (!string.IsNullOrEmpty(ddlIfmail.SelectedValue.Trim()))
+            {
+                strSql += " AND ifmail = @ifmail";
+                listStr.Add(new SqlParameter("@ifmail", ddlIfmail.SelectedValue.Trim()));
+            }
+            if (this.ddlDesignUserName.SelectedItemArray.Count() > 1 || (this.ddlDesignUserName.SelectedValue != BLL.Const._Null && this.ddlDesignUserName.SelectedItemArray.Count() == 1))
+            {
+                strSql += " AND (1=2 ";
+                int i = 0;
+                foreach (var item in this.ddlDesignUserName.SelectedValueArray)
+                {
+                    if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null)
+                    {
+                        strSql += " OR DesignUserName = @DesignUserName" + i.ToString();
+                        listStr.Add(new SqlParameter("@DesignUserName" + i.ToString(), item));
+                    }
+                    i++;
+                }
+                strSql += ")";
+            }
+            if (this.ddlJiaoheUserName.SelectedItemArray.Count() > 1 || (this.ddlJiaoheUserName.SelectedValue != BLL.Const._Null && this.ddlJiaoheUserName.SelectedItemArray.Count() == 1))
+            {
+                strSql += " AND (1=2 ";
+                int i = 0;
+                foreach (var item in this.ddlJiaoheUserName.SelectedValueArray)
+                {
+                    if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null)
+                    {
+                        strSql += " OR JiaoheUserName = @JiaoheUserName" + i.ToString();
+                        listStr.Add(new SqlParameter("@JiaoheUserName" + i.ToString(), item));
+                    }
+                    i++;
+                }
+                strSql += ")";
+            }
+            if (this.ddlShenheUserName.SelectedItemArray.Count() > 1 || (this.ddlShenheUserName.SelectedValue != BLL.Const._Null && this.ddlShenheUserName.SelectedItemArray.Count() == 1))
+            {
+                strSql += " AND (1=2 ";
+                int i = 0;
+                foreach (var item in this.ddlShenheUserName.SelectedValueArray)
+                {
+                    if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null)
+                    {
+                        strSql += " OR ShenheUserName = @ShenheUserName" + i.ToString();
+                        listStr.Add(new SqlParameter("@ShenheUserName" + i.ToString(), item));
+                    }
+                    i++;
+                }
+                strSql += ")";
+            }
+            if (this.ddlShendingUserName.SelectedItemArray.Count() > 1 || (this.ddlShendingUserName.SelectedValue != BLL.Const._Null && this.ddlShendingUserName.SelectedItemArray.Count() == 1))
+            {
+                strSql += " AND (1=2 ";
+                int i = 0;
+                foreach (var item in this.ddlShendingUserName.SelectedValueArray)
+                {
+                    if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null)
+                    {
+                        strSql += " OR ShendingUserName = @ShendingUserName" + i.ToString();
+                        listStr.Add(new SqlParameter("@ShendingUserName" + i.ToString(), item));
+                    }
+                    i++;
+                }
+                strSql += ")";
+            }
+            if (this.ddlMajorResponsibleUserName.SelectedItemArray.Count() > 1 || (this.ddlMajorResponsibleUserName.SelectedValue != BLL.Const._Null && this.ddlMajorResponsibleUserName.SelectedItemArray.Count() == 1))
+            {
+                strSql += " AND (1=2 ";
+                int i = 0;
+                foreach (var item in this.ddlMajorResponsibleUserName.SelectedValueArray)
+                {
+                    if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null)
+                    {
+                        strSql += " OR MajorResponsibleUserName = @MajorResponsibleUserName" + i.ToString();
+                        listStr.Add(new SqlParameter("@MajorResponsibleUserName" + i.ToString(), item));
+                    }
+                    i++;
+                }
+                strSql += ")";
+            }
 
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
@@ -203,6 +333,38 @@ namespace FineUIPro.Web.CQMS.DesignDrawing
             //}
         }
 
+        /// <summary>
+        /// 查看文件
+        /// </summary>
+        /// <param name="fileid"></param>
+        /// <param name="maintitle"></param>
+        /// <returns></returns>
+        public static string GetFileUrl(object fid, object maintitle)
+        {
+            string fileUrl = string.Empty;
+            string fileid = fid.ToString();
+            string filename = maintitle.ToString();
+            if (!string.IsNullOrWhiteSpace(fileid))
+            {
+                maintitle = !string.IsNullOrWhiteSpace(filename) ? filename : "查看";
+                string url = $"https://arch.cwcec.com/preview.html?fileid={fileid}";
+                fileUrl = ShowAttachment(url, filename);
+            }
+            return fileUrl;
+        }
+
+        public static string ShowAttachment(string path, string filename)
+        {
+            string htmlStr = string.Empty;
+            if (!string.IsNullOrEmpty(path))
+            {
+                htmlStr = "<table runat='server' cellpadding='5' cellspacing='5' style=\"width: 100%\">";
+                htmlStr += "<tr><td style=\"width: 60%\" align=\"left\"><span style='cursor:pointer;cursor:pointer;cursor:pointer;TEXT-DECORATION: underline;color:blue' onclick=\"window.open('" + path + "')\">" + filename + "</span></td>";
+                htmlStr += "</table>";
+            }
+            return htmlStr;
+        }
+
         #region 获取按钮权限
         /// <summary>
         /// 获取按钮权限
diff --git a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx.designer.cs
index 32386bb9..6a05abab 100644
--- a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx.designer.cs
@@ -95,6 +95,24 @@ namespace FineUIPro.Web.CQMS.DesignDrawing
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlStatus;
 
+        /// <summary>
+        /// ddlClass 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlClass;
+
+        /// <summary>
+        /// ddlIfmail 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlIfmail;
+
         /// <summary>
         /// btnQuery 控件。
         /// </summary>
@@ -104,6 +122,150 @@ namespace FineUIPro.Web.CQMS.DesignDrawing
         /// </remarks>
         protected global::FineUIPro.Button btnQuery;
 
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// ddlDesignUserName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlDesignUserName;
+
+        /// <summary>
+        /// ddlJiaoheUserName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlJiaoheUserName;
+
+        /// <summary>
+        /// ddlShenheUserName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlShenheUserName;
+
+        /// <summary>
+        /// ddlShendingUserName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlShendingUserName;
+
+        /// <summary>
+        /// ddlMajorResponsibleUserName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlMajorResponsibleUserName;
+
+        /// <summary>
+        /// Toolbar3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar3;
+
+        /// <summary>
+        /// txtStartUpdateTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartUpdateTime;
+
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label1;
+
+        /// <summary>
+        /// txtEndUpdateTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndUpdateTime;
+
+        /// <summary>
+        /// txtStartSendTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartSendTime;
+
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label2;
+
+        /// <summary>
+        /// txtEndSendTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndSendTime;
+
+        /// <summary>
+        /// txtStartPrintTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartPrintTime;
+
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+
+        /// <summary>
+        /// txtEndPrintTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndPrintTime;
+
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -113,6 +275,15 @@ namespace FineUIPro.Web.CQMS.DesignDrawing
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
 
+        /// <summary>
+        /// lbtnFileUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
diff --git a/SGGL/Model/IDP/SessionItem.cs b/SGGL/Model/IDP/SessionItem.cs
new file mode 100644
index 00000000..3cf63fcc
--- /dev/null
+++ b/SGGL/Model/IDP/SessionItem.cs
@@ -0,0 +1,19 @@
+
+namespace Model
+{
+    /// <summary>
+    /// IDP接口调用Session
+    /// </summary>
+    public class SessionItem
+    {
+        /// <summary>
+        /// value
+        /// </summary>
+        public string value { get; set; }
+        /// <summary>
+        /// name
+        /// </summary>
+        public string name { get; set; }
+    }
+}
+
diff --git a/SGGL/Model/Model.csproj b/SGGL/Model/Model.csproj
index f4b2819c..80ef2051 100644
--- a/SGGL/Model/Model.csproj
+++ b/SGGL/Model/Model.csproj
@@ -236,6 +236,7 @@
     <Compile Include="HSSE\SpResourceCollection.cs" />
     <Compile Include="HSSE\WorkPostStatisticItem.cs" />
     <Compile Include="HSSE\HSSE_HazardTemplate.cs" />
+    <Compile Include="IDP\SessionItem.cs" />
     <Compile Include="IDP\OADesignDrawingData.cs" />
     <Compile Include="IDP\IDPDesignDrawingResponseData.cs" />
     <Compile Include="JDGL\WBSDetailItem.cs" />
diff --git a/SGGL/WebAPI/Controllers/IDP/IDPController.cs b/SGGL/WebAPI/Controllers/IDP/IDPController.cs
index a05c82fc..c0d672d0 100644
--- a/SGGL/WebAPI/Controllers/IDP/IDPController.cs
+++ b/SGGL/WebAPI/Controllers/IDP/IDPController.cs
@@ -2,6 +2,7 @@
 using Model;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Web.Http;
 
 namespace WebAPI.Controllers
@@ -23,7 +24,16 @@ namespace WebAPI.Controllers
             var responeData = new Model.ResponeData();
             try
             {
-                IDPDataService.GetIDPProjectDesignDrawingData();
+                var lst = DesignDrawingService.GetIDPDesignDrawingFile();
+                if (lst.Any())
+                {
+                    string date = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd");
+                    IDPDataService.GetIDPProjectDesignDrawingData("", date);
+                }
+                else
+                {
+                    IDPDataService.GetIDPProjectDesignDrawingData();
+                }
             }
             catch (Exception ex)
             {
diff --git a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index b649e286..95e7be63 100644
--- a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -6,7 +6,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_PublishTargetUrl>G:\发布\五环WebApi</_PublishTargetUrl>
-    <History>True|2025-07-17T07:40:11.9126705Z||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;</History>
+    <History>True|2025-07-18T02:53:44.2534260Z||;True|2025-07-18T10:27:52.6751668+08:00||;True|2025-07-18T10:03:09.1785776+08:00||;True|2025-07-18T10:02:38.1252107+08:00||;True|2025-07-17T18:19:07.5837609+08:00||;True|2025-07-17T15:40:11.9126705+08:00||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;</History>
     <LastFailureDetails />
   </PropertyGroup>
   <ItemGroup>
@@ -86,22 +86,22 @@
       <publishTime>10/28/2024 14:02:50</publishTime>
     </File>
     <File Include="bin/App_global.asax.compiled">
-      <publishTime>07/17/2025 15:40:10</publishTime>
+      <publishTime>07/18/2025 10:53:43</publishTime>
     </File>
     <File Include="bin/App_global.asax.dll">
-      <publishTime>07/17/2025 15:40:10</publishTime>
+      <publishTime>07/18/2025 10:53:43</publishTime>
     </File>
     <File Include="bin/Aspose.Words.dll">
       <publishTime>12/06/2024 20:13:58</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>07/17/2025 15:39:50</publishTime>
+      <publishTime>07/18/2025 10:53:33</publishTime>
     </File>
     <File Include="bin/BLL.dll.config">
       <publishTime>12/26/2024 09:46:52</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>07/17/2025 15:39:50</publishTime>
+      <publishTime>07/18/2025 10:53:33</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
       <publishTime>12/18/2020 05:32:28</publishTime>
@@ -128,10 +128,10 @@
       <publishTime>07/25/2012 19:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>07/17/2025 15:39:43</publishTime>
+      <publishTime>07/18/2025 10:02:10</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>07/17/2025 15:39:43</publishTime>
+      <publishTime>07/18/2025 10:02:10</publishTime>
     </File>
     <File Include="bin/netstandard.dll">
       <publishTime>07/04/2024 14:13:01</publishTime>
@@ -389,13 +389,13 @@
       <publishTime>02/09/2013 00:42:28</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>07/17/2025 15:39:53</publishTime>
+      <publishTime>07/18/2025 10:53:34</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>07/17/2025 15:39:53</publishTime>
+      <publishTime>07/18/2025 10:53:34</publishTime>
     </File>
     <File Include="bin/WebAPI.xml">
-      <publishTime>07/17/2025 15:39:53</publishTime>
+      <publishTime>07/18/2025 10:53:34</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
       <publishTime>01/23/2014 21:57:34</publishTime>
@@ -479,7 +479,7 @@
       <publishTime>10/28/2024 14:02:50</publishTime>
     </File>
     <File Include="PrecompiledApp.config">
-      <publishTime>07/17/2025 15:39:54</publishTime>
+      <publishTime>07/18/2025 10:53:35</publishTime>
     </File>
     <File Include="Scripts/bootstrap.js">
       <publishTime>10/28/2024 14:02:50</publishTime>
diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index 17978b44..1a1a9a6c 100644
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />

From 3e28b8025d0324fbd972c6eca8710b6e6d71135c Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Fri, 18 Jul 2025 18:05:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=9A=E5=88=B6=E7=89=88=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E5=AE=89=E5=85=A8=E6=8A=A5=E8=A1=A8=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DataBase/版本日志/SUBQHSE_V2025-07-16-gf.sql  |  42 ++++++
 SGGL/BLL/WebService/CNCECHSSEWebService.cs    |   7 +-
 .../MillionsMonthlyReportService.cs           |   6 +
 .../Information/MillionsMonthlyReport.aspx    |  14 ++
 .../Information/MillionsMonthlyReport.aspx.cs |  37 +++--
 .../MillionsMonthlyReport.aspx.designer.cs    |  45 +++++++
 .../MillionsMonthlyReportSave.aspx            |  25 +++-
 .../MillionsMonthlyReportSave.aspx.cs         |  27 ++++
 ...MillionsMonthlyReportSave.aspx.designer.cs |  45 +++++++
 SGGL/Model/Model.cs                           | 126 ++++++++++++++++++
 .../PublishProfiles/FolderProfile.pubxml.user |  22 +--
 11 files changed, 368 insertions(+), 28 deletions(-)
 create mode 100644 DataBase/版本日志/SUBQHSE_V2025-07-16-gf.sql

diff --git a/DataBase/版本日志/SUBQHSE_V2025-07-16-gf.sql b/DataBase/版本日志/SUBQHSE_V2025-07-16-gf.sql
new file mode 100644
index 00000000..206b71d8
--- /dev/null
+++ b/DataBase/版本日志/SUBQHSE_V2025-07-16-gf.sql
@@ -0,0 +1,42 @@
+alter table Information_MillionsMonthlyReport add KeyWorkNum int null
+alter table Information_MillionsMonthlyReport add KeyWorkOKNum int null
+alter table Information_MillionsMonthlyReport add KeyWorkOKRate nvarchar(20) null
+GO
+
+
+/*************��ҵ����ʱ��ȫͳ���±���**************/
+ALTER VIEW [dbo].[View_Information_MillionsMonthlyReport]
+AS
+SELECT 
+Report.MillionsMonthlyReportId,
+Report.UnitId,
+Report.FillingDate,
+Report.UpState,
+(ISNULL(Group_0008.ConstText,'-') + ISNULL(Group_0009.ConstText,'-')) AS ReportDate,
+Group_0008.ConstText as YearStr,
+Group_0009.ConstText as MonthStr,
+U.UnitName,
+Report.Year,
+Report.Month,
+Report.DutyPerson,
+Report.RecordableIncidentRate,
+Report.LostTimeRate,
+Report.LostTimeInjuryRate,
+Report.DeathAccidentFrequency,
+Report.AccidentMortality,
+Report.HandleState,
+Report.HandleMan,
+Report.KeyWorkNum,
+Report.KeyWorkOKNum,
+Report.KeyWorkOKRate,
+US.UserName
+FROM dbo.Information_MillionsMonthlyReport AS Report
+LEFT JOIN Base_Unit AS U ON U.UnitId=Report.UnitId
+LEFT JOIN Sys_Const  AS Group_0008 ON Group_0008.GroupId='0008' AND Group_0008.ConstValue =Report.[Year]
+LEFT JOIN Sys_Const  AS Group_0009 ON Group_0009.GroupId='0009' AND Group_0009.ConstValue =Report.[Month]
+LEFT JOIN Sys_User AS US ON US.UserId=Report.HandleMan
+
+
+GO
+
+
diff --git a/SGGL/BLL/WebService/CNCECHSSEWebService.cs b/SGGL/BLL/WebService/CNCECHSSEWebService.cs
index cad704ed..f72f1bcd 100644
--- a/SGGL/BLL/WebService/CNCECHSSEWebService.cs
+++ b/SGGL/BLL/WebService/CNCECHSSEWebService.cs
@@ -92,16 +92,15 @@
             {
                 try
                 {
-                    CNCECHSSEService.HSSEServiceClient hsseC = new CNCECHSSEService.HSSEServiceClient();
                     var upReport = from x in db.Information_MillionsMonthlyReport
                                    where x.MillionsMonthlyReportId == millionsMonthlyReportId
-                                   select new CNCECHSSEService.Information_MillionsMonthlyReport
+                                   select new Information_MillionsMonthlyReport
                                    {
                                        MillionsMonthlyReportId = x.MillionsMonthlyReportId,
                                        UnitId = x.UnitId,
                                        Year = x.Year,
                                        Month = x.Month,
-                                       FillingMan = x.FillingMan,
+                                       FillingMan = x.FillingMan + "|" + (x.KeyWorkNum ?? 0).ToString() + "|" + (x.KeyWorkOKNum ?? 0).ToString() + "|" + (x.KeyWorkOKRate ?? ""),
                                        FillingDate = x.FillingDate,
                                        DutyPerson = x.DutyPerson,
                                        RecordableIncidentRate = x.RecordableIncidentRate,
@@ -129,7 +128,7 @@
 
                     var upReportItem = from x in db.Information_MillionsMonthlyReportItem
                                        where x.MillionsMonthlyReportId == millionsMonthlyReportId
-                                       select new CNCECHSSEService.Information_MillionsMonthlyReportItem
+                                       select new Information_MillionsMonthlyReportItem
                                        {
                                            MillionsMonthlyReportItemId = x.MillionsMonthlyReportItemId,
                                            MillionsMonthlyReportId = x.MillionsMonthlyReportId,
diff --git a/SGGL/BLL/ZHGL/Information/MillionsMonthlyReportService.cs b/SGGL/BLL/ZHGL/Information/MillionsMonthlyReportService.cs
index a807d8fa..b19cb2fa 100644
--- a/SGGL/BLL/ZHGL/Information/MillionsMonthlyReportService.cs
+++ b/SGGL/BLL/ZHGL/Information/MillionsMonthlyReportService.cs
@@ -73,6 +73,9 @@ namespace BLL
                 BreakGroundLicenseNum = MillionsMonthlyReport.BreakGroundLicenseNum,
                 ElectricityLicenseNum = MillionsMonthlyReport.ElectricityLicenseNum,
                 RTLicenseNum = MillionsMonthlyReport.RTLicenseNum,
+                KeyWorkNum = MillionsMonthlyReport.KeyWorkNum,
+                KeyWorkOKNum = MillionsMonthlyReport.KeyWorkOKNum,
+                KeyWorkOKRate = MillionsMonthlyReport.KeyWorkOKRate,
                 NightLicenseNum = MillionsMonthlyReport.NightLicenseNum,
                 CommissionerNum = MillionsMonthlyReport.CommissionerNum,
                 SoleDutyNum = MillionsMonthlyReport.SoleDutyNum,
@@ -120,6 +123,9 @@ namespace BLL
                 newMillionsMonthlyReport.NightLicenseNum = MillionsMonthlyReport.NightLicenseNum;
                 newMillionsMonthlyReport.CommissionerNum = MillionsMonthlyReport.CommissionerNum;
                 newMillionsMonthlyReport.SoleDutyNum = MillionsMonthlyReport.SoleDutyNum;
+                newMillionsMonthlyReport.KeyWorkNum = MillionsMonthlyReport.KeyWorkNum;
+                newMillionsMonthlyReport.KeyWorkOKNum = MillionsMonthlyReport.KeyWorkOKNum;
+                newMillionsMonthlyReport.KeyWorkOKRate = MillionsMonthlyReport.KeyWorkOKRate;
 
                 Funs.DB.SubmitChanges();
             }
diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx
index 2e3b6400..8b4822c9 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx
+++ b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx
@@ -110,6 +110,20 @@
                                         </f:Label>
                                     </Items>
                                 </f:FormRow>
+                                <f:FormRow>
+                                    <Items>
+                                        <f:Label ID="txtKeyWorkNum" runat="server" Label="重点工作任务数" LabelWidth="130px">
+                                        </f:Label>
+                                        <f:Label ID="txtKeyWorkOKNum" runat="server" Label="重点工作完成数" LabelWidth="130px">
+                                        </f:Label>
+                                        <f:Label ID="txtKeyWorkOKRate" runat="server" Label="综合完成率">
+                                        </f:Label>
+                                        <f:Label runat="server" ID="Label1">
+                                        </f:Label>
+                                        <f:Label runat="server" ID="Label2">
+                                        </f:Label>
+                                    </Items>
+                                </f:FormRow>
                             </Rows>
                         </f:Form>
                         <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" runat="server"
diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx.cs
index 6bddf04d..8eb12a95 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Linq;
 using System.Text;
 using BLL;
@@ -14,6 +15,11 @@ namespace FineUIPro.Web.ZHGL.Information
         {
             if (!IsPostBack)
             {
+                string loginform = ConfigurationManager.AppSettings["LoginForm"];
+                if (!string.IsNullOrWhiteSpace(loginform) &&loginform == "Login_ZJ.aspx")
+                {//判断是否是重机客户，如果是重定向页面
+                    Response.Redirect("MillionsMonthlyReportZJ.aspx");
+                }
 
                 BLL.ConstValue.InitConstValueDropDownList(this.drpMonth, ConstValue.Group_0009, false);
                 BLL.ConstValue.InitConstValueDropDownList(this.drpYear, ConstValue.Group_0008, false);
@@ -65,7 +71,7 @@ namespace FineUIPro.Web.ZHGL.Information
                 {
                     upState = "(未上报)";
                 }
-                this.SimpleForm1.Title = "企业企业安全数据统计月报" + report.MonthStr + report.YearStr + upState;
+                this.SimpleForm1.Title = "企业安全数据统计月报" + report.MonthStr + report.YearStr + upState;
                 lbUnitName.Text = "填报企业：" + report.UnitName;
                 if (report.FillingDate != null)
                 {
@@ -85,6 +91,18 @@ namespace FineUIPro.Web.ZHGL.Information
                     this.lbHandleMan.Hidden = false;
                     lbHandleMan.Text = "下一步办理人：" + report.UserName;
                 }
+                if (report.KeyWorkNum != null)
+                {
+                    txtKeyWorkNum.Text = report.KeyWorkNum.ToString();
+                }
+                if (report.KeyWorkOKNum != null)
+                {
+                    txtKeyWorkOKNum.Text = report.KeyWorkOKNum.ToString();
+                }
+                if (!string.IsNullOrEmpty(report.KeyWorkOKRate))
+                {
+                    txtKeyWorkOKRate.Text = report.KeyWorkOKRate;
+                }
                 lbRecordableIncidentRate.Text = "百万工时总可记录事件率:" + (report.RecordableIncidentRate ?? 0).ToString();
                 lbLostTimeRate.Text = "百万工时损失工时率:" + (report.LostTimeRate ?? 0).ToString();
                 lbLostTimeInjuryRate.Text = "百万工时损失工时伤害事故率:" + (report.LostTimeInjuryRate ?? 0).ToString();
@@ -109,7 +127,7 @@ namespace FineUIPro.Web.ZHGL.Information
                 yearTotalItem.SeriousInjuriesPersonNum = yearSumItems.Sum(x => x.SeriousInjuriesPersonNum ?? 0);
                 yearTotalItem.SeriousInjuriesLossHour = yearSumItems.Sum(x => x.SeriousInjuriesLossHour ?? 0);
                 yearTotalItem.MinorAccidentNum = yearSumItems.Sum(x => x.MinorAccidentNum ?? 0);
-                 yearTotalItem.MinorAccidentPersonNum = yearSumItems.Sum(x => x.MinorAccidentPersonNum ?? 0);
+                yearTotalItem.MinorAccidentPersonNum = yearSumItems.Sum(x => x.MinorAccidentPersonNum ?? 0);
                 yearTotalItem.MinorAccidentLossHour = yearSumItems.Sum(x => x.MinorAccidentLossHour ?? 0);
                 yearTotalItem.DeathAccidentNum = yearSumItems.Sum(x => x.DeathAccidentNum ?? 0);
                 yearTotalItem.DeathAccidentPersonNum = yearSumItems.Sum(x => x.DeathAccidentPersonNum ?? 0);
@@ -140,7 +158,7 @@ namespace FineUIPro.Web.ZHGL.Information
                     Grid1.Rows[Grid1.Rows.Count - 1].Values[0] = "";
                     Grid1.Rows[Grid1.Rows.Count - 1].Values[1] = "";
                 }
-                var report2 = from x in Funs.DB.Information_MillionsMonthlyReport where x.MillionsMonthlyReportId== report.MillionsMonthlyReportId select x;
+                var report2 = from x in Funs.DB.Information_MillionsMonthlyReport where x.MillionsMonthlyReportId == report.MillionsMonthlyReportId select x;
                 Grid2.DataSource = report2;
                 Grid2.DataBind();
             }
@@ -220,10 +238,10 @@ namespace FineUIPro.Web.ZHGL.Information
                 {
                     this.btnDelete.Hidden = false;
                 }
-                if (buttonList.Contains(BLL.Const.BtnIn))
-                {
-                    this.btnImport.Hidden = false;
-                }
+                //if (buttonList.Contains(BLL.Const.BtnIn))
+                //{
+                //    this.btnImport.Hidden = false;
+                //}
                 if (buttonList.Contains(BLL.Const.BtnPrint))
                 {
                     this.btnPrint.Hidden = false;
@@ -726,6 +744,7 @@ namespace FineUIPro.Web.ZHGL.Information
             DateTime date = Convert.ToDateTime(this.drpYear.SelectedValue + "-" + this.drpMonth.SelectedValue + "-01").AddDays(-1).AddMonths(1);
             var projects = (from x in Funs.DB.Base_Project
                             where (x.ProjectState == BLL.Const.ProjectState_1 || x.ProjectState == null)
+                              && (x.IsDelete == null || x.IsDelete == false)
                             && x.StartDate <= date
                             select x).ToList();
             foreach (var item in projects)
@@ -733,13 +752,13 @@ namespace FineUIPro.Web.ZHGL.Information
                 var millionsMonthlyReport = Funs.DB.InformationProject_MillionsMonthlyReport.FirstOrDefault(x => x.ProjectId == item.ProjectId && x.Year == date.Year && x.Month == date.Month);
                 if (millionsMonthlyReport == null)
                 {
-                    info += item.ProjectCode + ":" + item.ProjectName + "，未填写报表；</br>";
+                    info += /*item.ProjectCode + ":" +*/ item.ProjectName + "，未填写报表；</br>";
                 }
                 else
                 {
                     if (millionsMonthlyReport.States != BLL.Const.State_2)
                     {
-                        info += item.ProjectCode + ":" + item.ProjectName + "报表未报；";
+                        info += /*item.ProjectCode + ":" +*/ item.ProjectName + "报表未报；";
                         var flows = (from x in Funs.DB.Sys_FlowOperate
                                      join y in Funs.DB.Sys_User on x.OperaterId equals y.UserId
                                      where x.DataId == millionsMonthlyReport.MillionsMonthlyReportId && x.IsClosed != false
diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx.designer.cs
index 5fed1df2..78bf5a62 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx.designer.cs
@@ -300,6 +300,51 @@ namespace FineUIPro.Web.ZHGL.Information {
         /// </remarks>
         protected global::FineUIPro.Label lbAccidentMortality;
         
+        /// <summary>
+        /// txtKeyWorkNum 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label txtKeyWorkNum;
+        
+        /// <summary>
+        /// txtKeyWorkOKNum 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label txtKeyWorkOKNum;
+        
+        /// <summary>
+        /// txtKeyWorkOKRate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label txtKeyWorkOKRate;
+        
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label1;
+        
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label2;
+        
         /// <summary>
         /// Grid1 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx
index 800477d4..bbcc04b7 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx
+++ b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx
@@ -23,11 +23,11 @@
             <Rows>
                 <f:FormRow>
                     <Items>
-                        <f:DropDownList ID="drpYear" AutoPostBack="false" EnableSimulateTree="true" Required="true"
-                            ShowRedStar="true" runat="server" Label="年度">
+                        <f:DropDownList ID="drpYear" AutoPostBack="true" EnableSimulateTree="true" Required="true"
+                            ShowRedStar="true" runat="server" Label="年度" OnSelectedIndexChanged="drpDate_SelectedIndexChanged">
                         </f:DropDownList>
-                        <f:DropDownList ID="drpMonth" AutoPostBack="false" EnableSimulateTree="true" Required="true"
-                            ShowRedStar="true" runat="server" Label="月份">
+                        <f:DropDownList ID="drpMonth" AutoPostBack="true" EnableSimulateTree="true" Required="true"
+                            ShowRedStar="true" runat="server" Label="月份" OnSelectedIndexChanged="drpDate_SelectedIndexChanged">
                         </f:DropDownList>
                         <f:DropDownList ID="drpUnit" AutoPostBack="true" EnableSimulateTree="true" runat="server"
                             Label="填报企业" FocusOnPageLoad="true" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged">
@@ -185,6 +185,23 @@
                                         </f:Form>
                                     </Items>
                                 </f:GroupPanel>
+                                <f:GroupPanel runat="server" Title="治本攻坚三年行动" BodyPadding="5px" ID="GroupPanel1" EnableCollapse="True"
+                                    Collapsed="false">
+                                    <Items>
+                                        <f:Form ID="Form2" ShowBorder="false" ShowHeader="false" runat="server">
+                                            <Rows>
+                                                <f:FormRow>
+                                                    <Items>
+                                                        <f:NumberBox runat="server" ID="txtKeyWorkNum" Label="重点工作任务数" NoDecimal="true" LabelWidth="130px" NoNegative="true" Required="true" ShowRedStar="true" AutoPostBack="true" OnTextChanged="txtKeyWorkNum_TextChanged"></f:NumberBox>
+                                                        <f:NumberBox runat="server" ID="txtKeyWorkOKNum" Label="重点工作完成数" NoDecimal="true" LabelWidth="130px" NoNegative="true" Required="true" ShowRedStar="true" AutoPostBack="true" OnTextChanged="txtKeyWorkNum_TextChanged"></f:NumberBox>
+                                                        <f:TextBox ID="txtKeyWorkOKRate" runat="server" Label="综合完成率" Readonly="true">
+                                                        </f:TextBox>
+                                                    </Items>
+                                                </f:FormRow>
+                                            </Rows>
+                                        </f:Form>
+                                    </Items>
+                                </f:GroupPanel>
                             </Items>
                         </f:Panel>
                     </Items>
diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs
index 469bba05..31a135a3 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs
@@ -176,6 +176,18 @@ namespace FineUIPro.Web.ZHGL.Information
                         {
                             this.txtSoleDutyNum.Text = Convert.ToString(report.SoleDutyNum);
                         }
+                        if (report.KeyWorkNum != null)
+                        {
+                            this.txtKeyWorkNum.Text = report.KeyWorkNum.ToString();
+                        }
+                        if (report.KeyWorkOKNum != null)
+                        {
+                            this.txtKeyWorkOKNum.Text = report.KeyWorkOKNum.ToString();
+                        }
+                        if (!string.IsNullOrEmpty(report.KeyWorkOKRate))
+                        {
+                            this.txtKeyWorkOKRate.Text = report.KeyWorkOKRate;
+                        }
                     }
                 }
                 else
@@ -276,6 +288,9 @@ namespace FineUIPro.Web.ZHGL.Information
             report.NightLicenseNum = Funs.GetNewInt(this.txtNightLicenseNum.Text.Trim());
             report.CommissionerNum = Funs.GetNewInt(this.txtCommissionerNum.Text.Trim());
             report.SoleDutyNum = Funs.GetNewInt(this.txtSoleDutyNum.Text.Trim());
+            report.KeyWorkNum = Funs.GetNewIntOrZero(this.txtKeyWorkNum.Text.Trim());
+            report.KeyWorkOKNum = Funs.GetNewIntOrZero(this.txtKeyWorkOKNum.Text.Trim());
+            report.KeyWorkOKRate = this.txtKeyWorkOKRate.Text.Trim();
             if (String.IsNullOrEmpty(MillionsMonthlyReportId))
             {
                 Information_MillionsMonthlyReport old = MillionsMonthlyReportService.GetMillionsMonthlyReportByUnitIdDate(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpMonth.SelectedValue));
@@ -1254,5 +1269,17 @@ namespace FineUIPro.Web.ZHGL.Information
             }
         }
         #endregion
+
+        protected void txtKeyWorkNum_TextChanged(object sender, EventArgs e)
+        {
+            decimal keyWorkNum = Funs.GetNewDecimalOrZero(this.txtKeyWorkNum.Text.Trim());
+            decimal keyWorkOKNum = Funs.GetNewDecimalOrZero(this.txtKeyWorkOKNum.Text.Trim());
+            string rate = string.Empty;
+            if (keyWorkNum > 0)
+            {
+                rate = (decimal.Round(keyWorkOKNum / keyWorkNum, 4) * 100).ToString("0.##") + "%";
+            }
+            this.txtKeyWorkOKRate.Text = rate;
+        }
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.designer.cs
index 08fc7c78..7fea4761 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.designer.cs
@@ -381,6 +381,51 @@ namespace FineUIPro.Web.ZHGL.Information {
         /// </remarks>
         protected global::FineUIPro.NumberBox txtSoleDutyNum;
         
+        /// <summary>
+        /// GroupPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.GroupPanel GroupPanel1;
+        
+        /// <summary>
+        /// Form2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form2;
+        
+        /// <summary>
+        /// txtKeyWorkNum 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtKeyWorkNum;
+        
+        /// <summary>
+        /// txtKeyWorkOKNum 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtKeyWorkOKNum;
+        
+        /// <summary>
+        /// txtKeyWorkOKRate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtKeyWorkOKRate;
+        
         /// <summary>
         /// Grid1 控件。
         /// </summary>
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index e7904f32..965f3c1b 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -198023,6 +198023,12 @@ namespace Model
 		
 		private System.Nullable<int> _SoleDutyNum;
 		
+		private System.Nullable<int> _KeyWorkNum;
+		
+		private System.Nullable<int> _KeyWorkOKNum;
+		
+		private string _KeyWorkOKRate;
+		
 		private EntityRef<Base_Unit> _Base_Unit;
 		
 		private EntitySet<Information_MillionsMonthlyReportItem> _Information_MillionsMonthlyReportItem;
@@ -198093,6 +198099,12 @@ namespace Model
     partial void OnCommissionerNumChanged();
     partial void OnSoleDutyNumChanging(System.Nullable<int> value);
     partial void OnSoleDutyNumChanged();
+    partial void OnKeyWorkNumChanging(System.Nullable<int> value);
+    partial void OnKeyWorkNumChanged();
+    partial void OnKeyWorkOKNumChanging(System.Nullable<int> value);
+    partial void OnKeyWorkOKNumChanged();
+    partial void OnKeyWorkOKRateChanging(string value);
+    partial void OnKeyWorkOKRateChanged();
     #endregion
 		
 		public Information_MillionsMonthlyReport()
@@ -198726,6 +198738,66 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkNum", DbType="Int")]
+		public System.Nullable<int> KeyWorkNum
+		{
+			get
+			{
+				return this._KeyWorkNum;
+			}
+			set
+			{
+				if ((this._KeyWorkNum != value))
+				{
+					this.OnKeyWorkNumChanging(value);
+					this.SendPropertyChanging();
+					this._KeyWorkNum = value;
+					this.SendPropertyChanged("KeyWorkNum");
+					this.OnKeyWorkNumChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkOKNum", DbType="Int")]
+		public System.Nullable<int> KeyWorkOKNum
+		{
+			get
+			{
+				return this._KeyWorkOKNum;
+			}
+			set
+			{
+				if ((this._KeyWorkOKNum != value))
+				{
+					this.OnKeyWorkOKNumChanging(value);
+					this.SendPropertyChanging();
+					this._KeyWorkOKNum = value;
+					this.SendPropertyChanged("KeyWorkOKNum");
+					this.OnKeyWorkOKNumChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkOKRate", DbType="NVarChar(20)")]
+		public string KeyWorkOKRate
+		{
+			get
+			{
+				return this._KeyWorkOKRate;
+			}
+			set
+			{
+				if ((this._KeyWorkOKRate != value))
+				{
+					this.OnKeyWorkOKRateChanging(value);
+					this.SendPropertyChanging();
+					this._KeyWorkOKRate = value;
+					this.SendPropertyChanged("KeyWorkOKRate");
+					this.OnKeyWorkOKRateChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Information_MillionsMonthlyReport_Base_Unit", Storage="_Base_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)]
 		public Base_Unit Base_Unit
 		{
@@ -439748,6 +439820,12 @@ namespace Model
 		
 		private string _HandleMan;
 		
+		private System.Nullable<int> _KeyWorkNum;
+		
+		private System.Nullable<int> _KeyWorkOKNum;
+		
+		private string _KeyWorkOKRate;
+		
 		private string _UserName;
 		
 		public View_Information_MillionsMonthlyReport()
@@ -440042,6 +440120,54 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkNum", DbType="Int")]
+		public System.Nullable<int> KeyWorkNum
+		{
+			get
+			{
+				return this._KeyWorkNum;
+			}
+			set
+			{
+				if ((this._KeyWorkNum != value))
+				{
+					this._KeyWorkNum = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkOKNum", DbType="Int")]
+		public System.Nullable<int> KeyWorkOKNum
+		{
+			get
+			{
+				return this._KeyWorkOKNum;
+			}
+			set
+			{
+				if ((this._KeyWorkOKNum != value))
+				{
+					this._KeyWorkOKNum = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkOKRate", DbType="NVarChar(20)")]
+		public string KeyWorkOKRate
+		{
+			get
+			{
+				return this._KeyWorkOKRate;
+			}
+			set
+			{
+				if ((this._KeyWorkOKRate != value))
+				{
+					this._KeyWorkOKRate = value;
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UserName", DbType="NVarChar(50)")]
 		public string UserName
 		{
diff --git a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 95e7be63..0b2fea70 100644
--- a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -6,7 +6,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_PublishTargetUrl>G:\发布\五环WebApi</_PublishTargetUrl>
-    <History>True|2025-07-18T02:53:44.2534260Z||;True|2025-07-18T10:27:52.6751668+08:00||;True|2025-07-18T10:03:09.1785776+08:00||;True|2025-07-18T10:02:38.1252107+08:00||;True|2025-07-17T18:19:07.5837609+08:00||;True|2025-07-17T15:40:11.9126705+08:00||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;</History>
+    <History>True|2025-07-18T09:55:59.4892329Z||;True|2025-07-18T11:08:56.2628896+08:00||;True|2025-07-18T10:53:44.2534260+08:00||;True|2025-07-18T10:27:52.6751668+08:00||;True|2025-07-18T10:03:09.1785776+08:00||;True|2025-07-18T10:02:38.1252107+08:00||;True|2025-07-17T18:19:07.5837609+08:00||;True|2025-07-17T15:40:11.9126705+08:00||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;</History>
     <LastFailureDetails />
   </PropertyGroup>
   <ItemGroup>
@@ -86,22 +86,22 @@
       <publishTime>10/28/2024 14:02:50</publishTime>
     </File>
     <File Include="bin/App_global.asax.compiled">
-      <publishTime>07/18/2025 10:53:43</publishTime>
+      <publishTime>07/18/2025 17:55:56</publishTime>
     </File>
     <File Include="bin/App_global.asax.dll">
-      <publishTime>07/18/2025 10:53:43</publishTime>
+      <publishTime>07/18/2025 17:55:56</publishTime>
     </File>
     <File Include="bin/Aspose.Words.dll">
       <publishTime>12/06/2024 20:13:58</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>07/18/2025 10:53:33</publishTime>
+      <publishTime>07/18/2025 17:55:29</publishTime>
     </File>
     <File Include="bin/BLL.dll.config">
       <publishTime>12/26/2024 09:46:52</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>07/18/2025 10:53:33</publishTime>
+      <publishTime>07/18/2025 17:55:29</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
       <publishTime>12/18/2020 05:32:28</publishTime>
@@ -128,10 +128,10 @@
       <publishTime>07/25/2012 19:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>07/18/2025 10:02:10</publishTime>
+      <publishTime>07/18/2025 17:55:22</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>07/18/2025 10:02:10</publishTime>
+      <publishTime>07/18/2025 17:55:22</publishTime>
     </File>
     <File Include="bin/netstandard.dll">
       <publishTime>07/04/2024 14:13:01</publishTime>
@@ -389,13 +389,13 @@
       <publishTime>02/09/2013 00:42:28</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>07/18/2025 10:53:34</publishTime>
+      <publishTime>07/18/2025 17:55:33</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>07/18/2025 10:53:34</publishTime>
+      <publishTime>07/18/2025 17:55:33</publishTime>
     </File>
     <File Include="bin/WebAPI.xml">
-      <publishTime>07/18/2025 10:53:34</publishTime>
+      <publishTime>07/18/2025 17:55:33</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
       <publishTime>01/23/2014 21:57:34</publishTime>
@@ -479,7 +479,7 @@
       <publishTime>10/28/2024 14:02:50</publishTime>
     </File>
     <File Include="PrecompiledApp.config">
-      <publishTime>07/18/2025 10:53:35</publishTime>
+      <publishTime>07/18/2025 17:55:35</publishTime>
     </File>
     <File Include="Scripts/bootstrap.js">
       <publishTime>10/28/2024 14:02:50</publishTime>