20240911 WBS分部分项划分

.vs/CNCEC_SUBQHSE_WUHUAN/v17/DocumentLayout.json

@@ -0,0 +1,79 @@
+{
+  "Version": 1,
+  "WorkspaceRootPath": "D:\\\u6570\u636E\\\u8BFA\u5FC5\u8FBE\\\u4E94\u73AF\\CNCEC_SUBQHSE_WUHUAN\\",
+  "Documents": [],
+  "DocumentGroupContainers": [
+    {
+      "Orientation": 1,
+      "VerticalTabListWidth": 256,
+      "DocumentGroups": [
+        {
+          "DockedHeight": 200,
+          "SelectedChildIndex": -1,
+          "Children": [
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{e506b91c-c606-466a-90a9-123d1d1e12b3}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:130:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:132:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:133:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:134:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:1:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:131:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:129:0:{13b12e3e-c1b4-4539-9371-4fe9a0d523fc}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:2:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:3:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:129:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{1a46fd64-28d5-434c-8eb3-17a02d419b53}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:131:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

DataBase/版本日志/SGGLDB_WH_V2024-09-02-phf.sql

@@ -0,0 +1,6 @@
+ALTER TABLE Manager_Month_InjuryAccidentC
+add LossCount int null;
+
+ALTER TABLE Manager_Month_InjuryAccidentC
+add DeathCount int null;
+

DataBase/版本日志/SGGLDB_WH_V2024-09-04-01phf.sql

@@ -0,0 +1,48 @@
+Create PROCEDURE [dbo].[SpGetHsseKq]
+ @ProjectId nvarchar(50),/*表名*/
+ @startTime nvarchar(50),/*开始时间*/
+ @endTime nvarchar(50),/*结束时间*/
+ @UnitId nvarchar(50),/*0没有单位 1分包商 2五环*/
+ @returnVal int output
+AS
+/*获取安全月报考勤数据*/
+declare @sql nvarchar(500),
+@kqcount int;
+
+IF(@UnitId='0')
+BEGIN
+select @returnVal=count(*) from ( select IdentityCard FROM SitePerson_Checking WHERE PROJECTID=''+@ProjectId+'' AND IntoOut='1'
+AND IntoOutTime>=''+@startTime+''  AND IntoOutTime<=''+@endTime+'' Group by IdentityCard,CONVERT(varchar(100), IntoOutTime, 23)
+)f;
+
+--select @sql= N' SELECT @kqcount= count(*) from (select IdentityCard FROM SitePerson_Checking WHERE PROJECTID='''+@ProjectId+''' AND IntoOut=''1''
+-- AND IntoOutTime>='''+@startTime+'''  AND IntoOutTime<='''+@endTime+''' Group by IdentityCard,CONVERT(varchar(100), IntoOutTime, 23))f
+--';
+--EXEC sp_executesql @sql, N'@kqcount int OUTPUT', @kqcount OUTPUT ;
+--set @returnVal=@kqcount;
+
+
+END
+else
+begin
+	if(@UnitId='1')
+	begin
+		select @returnVal=count(*) from ( select IdentityCard FROM SitePerson_Checking WHERE PROJECTID=''+@ProjectId+'' AND IntoOut='1'
+		AND IntoOutTime>=''+@startTime+''  AND IntoOutTime<=''+@endTime+''
+		and UnitId<>'6d29ed79-e20a-4c19-bb91-d280ea2e442e'
+		Group by IdentityCard,CONVERT(varchar(100), IntoOutTime, 23)
+		)f;
+		
+	end
+	else
+	begin
+			select @returnVal=count(*) from ( select IdentityCard FROM SitePerson_Checking WHERE PROJECTID=''+@ProjectId+'' AND IntoOut='1'
+		AND IntoOutTime>=''+@startTime+''  AND IntoOutTime<=''+@endTime+''
+		and UnitId='6d29ed79-e20a-4c19-bb91-d280ea2e442e'
+		Group by IdentityCard,CONVERT(varchar(100), IntoOutTime, 23)
+		)f;
+		
+	end
+
+	
+end

DataBase/版本日志/SGGLDB_WH_V2024-09-04-phf.sql

@@ -0,0 +1,21 @@
+--修改试车菜单
+update sys_menu set SortIndex=0 where menuid='BC860C85-B224-48A6-B207-D7042BB71088';
+
+update sys_menu set menuname='系统资产导入' where MenuId='F0E06491-B1DA-4510-ABCA-D09F4B24EE50';
+
+update sys_menu set menuname='试车记录管理' where MenuId='29F80818-17A5-4BC0-8C38-A17415B0AC83';
+
+update sys_menu set menuname='投料试车记录管理' where MenuId='B62482DA-9A12-45AC-9427-D0CF8A78EE2C';
+
+update sys_menu set menuname='开车工程师项目工作总结' where MenuId='9EBA628D-E725-4A0B-B765-171F405D0821';
+
+--增加索引，执行速度会有点慢
+CREATE INDEX ProjectId_Index ON SitePerson_Checking (ProjectId); 
+CREATE INDEX IdentityCard_Index ON SitePerson_Checking (IdentityCard); 
+CREATE INDEX IntoOutTime_Index ON SitePerson_Checking (IntoOutTime); 
+CREATE INDEX IntoOut_Index ON SitePerson_Checking (IntoOut); 
+CREATE INDEX UnitId ON SitePerson_Checking (UnitId); 
+
+CREATE NONCLUSTERED INDEX [SitePerson_Checking_ProjectId_IntoOut_IntoOutTime_Index]
+ON [dbo].[SitePerson_Checking] ([ProjectId],[IntoOut],[IntoOutTime])
+INCLUDE ([IdentityCard]);

DataBase/版本日志/SGGLDB_WH_V2024-09-05-gaofei.sql

@@ -0,0 +1,9 @@
+insert into Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId) values
+(NEWID(),'ÆäËûÉ˺¦','ÆäËûÉ˺¦',14,'Hiddendangertype')
+GO
+insert into Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId) values
+(NEWID(),'ÆäËû±¬Õ¨','ÆäËû±¬Õ¨',15,'Hiddendangertype')
+GO
+insert into Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId) values
+(NEWID(),'͸ˮ','͸ˮ',16,'Hiddendangertype')
+GO

DataBase/版本日志/SGGLDB_WH_V2024-09-09-phf.sql

@@ -0,0 +1,2 @@
+alter table Sys_User
+add CompanyProjectId nvarchar(2000) null;

ReleasePackerALL2017_lpf.bat

@@ -0,0 +1,142 @@
+@echo off
+REM ---------------
+REM 发布包生成工具
+REM 执行此文件前请先用Release生成publisher项目
+REM --------------
+
+
+
+REM --------------
+REM 环境变量设置 Project_Src为如PUBLISHER4_CODING这样的分支
+REM --------------
+set PROJECT_SRC=%CD%
+
+REM 源代码publisher项目文件夹
+set PUBLISHER_SRC_ROOT=%PROJECT_SRC%\SGGL\FineUIPro.Web
+
+REM 源代码版本日志文件夹
+set VerLog_SRC_ROOT=%PROJECT_SRC%\database\版本日志
+
+REM 包文件夹名
+SET ReleasePack=PackFile
+
+REM 发布程序包文件夹
+SET ReleasePackFolder=%PROJECT_SRC%\SGGL%ReleasePack%
+
+REM 发布包publisher文件所在文件夹
+SET RELEASE_PUBLISHER_ROOT=%PROJECT_SRC%\SGGL%ReleasePack%\%ReleasePack%
+
+REM 发布包版本日志文件所在文件夹
+SET RELEASE_VerLog_ROOT=%PROJECT_SRC%\SGGL%ReleasePack%\版本日志
+
+
+REM --------------
+REM 发布程序包文件夹相关
+REM --------------
+
+IF exist %ReleasePackFolder%\nul.ext ( 
+@echo 删除已存在的发布程序包文件夹
+@echo. 
+rd  %ReleasePackFolder% /S /Q
+)
+mkdir %ReleasePackFolder%
+
+
+IF exist %RELEASE_VerLog_ROOT%\nul.ext (
+rd  %RELEASE_VerLog_ROOT% /S /Q
+)
+mkdir %RELEASE_VerLog_ROOT%
+
+
+IF errorlevel 1 goto delReleasePackError
+
+
+@echo 设置.net控制台环境
+@echo.
+@call "D:\Visual Studio 2022\Common7\Tools\VsDevCmd.bat"
+IF errorlevel 1 goto netEnvironmentError
+
+
+@echo 开始预编译...
+@echo.
+aspnet_compiler -p %PUBLISHER_SRC_ROOT% %RELEASE_PUBLISHER_ROOT% -u -v /
+IF errorlevel 1 goto aspnet_compilerError
+@echo 预编译完成
+@echo.
+
+
+@echo 开始合并程序集...
+@echo.
+Aspnet_merge %RELEASE_PUBLISHER_ROOT% -o UI
+IF errorlevel 1 goto Aspnet_mergeError
+@echo 合并程序集完成
+@echo.
+
+
+REM --------------
+REM 删除不必要的文件
+REM --------------
+
+@echo 开始清理垃圾文件...
+@echo.
+
+del %RELEASE_PUBLISHER_ROOT%\*.cs /s /f
+del %RELEASE_PUBLISHER_ROOT%\*.designer.cs /s /f
+del %RELEASE_PUBLISHER_ROOT%\*.csproj /s /f
+del %RELEASE_PUBLISHER_ROOT%\*.csproj.* /s /f
+del %RELEASE_PUBLISHER_ROOT%\*.pdb /s /f
+del %RELEASE_PUBLISHER_ROOT%\*.resx /s /f
+
+del %RELEASE_PUBLISHER_ROOT%\*.db /s /f
+del %RELEASE_PUBLISHER_ROOT%\*.bak /s /f
+del %RELEASE_PUBLISHER_ROOT%\*.*.bak /s /f
+del %RELEASE_PUBLISHER_ROOT%\*.sln /s /f
+del %RELEASE_PUBLISHER_ROOT%\*.suo /s /f
+del %RELEASE_PUBLISHER_ROOT%\*.scc /s /f
+rd %RELEASE_PUBLISHER_ROOT%\obj /s /q
+
+del %RELEASE_PUBLISHER_ROOT%\ReadMe.txt /s /f
+del %RELEASE_PUBLISHER_ROOT%\*.pfx /s /f
+del %RELEASE_PUBLISHER_ROOT%\*.StyleCop /s /f
+
+@echo 清理完成
+@echo.
+
+REM --------------
+REM 拷贝版本日志
+REM --------------
+@echo 拷贝版本日志...
+@echo.
+
+copy %VerLog_SRC_ROOT%\*.* %RELEASE_VerLog_ROOT% /Y
+
+
+
+
+@echo 发布包已生成,存放路径为%ReleasePackFolder%
+@echo.
+goto END
+
+
+:delReleasePackError
+@echo.
+@echo 删除包存储文件夹失败!
+goto END
+
+:netEnvironmentError
+@echo.
+@echo .net环境设置失败!
+goto END
+
+:aspnet_compilerError
+@echo.
+@echo 预编译失败!
+goto END
+
+:Aspnet_mergeError
+@echo.
+@echo 合并程序集失败!
+goto END
+
+:END
+pause

SGGL/BLL/API/APIBaseInfoService.cs

@@ -71,6 +71,30 @@ namespace BLL
         }
         #endregion
 
+        #region 根据项目名称获取项目信息
+        /// <summary>
+        /// 根据项目名称获取项目信息
+        /// </summary>
+        /// <param name="projectName"></param>
+        /// <returns></returns>
+        public static Model.BaseInfoItem getProjectByName(string projectName)
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var getDataLists = (from x in db.Base_Project
+                                    where x.ProjectName == projectName
+                                    select new Model.BaseInfoItem
+                                    {
+                                        BaseInfoId = x.ProjectId,
+                                        BaseInfoCode = x.ProjectCode,
+                                        BaseInfoName = x.ProjectName
+                                    }
+                                ).FirstOrDefault();
+                return getDataLists;
+            }
+        }
+        #endregion
+
         #region 根据项目id获取区域表
         /// <summary>
         /// 根据项目id获取区域表

SGGL/BLL/API/APIPersonService.cs

@@ -763,6 +763,10 @@ namespace BLL
                 {
                     newPerson.TeamGroupId = person.TeamGroupId;
                 }
+                if (!string.IsNullOrEmpty(person.WorkPostName))
+                {
+                    person.WorkPostId = WorkPostService.AddWorkPostByName(person.WorkPostName);
+                }
                 if (!string.IsNullOrEmpty(person.WorkPostId))
                 {
                     newPerson.WorkPostId = person.WorkPostId;

SGGL/BLL/API/HSSE/APIPageDataService.cs

@@ -167,6 +167,37 @@ namespace BLL
                 return getSiteInOutList;
             }
         }
+
+        public static List<Model.PageDataPersonInOutItem> getPersonNumByCompany(DateTime dateValue,string[] pids)
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                List<Model.PageDataPersonInOutItem> getSiteInOutList = new List<Model.PageDataPersonInOutItem>();
+                var getDayAll = from x in db.SitePerson_PersonInOutNow
+                                join y in db.SitePerson_Person on x.PersonId equals y.PersonId
+                                join z in db.Base_WorkPost on y.WorkPostId equals z.WorkPostId
+                                where x.ChangeTime.Value.Year == dateValue.Year && x.ChangeTime.Value.Month == dateValue.Month
+                                && x.ChangeTime.Value.Day == dateValue.Day && pids.Contains(x.ProjectId)
+                                select new { x.PersonId, x.ChangeTime, x.IsIn, z.PostType };
+                if (getDayAll.Count() > 0)
+                {
+                    var getInMaxs = from x in getDayAll
+                                    group x by x.PersonId into g
+                                    select new Model.PageDataPersonInOutItem
+                                    {
+                                        PersonId = g.First().PersonId,
+                                        ChangeTime = g.Max(x => x.ChangeTime),
+                                        IsIn = g.First().IsIn,
+                                        PostType = g.First().PostType
+                                    };
+                    if (getInMaxs.Count() > 0)
+                    {
+                        getSiteInOutList = getInMaxs.Where(x => x.IsIn == true).ToList();
+                    }
+                }
+                return getSiteInOutList;
+            }
+        }
         #endregion
     }
 }

SGGL/BLL/AnBang/AnBangService.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+    public static   class AnBangService
+    { 
+    }
+}

SGGL/BLL/BLL.csproj

@@ -85,6 +85,7 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AnBang\AnBangService.cs" />
     <Compile Include="API\APIBaseInfoService.cs" />
     <Compile Include="API\APICommonService.cs" />
     <Compile Include="API\APIDoorServerService.cs" />

SGGL/BLL/BaseInfo/WorkPostService.cs

@@ -45,7 +45,36 @@ namespace BLL
             db.Base_WorkPost.InsertOnSubmit(newWorkPost);
             db.SubmitChanges();
         }
+        public static string AddWorkPostByName(string workPostName)
+        {
+            string workpostid = String.Empty;
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var model = db.Base_WorkPost.FirstOrDefault(e => e.WorkPostName == workPostName);
+                if (model != null)
+                {
+                    workpostid = model.WorkPostId;
+                }
+                else
+                {
+                    Model.Base_WorkPost newWorkPost = new Model.Base_WorkPost
+                    {
+                        WorkPostId = SQLHelper.GetNewID(),
+                        WorkPostCode = "",
+                        WorkPostName = workPostName,
+                        IsHsse = false,
+                        IsCQMS = false,
+                        CNCodes = "",
+                    };
 
+                    db.Base_WorkPost.InsertOnSubmit(newWorkPost);
+                    db.SubmitChanges();
+                    workpostid = newWorkPost.WorkPostId;
+                }
+
+                return workpostid;
+            }
+        }
         /// <summary>
         /// 修改
         /// </summary>

SGGL/BLL/HSSE/Emergency/EmergencyTeamAndTrainService.cs

@@ -86,6 +86,14 @@ namespace BLL
                 BLL.CommonService.DeleteAttachFileById(EmergencyTeamAndTrain.FileId);
                 ////删除流程表
                 BLL.CommonService.DeleteFlowOperateByID(EmergencyTeamAndTrain.FileId);
+
+                //删除子表
+                var list = db.Emergency_EmergencyTeamItem.Where(x => x.FileId == FileId).ToList();
+                if (list.Count>0)
+                {
+                    db.Emergency_EmergencyTeamItem.DeleteAllOnSubmit(list);
+                }
+
                 db.Emergency_EmergencyTeamAndTrain.DeleteOnSubmit(EmergencyTeamAndTrain);
                 db.SubmitChanges();
             }

SGGL/BLL/HSSE/Manager/ManagerMonthC/InjuryAccidentCService.cs

@@ -36,9 +36,11 @@ namespace BLL
                 FirstAidDressing = injuryAccident.FirstAidDressing,
                 MedicalTreatment = injuryAccident.MedicalTreatment,
                 WorkLimitation = injuryAccident.WorkLimitation,
+                LossCount = injuryAccident.LossCount,
                 LossPerson = injuryAccident.LossPerson,
                 LossWorkTime = injuryAccident.LossWorkTime,
                 LossEconomy = injuryAccident.LossEconomy,
+                DeathCount=injuryAccident.DeathCount,
                 DeathPerson = injuryAccident.DeathPerson,
                 DeathWorkTime = injuryAccident.DeathWorkTime,
                 DeathEconomy = injuryAccident.DeathEconomy

SGGL/BLL/HSSE/Manager/ManagerMonthC/MonthReportCService.cs

@@ -369,5 +369,6 @@ namespace BLL
             db.SubmitChanges();
         }
         #endregion
+
     }
 }

SGGL/BLL/ProjectData/ProjectService.cs

@@ -251,12 +251,23 @@
         /// 获取项目下拉选项
         /// </summary>
         /// <returns></returns>
-        public static List<Model.Base_Project> GetAllProjectDropDownList()
+        public static List<Model.Base_Project> GetAllProjectDropDownList(string[] pids = null)
         {
-            var list = (from x in Funs.DB.Base_Project
-                        orderby x.ProjectCode descending
-                        select x).ToList();
-            return list;
+            if (pids == null)
+            {
+                var list = (from x in Funs.DB.Base_Project
+                            orderby x.ProjectCode descending
+                            select x).ToList();
+                return list;
+            }
+            else {
+                var list = (from x in Funs.DB.Base_Project
+                            where pids.Contains(x.ProjectId)
+                            orderby x.ProjectCode descending
+                            select x).ToList();
+                return list;
+            }
+          
         }
 
 
@@ -669,5 +680,27 @@
 
             return list;
         }
+
+        #region 加载公司级别项目
+        public static List<Model.Base_Project> GetUnEndProjectByUserIdDropDownList(string projectState,
+            string projectName = null, string projectCode = null) {
+            IQueryable<Model.Base_Project> projects = (from x in Funs.DB.Base_Project
+                                                       where x.ProjectState == projectState
+                                                       orderby x.ProjectCode descending
+                                                       select x);
+            if (!string.IsNullOrEmpty(projectName))
+            {
+                projects = from x in projects where x.ProjectName.Contains(projectName) select x;
+            }
+            if (!string.IsNullOrEmpty(projectCode))
+            {
+                projects = from x in projects where x.ProjectCode.Contains(projectCode) select x;
+            }
+            return (from x in projects
+                    join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
+                    select x).Distinct().ToList();
+
+        }
+        #endregion
     }
 }

SGGL/BLL/SQLHelper.cs

@@ -972,5 +972,44 @@ namespace BLL
             maxId = GetIntValue(str);
             return maxId;
         }
+
+        /// <summary>
+        /// ͨ¹ý´æ´¢¹ý³Ì»ñÈ¡Êý¾Ý
+        /// </summary>
+        /// <param name="storedProcName"></param>
+        /// <returns></returns>
+        public static int RunProcGetHsseKq(string ProjectId,DateTime startTime,DateTime endTime,string UnitId)
+        {
+            string str = "";
+            using (SqlConnection Connection = new SqlConnection(connectionString))
+            {
+                try
+                {
+                    Connection.Open();
+                    SqlCommand command = new SqlCommand("SpGetHsseKq", Connection)
+                    {
+                        CommandTimeout = 0,
+                        CommandType = CommandType.StoredProcedure
+                    };
+                    SqlParameter[] values = new SqlParameter[]
+                                            {
+                                                new SqlParameter("@ProjectId", ProjectId),
+                                                 new SqlParameter("@startTime", startTime.ToString()),
+                                                new SqlParameter("@endTime", endTime.ToString()),
+                                                new SqlParameter("@UnitId", UnitId),
+                                                new SqlParameter("@returnVal", SqlDbType.Int)
+                                            };
+                    command.Parameters.AddRange(values);
+                    command.Parameters["@returnVal"].Direction = ParameterDirection.Output;
+                    command.ExecuteNonQuery();
+                    str = command.Parameters["@returnVal"].Value.ToString();
+                }
+                finally
+                {
+                    Connection.Close();
+                }
+                return Convert.ToInt32(str);
+            }
+        }
     }
 }

SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs

@@ -686,36 +686,67 @@ namespace BLL
         ///     获取企业负责人带班检查次数
         /// </summary>
         /// <returns></returns>
-        public static int GetCompanyLeadShiftCheckNum()
+        public static int GetCompanyLeadShiftCheckNum(string[] pids=null)
         {
-            var result = (from x in Funs.DB.Supervise_SuperviseCheckReport
-                where x.CheckType == "1" && x.CheckDate > Const.DtmarkTime
-                select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.Supervise_SuperviseCheckReport
+                              where x.CheckType == "1" && x.CheckDate > Const.DtmarkTime
+                              select x).Count();
+                return result;
+            }
+            else {
+                var result = (from x in Funs.DB.Supervise_SuperviseCheckReport
+                              where x.CheckType == "1" && x.CheckDate > Const.DtmarkTime
+                              && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
+           
         }
 
         /// <summary>
         ///     获取企业综合检查次数
         /// </summary>
         /// <returns></returns>
-        public static int GetCompanyComprehensiveCheckNum()
+        public static int GetCompanyComprehensiveCheckNum(string[] pids = null)
         {
-            var result = (from x in Funs.DB.Supervise_SuperviseCheckReport
-                where x.CheckType == "2" && x.CheckDate > Const.DtmarkTime
-                select x).Count();
-            return result;
+            if (pids == null) { 
+                var result = (from x in Funs.DB.Supervise_SuperviseCheckReport
+                              where x.CheckType == "2" && x.CheckDate > Const.DtmarkTime
+                              select x).Count();
+                return result;
+            }
+            else {
+                var result = (from x in Funs.DB.Supervise_SuperviseCheckReport
+                              where x.CheckType == "2" && x.CheckDate > Const.DtmarkTime
+                               && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
+           
         }
 
         /// <summary>
         ///     获取企业专项检查次数
         /// </summary>
         /// <returns></returns>
-        public static int GetCompanySpecialCheckNum()
+        public static int GetCompanySpecialCheckNum(string[] pids = null)
         {
-            var result = (from x in Funs.DB.Supervise_SuperviseCheckReport
-                where x.CheckType == "3" && x.CheckDate > Const.DtmarkTime
-                select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.Supervise_SuperviseCheckReport
+                              where x.CheckType == "3" && x.CheckDate > Const.DtmarkTime
+                              select x).Count();
+                return result;
+            }
+            else {
+                var result = (from x in Funs.DB.Supervise_SuperviseCheckReport
+                              where x.CheckType == "3" && x.CheckDate > Const.DtmarkTime
+                               && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
 
         /// <summary>

SGGL/FineUIPro.Web/DataShow/EduTrain.aspx

@@ -16,7 +16,7 @@
             ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="教育培训" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="TrainingId" DataIDField="TrainingId" AllowSorting="true"
+                    runat="server" BoxFlex="1" DataKeyNames="TrainingId,Ttype" DataIDField="TrainingId" AllowSorting="true"
                     SortField="ProjectCode,TrainStartDate" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
                     IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
                      EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" 
@@ -30,9 +30,9 @@
                                 <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
                                 <f:RadioButtonList runat="server" ID="rbType" Width="600px" Label="类型" LabelWidth="50px"
                                     AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoColumnWidth="true">
-                                    <f:RadioItem Text="三级教育培训" Value="1" Selected="true" />
-                                    <f:RadioItem Text="专项培训" Value="2" />
-                                      <f:RadioItem Text="特种作业培训" Value="3" />
+                                    <f:RadioItem Text="入场" Value="dfb6a37e-4412-4ba9-ad59-3bc505bc21f7" Selected="true" />
+                                    <f:RadioItem Text="其他" Value="c1a513bb-a547-45b0-944d-b0dd88f06f82" />
+                                      <f:RadioItem Text="专项" Value="0e7fdf78-eaa0-4d00-a60b-490040bbea18" />
                                 </f:RadioButtonList>
                                 <f:DatePicker ID="txtStartTime" runat="server" Label="时间" LabelAlign="Right"
                                     AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
@@ -62,6 +62,10 @@
                            <f:RenderField Width="100px" ColumnID="TrainTitle" DataField="TrainTitle" 
                                FieldType="String" HeaderText="名称" HeaderTextAlign="Center"
                             TextAlign="Left">
+                        </f:RenderField>
+                           <f:RenderField Width="100px" ColumnID="Ttype" DataField="Ttype" 
+                               FieldType="String" HeaderText="来源" HeaderTextAlign="Center"
+                            TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="110px" ColumnID="TrainStartDate" DataField="TrainStartDate"
                                FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"

SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs

@@ -34,38 +34,167 @@ namespace FineUIPro.Web.DataShow
         {
             string strSql = string.Empty;
             List<SqlParameter> listStr = new List<SqlParameter>();
+            List<SqlParameter> listStrSum = new List<SqlParameter>();
+            //strSql = @"select TrainRecord.TrainTypeId,TrainRecord.TrainingId,
+            //            TrainRecord.TrainTitle,
+            //            Project.ProjectId,
+            //            Project.ProjectCode,
+            //            Project.ProjectName,
+            //            TrainRecord.TrainStartDate,
+            //            TrainRecord.TrainEndDate,
+            //            TrainRecord.TrainPersonNum,
+            //            UnitName= STUFF((SELECT ',' + UnitName FROM dbo.Base_Unit where PATINDEX('%,' + RTRIM(UnitId) + ',%',',' +TrainRecord.UnitIds + ',')>0 FOR XML PATH('')), 1, 1,'')
+            //            from EduTrain_TrainRecord AS TrainRecord 
+            //            LEFT JOIN Base_TrainType AS TrainType ON TrainRecord.TrainTypeId=TrainType.TrainTypeId 
+            //            LEFT JOIN Base_Project AS Project ON TrainRecord.ProjectId=Project.ProjectId 
+            //            WHERE 1=1 ";
 
-            strSql = @"select TrainRecord.TrainingId,TrainRecord.TrainTitle,TrainType.TrainTypeName,Project.ProjectId,Project.ProjectCode,Project.ProjectName
-            ,TrainRecord.TrainStartDate,TrainRecord.TrainEndDate,TrainRecord.TrainPersonNum,TrainRecord.UnitIds
-            ,UnitName= STUFF((SELECT ',' + UnitName FROM dbo.Base_Unit where PATINDEX('%,' + RTRIM(UnitId) + ',%',',' +TrainRecord.UnitIds + ',')>0 FOR XML PATH('')), 1, 1,'')
-             from EduTrain_TrainRecord AS TrainRecord 
-             LEFT JOIN Base_TrainType AS TrainType ON TrainRecord.TrainTypeId=TrainType.TrainTypeId 
-              LEFT JOIN Base_Project AS Project ON TrainRecord.ProjectId=Project.ProjectId 
-             WHERE 1=1 ";
+            //strSql += " AND TrainRecord.TrainTypeId =@TrainType";
+            //listStr.Add(new SqlParameter("@TrainType", this.rbType.SelectedValue));
 
-            strSql += " AND TrainType.TrainType =@TrainType";
-            listStr.Add(new SqlParameter("@TrainType", this.rbType.SelectedValue));
+            //当前页数
+            int pageIndex = Grid1.PageIndex + 1;
+            //每页显示条数
+            int pageSize = Grid1.PageSize;
+            strSql = @"select*from(
+                                select ROW_NUMBER() OVER(Order by ProjectCode desc) AS RowNumber,
+                                * from (
+                                select 
+                                '本系统' as Ttype,
+                                TrainRecord.TrainTypeId,
+                                TrainRecord.TrainingId,
+                                TrainRecord.TrainTitle,
+                                Project.ProjectId,
+                                Project.ProjectCode,
+                                Project.ProjectName,
+                                TrainRecord.TrainStartDate,
+                                TrainRecord.TrainEndDate,
+                                TrainRecord.TrainPersonNum,
+                                UnitName= STUFF((SELECT ',' + UnitName FROM dbo.Base_Unit where PATINDEX('%,' + RTRIM(UnitId) + ',%',',' +TrainRecord.UnitIds + ',')>0 FOR XML PATH('')), 1, 1,'')
+                                from EduTrain_TrainRecord AS TrainRecord 
+                                LEFT JOIN Base_TrainType AS TrainType ON TrainRecord.TrainTypeId=TrainType.TrainTypeId 
+                                LEFT JOIN Base_Project AS Project ON TrainRecord.ProjectId=Project.ProjectId 
+
+                                UNION ALL
+
+                                select 
+                                '博晟' as Ttype,
+                                TrainType as TrainTypeId,
+                                Id as TrainingId,
+                                RecordName as TrainTitle,
+                                Project.ProjectId,
+                                Project.ProjectCode,
+                                Project.ProjectName,
+                                TrainStartDate,
+                                TrainEndDate,
+                                PersonCount as TrainPersonNum,
+                                TrainDepart as UnitName
+                                From Bo_Sheng_Train F
+                                LEFT JOIN Base_Project AS Project ON F.ProjectId=Project.ProjectId 
+                                )f WHERE 1=1 ";
+
+            #region 总数
+            var strSqlSum = @"select Count(*)as allCount from(
+                                select ROW_NUMBER() OVER(Order by ProjectCode desc) AS RowNumber,
+                                * from (
+                                select 
+                                '1' as Ttype,
+                                TrainRecord.TrainTypeId,
+                                TrainRecord.TrainingId,
+                                TrainRecord.TrainTitle,
+                                Project.ProjectId,
+                                Project.ProjectCode,
+                                Project.ProjectName,
+                                TrainRecord.TrainStartDate,
+                                TrainRecord.TrainEndDate,
+                                TrainRecord.TrainPersonNum,
+                                UnitName= STUFF((SELECT ',' + UnitName FROM dbo.Base_Unit where PATINDEX('%,' + RTRIM(UnitId) + ',%',',' +TrainRecord.UnitIds + ',')>0 FOR XML PATH('')), 1, 1,'')
+                                from EduTrain_TrainRecord AS TrainRecord 
+                                LEFT JOIN Base_TrainType AS TrainType ON TrainRecord.TrainTypeId=TrainType.TrainTypeId 
+                                LEFT JOIN Base_Project AS Project ON TrainRecord.ProjectId=Project.ProjectId 
+
+                                UNION ALL
+
+                                select 
+                                '博晟' as Ttype,
+                                TrainType as TrainTypeId,
+                                Id as TrainingId,
+                                RecordName as TrainTitle,
+                                Project.ProjectId,
+                                Project.ProjectCode,
+                                Project.ProjectName,
+                                TrainStartDate,
+                                TrainEndDate,
+                                PersonCount as TrainPersonNum,
+                                TrainDepart as UnitName
+                                From Bo_Sheng_Train F
+                                LEFT JOIN Base_Project AS Project ON F.ProjectId=Project.ProjectId 
+                                )f WHERE 1=1";
+            
+            #endregion
             if (this.drpProject.SelectedValue != Const._Null)
             {
-                strSql += " AND TrainRecord.ProjectId = @ProjectId";
+                strSql += " AND ProjectId = @ProjectId";
                 listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
+
+                strSqlSum += " AND ProjectId = @ProjectId";
+                listStrSum.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
             }
             if (!string.IsNullOrEmpty(this.txtStartTime.Text))
             {
-                strSql += " AND TrainRecord.TrainEndDate >=@StartTime";
+                strSql += " AND TrainStartDate >=@StartTime";
                 listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+
+                strSqlSum += " AND TrainStartDate >=@StartTime";
+                listStrSum.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
             }
             if (!string.IsNullOrEmpty(this.txtEndTime.Text))
             {
-                strSql += " AND TrainRecord.TrainEndDate <=@EndTime";
+                strSql += " AND TrainStartDate <=@EndTime";
                 listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+
+                strSqlSum += " AND TrainStartDate <=@EndTime";
+                listStrSum.Add(new SqlParameter("@EndTime", this.txtStartTime.Text));
             }
+            if (!string.IsNullOrEmpty(this.rbType.SelectedValue))
+            {
+                strSql += " And ( TrainTypeId='" + rbType.SelectedValue + "' or ";
+
+                strSqlSum+= " And ( TrainTypeId='" + rbType.SelectedValue + "' or ";
+                if (rbType.SelectedValue == "dfb6a37e-4412-4ba9-ad59-3bc505bc21f7")
+                {
+                    strSql += " TrainTypeId like '%入场%' ) ";
+
+                    strSqlSum += " TrainTypeId like '%入场%' ) ";
+                }
+                else if (rbType.SelectedValue == "c1a513bb-a547-45b0-944d-b0dd88f06f82")
+                {
+                    strSql += " TrainTypeId like '%其他%' ) ";
+                    strSqlSum += " TrainTypeId like '%其他%' ) ";
+                }
+                else {
+                    strSql += " TrainTypeId like '%专项%' ) ";
+                    strSqlSum += " TrainTypeId like '%专项%' ) ";
+                }
+            }
+
+            strSql += " ) b where b.RowNumber BETWEEN(@pageIndex-1)*@pageSize + 1 and @pageIndex*@pageSize order by RowNumber asc";
+            strSqlSum+= " ) b ";
+
+            listStr.Add(new SqlParameter("@pageIndex", pageIndex));
+            listStr.Add(new SqlParameter("@pageSize", pageSize));
+
+
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
 
-            Grid1.RecordCount = tb.Rows.Count;
-            var table = this.GetPagedDataTable(Grid1, tb);
-            Grid1.DataSource = table;
+            #region 总数
+            DataTable tbSum = SQLHelper.GetDataTableRunText(strSqlSum, listStrSum.ToArray());
+            Grid1.RecordCount = Convert.ToInt32(tbSum.Rows[0]["allcount"].ToString());
+            #endregion
+
+
+            Grid1.DataSource = tb;
             Grid1.DataBind();
         }
         #endregion
@@ -78,6 +207,7 @@ namespace FineUIPro.Web.DataShow
         /// <param name="e"></param>
         protected void TextBox_TextChanged(object sender, EventArgs e)
         {
+            Grid1.PageIndex = 0;
             this.BindGrid();
         }
         #endregion
@@ -147,8 +277,11 @@ namespace FineUIPro.Web.DataShow
                 Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
                 return;
             }
-
-            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HSSE/EduTrain/TrainRecordView.aspx?TrainingId={0}", Grid1.SelectedRowID, "查看 - ")));
+            var tType= Grid1.SelectedRow.DataKeys[1].ToString();
+            if (tType!="博晟")
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HSSE/EduTrain/TrainRecordView.aspx?TrainingId={0}", Grid1.SelectedRowID, "查看 - ")));
+            }
         }
         #endregion
 

SGGL/FineUIPro.Web/ErrLog.txt

@@ -0,0 +1,429 @@
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:无法绑定由多个部分组成的标识符 "D.UnitWorkId"。
+错误堆栈:
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+   在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
+   在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\SQLHelper.cs:行号 311
+   在 FineUIPro.Web.CQMS.ProcessControl.InspectionNotice.BindGrid() 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionNotice.aspx.cs:行号 83
+   在 FineUIPro.Web.CQMS.ProcessControl.InspectionNotice.btnSearch_Click(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionNotice.aspx.cs:行号 135
+   在 FineUIPro.Button.OnClick(EventArgs e)
+   在 (Button , EventArgs )
+   在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:09/02/2024 10:32:29
+出错文件:http://localhost:8579/CQMS/ProcessControl/InspectionNotice.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:09/02/2024 10:32:29
+
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:列名 'NextNum' 无效。
+错误堆栈:
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+   在 System.Data.Common.DbCommand.ExecuteReader()
+   在 System.Data.Linq.SqlClient.SqlProvider.Execute(Expression query, QueryInfo queryInfo, IObjectReaderFactory factory, Object[] parentArgs, Object[] userArgs, ICompiledSubQuery[] subQueries, Object lastResult)
+   在 System.Data.Linq.SqlClient.SqlProvider.ExecuteAll(Expression query, QueryInfo[] queryInfos, IObjectReaderFactory factory, Object[] userArguments, ICompiledSubQuery[] subQueries)
+   在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
+   在 System.Data.Linq.DataQuery`1.System.Collections.Generic.IEnumerable<T>.GetEnumerator()
+   在 System.Collections.Generic.List`1..ctor(IEnumerable`1 collection)
+   在 System.Linq.Enumerable.ToList[TSource](IEnumerable`1 source)
+   在 FineUIPro.Web.common.mainProject2.GetJD() 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\common\mainProject2.aspx.cs:行号 720
+   在 FineUIPro.Web.common.mainProject2.Page_Load(Object sender, EventArgs e) 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\common\mainProject2.aspx.cs:行号 113
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:06/25/2024 17:08:52
+出错文件:http://localhost:8579/common/mainProject2.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:06/25/2024 17:08:52
+
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:参数化查询 '(@ProjectId nvarchar(4000))SELECT NEWID() AS ID, CardNo,PersonNa' 需要参数 '@ProjectId'，但未提供该参数。
+错误堆栈:
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+   在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
+   在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\SQLHelper.cs:行号 311
+   在 FineUIPro.Web.HSSE.EduTrain.TrainFind.BindGrid() 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\EduTrain\TrainFind.aspx.cs:行号 116
+   在 FineUIPro.Web.HSSE.EduTrain.TrainFind.Page_Load(Object sender, EventArgs e) 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\EduTrain\TrainFind.aspx.cs:行号 59
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:09/03/2024 15:38:17
+出错文件:http://localhost:8579/HSSE/EduTrain/TrainFind.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:09/03/2024 15:38:17
+
+
+错误信息开始=====>
+错误类型:FormatException
+错误信息:输入字符串的格式不正确。
+错误堆栈:
+   在 System.Number.StringToNumber(String str, NumberStyles options, NumberBuffer& number, NumberFormatInfo info, Boolean parseDecimal)
+   在 System.Number.ParseInt32(String s, NumberStyles style, NumberFormatInfo info)
+   在 System.String.System.IConvertible.ToInt32(IFormatProvider provider)
+   在 System.Convert.ToInt32(Object value)
+   在 FineUIPro.RenderField.DSVurKNBLhHEBGjRDehgsQmnHqGTA(GridRow )
+   在 (GridColumn , GridRow )
+   在 FineUIPro.GridRow.JKAqhrYRKGjUrputGryVTdIrcyJN()
+   在 (GridRow )
+   在 FineUIPro.Grid.JKAqhrYRKGjUrputGryVTdIrcyJN(Int32 , Object )
+   在 (Grid , Int32 , Object )
+   在 FineUIPro.Grid.AYqoKqSqsgZakIKkWuWxQURnixDO(IEnumerable , Boolean )
+   在 (Grid , IEnumerable , Boolean )
+   在 FineUIPro.Grid.DataBind(Boolean keepCurrentData)
+   在 (Grid , Boolean )
+   在 FineUIPro.Grid.DataBind()
+   在 FineUIPro.Web.BoSheng.BoPersonTrainRecord.GridBind() 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:行号 34
+   在 FineUIPro.Web.BoSheng.BoPersonTrainRecord.btnSearch_Click(Object sender, EventArgs e) 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:行号 39
+   在 FineUIPro.Button.OnClick(EventArgs e)
+   在 (Button , EventArgs )
+   在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:09/03/2024 15:53:12
+出错文件:http://localhost:8579/BoSheng/BoPersonTrainRecord.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:09/03/2024 15:53:12
+
+
+错误信息开始=====>
+错误类型:FormatException
+错误信息:输入字符串的格式不正确。
+错误堆栈:
+   在 System.Number.StringToNumber(String str, NumberStyles options, NumberBuffer& number, NumberFormatInfo info, Boolean parseDecimal)
+   在 System.Number.ParseInt32(String s, NumberStyles style, NumberFormatInfo info)
+   在 System.String.System.IConvertible.ToInt32(IFormatProvider provider)
+   在 System.Convert.ToInt32(Object value)
+   在 FineUIPro.RenderField.DSVurKNBLhHEBGjRDehgsQmnHqGTA(GridRow )
+   在 (GridColumn , GridRow )
+   在 FineUIPro.GridRow.JKAqhrYRKGjUrputGryVTdIrcyJN()
+   在 (GridRow )
+   在 FineUIPro.Grid.JKAqhrYRKGjUrputGryVTdIrcyJN(Int32 , Object )
+   在 (Grid , Int32 , Object )
+   在 FineUIPro.Grid.AYqoKqSqsgZakIKkWuWxQURnixDO(IEnumerable , Boolean )
+   在 (Grid , IEnumerable , Boolean )
+   在 FineUIPro.Grid.DataBind(Boolean keepCurrentData)
+   在 (Grid , Boolean )
+   在 FineUIPro.Grid.DataBind()
+   在 FineUIPro.Web.BoSheng.BoPersonTrainRecord.GridBind() 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:行号 34
+   在 FineUIPro.Web.BoSheng.BoPersonTrainRecord.Page_Load(Object sender, EventArgs e) 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:行号 22
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:09/03/2024 15:53:47
+出错文件:http://localhost:8579/BoSheng/BoPersonTrainRecord.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:09/03/2024 15:53:47
+
+
+错误信息开始=====>
+错误类型:FormatException
+错误信息:输入字符串的格式不正确。
+错误堆栈:
+   在 System.Number.StringToNumber(String str, NumberStyles options, NumberBuffer& number, NumberFormatInfo info, Boolean parseDecimal)
+   在 System.Number.ParseInt32(String s, NumberStyles style, NumberFormatInfo info)
+   在 System.String.System.IConvertible.ToInt32(IFormatProvider provider)
+   在 System.Convert.ToInt32(Object value)
+   在 FineUIPro.RenderField.DSVurKNBLhHEBGjRDehgsQmnHqGTA(GridRow )
+   在 (GridColumn , GridRow )
+   在 FineUIPro.GridRow.JKAqhrYRKGjUrputGryVTdIrcyJN()
+   在 (GridRow )
+   在 FineUIPro.Grid.JKAqhrYRKGjUrputGryVTdIrcyJN(Int32 , Object )
+   在 (Grid , Int32 , Object )
+   在 FineUIPro.Grid.AYqoKqSqsgZakIKkWuWxQURnixDO(IEnumerable , Boolean )
+   在 (Grid , IEnumerable , Boolean )
+   在 FineUIPro.Grid.DataBind(Boolean keepCurrentData)
+   在 (Grid , Boolean )
+   在 FineUIPro.Grid.DataBind()
+   在 FineUIPro.Web.BoSheng.BoPersonTrainRecord.GridBind() 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:行号 34
+   在 FineUIPro.Web.BoSheng.BoPersonTrainRecord.Page_Load(Object sender, EventArgs e) 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:行号 22
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:09/03/2024 15:54:12
+出错文件:http://localhost:8579/BoSheng/BoPersonTrainRecord.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:09/03/2024 15:54:12
+
+
+错误信息开始=====>
+错误类型:FormatException
+错误信息:输入字符串的格式不正确。
+错误堆栈:
+   在 System.Number.StringToNumber(String str, NumberStyles options, NumberBuffer& number, NumberFormatInfo info, Boolean parseDecimal)
+   在 System.Number.ParseInt32(String s, NumberStyles style, NumberFormatInfo info)
+   在 System.String.System.IConvertible.ToInt32(IFormatProvider provider)
+   在 System.Convert.ToInt32(Object value)
+   在 FineUIPro.RenderField.DSVurKNBLhHEBGjRDehgsQmnHqGTA(GridRow )
+   在 (GridColumn , GridRow )
+   在 FineUIPro.GridRow.JKAqhrYRKGjUrputGryVTdIrcyJN()
+   在 (GridRow )
+   在 FineUIPro.Grid.JKAqhrYRKGjUrputGryVTdIrcyJN(Int32 , Object )
+   在 (Grid , Int32 , Object )
+   在 FineUIPro.Grid.AYqoKqSqsgZakIKkWuWxQURnixDO(IEnumerable , Boolean )
+   在 (Grid , IEnumerable , Boolean )
+   在 FineUIPro.Grid.DataBind(Boolean keepCurrentData)
+   在 (Grid , Boolean )
+   在 FineUIPro.Grid.DataBind()
+   在 FineUIPro.Web.BoSheng.BoPersonTrainRecord.GridBind() 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:行号 34
+   在 FineUIPro.Web.BoSheng.BoPersonTrainRecord.Page_Load(Object sender, EventArgs e) 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:行号 22
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:09/03/2024 15:54:41
+出错文件:http://localhost:8579/BoSheng/BoPersonTrainRecord.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:09/03/2024 15:54:41
+
+
+错误信息开始=====>
+错误类型:FormatException
+错误信息:输入字符串的格式不正确。
+错误堆栈:
+   在 System.Number.StringToNumber(String str, NumberStyles options, NumberBuffer& number, NumberFormatInfo info, Boolean parseDecimal)
+   在 System.Number.ParseInt32(String s, NumberStyles style, NumberFormatInfo info)
+   在 System.String.System.IConvertible.ToInt32(IFormatProvider provider)
+   在 System.Convert.ToInt32(Object value)
+   在 FineUIPro.RenderField.DSVurKNBLhHEBGjRDehgsQmnHqGTA(GridRow )
+   在 (GridColumn , GridRow )
+   在 FineUIPro.GridRow.JKAqhrYRKGjUrputGryVTdIrcyJN()
+   在 (GridRow )
+   在 FineUIPro.Grid.JKAqhrYRKGjUrputGryVTdIrcyJN(Int32 , Object )
+   在 (Grid , Int32 , Object )
+   在 FineUIPro.Grid.AYqoKqSqsgZakIKkWuWxQURnixDO(IEnumerable , Boolean )
+   在 (Grid , IEnumerable , Boolean )
+   在 FineUIPro.Grid.DataBind(Boolean keepCurrentData)
+   在 (Grid , Boolean )
+   在 FineUIPro.Grid.DataBind()
+   在 FineUIPro.Web.BoSheng.BoPersonTrainRecord.GridBind() 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:行号 34
+   在 FineUIPro.Web.BoSheng.BoPersonTrainRecord.Page_Load(Object sender, EventArgs e) 位置 D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:行号 22
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:09/03/2024 15:55:36
+出错文件:http://localhost:8579/BoSheng/BoPersonTrainRecord.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:09/03/2024 15:55:36
+
+
+错误信息开始=====>
+错误类型:NullReferenceException
+错误信息:未将对象引用设置到对象的实例。
+错误堆栈:
+   在 BLL.APIGetHttpService.ControlHttp(String url, String method, String contenttype, Hashtable header, String data) 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\API\APIGetHttpService.cs:行号 202
+   在 FineUIPro.Web.ProjectData.Installation.btnMenuDown_Click(Object sender, EventArgs e) 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\ProjectData\Installation.aspx.cs:行号 252
+   在 FineUIPro.MenuButton.OnClick(EventArgs e)
+   在 (MenuButton , EventArgs )
+   在 FineUIPro.MenuButton.RaisePostBackEvent(String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:09/05/2024 09:35:46
+出错文件:http://localhost:8579/ProjectData/Installation.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:09/05/2024 09:35:46
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEService.HSSEServiceClient.GetSupervise_SubUnitReportListToSUB() 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13827
+   在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2181
+出错时间:09/05/2024 10:57:15
+出错时间:09/05/2024 10:57:15
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckInfo_Table8ItemListToSUB(String unitId) 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13851
+   在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2046
+出错时间:09/05/2024 10:57:15
+出错时间:09/05/2024 10:57:16
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckRectifyListToSUB(String unitId) 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13843
+   在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1942
+出错时间:09/05/2024 10:57:16
+出错时间:09/05/2024 10:57:16
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEService.HSSEServiceClient.GetInformation_UrgeReportToSUB(String unitId) 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 13643
+   在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1884
+出错时间:09/05/2024 10:57:16
+出错时间:09/05/2024 10:57:16
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:另一个 SqlParameterCollection 中已包含 SqlParameter。
+错误堆栈:
+   在 System.Data.SqlClient.SqlParameterCollection.Validate(Int32 index, Object value)
+   在 System.Data.SqlClient.SqlParameterCollection.AddRange(Array values)
+   在 System.Data.SqlClient.SqlParameterCollection.AddRange(SqlParameter[] values)
+   在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 G:\公司项目\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\SQLHelper.cs:行号 307
+   在 FineUIPro.Web.DataShow.EduTrain.BindGrid()
+   在 FineUIPro.Web.DataShow.EduTrain.Page_Load(Object sender, EventArgs e)
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:09/06/2024 11:25:16
+出错文件:http://localhost:8579/DataShow/EduTrain.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:09/06/2024 11:25:16
+

SGGL/FineUIPro.Web/HSSE/Emergency/EmergencyTeamAndTrain.aspx.cs

@@ -222,6 +222,8 @@ namespace FineUIPro.Web.HSSE.Emergency
                     var EmergencyTeamAndTrain = BLL.EmergencyTeamAndTrainService.GetEmergencyTeamAndTrainById(rowID);
                     if (EmergencyTeamAndTrain != null)
                     {
+                        
+
                         BLL.LogService.AddSys_Log(this.CurrUser, EmergencyTeamAndTrain.FileCode, EmergencyTeamAndTrain.FileId, BLL.Const.ProjectEmergencyTeamAndTrainMenuId, BLL.Const.BtnDelete);
                         BLL.EmergencyTeamAndTrainService.DeleteEmergencyTeamAndTrainById(rowID);
                     }

SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx

@@ -10,6 +10,19 @@
     <script type="text/javascript" src="../../res/index/js/jquery-3.4.1.min.js"></script>
 
     <script src="../../Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <style>
+        .grid-empty-text {
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            width: 500px;
+            margin-left: -250px;
+            margin-top: -15px;
+ 
+            font-size: 24px;
+            text-align: center;
+        }
+    </style>
     <style>
         .Toolbar2 {
             position: absolute;
@@ -41,6 +54,7 @@
 
         .photo {
             height: 300px;
+            
             line-height: 300px;
             overflow: hidden;
         }
@@ -48,6 +62,7 @@
             .photo img {
                 height: 300px;
                 vertical-align: middle;
+               
             }
     </style>
 </head>
@@ -85,7 +100,7 @@
                             bordercolor="#bcd2e7" bordercolordark="#bcd2e7" bordercolorlight="#bcd2e7">
                             <tr>
                                 <td align="center" style="width: 24%;" rowspan="2">
-                                    <img alt="" src="../../Images/Logo.jpg" />
+                                    <img alt="" src="../../Images/Logo1.jpg" />
                                 </td>
                                 <td align="center" style="width: 46%; height: 30px; vertical-align: middle; font-size: 12pt;">
                                     <asp:Label ID="lblProjectName" runat="server"></asp:Label>
@@ -103,7 +118,7 @@
                             </tr>
                             <tr>
                                 <td align="center" style="width: 46%; height: 50px; vertical-align: middle; font-size: 20pt; font-weight: bold">
-                                    <asp:Label ID="lblTital" runat="server" Text="项 目 安 全 月 报"></asp:Label>
+                                    <asp:Label ID="lblTital" runat="server" Text="项 目 H S E 月 报"></asp:Label>
                                 </td>
                             </tr>
                         </table>
@@ -202,7 +217,7 @@
                                     </f:RenderField>
                                 </Columns>
                             </f:GroupField>
-                            <f:RenderField Width="160px" ColumnID="HSEPersonNum" DataField="HSEPersonNum" FieldType="Int"
+                            <f:RenderField Width="170px" ColumnID="HSEPersonNum" DataField="HSEPersonNum" FieldType="Int"
                                 HeaderText="专职HSE管理人员数量" HeaderTextAlign="Center" TextAlign="Left">
                                 <Editor>
                                     <f:NumberBox ID="nbHSEPersonNum" NoDecimal="true" NoNegative="true" MinValue="0"
@@ -502,31 +517,31 @@
                             <f:Panel ID="Panel11" Layout="HBox" ShowHeader="false" ShowBorder="false" runat="server">
                                 <Items>
                                     <f:NumberBox ID="nbFireWorkCount" Label="动火作业许可数量" LabelAlign="Right" LabelWidth="170px" Width="300px"
-                                        NoDecimal="true" NoNegative="true" MinValue="0" runat="server" />
+                                        NoDecimal="true" NoNegative="true" MinValue="0" runat="server" AutoPostBack="true" OnTextChanged="Zy_TextChanged"/>
 
                                     <f:NumberBox ID="nbBreakGroundCount" Label="动土作业许可数量" LabelAlign="Right" LabelWidth="170px" Width="300px"
-                                        NoDecimal="true" NoNegative="true" MinValue="0" runat="server" />
+                                        NoDecimal="true" NoNegative="true" MinValue="0" runat="server" AutoPostBack="true" OnTextChanged="Zy_TextChanged"/>
 
                                     <f:NumberBox ID="nbLimitedSpaceCount" Label="受限空间作业许可数量" LabelAlign="Right" LabelWidth="170px" Width="300px"
-                                        NoDecimal="true" NoNegative="true" MinValue="0" runat="server" />
+                                        NoDecimal="true" NoNegative="true" MinValue="0" runat="server" AutoPostBack="true" OnTextChanged="Zy_TextChanged"/>
 
                                     <f:NumberBox ID="nbElectricityCount" Label="临时用电作业许可数量" LabelAlign="Right" LabelWidth="170px" Width="300px"
-                                        NoDecimal="true" NoNegative="true" MinValue="0" runat="server" />
+                                        NoDecimal="true" NoNegative="true" MinValue="0" runat="server" AutoPostBack="true" OnTextChanged="Zy_TextChanged"/>
                                 </Items>
                             </f:Panel>
                             <f:Panel ID="Panel12" Layout="HBox" ShowHeader="false" ShowBorder="false" runat="server">
                                 <Items>
                                     <f:NumberBox ID="nbHeightWorkCount" Label="高处作业许可数量" LabelAlign="Right" LabelWidth="170px" Width="300px"
-                                        NoDecimal="true" NoNegative="true" MinValue="0" runat="server" />
+                                        NoDecimal="true" NoNegative="true" MinValue="0" runat="server" AutoPostBack="true" OnTextChanged="Zy_TextChanged"/>
 
                                     <f:NumberBox ID="nbRadialWork" Label="射线作业许可数量" LabelAlign="Right" LabelWidth="170px" Width="300px"
-                                        NoDecimal="true" NoNegative="true" MinValue="0" runat="server" />
+                                        NoDecimal="true" NoNegative="true" MinValue="0" runat="server" AutoPostBack="true" OnTextChanged="Zy_TextChanged"/>
 
                                     <f:NumberBox ID="nbLiftingWorkCount" Label="吊装作业许可数量" LabelAlign="Right" LabelWidth="170px" Width="300px"
-                                        NoDecimal="true" NoNegative="true" MinValue="0" runat="server" />
+                                        NoDecimal="true" NoNegative="true" MinValue="0" runat="server" AutoPostBack="true" OnTextChanged="Zy_TextChanged"/>
 
                                     <f:NumberBox ID="nbNightWork" Label="夜间施工许可数量" LabelAlign="Right" LabelWidth="170px" Width="300px"
-                                        NoDecimal="true" NoNegative="true" MinValue="0" runat="server" />
+                                        NoDecimal="true" NoNegative="true" MinValue="0" runat="server" AutoPostBack="true" OnTextChanged="Zy_TextChanged"/>
                                 </Items>
                             </f:Panel>
                             <f:Panel ID="Panel13" Layout="HBox" ShowHeader="false" ShowBorder="false" runat="server">
@@ -783,6 +798,7 @@
                             <f:Grid ID="gvFiveExpenseC" ShowBorder="true" ShowHeader="false" Title="本月项目HSE费用投入统计" runat="server"
                                 AllowCellEditing="true" ClicksToEdit="1" DataIDField="FiveExpenseId" DataKeyNames="FiveExpenseId"
                                 EnableMultiSelect="false" ShowGridHeader="true" MinHeight="380px" EnableColumnLines="true" EnableSummary="true" SummaryPosition="Flow">
+
                                 <Columns>
                                     <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
                                         TextAlign="Center" />
@@ -802,6 +818,10 @@
                                                     </f:NumberBox>
                                                 </Editor>
                                             </f:RenderField>
+                                            <f:RenderField Width="150px" ColumnID="PlanCostMonth1" DataField="PlanCostMonth" FieldType="String"
+                                                HeaderText="本月原始数据" HeaderTextAlign="Center" TextAlign="Left" Hidden="true">
+                                            </f:RenderField>
+
                                             <f:RenderField Width="150px" ColumnID="PlanCostYear" DataField="PlanCostYear" FieldType="String"
                                                 HeaderText="项目累计" HeaderTextAlign="Center" TextAlign="Left">
                                                 <Editor>
@@ -820,6 +840,11 @@
                                                     </f:NumberBox>
                                                 </Editor>
                                             </f:RenderField>
+
+                                             <f:RenderField Width="150px" ColumnID="ActualCostMonth1" DataField="ActualCostMonth" FieldType="String"
+                                                HeaderText="本月原始数据" HeaderTextAlign="Center" TextAlign="Left" Hidden="true">
+                                            </f:RenderField>
+
                                             <f:RenderField Width="150px" ColumnID="ActualCostYear" DataField="ActualCostYear" FieldType="String"
                                                 HeaderText="项目累计" HeaderTextAlign="Center" TextAlign="Left">
                                                 <Editor>
@@ -828,8 +853,12 @@
                                                 </Editor>
                                             </f:RenderField>
                                         </Columns>
+                                      
                                     </f:GroupField>
                                 </Columns>
+                                   <Listeners>
+                                            <f:Listener Event="afteredit" Handler="ongvFiveExpenseC" />
+                                        </Listeners>
                             </f:Grid>
                         </Items>
                     </f:Panel>
@@ -925,6 +954,13 @@
                                                         <Columns>
                                                             <f:GroupField EnableLock="true" HeaderText="损工事故" TextAlign="Center">
                                                                 <Columns>
+                                                                     <f:RenderField Width="90px" ColumnID="LossCount" DataField="LossCount" FieldType="Int"
+                                                                        HeaderText="起数" HeaderTextAlign="Center" TextAlign="Left">
+                                                                        <Editor>
+                                                                            <f:NumberBox ID="NumberBox27" runat="server" NoDecimal="true" NoNegative="true"></f:NumberBox>
+                                                                        </Editor>
+                                                                    </f:RenderField>
+
                                                                     <f:RenderField Width="90px" ColumnID="LossPerson" DataField="LossPerson" FieldType="Int"
                                                                         HeaderText="人数" HeaderTextAlign="Center" TextAlign="Left">
                                                                         <Editor>
@@ -947,6 +983,13 @@
                                                             </f:GroupField>
                                                             <f:GroupField EnableLock="true" HeaderText="死亡事故" TextAlign="Center">
                                                                 <Columns>
+                                                                    <f:RenderField Width="90px" ColumnID="DeathCount" DataField="DeathCount" FieldType="Int"
+                                                                        HeaderText="起数" HeaderTextAlign="Center" TextAlign="Left">
+                                                                        <Editor>
+                                                                            <f:NumberBox ID="NumberBox28" runat="server" NoDecimal="true" NoNegative="true"></f:NumberBox>
+                                                                        </Editor>
+                                                                    </f:RenderField>
+
                                                                     <f:RenderField Width="90px" ColumnID="DeathPerson" DataField="DeathPerson" FieldType="Int"
                                                                         HeaderText="人数" HeaderTextAlign="Center" TextAlign="Left">
                                                                         <Editor>
@@ -1435,4 +1478,33 @@
             me.updateCellValue(rowId, 'TotalCheckNum', parseInt(totalCheckNum) + (parseInt(yearCheckNum) - parseInt(yearCheckNum1)));
         }
     }
+
+    //5.1 修改本月费用 更改累计费用
+    function ongvFiveExpenseC(event, value, params) {
+        var me = this, columnId = params.columnId, rowId = params.rowId;
+       
+        //修改本月五环数，累计值变化
+        if (columnId === 'PlanCostMonth') {
+            //原始本月
+            var planCostMonth1 = me.getCellValue(rowId, 'PlanCostMonth1');
+            //本月
+            var planCostMonth = me.getCellValue(rowId, 'PlanCostMonth');
+
+            //年度
+            var planCostYear = me.getCellValue(rowId, 'PlanCostYear');
+
+            me.updateCellValue(rowId, 'PlanCostMonth1', planCostMonth);
+            me.updateCellValue(rowId, 'PlanCostYear', Number(planCostYear) - Number(planCostMonth1) + Number(planCostMonth));
+        } else if (columnId === 'ActualCostMonth') {
+            //原始本月
+            var actualCostMonth1 = me.getCellValue(rowId, 'ActualCostMonth1');
+            //本月
+            var actualCostMonth = me.getCellValue(rowId, 'ActualCostMonth');
+            //年度
+            var actualCostYear = me.getCellValue(rowId, 'ActualCostYear');
+           
+            me.updateCellValue(rowId, 'ActualCostMonth1', actualCostMonth);
+            me.updateCellValue(rowId, 'ActualCostYear', Number(actualCostYear) - Number(actualCostMonth1) + Number(actualCostMonth));
+        }
+    }
 </script>

SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx.cs

@@ -188,6 +188,7 @@ namespace FineUIPro.Web.HSSE.Manager
                         if (model.Months != null)
                         {
                             txtReportMonths.Text = string.Format("{0:yyyy-MM}", model.Months);
+                            months = Convert.ToDateTime(model.Months);
                         }
                         if (model.StartDate != null)
                         {
@@ -263,7 +264,7 @@ namespace FineUIPro.Web.HSSE.Manager
                     {
                         nbFireWorkCount.Text = PModel.FireWorkCount.ToString();
                         nbBreakGroundCount.Text = PModel.BreakGroundCount.ToString();
-                        nbLimitedSpaceCount.Text = PModel.FireWorkCount.ToString();
+                        nbLimitedSpaceCount.Text = PModel.LimitedSpaceCount.ToString();
                         nbElectricityCount.Text = PModel.ElectricityCount.ToString();
                         nbHeightWorkCount.Text = PModel.HeightWorkCount.ToString();
                         nbRadialWork.Text = PModel.RadialWork.ToString();
@@ -321,6 +322,9 @@ namespace FineUIPro.Web.HSSE.Manager
                         DrillRecordListGrid.DataSource = drillRecordList;
                         DrillRecordListGrid.DataBind();
                     }
+                    else {
+                        DrillRecordListGrid.EmptyText = "<raw><div class=\"grid-empty-text\">暂无数据</div></raw>";
+                    }
                     #endregion
 
                     #region 4.6.3其他应急管理工作描述
@@ -474,7 +478,7 @@ namespace FineUIPro.Web.HSSE.Manager
                     startTime = Convert.ToDateTime(txtStartDate.Text);
                     endTime = Convert.ToDateTime(txtEndDate.Text);
 
-                    yearStartTime = Convert.ToDateTime(months.ToString("yyyy-01-01"));
+                    yearStartTime = Convert.ToDateTime(startTime.ToString("yyyy-01-01"));
 
                     if (project.StartDate != null)
                     {
@@ -600,7 +604,7 @@ namespace FineUIPro.Web.HSSE.Manager
             monthReport.MonthReportId = MonthReportId;
             monthReport.ProjectId = this.CurrUser.LoginProjectId;
             monthReport.MonthReportCode = txtPeriod.Text;
-            monthReport.Months = Funs.GetNewDateTime(Request.Params["months"]);
+            monthReport.Months = months;
             monthReport.ReportMan = this.CurrUser.UserId;
             monthReport.MonthReportDate = DateTime.Now;
 
@@ -1066,10 +1070,12 @@ namespace FineUIPro.Web.HSSE.Manager
                     FirstAidDressing = Funs.GetNewInt(values.Value<string>("FirstAidDressing").ToString()),
                     MedicalTreatment = Funs.GetNewInt(values.Value<string>("MedicalTreatment").ToString()),
                     WorkLimitation = Funs.GetNewInt(values.Value<string>("WorkLimitation").ToString()),
+                    LossCount = Funs.GetNewInt(values.Value<string>("LossCount").ToString()),
                     LossPerson = Funs.GetNewInt(values.Value<string>("LossPerson").ToString()),
                     LossWorkTime = Funs.GetNewDecimal(values.Value<string>("LossWorkTime").ToString()),
                     LossEconomy = Funs.GetNewDecimal(values.Value<string>("LossEconomy").ToString()),
                     DeathPerson = Funs.GetNewInt(values.Value<string>("DeathPerson").ToString()),
+                    DeathCount = Funs.GetNewInt(values.Value<string>("DeathCount").ToString()),
                     DeathWorkTime = Funs.GetNewDecimal(values.Value<string>("DeathWorkTime").ToString()),
                     DeathEconomy = Funs.GetNewDecimal(values.Value<string>("DeathEconomy").ToString()),
                 };
@@ -1769,6 +1775,8 @@ namespace FineUIPro.Web.HSSE.Manager
             int totalSumPersonNum = 0;//总部
             int totalSumOutPersonNum = 0;//外聘
             int totalHSEPersonNum = 0;
+            var spckList = db.SitePerson_Checking.Where(x => x.IntoOutTime >= startTime
+                      && x.IntoOutTime <= endTime && x.ProjectId == ProjectId && x.IntoOut == "1");
             if (units.Count() > 0)
             {
                 foreach (Model.Project_ProjectUnit u in units)
@@ -1777,13 +1785,33 @@ namespace FineUIPro.Web.HSSE.Manager
                     {
                         PersonSortId = Guid.NewGuid().ToString(),
                         UnitId = u.UnitId,
-                        SumPersonNum = BLL.PersonService.GetPersonCountByUnitId(u.UnitId, ProjectId, Convert.ToDateTime(txtEndDate.Text), false),//本部
-                        SumOutPersonNum = BLL.PersonService.GetPersonCountByUnitId(u.UnitId, ProjectId, Convert.ToDateTime(txtEndDate.Text), true),//外聘
-                        HSEPersonNum = BLL.PersonService.GetHSEPersonCountByUnitId(u.UnitId, ProjectId, Convert.ToDateTime(txtEndDate.Text)),
+                        HSEPersonNum = 0,
                         ContractRange = u.ContractRange
                     };
+                    //本部本月人数，本年考勤人数除当前月份，取平均数
+                    //年度
+                    var yearList = spckList.Where(x =>  x.UnitId == u.UnitId).ToList().Select(x => new hseDayItem()
+                      {
+                          IdentityCard = x.IdentityCard,
+                          IntoOutTime = getShortTime(x.IntoOutTime)
+                      }).GroupBy(x => new { x.IdentityCard})
+                      .ToList();
+
+                    personSort.SumPersonNum = yearList.Count();
+
+                    //五环
+                    if (u.UnitId == Const.UnitId_CWCEC)
+                    {
+                        personSort.SumOutPersonNum = 0;
+                    }
+                    else {
+                        personSort.SumOutPersonNum = 0;
+                    }
+                    ////本部人员
+                    //SumPersonNum = BLL.PersonService.GetPersonCountByUnitId(u.UnitId, ProjectId, Convert.ToDateTime(txtEndDate.Text), false),//本部
+                    //    SumOutPersonNum = 0,//外聘
                     personSorts.Add(personSort);
-                    totalSumPersonNum += Convert.ToInt32(personSort.SumPersonNum);
+                    totalSumPersonNum += Convert.ToInt32(personSort.SumPersonNum)+ Convert.ToInt32(personSort.SumOutPersonNum);
                     totalSumOutPersonNum += Convert.ToInt32(personSort.SumOutPersonNum);
                     totalHSEPersonNum += Convert.ToInt32(personSort.HSEPersonNum);
                 }
@@ -1795,7 +1823,7 @@ namespace FineUIPro.Web.HSSE.Manager
                 JObject summary = new JObject();
                 summary.Add("UnitId", "合计：");
                 summary.Add("SumPersonNum", totalSumPersonNum);
-                summary.Add("SumOutPersonNum", totalSumOutPersonNum);
+                //summary.Add("SumOutPersonNum", totalSumOutPersonNum);
                 summary.Add("HSEPersonNum", totalHSEPersonNum);
                 this.gvPersonSort.SummaryData = summary;
             }
@@ -1836,8 +1864,8 @@ namespace FineUIPro.Web.HSSE.Manager
                 {
                     JObject summary = new JObject();
                     summary.Add("UnitId", "合计：");
-                    summary.Add("SumPersonNum", (from x in personSorts select x.SumPersonNum ?? 0).Sum());
-                    summary.Add("SumOutPersonNum", (from x in personSorts select x.SumOutPersonNum ?? 0).Sum());
+                    summary.Add("SumPersonNum", (from x in personSorts select x.SumPersonNum ?? 0).Sum()+ (from x in personSorts select x.SumOutPersonNum ?? 0).Sum());
+                    //summary.Add("SumOutPersonNum", (from x in personSorts select x.SumOutPersonNum ?? 0).Sum());
                     summary.Add("HSEPersonNum", (from x in personSorts select x.HSEPersonNum ?? 0).Sum());
                     this.gvPersonSort.SummaryData = summary;
                 }
@@ -1854,174 +1882,115 @@ namespace FineUIPro.Web.HSSE.Manager
         #endregion
 
         #region 3.本月项目现场HSE人工日统计
+        public class hseDayItem {
+            public string IdentityCard { get; set; }
+
+            public string IntoOutTime { get; set; }
+
+            public string UnitId { get; set; }
+        }
+
+        public string getShortTime(DateTime? a) {
+            return Convert.ToDateTime(a).ToString("yyyy-MM-dd");
+        }
+
         private void getMonthReportCHSEDay()
         {
+            //数据了太大，查起来有点问题。
 
+            //var spckList = db.SitePerson_Checking.Where(x => x.ProjectId == ProjectId && x.IntoOut == "1").Select(x=>new {
+            //    IntoOutTime=x.IntoOutTime,
+            //    IdentityCard=x.IdentityCard,
+            //    UnitId=x.UnitId
+            //});
             //本月项目现场HSE人工日统计
             Model.MonthReportCHSEDay hseDay = new Model.MonthReportCHSEDay
             {
                 MonthHSEDay = (endTime - startTime).Days + 1
             };
-            Model.Manager_MonthReportC mr = BLL.MonthReportCService.GetLastMonthReportByDate(endTime, this.ProjectId);
-            if (mr != null)
-            {
-                if (mr.SumHSEDay != 0)
-                {
-                    hseDay.SumHSEDay = (mr.SumHSEDay ?? 0) + hseDay.MonthHSEDay;
-                }
-                else
-                {
-                    hseDay.SumHSEDay = hseDay.MonthHSEDay;
-                }
-            }
-            else
-            {
-                hseDay.SumHSEDay = hseDay.MonthHSEDay;
-            }
+            //累计安全工作天数（当前日期-项目开始日期）
+            hseDay.SumHSEDay = (endTime - projectStartTime).Days;
 
-            int? monthHSEWorkDay = 0;
-            int? yearHSEWorkDay = 0;
-            int? sumHSEWorkDay = 0;
-            decimal? hSEManhours = 0;
-            decimal? sumHseManhours = 0;
-            decimal? SubcontractManHours = 0;
+            ////本月HSE人工日、年度累计HSE人工日、总累计HSE人工日，考勤中取
+            ////本月
+            //var list = spckList.Where(x => x.IntoOutTime >= startTime
+            //&& x.IntoOutTime <= endTime).ToList().Select(x => new hseDayItem()
+            //{
+            //    IdentityCard = x.IdentityCard,
+            //    IntoOutTime = getShortTime(x.IntoOutTime)
+            //}).GroupBy(x => new { x.IdentityCard, x.IntoOutTime })
+            //  .ToList();
 
-            decimal? YearHSEWorkDay = 0;
-            //年度安全人工时
-            var getProjectMonthReport = from x in db.SitePerson_MonthReport where x.ProjectId == ProjectId select x;
-            if (getProjectMonthReport.Count() > 0)
-            {
-                ////人工时月报明细
-                var getMonthReportDetail = from x in db.SitePerson_MonthReportDetail
-                                           join y in getProjectMonthReport on x.MonthReportId equals y.MonthReportId
-                                           select x;
-                var yearMonthReport = from x in getProjectMonthReport
-                                      where x.CompileDate.Value.Year == months.Year
-                                      select x;
-                if (yearMonthReport.Count() > 0)
-                {
-                    foreach (var item in yearMonthReport)
-                    {
-                        ////年度累计安全人工时
-                        YearHSEWorkDay += getMonthReportDetail.Where(x => x.MonthReportId ==
-                        item.MonthReportId).Sum(x => x.PersonWorkTime) ?? 0;
-                    }
-                }
-            }
-            else
-            {
-                YearHSEWorkDay = 0;
-            }
-            hseDay.YearHSEWorkDay = Convert.ToInt32(YearHSEWorkDay);
-            var monthReport = BLL.Funs.DB.SitePerson_MonthReport.FirstOrDefault(x => x.CompileDate == months && x.ProjectId == ProjectId);   //当月人工时月报
-            if (monthReport != null)
-            {
-                monthHSEWorkDay = Convert.ToInt32((from x in Funs.DB.SitePerson_MonthReportDetail
-                                                   where x.MonthReportId == monthReport.MonthReportId
-                                                   select x.RealPersonNum ?? 0).Sum());
-                hSEManhours = (from x in Funs.DB.SitePerson_MonthReportDetail
-                               join z in Funs.DB.Project_ProjectUnit
-                               on x.UnitId equals z.UnitId
-                               where z.UnitType == "1" && z.ProjectId == this.CurrUser.LoginProjectId && x.MonthReportId == monthReport.MonthReportId   //总包
-                               select x.PersonWorkTime ?? 0).Sum();
-                var q = (from x in Funs.DB.SitePerson_MonthReportDetail
-                         join z in Funs.DB.Project_ProjectUnit
-                         on x.UnitId equals z.UnitId
-                         where z.UnitType == "2" && z.ProjectId == this.CurrUser.LoginProjectId && x.MonthReportId == monthReport.MonthReportId   //分包
-                         select x);
-                foreach (var item in q)
-                {
-                    SubcontractManHours += item.PersonWorkTime ?? 0;
-                }
-            }
-            else
-            {
-                monthHSEWorkDay = 0;
-                hSEManhours = 0;
-                SubcontractManHours = 0;
-            }
-            //年度人工日
-            if (months.Month == 1)
-            {
-                yearHSEWorkDay = monthHSEWorkDay;
-            }
-            else
-            {
-                if (mr != null)
-                {
-                    if (mr.YearHSEWorkDay != null)
-                    {
-                        yearHSEWorkDay = (mr.YearHSEWorkDay ?? 0) + monthHSEWorkDay;
-                    }
-                    else
-                    {
-                        yearHSEWorkDay = monthHSEWorkDay;
-                    }
-                }
-                else
-                {
-                    yearHSEWorkDay = monthHSEWorkDay;
-                }
-            }
-            if (mr != null)
-            {
-                if (mr.SumHSEWorkDay != 0)
-                {
-                    sumHSEWorkDay = (mr.SumHSEWorkDay ?? 0) + monthHSEWorkDay;
-                }
-                else
-                {
-                    sumHSEWorkDay = monthHSEWorkDay;
-                }
-                if (mr.TotalHseManhours != 0)
-                {
-                    sumHseManhours = (mr.TotalHseManhours ?? 0) + hSEManhours + SubcontractManHours;
-                }
-                else
-                {
-                    sumHseManhours = hSEManhours + SubcontractManHours;
-                }
-            }
-            else
-            {
-                sumHSEWorkDay = monthHSEWorkDay;
-                sumHseManhours = hSEManhours + SubcontractManHours;
-            }
-            hseDay.MonthHSEWorkDay = monthHSEWorkDay ?? 0;
-            hseDay.YearHSEWorkDay = yearHSEWorkDay ?? 0;
-            hseDay.SumHSEWorkDay = sumHSEWorkDay ?? 0;
-            if (hSEManhours.ToString().Contains("."))
-            {
-                hseDay.HseManhours = int.Parse(hSEManhours.ToString().Substring(0, hSEManhours.ToString().LastIndexOf(".")));
-            }
-            else
-            {
-                hseDay.HseManhours = int.Parse(hSEManhours.ToString());
-            }
-            if (SubcontractManHours.ToString().Contains("."))
-            {
-                hseDay.SubcontractManHours = int.Parse(SubcontractManHours.ToString().Substring(0, SubcontractManHours.ToString().LastIndexOf(".")));
-            }
-            else
-            {
-                hseDay.SubcontractManHours = int.Parse(SubcontractManHours.ToString());
-            }
-            if (sumHseManhours.ToString().Contains("."))
-            {
-                hseDay.TotalHseManhours = int.Parse(sumHseManhours.ToString().Substring(0, sumHseManhours.ToString().LastIndexOf(".")));
-            }
-            else
-            {
-                hseDay.TotalHseManhours = int.Parse(sumHseManhours.ToString());
-            }
-            List<Model.MonthReportCHSEDay> list = new List<Model.MonthReportCHSEDay>();
-            list.Add(hseDay);
-            this.gvHSEDay.DataSource = list;
+            //本月HSE人工日
+            hseDay.MonthHSEWorkDay = SQLHelper.RunProcGetHsseKq(ProjectId, startTime, endTime, "0");
+
+            //list.Count();
+            //本月安全人工时（五环）
+            //hseDay.HseManhours = spckList.Where(x => x.IntoOutTime >= startTime
+            //&& x.IntoOutTime <= endTime && x.UnitId == Const.UnitId_CWCEC).ToList().Select(x => new hseDayItem()
+            //{
+            //    IdentityCard = x.IdentityCard,
+            //    IntoOutTime = getShortTime(x.IntoOutTime)
+            //}).GroupBy(x => new { x.IdentityCard, x.IntoOutTime })
+            //  .ToList().Count() * 8;
+            hseDay.HseManhours = SQLHelper.RunProcGetHsseKq(ProjectId, startTime, endTime, "3");
+            //本月安全人工时（分包商）
+            hseDay.SubcontractManHours = SQLHelper.RunProcGetHsseKq(ProjectId, startTime, endTime, "1");
+
+            //    spckList.Where(x => x.IntoOutTime >= startTime
+            //&& x.IntoOutTime <= endTime && x.UnitId != Const.UnitId_CWCEC).ToList().Select(x => new hseDayItem()
+            //{
+            //    IdentityCard = x.IdentityCard,
+            //    IntoOutTime = getShortTime(x.IntoOutTime)
+            //}).GroupBy(x => new { x.IdentityCard, x.IntoOutTime })
+            //  .ToList().Count() * 8;
+
+            //年度
+            //var yearList = spckList.Where(x => x.IntoOutTime >= yearStartTime
+            //  && x.IntoOutTime <= endTime).ToList().Select(x => new hseDayItem()
+            //  {
+            //      IdentityCard = x.IdentityCard,
+            //      IntoOutTime = getShortTime(x.IntoOutTime)
+            //  }).GroupBy(x => new { x.IdentityCard, x.IntoOutTime })
+            //  .ToList();
+
+
+            //年度累计人工日
+            hseDay.YearHSEWorkDay = SQLHelper.RunProcGetHsseKq(ProjectId, yearStartTime, endTime, "0"); ;
+            //yearList.Count;
+            //年度累计HSE人工时
+            hseDay.TotalHseManhoursYear = hseDay.YearHSEWorkDay*8;
+            //yearList.Count * 8;
+
+            // // //项目累计
+            // var pList = spckList.Where(x => x.IntoOutTime >= projectStartTime
+            //&& x.IntoOutTime <= endTime).ToList().Select(x => new hseDayItem()
+            //{
+            //    IdentityCard = x.IdentityCard,
+            //    IntoOutTime = getShortTime(x.IntoOutTime)
+            //}).GroupBy(x => new { x.IdentityCard, x.IntoOutTime })
+            //   .ToList();
+
+            hseDay.SumHSEWorkDay = SQLHelper.RunProcGetHsseKq(ProjectId, projectStartTime, endTime, "0");
+            //pList.Count;
+
+            hseDay.TotalHseManhours = hseDay.SumHSEWorkDay*8;
+                //pList.Count * 8;
+
+            List<Model.MonthReportCHSEDay> listCHSEDay = new List<Model.MonthReportCHSEDay>();
+            listCHSEDay.Add(hseDay);
+            this.gvHSEDay.DataSource = listCHSEDay;
             this.gvHSEDay.DataBind();
         }
         #endregion
 
         #region HSE培训
+        public class Bosheng {
+            public string TrainType { get; set; }
+
+            public decimal TrainPeriod { get; set; }
+        }
+
         /// <summary>
         /// 显示月报告HSE培训情况
         /// </summary>
@@ -2029,9 +1998,12 @@ namespace FineUIPro.Web.HSSE.Manager
         {
             trainSorts.Clear();
             var TotalPersonNum = 0;
-            var list = db.Base_TrainType.ToList();
+            var list = db.Base_TrainType.ToList().OrderBy(x=>x.TrainTypeCode);
             var listTrain = BLL.EduTrain_TrainRecordService.GetTrainingsByTrainDate(startTime, endTime, this.ProjectId);
             var listAllTrain = BLL.EduTrain_TrainRecordService.GetTrainingsByTrainDate(endTime, this.ProjectId);
+
+            var listBosheng = db.Bo_Sheng_Train.Where(x => x.ProjectId == ProjectId && x.TrainStartDate >= startTime && x.TrainStartDate <= endTime).ToList();
+            var listAllBosheng = db.Bo_Sheng_Train.Where(x => x.ProjectId == ProjectId  && x.TrainStartDate <= endTime).ToList();
             foreach (var item in list)
             {
                 int i = 0;
@@ -2043,7 +2015,8 @@ namespace FineUIPro.Web.HSSE.Manager
                 trainSort.TrainType = item.TrainTypeName;
                 if (listTrain.Count > 0)
                 {
-                    trainSort.TeachHour = listTrain.Where(x => x.TrainTypeId == item.TrainTypeId).Sum(x => x.TeachHour);
+                    trainSort.TeachHour = 0;
+                    //trainSort.TeachHour = listTrain.Where(x => x.TrainTypeId == item.TrainTypeId).Sum(x => x.TeachHour);
                     trainSort.PersonNum = listTrain.Where(x => x.TrainTypeId == item.TrainTypeId).Sum(x => x.TrainPersonNum);
                 }
                 else
@@ -2051,6 +2024,75 @@ namespace FineUIPro.Web.HSSE.Manager
                     trainSort.TeachHour = 0;
                     trainSort.PersonNum = 0;
                 }
+
+                if (listBosheng.Count> 0)
+                {
+                    //入场
+                    if (item.TrainTypeId == "dfb6a37e-4412-4ba9-ad59-3bc505bc21f7")
+                    {
+                        trainSort.PersonNum += listBosheng.Where(x => x.TrainType.Contains("入场")).Sum(x=>x.PersonCount);
+                        Func<string, decimal, decimal> funDelegate = CustomCount;
+                        decimal numSum = 0;
+                        var listB = listBosheng.Where(x => x.TrainType.Contains("入场")).Select(x => new Bosheng
+                        {
+                            TrainType = x.TrainType,
+                            TrainPeriod = Convert.ToDecimal(x.TrainPeriod)
+                        });
+                        var model = listB.Where(x => x.TrainType.Contains("入场")).OrderByDescending(x => x.TrainPeriod).FirstOrDefault();
+                        if (model != null)
+                        {
+                            trainSort.TeachHour += model.TrainPeriod;
+                        }
+                        else {
+                            trainSort.TeachHour = 0;
+                        }
+
+                       
+                    }
+                    else if (item.TrainTypeId == "c1a513bb-a547-45b0-944d-b0dd88f06f82")
+                    {
+                        //其他
+                        trainSort.PersonNum += listBosheng.Where(x => x.TrainType.Contains("其他")).Sum(x => x.PersonCount);
+                        Func<string, decimal, decimal> funDelegate = CustomCount;
+                        decimal numSum = 0;
+                        var listB = listBosheng.Where(x => x.TrainType.Contains("其他")).Select(x => new Bosheng {
+                            TrainType = x.TrainType,
+                            TrainPeriod = Convert.ToDecimal(x.TrainPeriod)
+                        });
+
+                        var model = listB.Where(x => x.TrainType.Contains("其他")).OrderByDescending(x => x.TrainPeriod).FirstOrDefault();
+                        if (model != null)
+                        {
+                            trainSort.TeachHour += model.TrainPeriod;
+                        }
+                        else
+                        {
+                            trainSort.TeachHour = 0;
+                        }
+                    }
+                    else {
+                        //专项
+                        trainSort.PersonNum += listBosheng.Where(x => x.TrainType.Contains("专项")).Sum(x => x.PersonCount);
+                        var listB = listBosheng.Where(x => x.TrainType.Contains("专项")).Select(x => new Bosheng
+                        {
+                            TrainType = x.TrainType,
+                            TrainPeriod = Convert.ToDecimal(x.TrainPeriod)
+                        });
+                        var model = listB.Where(x => x.TrainType.Contains("专项")).OrderByDescending(x => x.TrainPeriod).FirstOrDefault();
+                        if (model != null)
+                        {
+                            trainSort.TeachHour += model.TrainPeriod;
+                        }
+                        else
+                        {
+                            trainSort.TeachHour = 0;
+                        }
+                        //Func<string, decimal, decimal> funDelegate = CustomCount;
+                        //decimal numSum = 0;
+                        //trainSort.TeachHour += listBosheng.Where(x => x.TrainType.Contains("专项")).Max(x => funDelegate(x.TrainPeriod, numSum));
+                    }
+                }
+
                 if (listAllTrain.Count > 0)
                 {
                     trainSort.TotalPersonNum = listAllTrain.Where(x => x.TrainTypeId == item.TrainTypeId).Sum(x => x.TrainPersonNum);
@@ -2060,6 +2102,31 @@ namespace FineUIPro.Web.HSSE.Manager
                 {
                     trainSort.TotalPersonNum = 0;
                 }
+                if (listAllBosheng.Count>0)
+                {
+                    //入场
+                    if (item.TrainTypeId == "dfb6a37e-4412-4ba9-ad59-3bc505bc21f7")
+                    {
+                        trainSort.TotalPersonNum += listAllBosheng.Where(x => x.TrainType.Contains("入场")).Sum(x => x.PersonCount);
+                        TotalPersonNum+= Convert.ToInt32(trainSort.TotalPersonNum);
+                    }
+                    else if (item.TrainTypeId == "c1a513bb-a547-45b0-944d-b0dd88f06f82")
+                    {
+                        //其他
+                        trainSort.TotalPersonNum += listAllBosheng.Where(x => x.TrainType.Contains("其他")).Sum(x => x.PersonCount);
+                        TotalPersonNum += Convert.ToInt32(trainSort.TotalPersonNum);
+                    }
+                    else
+                    {
+                        //专项
+                        trainSort.TotalPersonNum += listAllBosheng.Where(x => x.TrainType.Contains("专项")).Sum(x => x.PersonCount);
+                        TotalPersonNum += Convert.ToInt32(trainSort.TotalPersonNum);
+                    }
+                }
+
+
+                //博晟工具箱中的数据
+
                 i++;
                 trainSorts.Add(trainSort);
             }
@@ -2079,9 +2146,16 @@ namespace FineUIPro.Web.HSSE.Manager
         }
         #endregion
 
-        #region 4.2现场HSE会议及检查统计
-        private void GetCheckSort()
+        public static decimal CustomCount(string strNum, decimal Sum)
+         {
+             Sum += Convert.ToDecimal(strNum);
+             return Sum;
+         }
+
+    #region 4.2现场HSE会议及检查统计
+    private void GetCheckSort()
         {
+            var hselogList = db.Manager_HSSELog.Where(x => x.ProjectId == ProjectId).ToList();
             int i = 0;
 
             #region HSE会议 本月开展次数
@@ -2131,14 +2205,15 @@ namespace FineUIPro.Web.HSSE.Manager
             };
             checkSorts.Add(checkSort2);
             i++;
+            //日巡检取HSE日志检查次数
             Model.Manager_CheckSortC checkSort3 = new Model.Manager_CheckSortC
             {
                 CheckSortId = SQLHelper.GetNewID(typeof(Model.Manager_CheckSortC)),
                 SortIndex = i,
                 CheckType = "日巡检",
-                CheckNumber = BLL.Check_CheckDayService.GetCountByCheckTime(startTime, endTime, this.ProjectId),
-                YearCheckNum = BLL.Check_CheckDayService.GetCountByCheckTime(yearStartTime, endTime, this.ProjectId),
-                TotalCheckNum = BLL.Check_CheckDayService.GetCountByCheckTime(projectStartTime, endTime, this.ProjectId)
+                CheckNumber = hselogList.Where(x=>x.CompileDate>=startTime && x.CompileDate<=endTime).Sum(x=>x.Num21),
+                YearCheckNum = hselogList.Where(x => x.CompileDate >= yearStartTime && x.CompileDate <= endTime).Sum(x => x.Num21),
+                TotalCheckNum = hselogList.Where(x => x.CompileDate >= projectStartTime && x.CompileDate <= endTime).Sum(x => x.Num21)
             };
             checkSorts.Add(checkSort3);
             i++;
@@ -2293,7 +2368,7 @@ namespace FineUIPro.Web.HSSE.Manager
             var YhzgdList = from x in db.Check_RectifyNoticesItem
                             join y in db.Check_RectifyNotices on x.RectifyNoticesId equals y.RectifyNoticesId
                             where y.ProjectId == ProjectId && y.CheckedDate >= startTime && y.CheckedDate <= endTime
-                            select new { y.UnitId, x.HiddenHazardType, y.States };
+                            select new { y.UnitId, x.HiddenHazardType, y.States,y.CompleteDate,x.LimitTime };
 
             int yhMonthSum = 0, yhYearSum = 0;
             var list = new List<Model.Manager_HiddenDanger>();
@@ -2310,32 +2385,41 @@ namespace FineUIPro.Web.HSSE.Manager
                     };
                     //HSE巡检(一般和重大)
                     //所有数据
-                    var Commonly1 = HseList.Where(x => x.ResponsibleUnit == u.UnitId && x.Type == 0 && x.Risk_Level == "一般" && x.States == "2").Count();
-                    var MajorNum1 = HseList.Where(x => x.ResponsibleUnit == u.UnitId && x.Type == 0 && x.Risk_Level == "重大" && x.States == "2").Count();
-                    //总数，已整改
+                    var Commonly1 = HseList.Where(x => x.ResponsibleUnit == u.UnitId && x.Type == 0 && (x.Risk_Level == "一般" || x.Risk_Level==null || x.Risk_Level == "") && x.States == "3").Count();
+                    var MajorNum1 = HseList.Where(x => x.ResponsibleUnit == u.UnitId && x.Type == 0 && x.Risk_Level == "重大" && x.States == "3").Count();
+                    
+                    //总数
                     var Sum1 = HseList.Where(x => x.ResponsibleUnit == u.UnitId && x.Type == 0).Count();
-                    var Yzg1 = HseList.Where(x => x.ResponsibleUnit == u.UnitId && x.Type == 0 && x.States == "2").Count();
+                    //已关闭并且在期限内的
+                    var Yzg1 = HseList.Where(x => x.ResponsibleUnit == u.UnitId && x.Type == 0 && x.States == "2"
+                    && x.RectificationTime<=  x.RectificationPeriod ).Count();
 
                     //专项检查(一般和重大)
-                    var Commonly2 = CheckSpecialList.Where(x => x.UnitId == u.UnitId && x.HiddenHazardType == "1" && x.CompleteStatus == true).Count();
+                    var Commonly2 = CheckSpecialList.Where(x => x.UnitId == u.UnitId && (x.HiddenHazardType == "1"|| x.HiddenHazardType==null || x.HiddenHazardType == "") && x.CompleteStatus == true).Count();
                     var MajorNum2 = CheckSpecialList.Where(x => x.UnitId == u.UnitId && x.HiddenHazardType == "3" && x.CompleteStatus == true).Count();
                     //总数，已整改
                     var Sum2 = CheckSpecialList.Where(x => x.UnitId == u.UnitId).Count();
-                    var Yzg2 = CheckSpecialList.Where(x => x.UnitId == u.UnitId && x.CompleteStatus == true).Count();
+                    //已整改，在期限内的
+                    var Yzg2 = CheckSpecialList.Where(x => x.UnitId == u.UnitId && x.CompleteStatus == true
+                    && x.CompletedDate<=x.Rectification_Date).Count();
 
                     //综合检查(一般和重大)
-                    var Commonly3 = CheckColligationList.Where(x => x.UnitId == u.UnitId && x.HiddenHazardType == "一般" && x.CompleteStatus == true).Count();
+                    var Commonly3 = CheckColligationList.Where(x => x.UnitId == u.UnitId && (x.HiddenHazardType == "一般" || x.HiddenHazardType==null || x.HiddenHazardType == "") && x.CompleteStatus == true).Count();
                     var MajorNum3 = CheckColligationList.Where(x => x.UnitId == u.UnitId && x.HiddenHazardType == "重大" && x.CompleteStatus == true).Count();
                     //总数，已整改
                     var Sum3 = CheckColligationList.Where(x => x.UnitId == u.UnitId).Count();
-                    var Yzg3 = CheckColligationList.Where(x => x.UnitId == u.UnitId && x.CompleteStatus == true).Count();
+                    //已整改
+                    var Yzg3 = CheckColligationList.Where(x => x.UnitId == u.UnitId && x.CompleteStatus == true && x.HandleStep=="5"
+                    && x.CompletedDate<= x.LimitedDate).Count();
 
                     //隐患整改(一般和重大)
-                    var Commonly4 = YhzgdList.Where(x => x.UnitId == u.UnitId && x.HiddenHazardType == "一般" && x.States == "5").Count();
+                    var Commonly4 = YhzgdList.Where(x => x.UnitId == u.UnitId && (x.HiddenHazardType == "一般" 
+                    || x.HiddenHazardType == null || x.HiddenHazardType == "") && x.States == "5").Count();
                     var MajorNum4 = YhzgdList.Where(x => x.UnitId == u.UnitId && x.HiddenHazardType == "重大" && x.States == "5").Count();
                     //总数，已整改
                     var Sum4 = YhzgdList.Where(x => x.UnitId == u.UnitId).Count();
-                    var Yzg4 = YhzgdList.Where(x => x.UnitId == u.UnitId && x.States == "5").Count();
+                    var Yzg4 = YhzgdList.Where(x => x.UnitId == u.UnitId && x.States == "5"
+                    && x.CompleteDate<= x.LimitTime).Count();
 
 
                     model.CommonlyNum = Commonly1 + Commonly2 + Commonly3 + Commonly4;
@@ -2350,7 +2434,7 @@ namespace FineUIPro.Web.HSSE.Manager
                     {
                         model.ReRate = "0";
                     }
-                    yhMonthSum += Sum1 + Sum2 + Sum3 + Sum4;
+                    yhMonthSum += Convert.ToInt32(model.CommonlyNum) + Convert.ToInt32(model.MajorNum);
 
                     list.Add(model);
                     i++;
@@ -2364,21 +2448,25 @@ namespace FineUIPro.Web.HSSE.Manager
             //安全巡检list
             var HseListYear = (from x in Funs.DB.View_Hazard_HazardRegister
                                where x.ProblemTypes == "1" && x.ProjectId == ProjectId && x.CheckTime >= yearStartTime && x.CheckTime <= endTime
+                               && x.States == "3"
                                select x).ToList().Count;
             //专项检查
             var CheckSpecialListYear = (from x in db.Check_CheckSpecialDetail
                                         join y in db.Check_CheckSpecial on x.CheckSpecialId equals y.CheckSpecialId
                                         where y.ProjectId == ProjectId && y.CheckTime >= yearStartTime && y.CheckTime <= endTime
+                                        && x.CompleteStatus == true
                                         select x).ToList().Count;
             //综合检查
             var CheckColligationListYear = (from x in db.Check_CheckColligationDetail
                                             join y in db.Check_CheckColligation on x.CheckColligationId equals y.CheckColligationId
                                             where y.ProjectId == ProjectId && y.CheckTime >= yearStartTime && y.CheckTime <= endTime
+                                            && x.CompleteStatus == true
                                             select x).ToList().Count;
             //隐患整改单
             var YhzgdListYear = (from x in db.Check_RectifyNoticesItem
                                  join y in db.Check_RectifyNotices on x.RectifyNoticesId equals y.RectifyNoticesId
                                  where y.ProjectId == ProjectId && y.CheckedDate >= yearStartTime && y.CheckedDate <= endTime
+                                 && y.States == "5"
                                  select new { y.UnitId, x.HiddenHazardType, y.States }).ToList().Count;
             txtYearHdangerCount.Text = (HseListYear + CheckSpecialListYear + CheckColligationListYear + YhzgdListYear).ToString();
             #endregion
@@ -2572,8 +2660,14 @@ namespace FineUIPro.Web.HSSE.Manager
                 };
                 drillRecordList.Add(model);
             }
-            this.DrillRecordListGrid.DataSource = drillRecordList;
-            this.DrillRecordListGrid.DataBind();
+            if (drillRecordList.Count == 0)
+            {
+                DrillRecordListGrid.EmptyText = "<raw><div class=\"grid-empty-text\">暂无数据</div></raw>";
+            }
+            else { 
+                this.DrillRecordListGrid.DataSource = drillRecordList;
+                this.DrillRecordListGrid.DataBind();
+            }
         }
         #endregion
 
@@ -2981,9 +3075,11 @@ namespace FineUIPro.Web.HSSE.Manager
                 FirstAidDressing = 0, //
                 MedicalTreatment = 0,//
                 WorkLimitation = 0,//
+                LossCount=0,
                 LossPerson = (from x in reports where x.UnitId == Const.UnitId_CWCEC select x.PeopleNum).Sum(),
                 LossWorkTime = (from x in reports where x.UnitId == Const.UnitId_CWCEC select x.WorkingHoursLoss).Sum(),
                 LossEconomy = (from x in reports where x.UnitId == Const.UnitId_CWCEC select x.EconomicLoss).Sum() + (from x in reports where x.UnitId == Const.UnitId_CWCEC select x.EconomicOtherLoss).Sum(),
+                DeathCount=0,
                 DeathPerson = (from x in deathReports where x.UnitId == Const.UnitId_CWCEC select x.PeopleNum).Sum(),
                 DeathWorkTime = (from x in deathReports where x.UnitId == Const.UnitId_CWCEC select x.WorkingHoursLoss).Sum(),
                 DeathEconomy = (from x in deathReports where x.UnitId == Const.UnitId_CWCEC select x.EconomicLoss).Sum() + (from x in deathReports where x.UnitId == Const.UnitId_CWCEC select x.EconomicOtherLoss).Sum(),
@@ -2997,6 +3093,8 @@ namespace FineUIPro.Web.HSSE.Manager
                 FirstAidDressing = 0, //
                 MedicalTreatment = 0,//
                 WorkLimitation = 0,//
+                LossCount = 0,
+                DeathCount = 0,
                 LossPerson = (from x in reports
                               join y in Funs.DB.Project_ProjectUnit on x.UnitId equals y.UnitId
                               where y.UnitType == Const.ProjectUnitType_2
@@ -3044,7 +3142,7 @@ namespace FineUIPro.Web.HSSE.Manager
             JObject summary = new JObject();
 
             int TotalAttemptedIncidents = 0, TotalFirstAidDressing = 0, TotalMedicalTreatment = 0, TotalWorkLimitation = 0, TotalLossPerson = 0, TotalDeathPerson = 0;
-            decimal TotalLossWorkTime = 0, TotalLossEconomy = 0, TotalDeathWorkTime = 0, TotalDeathEconomy = 0;
+            decimal TotalLossWorkTime = 0, TotalLossEconomy = 0, TotalDeathWorkTime = 0, TotalDeathEconomy = 0 ,TotalLossCount=0,TotalDeathCount=0;
             foreach (JObject mergedRow in gvInjuryAccident.GetMergedData())
             {
                 JObject values = mergedRow.Value<JObject>("values");
@@ -3084,15 +3182,25 @@ namespace FineUIPro.Web.HSSE.Manager
                 {
                     TotalDeathEconomy += values.Value<decimal>("DeathEconomy");
                 }
+                if (!string.IsNullOrEmpty(values["LossCount"].ToString()))
+                {
+                    TotalLossCount += values.Value<decimal>("LossCount");
+                }
+                if (!string.IsNullOrEmpty(values["DeathCount"].ToString()))
+                {
+                    TotalDeathCount += values.Value<decimal>("DeathCount");
+                }
             }
             summary.Add("UnitName", "项目合计");
             summary.Add("AttemptedIncidents", TotalAttemptedIncidents.ToString("F2"));
             summary.Add("FirstAidDressing", TotalFirstAidDressing.ToString("F2"));
             summary.Add("MedicalTreatment", TotalMedicalTreatment.ToString("F2"));
             summary.Add("WorkLimitation", TotalWorkLimitation.ToString("F2"));
+            summary.Add("LossCount", TotalLossCount.ToString("F2"));
             summary.Add("LossPerson", TotalLossPerson.ToString("F2"));
             summary.Add("LossWorkTime", TotalLossWorkTime.ToString("F2"));
             summary.Add("LossEconomy", TotalLossEconomy.ToString("F2"));
+            summary.Add("DeathCount", TotalDeathCount.ToString("F2"));
             summary.Add("DeathPerson", TotalDeathPerson.ToString("F2"));
             summary.Add("DeathWorkTime", TotalDeathWorkTime.ToString("F2"));
             summary.Add("DeathEconomy", TotalDeathEconomy.ToString("F2"));
@@ -3166,6 +3274,34 @@ namespace FineUIPro.Web.HSSE.Manager
         }
         #endregion
 
+        /// <summary>
+        /// 4.4修改数量自动修改本月和累计
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Zy_TextChanged(object sender, EventArgs e) {
+            if (!string.IsNullOrEmpty(nbFireWorkCount.Text)&&!string.IsNullOrEmpty(nbBreakGroundCount.Text)&&
+                !string.IsNullOrEmpty(nbLimitedSpaceCount.Text) && !string.IsNullOrEmpty(nbElectricityCount.Text) &&
+                !string.IsNullOrEmpty(nbHeightWorkCount.Text) && !string.IsNullOrEmpty(nbRadialWork.Text) &&
+                !string.IsNullOrEmpty(nbLiftingWorkCount.Text) && !string.IsNullOrEmpty(nbNightWork.Text) )
+            {
 
+            
+            var number1 = Convert.ToInt32(nbFireWorkCount.Text);
+            var number2 = Convert.ToInt32(nbBreakGroundCount.Text);
+            var number3 = Convert.ToInt32(nbLimitedSpaceCount.Text);
+            var number4 = Convert.ToInt32(nbElectricityCount.Text);
+            var number5 = Convert.ToInt32(nbHeightWorkCount.Text);
+            var number6 = Convert.ToInt32(nbRadialWork.Text);
+            var number7 = Convert.ToInt32(nbLiftingWorkCount.Text);
+            var number8 = Convert.ToInt32(nbNightWork.Text);
+
+            //作业累计
+            nbProCount.Text = (Convert.ToInt32(nbProCount.Text) - Convert.ToInt32(nbMonthCount.Text)
+                + number1 + number2 + number3 + number4 + number5 + number6 + number7 + number8).ToString();
+            nbYearCount.Text= (Convert.ToInt32(nbYearCount.Text) - Convert.ToInt32(nbMonthCount.Text)
+                + number1 + number2 + number3 + number4 + number5 + number6 + number7 + number8).ToString();
+            nbMonthCount.Text = ( number1 + number2 + number3 + number4 + number5 + number6 + number7 + number8).ToString();
+        }}
     }
 }

SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx.designer.cs

@@ -1292,6 +1292,15 @@ namespace FineUIPro.Web.HSSE.Manager
         /// </remarks>
         protected global::FineUIPro.NumberBox NumberBox20;
 
+        /// <summary>
+        /// NumberBox27 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox NumberBox27;
+
         /// <summary>
         /// NumberBox21 控件。
         /// </summary>
@@ -1319,6 +1328,15 @@ namespace FineUIPro.Web.HSSE.Manager
         /// </remarks>
         protected global::FineUIPro.NumberBox NumberBox23;
 
+        /// <summary>
+        /// NumberBox28 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox NumberBox28;
+
         /// <summary>
         /// NumberBox24 控件。
         /// </summary>

SGGL/FineUIPro.Web/Web.config

@@ -12,7 +12,7 @@
   <appSettings>
     <!--连接字符串-->
     <!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
-    <add key="ConnectionString" value="Server=.\SQL2012;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
     <!--系统名称-->
     <add key="SystemName" value="智慧施工管理信息系统V1.0"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>

SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs

@@ -131,22 +131,22 @@ namespace FineUIPro.Web.ZHGL.Environmental
                 Grid1.Rows[0].CellCssClasses[5] = "f-grid-cell-uneditable";
                 Grid1.Rows[14].CellCssClasses[4] = "f-grid-cell-uneditable";
                 Grid1.Rows[14].CellCssClasses[5] = "f-grid-cell-uneditable";
-                //Grid1.Rows[16].CellCssClasses[4] = "f-grid-cell-uneditable";
-                //Grid1.Rows[16].CellCssClasses[5] = "f-grid-cell-uneditable";
+                Grid1.Rows[16].CellCssClasses[4] = "f-grid-cell-uneditable";
+                Grid1.Rows[16].CellCssClasses[5] = "f-grid-cell-uneditable";
                 //Grid1.Rows[17].CellCssClasses[4] = "f-grid-cell-uneditable";
                 //Grid1.Rows[17].CellCssClasses[5] = "f-grid-cell-uneditable";
                 Grid1.Rows[18].CellCssClasses[4] = "f-grid-cell-uneditable";
                 Grid1.Rows[18].CellCssClasses[5] = "f-grid-cell-uneditable";
-                //Grid1.Rows[20].CellCssClasses[4] = "f-grid-cell-uneditable";
-                //Grid1.Rows[20].CellCssClasses[5] = "f-grid-cell-uneditable";
+                Grid1.Rows[20].CellCssClasses[4] = "f-grid-cell-uneditable";
+                Grid1.Rows[20].CellCssClasses[5] = "f-grid-cell-uneditable";
                 //Grid1.Rows[21].CellCssClasses[4] = "f-grid-cell-uneditable";
                 //Grid1.Rows[21].CellCssClasses[5] = "f-grid-cell-uneditable";
-                //Grid1.Rows[22].CellCssClasses[4] = "f-grid-cell-uneditable";
-                //Grid1.Rows[22].CellCssClasses[5] = "f-grid-cell-uneditable";
+                Grid1.Rows[22].CellCssClasses[4] = "f-grid-cell-uneditable";
+                Grid1.Rows[22].CellCssClasses[5] = "f-grid-cell-uneditable";
                 //Grid1.Rows[24].CellCssClasses[4] = "f-grid-cell-uneditable";
                 //Grid1.Rows[24].CellCssClasses[5] = "f-grid-cell-uneditable";
-                //Grid1.Rows[36].CellCssClasses[4] = "f-grid-cell-uneditable";
-                //Grid1.Rows[36].CellCssClasses[5] = "f-grid-cell-uneditable";
+                Grid1.Rows[36].CellCssClasses[4] = "f-grid-cell-uneditable";
+                Grid1.Rows[36].CellCssClasses[5] = "f-grid-cell-uneditable";
                 Grid1.Rows[58].CellCssClasses[4] = "f-grid-cell-uneditable";
                 Grid1.Rows[58].CellCssClasses[5] = "f-grid-cell-uneditable";
             }
@@ -542,8 +542,8 @@ namespace FineUIPro.Web.ZHGL.Environmental
         private void GetData()
         {
             decimal E6 = 0, F6 = 0, E7 = 0, F7 = 0, E8, F8, E9 = 0, F9 = 0, E10 = 0, F10 = 0, E11 = 0, F11 = 0, E12 = 0, F12 = 0, E13 = 0, F13 = 0, E14 = 0, F14 = 0, E15 = 0, F15 = 0, E16 = 0, F16 = 0, E17 = 0, F17 = 0, E18 = 0, F18 = 0, E20 = 0, F20 = 0, E21 = 0, F21 = 0, E22 = 0, F22 = 0,
-                E24 = 0, F24 = 0, E25 = 0, F25 = 0, E26 = 0, F26 = 0, E27 = 0, F27 = 0, E28, F28, E29 = 0, F29 = 0, E30, F30, E31, F31, E32, F32, E33, F33, E34, F34, E35, F35, E36, F36, E37, F37, E38, F38, E39, F39, E40, F40, E41 = 0, F41 = 0,
-                E42, F42, E43, F43, E44, F44, E45, F45, E46, F46, E47, F47, E48, F48, E49, F49, E50, F50, E51, F51, E52, F52, E53, F53, E54, F54, E55, F55,
+                E24 = 0, F24 = 0, E25 = 0, F25 = 0, E26 = 0, F26 = 0, E27 = 0, F27 = 0, E28 = 0, F28 = 0, E29 = 0, F29 = 0, E30, F30, E31, F31, E32, F32, E33, F33, E34, F34, E35, F35, E36, F36, E37, F37, E38, F38, E39, F39, E40, F40, E41 = 0, F41 = 0,
+                E42 = 0, F42 = 0, E43, F43, E44, F44, E45, F45, E46, F46, E47, F47, E48, F48, E49, F49, E50, F50, E51, F51, E52, F52, E53, F53, E54, F54, E55, F55,
                 E56, F56, E57, F57, E58, F58, E59, F59, E60, F60, E61, F61, E62, F62, E64 = 0, F64 = 0, E65 = 0, F65 = 0;
             JArray mergedData = Grid1.GetMergedData();
             foreach (JObject mergedRow in mergedData)
@@ -1105,6 +1105,18 @@ namespace FineUIPro.Web.ZHGL.Environmental
             {
                 this.Grid1.Rows[14].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[14].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[14].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[14].Values[4].ToString()), 2).ToString() + "%";
             }
+            if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[4].ToString()) && E22 > 0)
+            {
+                this.Grid1.Rows[16].Values[4] = decimal.Round(Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[4].ToString()) * 10000 / E22, 4);
+            }
+            if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[5].ToString()) && F22 > 0)
+            {
+                this.Grid1.Rows[16].Values[5] = decimal.Round(Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[5].ToString()) * 10000 / F22, 4);
+            }
+            if (!string.IsNullOrEmpty(this.Grid1.Rows[16].Values[4].ToString()) && this.Grid1.Rows[16].Values[4].ToString() != "0" && !string.IsNullOrEmpty(this.Grid1.Rows[16].Values[5].ToString()))
+            {
+                this.Grid1.Rows[16].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[16].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[16].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[16].Values[4].ToString()), 2).ToString() + "%";
+            }
             if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[4].ToString()) && E24 > 0)
             {
                 this.Grid1.Rows[18].Values[4] = decimal.Round(Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[4].ToString()) * 10000 / E24, 4);
@@ -1117,6 +1129,42 @@ namespace FineUIPro.Web.ZHGL.Environmental
             {
                 this.Grid1.Rows[18].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[18].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[18].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[18].Values[4].ToString()), 2).ToString() + "%";
             }
+            if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[4].ToString()) && E26 > 0)
+            {
+                this.Grid1.Rows[20].Values[4] = decimal.Round(Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[4].ToString()) * 10000 / E26, 4);
+            }
+            if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[5].ToString()) && F26 > 0)
+            {
+                this.Grid1.Rows[20].Values[5] = decimal.Round(Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[5].ToString()) * 10000 / F26, 4);
+            }
+            if (!string.IsNullOrEmpty(this.Grid1.Rows[20].Values[4].ToString()) && this.Grid1.Rows[20].Values[4].ToString() != "0" && !string.IsNullOrEmpty(this.Grid1.Rows[20].Values[5].ToString()))
+            {
+                this.Grid1.Rows[20].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[20].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[20].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[20].Values[4].ToString()), 2).ToString() + "%";
+            }
+            if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[4].ToString()) && E28 > 0)
+            {
+                this.Grid1.Rows[22].Values[4] = decimal.Round(Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[4].ToString()) * 10000 / E28, 4);
+            }
+            if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[5].ToString()) && F28 > 0)
+            {
+                this.Grid1.Rows[22].Values[5] = decimal.Round(Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[5].ToString()) * 10000 / F28, 4);
+            }
+            if (!string.IsNullOrEmpty(this.Grid1.Rows[22].Values[4].ToString()) && this.Grid1.Rows[22].Values[4].ToString() != "0" && !string.IsNullOrEmpty(this.Grid1.Rows[22].Values[5].ToString()))
+            {
+                this.Grid1.Rows[22].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[22].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[22].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[22].Values[4].ToString()), 2).ToString() + "%";
+            }
+            if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[4].ToString()) && E42 > 0)
+            {
+                this.Grid1.Rows[36].Values[4] = decimal.Round(Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[4].ToString()) * 10000 / E42, 4);
+            }
+            if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[5].ToString()) && F42 > 0)
+            {
+                this.Grid1.Rows[36].Values[5] = decimal.Round(Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[5].ToString()) * 10000 / F42, 4);
+            }
+            if (!string.IsNullOrEmpty(this.Grid1.Rows[36].Values[4].ToString()) && this.Grid1.Rows[36].Values[4].ToString() != "0" && !string.IsNullOrEmpty(this.Grid1.Rows[36].Values[5].ToString()))
+            {
+                this.Grid1.Rows[36].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[36].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[36].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[36].Values[4].ToString()), 2).ToString() + "%";
+            }
             if (E64 > 0 && E65 > 0 && E20 > 0)
             {
                 this.Grid1.Rows[58].Values[4] = decimal.Round((E64 + E65) / E20, 4);
@@ -1232,6 +1280,26 @@ namespace FineUIPro.Web.ZHGL.Environmental
 
         protected void btnSave_Click(object sender, EventArgs e)
         {
+            bool isEmpty = false;
+            foreach (JObject mergedRow in Grid1.GetMergedData())
+            {
+                JObject values = mergedRow.Value<JObject>("values");
+                int rowIndex = mergedRow.Value<int>("index");
+                string sortIndex = values.Value<string>("SortIndex");
+                if (sortIndex == "18" || sortIndex == "37" || sortIndex == "38")
+                {
+                    if (Funs.GetNewDecimalOrZero(System.Web.HttpUtility.HtmlDecode(values.Value<string>("ThisYearValue"))) == 0)
+                    {
+                        isEmpty = true;
+                        break;
+                    }
+                }
+            }
+            if (isEmpty)
+            {
+                ShowNotify("营业收入(可比价)、万元收入二氧化碳排放(可比价)和二氧化碳排放量不能为空，必须填报数据！", MessageBoxIcon.Warning);
+                return;
+            }
             Save("add");
             ShowNotify("保存成功！", MessageBoxIcon.Success);
             PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
@@ -1239,11 +1307,51 @@ namespace FineUIPro.Web.ZHGL.Environmental
 
         protected void btnUpdata_Click(object sender, EventArgs e)
         {
+            bool isEmpty = false;
+            foreach (JObject mergedRow in Grid1.GetMergedData())
+            {
+                JObject values = mergedRow.Value<JObject>("values");
+                int rowIndex = mergedRow.Value<int>("index");
+                string sortIndex = values.Value<string>("SortIndex");
+                if (sortIndex == "18" || sortIndex == "37" || sortIndex == "38")
+                {
+                    if (Funs.GetNewDecimalOrZero(System.Web.HttpUtility.HtmlDecode(values.Value<string>("ThisYearValue"))) == 0)
+                    {
+                        isEmpty = true;
+                        break;
+                    }
+                }
+            }
+            if (isEmpty)
+            {
+                ShowNotify("营业收入(可比价)、万元收入二氧化碳排放(可比价)和二氧化碳排放量不能为空，必须填报数据！", MessageBoxIcon.Warning);
+                return;
+            }
             Save("updata");
         }
 
         protected void btnSubmit_Click(object sender, EventArgs e)
         {
+            bool isEmpty = false;
+            foreach (JObject mergedRow in Grid1.GetMergedData())
+            {
+                JObject values = mergedRow.Value<JObject>("values");
+                int rowIndex = mergedRow.Value<int>("index");
+                string sortIndex = values.Value<string>("SortIndex");
+                if (sortIndex == "18" || sortIndex == "37" || sortIndex == "38")
+                {
+                    if (Funs.GetNewDecimalOrZero(System.Web.HttpUtility.HtmlDecode(values.Value<string>("ThisYearValue"))) == 0)
+                    {
+                        isEmpty = true;
+                        break;
+                    }
+                }
+            }
+            if (isEmpty)
+            {
+                ShowNotify("营业收入(可比价)、万元收入二氧化碳排放(可比价)和二氧化碳排放量不能为空，必须填报数据！", MessageBoxIcon.Warning);
+                return;
+            }
             Save("submit");
         }
         #endregion

SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReportSave.aspx.cs

@@ -124,8 +124,16 @@ namespace FineUIPro.Web.ZHGL.Environmental
             Grid1.Rows[0].CellCssClasses[5] = "f-grid-cell-uneditable";
             Grid1.Rows[15].CellCssClasses[4] = "f-grid-cell-uneditable";
             Grid1.Rows[15].CellCssClasses[5] = "f-grid-cell-uneditable";
+            Grid1.Rows[17].CellCssClasses[4] = "f-grid-cell-uneditable";
+            Grid1.Rows[17].CellCssClasses[5] = "f-grid-cell-uneditable";
             Grid1.Rows[19].CellCssClasses[4] = "f-grid-cell-uneditable";
             Grid1.Rows[19].CellCssClasses[5] = "f-grid-cell-uneditable";
+            Grid1.Rows[21].CellCssClasses[4] = "f-grid-cell-uneditable";
+            Grid1.Rows[21].CellCssClasses[5] = "f-grid-cell-uneditable";
+            Grid1.Rows[23].CellCssClasses[4] = "f-grid-cell-uneditable";
+            Grid1.Rows[23].CellCssClasses[5] = "f-grid-cell-uneditable";
+            Grid1.Rows[68].CellCssClasses[4] = "f-grid-cell-uneditable";
+            Grid1.Rows[68].CellCssClasses[5] = "f-grid-cell-uneditable";
             Grid1.Rows[96].CellCssClasses[4] = "f-grid-cell-uneditable";
             Grid1.Rows[96].CellCssClasses[5] = "f-grid-cell-uneditable";
         }
@@ -140,20 +148,22 @@ namespace FineUIPro.Web.ZHGL.Environmental
                 Grid1.Rows[0].CellCssClasses[5] = "f-grid-cell-uneditable";
                 Grid1.Rows[15].CellCssClasses[4] = "f-grid-cell-uneditable";
                 Grid1.Rows[15].CellCssClasses[5] = "f-grid-cell-uneditable";
-                //Grid1.Rows[17].CellCssClasses[4] = "f-grid-cell-uneditable";
-                //Grid1.Rows[17].CellCssClasses[5] = "f-grid-cell-uneditable";
+                Grid1.Rows[17].CellCssClasses[4] = "f-grid-cell-uneditable";
+                Grid1.Rows[17].CellCssClasses[5] = "f-grid-cell-uneditable";
                 //Grid1.Rows[18].CellCssClasses[4] = "f-grid-cell-uneditable";
                 //Grid1.Rows[18].CellCssClasses[5] = "f-grid-cell-uneditable";
                 Grid1.Rows[19].CellCssClasses[4] = "f-grid-cell-uneditable";
                 Grid1.Rows[19].CellCssClasses[5] = "f-grid-cell-uneditable";
-                //Grid1.Rows[21].CellCssClasses[4] = "f-grid-cell-uneditable";
-                //Grid1.Rows[21].CellCssClasses[5] = "f-grid-cell-uneditable";
+                Grid1.Rows[21].CellCssClasses[4] = "f-grid-cell-uneditable";
+                Grid1.Rows[21].CellCssClasses[5] = "f-grid-cell-uneditable";
                 //Grid1.Rows[22].CellCssClasses[4] = "f-grid-cell-uneditable";
                 //Grid1.Rows[22].CellCssClasses[5] = "f-grid-cell-uneditable";
-                //Grid1.Rows[23].CellCssClasses[4] = "f-grid-cell-uneditable";
-                //Grid1.Rows[23].CellCssClasses[5] = "f-grid-cell-uneditable";
+                Grid1.Rows[23].CellCssClasses[4] = "f-grid-cell-uneditable";
+                Grid1.Rows[23].CellCssClasses[5] = "f-grid-cell-uneditable";
                 //Grid1.Rows[33].CellCssClasses[4] = "f-grid-cell-uneditable";
                 //Grid1.Rows[33].CellCssClasses[5] = "f-grid-cell-uneditable";
+                Grid1.Rows[68].CellCssClasses[4] = "f-grid-cell-uneditable";
+                Grid1.Rows[68].CellCssClasses[5] = "f-grid-cell-uneditable";
                 Grid1.Rows[96].CellCssClasses[4] = "f-grid-cell-uneditable";
                 Grid1.Rows[96].CellCssClasses[5] = "f-grid-cell-uneditable";
             }
@@ -792,10 +802,10 @@ namespace FineUIPro.Web.ZHGL.Environmental
         private void GetData()
         {
             decimal E6 = 0, F6 = 0, E7 = 0, F7 = 0, E8, F8, E9, F9, E10 = 0, F10 = 0, E11 = 0, F11 = 0, E12 = 0, F12 = 0, E13 = 0, F13 = 0, E14 = 0, F14 = 0, E15 = 0, F15 = 0, E16 = 0, F16 = 0, E17 = 0, F17 = 0, E18 = 0, F18 = 0, E19 = 0, F19 = 0,
-                E21 = 0, F21 = 0, E22 = 0, F22 = 0, E23 = 0, F23 = 0, E25 = 0, F25 = 0, E26 = 0, F26 = 0, E27 = 0, F27 = 0, E28 = 0, F28 = 0, E29, F29, E30, F30, E31, F31, E32, F32, E33, F33, E34, F34, E35, F35, E36, F36, E37, F37, E38, F38, E39, F39, E40, F40, E41, F41,
+                E21 = 0, F21 = 0, E22 = 0, F22 = 0, E23 = 0, F23 = 0, E25 = 0, F25 = 0, E26 = 0, F26 = 0, E27 = 0, F27 = 0, E28 = 0, F28 = 0, E29 = 0, F29 = 0, E30, F30, E31, F31, E32, F32, E33, F33, E34, F34, E35, F35, E36, F36, E37, F37, E38, F38, E39, F39, E40, F40, E41, F41,
                 E42, F42, E43, F43, E44, F44, E45, F45, E46, F46, E47, F47, E48, F48, E49, F49, E50, F50, E51, F51, E52, F52, E53, F53, E54, F54, E55, F55,
                 E56, F56, E57, F57, E58, F58, E59, F59, E60, F60, E61, F61, E62, F62, E63, F63, E64, F64, E65, F65, E66, F66, E67, F67, E68, F68, E69, F69,
-                E70, F70, E71, F71, E72, F72, E73, F73, E74, F74, E75, F75, E76, F76, E77, F77, E78, F78, E79, F79, E80, F80, E81, F81, E82, F82, E83, F83,
+                E70, F70, E71, F71, E72, F72, E73, F73, E74 = 0, F74 = 0, E75, F75, E76, F76, E77, F77, E78, F78, E79, F79, E80, F80, E81, F81, E82, F82, E83, F83,
                 E84, F84, E85, F85, E86, F86, E87, F87, E88, F88, E89, F89, E90, F90, E91, F91, E92, F92, E93, F93, E94, F94, E95, F95, E96, F96, E97, F97,
                 E98, F98, E99, F99, E100, F100, E102 = 0, F102 = 0, E103 = 0, F103 = 0;
             JArray mergedData = Grid1.GetMergedData();
@@ -1700,6 +1710,18 @@ namespace FineUIPro.Web.ZHGL.Environmental
             {
                 this.Grid1.Rows[15].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[15].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[15].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[15].Values[4].ToString()), 2).ToString() + "%";
             }
+            if (E6 > 0 && E23 > 0)
+            {
+                this.Grid1.Rows[17].Values[4] = decimal.Round(E6 * 10000 / E23, 4);
+            }
+            if (F6 > 0 && F23 > 0)
+            {
+                this.Grid1.Rows[17].Values[5] = decimal.Round(F6 * 10000 / F23, 4);
+            }
+            if (!string.IsNullOrEmpty(this.Grid1.Rows[17].Values[4].ToString()) && this.Grid1.Rows[17].Values[4].ToString() != "0" && !string.IsNullOrEmpty(this.Grid1.Rows[17].Values[5].ToString()))
+            {
+                this.Grid1.Rows[17].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[17].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[17].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[17].Values[4].ToString()), 2).ToString() + "%";
+            }
             if (E6 > 0 && E25 > 0)
             {
                 this.Grid1.Rows[19].Values[4] = decimal.Round(E6 * 10000 / E25, 4);
@@ -1712,6 +1734,42 @@ namespace FineUIPro.Web.ZHGL.Environmental
             {
                 this.Grid1.Rows[19].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[19].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[19].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[19].Values[4].ToString()), 2).ToString() + "%";
             }
+            if (E6 > 0 && E27 > 0)
+            {
+                this.Grid1.Rows[21].Values[4] = decimal.Round(E6 * 10000 / E27, 4);
+            }
+            if (F6 > 0 && F27 > 0)
+            {
+                this.Grid1.Rows[21].Values[5] = decimal.Round(F6 * 10000 / F27, 4);
+            }
+            if (!string.IsNullOrEmpty(this.Grid1.Rows[21].Values[4].ToString()) && this.Grid1.Rows[21].Values[4].ToString() != "0" && !string.IsNullOrEmpty(this.Grid1.Rows[21].Values[5].ToString()))
+            {
+                this.Grid1.Rows[21].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[21].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[21].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[21].Values[4].ToString()), 2).ToString() + "%";
+            }
+            if (E6 > 0 && E29 > 0)
+            {
+                this.Grid1.Rows[23].Values[4] = decimal.Round(E6 * 10000 / E29, 4);
+            }
+            if (F6 > 0 && F29 > 0)
+            {
+                this.Grid1.Rows[23].Values[5] = decimal.Round(F6 * 10000 / F29, 4);
+            }
+            if (!string.IsNullOrEmpty(this.Grid1.Rows[23].Values[4].ToString()) && this.Grid1.Rows[23].Values[4].ToString() != "0" && !string.IsNullOrEmpty(this.Grid1.Rows[23].Values[5].ToString()))
+            {
+                this.Grid1.Rows[23].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[23].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[23].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[23].Values[4].ToString()), 2).ToString() + "%";
+            }
+            if (E6 > 0 && E74 > 0)
+            {
+                this.Grid1.Rows[68].Values[4] = decimal.Round(E6 * 10000 / E74, 4);
+            }
+            if (F6 > 0 && F74 > 0)
+            {
+                this.Grid1.Rows[68].Values[5] = decimal.Round(F6 * 10000 / F74, 4);
+            }
+            if (!string.IsNullOrEmpty(this.Grid1.Rows[68].Values[4].ToString()) && this.Grid1.Rows[68].Values[4].ToString() != "0" && !string.IsNullOrEmpty(this.Grid1.Rows[68].Values[5].ToString()))
+            {
+                this.Grid1.Rows[68].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[68].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[68].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[68].Values[4].ToString()), 2).ToString() + "%";
+            }
             if (E102 > 0 && E103 > 0 && E21 > 0)
             {
                 this.Grid1.Rows[96].Values[4] = decimal.Round((E102 + E103) / E21, 4);
@@ -1844,6 +1902,26 @@ namespace FineUIPro.Web.ZHGL.Environmental
 
         protected void btnSave_Click(object sender, EventArgs e)
         {
+            bool isEmpty = false;
+            foreach (JObject mergedRow in Grid1.GetMergedData())
+            {
+                JObject values = mergedRow.Value<JObject>("values");
+                int rowIndex = mergedRow.Value<int>("index");
+                string sortIndex = values.Value<string>("SortIndex");
+                if (sortIndex == "19" || sortIndex == "69" || sortIndex == "70")
+                {
+                    if (Funs.GetNewDecimalOrZero(System.Web.HttpUtility.HtmlDecode(values.Value<string>("ThisYearValue"))) == 0)
+                    {
+                        isEmpty = true;
+                        break;
+                    }
+                }
+            }
+            if (isEmpty)
+            {
+                ShowNotify("工业总产值(可比价)、万元产值二氧化碳排放(可比价)和二氧化碳排放量不能为空，必须填报数据！", MessageBoxIcon.Warning);
+                return;
+            }
             Save("add");
             ShowNotify("保存成功！", MessageBoxIcon.Success);
             PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
@@ -1851,11 +1929,51 @@ namespace FineUIPro.Web.ZHGL.Environmental
 
         protected void btnUpdata_Click(object sender, EventArgs e)
         {
+            bool isEmpty = false;
+            foreach (JObject mergedRow in Grid1.GetMergedData())
+            {
+                JObject values = mergedRow.Value<JObject>("values");
+                int rowIndex = mergedRow.Value<int>("index");
+                string sortIndex = values.Value<string>("SortIndex");
+                if (sortIndex == "19" || sortIndex == "69" || sortIndex == "70")
+                {
+                    if (Funs.GetNewDecimalOrZero(System.Web.HttpUtility.HtmlDecode(values.Value<string>("ThisYearValue"))) == 0)
+                    {
+                        isEmpty = true;
+                        break;
+                    }
+                }
+            }
+            if (isEmpty)
+            {
+                ShowNotify("工业总产值(可比价)、万元产值二氧化碳排放(可比价)和二氧化碳排放量不能为空，必须填报数据！", MessageBoxIcon.Warning);
+                return;
+            }
             Save("updata");
         }
 
         protected void btnSubmit_Click(object sender, EventArgs e)
         {
+            bool isEmpty = false;
+            foreach (JObject mergedRow in Grid1.GetMergedData())
+            {
+                JObject values = mergedRow.Value<JObject>("values");
+                int rowIndex = mergedRow.Value<int>("index");
+                string sortIndex = values.Value<string>("SortIndex");
+                if (sortIndex == "19" || sortIndex == "69" || sortIndex == "70")
+                {
+                    if (Funs.GetNewDecimalOrZero(System.Web.HttpUtility.HtmlDecode(values.Value<string>("ThisYearValue"))) == 0)
+                    {
+                        isEmpty = true;
+                        break;
+                    }
+                }
+            }
+            if (isEmpty)
+            {
+                ShowNotify("工业总产值(可比价)、万元产值二氧化碳排放(可比价)和二氧化碳排放量不能为空，必须填报数据！", MessageBoxIcon.Warning);
+                return;
+            }
             Save("submit");
         }
         #endregion

SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx

@@ -68,6 +68,11 @@
         .tab .t-item {
             font-size: 13px;
         }
+
+        .bw-item-content {
+            overflow: hidden;
+            overflow-y: scroll;
+        }
     </style>
 </head>
 <body>
@@ -116,11 +121,11 @@
                             </div>
                             <div class="tab-wrap">
                                 <div class="tab" data-value="1">
-                                    <div class="t-item" style="background-color: #B3764D">未投料</div>
+                                    <div class="t-item" style="background-color: #DD226D">未投料</div>
                                     <div class="spline"></div>
-                                    <div class="t-item" style="background-color: #DD226D">投料中</div>
+                                    <div class="t-item" style="background-color: #57C43C">投料中</div>
                                     <div class="spline"></div>
-                                    <div class="t-item" style="background-color: #57C43C">投料完成</div>
+                                    <div class="t-item" style="background-color: #B3764D">投料完成</div>
                                 </div>
                             </div>
                             <div class="bw-item-content">
@@ -487,7 +492,7 @@
     var threeData = JSON.parse(fourDecisionStr);
     var threewidth = Math.floor(100 / threeData.length);
     $.each(threeData, function (index, item) {
-        $("#three").append("<div id='three" + index + "' style='width:" + threewidth + "%; height:100%; display:inline-block'></div>");
+        $("#three").append("<div id='three" + index + "' style='width:129px; height:148px; display:inline-block'></div>");
     });
 
     //图4
@@ -495,7 +500,7 @@
     var fourData = JSON.parse(fourStr);
     var fourwidth = Math.floor(100 / (fourData.length / 2));
     $.each(fourData, function (index, item) {
-        $("#four").append("<div id='four" + index + "' style='width:" + fourwidth + "%; height:50%; display:inline-block'></div>");
+        $("#four").append("<div id='four" + index + "' style='width:129px; height:148px; display:inline-block'></div>");
     });
 
     //图5
@@ -503,7 +508,7 @@
     var fiveData = JSON.parse(fiveStr);
     var fivewidth = Math.floor(100 / (fiveData.length / 2));
     $.each(fourData, function (index, item) {
-        $("#five").append("<div id='five" + index + "' style='width:" + fivewidth + "%; height:50%; display:inline-block'></div>");
+        $("#five").append("<div id='five" + index + "' style='width:129px; height:148px; display:inline-block'></div>");
     });
 
     //图6
@@ -816,19 +821,26 @@
             //if (item.RunType == 3) {
             //    colorData = ["#CCCC33", "#8FCC33", "#57C43C", "#22DD48"];
             //}
-            var colorData = ["#7A7AA7", "#5656CC", "#3939E9", "#2222FF"];
+            var colorData = ["#DD226D", "#DD226D", "#DD226D", "#DD226D"];
             if (item.RunType == 2) {
-                colorData = ["#DD226D", "#DD226D", "#E95B39", "#DD226D"];
+                colorData = ["#57C43C", "#57C43C", "#57C43C", "#57C43C"];
             }
             if (item.RunType == 3) {
-                colorData = ["#3fbb6a", "#3fbb6a", "#3fbb6a", "#3fbb6a"];
+                colorData = ["#B3764D", "#B3764D", "#B3764D", "#B3764D"];
             }
             var chart = echarts.init(document.getElementById('four' + index));
             var value = 100;
+
+            //名称
+            var sname = item.SystemName;
+            var index = sname.indexOf(" ")
+            if (index!=-1) {
+                sname = sname.substring(0, index) + "\n" + sname.substring(index + 1, sname.length);
+            }
             option = {
                 backgroundColor: '000',
                 title: {
-                    text: `` + item.SystemName,
+                    text: `` + sname,
                     subtext: item.RunType == 1 ? "未投料" : item.RunType == 2 ? "投料中" : "投料完成",
                     left: 'center',
                     top: '45%', //top待调整
@@ -926,10 +938,17 @@
             }
             var chart = echarts.init(document.getElementById('five' + index));
             var value = 100;
+            //名称
+            var sname = item.SystemName;
+            var index = sname.indexOf(" ")
+            if (index != -1) {
+                sname = sname.substring(0, index) + "\n" + sname.substring(index + 1, sname.length);
+            }
+
             option = {
                 backgroundColor: '000',
                 title: {
-                    text: `` + item.SystemName,
+                    text: sname,
                     subtext: item.RunType == 1 ? "未运行" : item.RunType == 2 ? "运行中" : "停车检修",
                     left: 'center',
                     top: '45%', //top待调整

SGGL/FineUIPro.Web/common/main_new.aspx

@@ -39,6 +39,11 @@
         .cl-tab {
             padding: 0.025rem 0 !important;
         }
+
+        .c-site>.num-box>.num {
+    font-size: .215rem;
+    color: #21FFAF;
+}
     </style>
 </head>
 <body>
@@ -2346,7 +2351,8 @@
             dataZoom: [
                 {
                     // 设置滚动条的隐藏或显示
-                    show: value.length > 10,
+                    /* show: value.length > 10,*/
+                    show: true,
                     // 设置类型
                     type: "slider",
                     // 设置背景颜色

SGGL/FineUIPro.Web/common/main_new.aspx.cs

@@ -13,11 +13,19 @@ namespace FineUIPro.Web.common
     {
         List<Model.Base_Project> allProjects;
         public static List<Model.Solution_LargerHazard> LargerHazard = new List<Model.Solution_LargerHazard>();
+
+        public string[] pids { get; set; }
         protected void Page_Load(object sender, EventArgs e)
         {
             if (!IsPostBack)
             {
                 Model.SGGLDB db = Funs.DB;
+                if (!string.IsNullOrEmpty(CurrUser.CompanyProjectId))
+                {
+                    pids = CurrUser.CompanyProjectId.Split(',');
+                }
+                
+
                 //未遂事故
                 var wsAccidentList1 = from x in db.Accident_AccidentPersonRecord
                                       join y in db.Base_AccidentType on x.AccidentTypeId equals y.AccidentTypeId
@@ -31,7 +39,26 @@ namespace FineUIPro.Web.common
 
                 //安全人工时
                 int wHours = db.SitePerson_PersonInOutNumber.Max(x => x.WorkHours) ?? 0;
-                this.divSafeWorkTime.InnerHtml = CountAqrgs().ToString().Split('.')[0];
+                var countAqrgsSum = Convert.ToDecimal(0);
+                if (pids == null)
+                {
+                    countAqrgsSum = CountAqrgs();
+                }
+                else {
+                    countAqrgsSum = CountAqrgs(null,null,pids);
+                }
+               
+                if (countAqrgsSum > 10000)
+                {
+                    countAqrgsSum = countAqrgsSum / Convert.ToDecimal(10000.00);
+
+                    this.divSafeWorkTime.InnerHtml = Math.Round(countAqrgsSum, 2).ToString() + "万";
+                }
+                else {
+                    this.divSafeWorkTime.InnerHtml = countAqrgsSum.ToString().Split('.')[0];
+                }
+
+               
 
                 //本月安全人工时
                 //int wHoursMonth = 0;
@@ -43,50 +70,125 @@ namespace FineUIPro.Web.common
                 //}
                 DateTime d1 = getStartMonth();
                 DateTime d2 = getEndMonth();
+                var countMonthAqrgs = Convert.ToDecimal(0);
+                if (pids == null)
+                {
+                    countMonthAqrgs = CountAqrgs(d1, d2);
+                }
+                else
+                {
+                    countMonthAqrgs = CountAqrgs(d1, d2,pids);
+                }
+                if (countMonthAqrgs > 10000)
+                {
+                    countMonthAqrgs = countMonthAqrgs / Convert.ToDecimal(10000.00);
+
+                    this.divSafeWorkTimeMonth.InnerHtml = Math.Round(countMonthAqrgs, 2).ToString() + "万";
+                }
+                else {
+                    this.divSafeWorkTimeMonth.InnerHtml = CountAqrgs(d1, d2).ToString().Split('.')[0];
+                }
+
 
-                this.divSafeWorkTimeMonth.InnerHtml = CountAqrgs(d1, d2).ToString().Split('.')[0];
 
                 //int wHoursMonth = db.SitePerson_PersonInOutNumber.Where(x => x.InOutDate > DateTime.Now.AddDays(-Convert.ToInt32(DateTime.Now.Date.Day)))
                 //    .Max(x => x.WorkHours) ?? 0;
                 //this.divSafeWorkTimeMonth.InnerHtml = wHoursMonth.ToString();
 
                 //安全培训累计人员
-                var getTrainRecord = db.EduTrain_TrainRecord.Sum(x => x.TrainPersonNum) ?? 0;
-                //修改：增加博晟教育中的人数
-                var boShengCount = db.Bo_Sheng_TrainPerson.Where(x => (x.DeleteTag == "False" || x.DeleteTag == null)).ToList().Count;
-                this.divSafePersonNum.InnerHtml = (getTrainRecord + boShengCount).ToString();
+                var getTrainRecord = 0;
+                var boShengCount = 0;
+                if (pids == null)
+                {
+                    getTrainRecord = db.EduTrain_TrainRecord.Sum(x => x.TrainPersonNum) ?? 0;
+                    //修改：增加博晟教育中的人数
+                    boShengCount = db.Bo_Sheng_TrainPerson.Where(x => (x.DeleteTag == "False" || x.DeleteTag == null)).ToList().Count;
+                    this.divSafePersonNum.InnerHtml = (getTrainRecord + boShengCount).ToString();
+                }
+                else {
+                    getTrainRecord = db.EduTrain_TrainRecord.Where(x=>pids.Contains(x.ProjectId)).Sum(x => x.TrainPersonNum) ?? 0;
+                    //修改：增加博晟教育中的人数
+                    boShengCount = db.Bo_Sheng_TrainPerson.Where(x => (x.DeleteTag == "False" || x.DeleteTag == null)
+                    && pids.Contains(x.ProjectId) ).ToList().Count;
 
-                //安全管理人员
-                var allSum = from x in Funs.DB.SitePerson_Person
-                             where x.IsUsed == true && x.InTime < DateTime.Now && (x.OutTime == null || x.OutTime > DateTime.Now)
-                             select x;
-                var glAllPerson = from x in allSum
-                                  join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
-                                  //where (y.PostType == "1" || y.PostType == "4")    //一般管理岗位和特种管理人员
-                                  where y.IsHsse == true
-                                  select x;
-                this.divSafeManagePersonNum.InnerText = glAllPerson.Count().ToString();
+                    this.divSafePersonNum.InnerHtml = (getTrainRecord + boShengCount).ToString();
+                }
 
-                //质量管理人员
-                int CqmsManageNum = (from x in Funs.DB.Person_CompanyBranchPerson
+
+                if (pids == null)
+                {
+                    //安全管理人员
+                    var allSum = from x in Funs.DB.SitePerson_Person
+                                 where x.IsUsed == true && x.InTime < DateTime.Now && (x.OutTime == null || x.OutTime > DateTime.Now)
+                                 select x;
+
+                    var glAllPerson = from x in allSum
+                                      join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
+                                      //where (y.PostType == "1" || y.PostType == "4")    //一般管理岗位和特种管理人员
+                                      where y.IsHsse == true
+                                      select x;
+                    this.divSafeManagePersonNum.InnerText = glAllPerson.Count().ToString();
+                }
+                else {
+                    //安全管理人员
+                    var allSum = from x in Funs.DB.SitePerson_Person
+                                 where x.IsUsed == true && x.InTime < DateTime.Now && (x.OutTime == null || x.OutTime > DateTime.Now)
+                                 && pids.Contains(x.ProjectId)
+                                 select x;
+
+                    var glAllPerson = from x in allSum
+                                      join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
+                                      //where (y.PostType == "1" || y.PostType == "4")    //一般管理岗位和特种管理人员
+                                      where y.IsHsse == true
+                                      select x;
+                    this.divSafeManagePersonNum.InnerText = glAllPerson.Count().ToString();
+                }
+
+                #region 质量管理人员，质量培训人员 增加公司级 
+                int CqmsManageNum = 0;
+                int CqmsPxNum = 0;
+                //质量培训人员
+                DateTime date = DateTime.Now.AddDays(-1);
+                if (pids == null)
+                {
+                    CqmsManageNum = (from x in Funs.DB.Person_CompanyBranchPerson
                                      join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
                                      where x.IsOnJob == true && y.IsCQMS == true
                                      select x).Count() +
-                                     (from x in Funs.DB.SitePerson_Person
-                                      join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
-                                      where x.IsUsed == true && y.IsCQMS == true
-                                      select x).Count();
-                this.divCqmsManageNum.InnerText = CqmsManageNum.ToString();
+                                   (from x in Funs.DB.SitePerson_Person
+                                    join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
+                                    where x.IsUsed == true && y.IsCQMS == true
+                                    select x).Count();
+                    this.divCqmsManageNum.InnerText = CqmsManageNum.ToString();
 
-                //质量培训人员
-                DateTime date = DateTime.Now.AddDays(-1);
-                int CqmsPxNum = (from x in Funs.DB.Comprehensive_InspectionPerson
+                    CqmsPxNum = (from x in Funs.DB.Comprehensive_InspectionPerson
                                  where x.IsTrain == true
                                  select x).Count();
-                divCqmsPxNum.InnerText = CqmsPxNum.ToString();
+                    divCqmsPxNum.InnerText = CqmsPxNum.ToString();
+                }
+                else {
+                    CqmsManageNum = (from x in Funs.DB.SitePerson_Person
+                                    join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
+                                    where x.IsUsed == true && y.IsCQMS == true && pids.Contains(x.ProjectId)
+                                    select x).Count();
+                    this.divCqmsManageNum.InnerText = CqmsManageNum.ToString();
+
+                    CqmsPxNum = (from x in Funs.DB.Comprehensive_InspectionPerson
+                                 where x.IsTrain == true && pids.Contains(x.ProjectId)
+                                 select x).Count();
+                    divCqmsPxNum.InnerText = CqmsPxNum.ToString();
+                }
+                #endregion
 
                 //在建项目
-                allProjects = ProjectService.GetAllProjectDropDownList();
+                if (pids == null)
+                {
+                    allProjects = ProjectService.GetAllProjectDropDownList();
+                }
+                else {
+                    allProjects = ProjectService.GetAllProjectDropDownList(pids);
+                }
+                
                 int acount = allProjects.Count();
                 int pcount1 = 0;
                 int pcount2 = 0;
@@ -94,8 +196,15 @@ namespace FineUIPro.Web.common
                 if (acount > 0)
                 {
                     pcount1 = allProjects.Where(x => x.ProjectState == Const.ProjectState_1 || x.ProjectState == null).Count();
-                    pcount2 = (from x in Funs.DB.SitePerson_Person where x.IsUsed == true select x).Count();
-                    pcount3 = Count3();
+                    var pidzjsg = string.Join(",", allProjects.Where(x => x.ProjectState == Const.ProjectState_1 || x.ProjectState == null).Select(x => x.ProjectId)).Split(',');
+                    if (pids == null) { 
+                        pcount2 = (from x in Funs.DB.SitePerson_Person where x.IsUsed == true && pidzjsg.Contains(x.ProjectId) select x).Count();
+                    }
+                    else { 
+                        pidzjsg = pids;
+                        pcount2 = (from x in Funs.DB.SitePerson_Person where x.IsUsed == true && pids.Contains(x.ProjectId) select x).Count();
+                    }
+                    pcount3 = Count3(pidzjsg);
                 }
                 div_zjxmCount.InnerHtml = pcount1.ToString() + "<div class=\"th\">个</div>";
                 div_cjrsCount.InnerHtml = pcount2.ToString() + "<div class=\"th\">人</div>";
@@ -162,7 +271,7 @@ namespace FineUIPro.Web.common
         /// </summary>
         /// <param name="state"></param>
         /// <returns></returns>
-        protected decimal CountAqrgs(DateTime? d1 = null, DateTime? d2 = null)
+        protected decimal CountAqrgs(DateTime? d1 = null, DateTime? d2 = null,string[] pids =null)
         {
             decimal cout1 = 0;
 
@@ -171,7 +280,12 @@ namespace FineUIPro.Web.common
             var getAllPersonInOutList = from x in Funs.DB.SitePerson_PersonInOutNumber
 
                                         select x;
-            if (getAllPersonInOutList.Count() > 0)
+            if (pids != null) {
+                getAllPersonInOutList = from x in Funs.DB.SitePerson_PersonInOutNumber
+                                        where pids.Contains(x.ProjectId)
+                                        select x;
+            }
+                if (getAllPersonInOutList.Count() > 0)
             {
                 if (datetime1.HasValue)
                 {
@@ -196,6 +310,18 @@ namespace FineUIPro.Web.common
                         where y.ProjectState == Const.ProjectState_1
                         select x;
 
+            if (pids!=null)
+            {
+                getD1 = from x in Funs.DB.Accident_AccidentHandle
+                        join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
+                        where  pids.Contains(x.ProjectId)
+                        select x;
+                getD2 = from x in Funs.DB.Accident_AccidentReport
+                        join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
+                        where   pids.Contains(x.ProjectId)
+                        select x;
+            }
+
             if (datetime1.HasValue)
             {
                 getD1 = getD1.Where(x => x.AccidentDate >= datetime1);
@@ -542,10 +668,10 @@ namespace FineUIPro.Web.common
         /// </summary>
         /// <param name="state"></param>
         /// <returns></returns>
-        protected int Count3()
+        protected int Count3(string[] pids)
         {
             int cout1 = 0;
-            cout1 = Funs.DB.Solution_LargerHazard.Where(x => x.States == Const.State_2).Count();
+            cout1 = Funs.DB.Solution_LargerHazard.Where(x => x.States == Const.State_2 && pids.Contains(x.ProjectId)).Count();
             return cout1;
         }
         #endregion
@@ -561,20 +687,48 @@ namespace FineUIPro.Web.common
         protected string zgzglDataValue;
         protected void getZlwt()
         {
-            zlallNumber = (from x in Funs.DB.Check_CheckControl
-                           where x.CheckDate <= DateTime.Now
-                           select x).Count().ToString();
-            var num2 = (from x in Funs.DB.Check_CheckControl
-                        where x.CheckDate <= DateTime.Now && x.State == "7"
-                        select x).Count();
-            zlfinishNumber = num2.ToString();
-            var num3 = (from x in Funs.DB.Check_CheckControl
-                        where x.CheckDate <= DateTime.Now && x.State != "7"
-                        select x).Count();
+            if (pids == null)
+            {
+                zlallNumber = (from x in Funs.DB.Check_CheckControl
+                               where x.CheckDate <= DateTime.Now
+                               select x).Count().ToString();
 
-            var zgl = String.Format("{0:N2}", 100.0 * num2 / (num2 + num3));
-            zlzgl = zgl.ToString();
-            zgzglDataValue = (100 - (100.0 * num2 / (num2 + num3))).ToString();
+                var num2 = (from x in Funs.DB.Check_CheckControl
+                            where x.CheckDate <= DateTime.Now && x.State == "7"
+                            select x).Count();
+
+                zlfinishNumber = num2.ToString();
+                var num3 = (from x in Funs.DB.Check_CheckControl
+                            where x.CheckDate <= DateTime.Now && x.State != "7"
+                            select x).Count();
+
+                var zgl = String.Format("{0:N2}", 100.0 * num2 / (num2 + num3));
+
+                zlzgl = zgl.ToString();
+
+                zgzglDataValue = (100 - (100.0 * num2 / (num2 + num3))).ToString();
+            }
+            else {
+                zlallNumber = (from x in Funs.DB.Check_CheckControl
+                               where x.CheckDate <= DateTime.Now && pids.Contains(x.ProjectId)
+                               select x).Count().ToString();
+
+                var num2 = (from x in Funs.DB.Check_CheckControl
+                            where x.CheckDate <= DateTime.Now && x.State == "7" && pids.Contains(x.ProjectId)
+                            select x).Count();
+
+                zlfinishNumber = num2.ToString();
+                var num3 = (from x in Funs.DB.Check_CheckControl
+                            where x.CheckDate <= DateTime.Now && x.State != "7" && pids.Contains(x.ProjectId)
+                            select x).Count();
+
+                var zgl = String.Format("{0:N2}", 100.0 * num2 / (num2 + num3));
+
+                zlzgl = zgl.ToString();
+
+                zgzglDataValue = (100 - (100.0 * num2 / (num2 + num3))).ToString();
+            }
+            
         }
         #endregion
 
@@ -586,19 +740,39 @@ namespace FineUIPro.Web.common
         protected string zggjzglDataValue;
         protected void getZlgj()
         {
-            var num1 = (from x in Funs.DB.ProcessControl_InspectionManagement
-                        select x).Count();
-            //Check_JointCheck
-            zlgjallNumber = num1.ToString();
+            if (pids == null)
+            {
+                var num1 = (from x in Funs.DB.ProcessControl_InspectionManagement
+                            select x).Count();
+                //Check_JointCheck
+                zlgjallNumber = num1.ToString();
 
-            var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
-                        where x.IsOnceQualified == true
-                        select x).Count();
-            zlgjfinishNumber = num2.ToString();
+                var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
+                            where x.IsOnceQualified == true
+                            select x).Count();
+                zlgjfinishNumber = num2.ToString();
 
-            var zgl = String.Format("{0:N2}", 100.0 * num2 / num1);
-            zlgjzgl = zgl.ToString();
-            zggjzglDataValue = (100 - (100.0 * num2 / num1)).ToString();
+                var zgl = String.Format("{0:N2}", 100.0 * num2 / num1);
+                zlgjzgl = zgl.ToString();
+                zggjzglDataValue = (100 - (100.0 * num2 / num1)).ToString();
+            }
+            else {
+                var num1 = (from x in Funs.DB.ProcessControl_InspectionManagement
+                            where pids.Contains(x.ProjectId)
+                            select x).Count();
+                //Check_JointCheck
+                zlgjallNumber = num1.ToString();
+
+                var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
+                            where x.IsOnceQualified == true && pids.Contains(x.ProjectId)
+                            select x).Count();
+                zlgjfinishNumber = num2.ToString();
+
+                var zgl = String.Format("{0:N2}", 100.0 * num2 / num1);
+                zlgjzgl = zgl.ToString();
+                zggjzglDataValue = (100 - (100.0 * num2 / num1)).ToString();
+            }
+            
         }
 
         #endregion
@@ -617,6 +791,10 @@ namespace FineUIPro.Web.common
             double result = 0;
             Model.SGGLDB db = Funs.DB;
             var ndtLists = from x in db.ProcessControl_NondestructiveTest_New where x.ProfessionalName == "工艺管道" select x;
+            if (pids!=null)
+            {
+                ndtLists = from x in db.ProcessControl_NondestructiveTest_New where x.ProfessionalName == "工艺管道" && pids.Contains(x.ProjectId) select x;
+            }
             decimal a = 0, b = 0;
             if (ndtLists.Count() > 0)
             {
@@ -673,30 +851,61 @@ namespace FineUIPro.Web.common
         protected string gjsxZdl = "0";
         protected void getGjsx()
         {
-            //Check_JointCheck
-            var znum = (from x in Funs.DB.GJSX
-                        select x).Count();
-            divGjsxzj.InnerHtml = znum.ToString();
+            if (pids == null)
+            {
+                //Check_JointCheck
+                var znum = (from x in Funs.DB.GJSX
+                            select x).Count();
+                divGjsxzj.InnerHtml = znum.ToString();
 
-            //到期应完成
-            var dqnum = (from x in Funs.DB.GJSX
-                         where x.CompleteDate <= DateTime.Now
-                         select x).Count().ToString();
-            divGjsxdq.InnerHtml = dqnum;
+                //到期应完成
+                var dqnum = (from x in Funs.DB.GJSX
+                             where x.CompleteDate <= DateTime.Now
+                             select x).Count().ToString();
+                divGjsxdq.InnerHtml = dqnum;
 
-            //未准点完成
-            var wzdnum = (from x in Funs.DB.GJSX
-                          where x.CompleteDate <= DateTime.Now
-                          && x.State != "0"
-                          select x).Count().ToString();
-            divGjsxwzd.InnerHtml = wzdnum;
+                //未准点完成
+                var wzdnum = (from x in Funs.DB.GJSX
+                              where x.CompleteDate <= DateTime.Now
+                              && x.State != "0"
+                              select x).Count().ToString();
+                divGjsxwzd.InnerHtml = wzdnum;
 
-            //准点率，已完成/总数*100
-            var ywcnum = (from x in Funs.DB.GJSX
-                          where x.CompleteDate <= DateTime.Now
-                          && x.State == "0"
-                          select x).Count();
-            gjsxZdl = Math.Round((100.0 * ywcnum / znum), 2).ToString();
+                //准点率，已完成/总数*100
+                var ywcnum = (from x in Funs.DB.GJSX
+                              where x.CompleteDate <= DateTime.Now
+                              && x.State == "0"
+                              select x).Count();
+                gjsxZdl = Math.Round((100.0 * ywcnum / znum), 2).ToString();
+            }
+            else {
+                //Check_JointCheck
+                var znum = (from x in Funs.DB.GJSX
+                            where pids.Contains(x.ProjectId)
+                            select x).Count();
+                divGjsxzj.InnerHtml = znum.ToString();
+
+                //到期应完成
+                var dqnum = (from x in Funs.DB.GJSX
+                             where x.CompleteDate <= DateTime.Now && pids.Contains(x.ProjectId)
+                             select x).Count().ToString();
+                divGjsxdq.InnerHtml = dqnum;
+
+                //未准点完成
+                var wzdnum = (from x in Funs.DB.GJSX
+                              where x.CompleteDate <= DateTime.Now
+                              && x.State != "0" && pids.Contains(x.ProjectId)
+                              select x).Count().ToString();
+                divGjsxwzd.InnerHtml = wzdnum;
+
+                //准点率，已完成/总数*100
+                var ywcnum = (from x in Funs.DB.GJSX
+                              where x.CompleteDate <= DateTime.Now
+                              && x.State == "0" && pids.Contains(x.ProjectId)
+                              select x).Count();
+                gjsxZdl = Math.Round((100.0 * ywcnum / znum), 2).ToString();
+            }
+           
         }
 
         #endregion
@@ -706,7 +915,14 @@ namespace FineUIPro.Web.common
         {
             int AllCount = 0;
             int MCount = 0;
-            var getallin = APIPageDataService.getPersonNumByCompany(DateTime.Now);
+            var getallin = new List<Model.PageDataPersonInOutItem>();
+            if (pids == null)
+            {
+                getallin = APIPageDataService.getPersonNumByCompany(DateTime.Now);
+            }
+            else {
+                getallin = APIPageDataService.getPersonNumByCompany(DateTime.Now,pids);
+            }
             AllCount = getallin.Count();
             if (AllCount > 0)
             {
@@ -727,7 +943,16 @@ namespace FineUIPro.Web.common
         protected string ProjectPersonMc;
         private void getProjectSitePerson()
         {
-            var list = Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null)).ToList();
+            var list = new List<Model.Base_Project>();
+            if (pids == null)
+            {
+                list= Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null)).ToList();
+            }
+            else {
+                list = Funs.DB.Base_Project.Where(x => pids.Contains(x.ProjectId)).ToList();
+            }
+                
+               
             foreach (var item in list)
             {
                 ProjectPersonMc += "'" + item.ShortName + "',";
@@ -743,14 +968,25 @@ namespace FineUIPro.Web.common
         protected string ProjectMc;
         protected void getJd()
         {
-            var list = Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null) && x.Progress != null).ToList();
-            foreach (var item in list)
+            var list = new List<Model.Base_Project>();
+            if (pids == null)
             {
-                ProjectJd += "'" + item.Progress.Value.ToString("0.##") + "',";
-                ProjectMc += "'" + item.ShortName + "',";
+                list = Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null) && x.Progress != null).ToList();
             }
-            ProjectJd = ProjectJd.TrimEnd(',');
-            ProjectMc = ProjectMc.TrimEnd(',');
+            else {
+                list = Funs.DB.Base_Project.Where(x => pids.Contains(x.ProjectId) && x.Progress != null).ToList();
+            }
+            if (list.Count>0)
+            {
+                foreach (var item in list)
+                {
+                    ProjectJd += "'" + item.Progress.Value.ToString("0.##") + "',";
+                    ProjectMc += "'" + item.ShortName + "',";
+                }
+                ProjectJd = ProjectJd.TrimEnd(',');
+                ProjectMc = ProjectMc.TrimEnd(',');
+            }
+            
         }
         #endregion
 
@@ -767,22 +1003,42 @@ namespace FineUIPro.Web.common
         /// 获取隐患整改闭环项
         /// </summary>
         /// <returns></returns>
-        public static int GetGeneralClosedNum()
+        public  int GetGeneralClosedNum()
         {
-            int result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
+            int result = 0;
+            if (pids==null)
+            {
+                result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
                           where x.States == "3"
                           select x).Count();
+            }
+            else {
+                result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
+                          where x.States == "3" && pids.Contains(x.ProjectId)
+                          select x).Count();
+            }
+           
             return result;
         }
         /// <summary>
         /// 获取隐患未整改完成项
         /// </summary>
         /// <returns></returns>
-        public static int GetGeneralNotClosedNum()
+        public  int GetGeneralNotClosedNum()
         {
-            int result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
+            int result = 0;
+            if (pids == null)
+            {
+                result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
                           where x.States != "3"
                           select x).Count();
+            }
+            else {
+                result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
+                          where x.States != "3" && pids.Contains(x.ProjectId)
+                          select x).Count();
+            }
+                
             return result;
         }
         #endregion
@@ -797,7 +1053,15 @@ namespace FineUIPro.Web.common
         {
 
             //项目
-            var list = Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null)).ToList();
+            var list = new List<Model.Base_Project>();
+            if (pids == null)
+            {
+                list = Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null) && x.Progress != null).ToList();
+            }
+            else
+            {
+                list = Funs.DB.Base_Project.Where(x => pids.Contains(x.ProjectId) && x.Progress != null).ToList();
+            }
             var PipelinList = Funs.DB.CLGL_PipelineMaterialSumList.Where(x => x.Type == "M");
             var SbclList = Funs.DB.CLGL_ContractListSum.Where(x => x.C1 == "设备");
             foreach (var item in list)
@@ -920,13 +1184,25 @@ namespace FineUIPro.Web.common
         ///     获取未遂事件数
         /// </summary>
         /// <returns></returns>
-        public static int GetNearMissNum()
+        private  int GetNearMissNum()
         {
-            var result = (from x in Funs.DB.Accident_AccidentPersonRecord
-                          join y in Funs.DB.Base_AccidentType on x.AccidentTypeId equals y.AccidentTypeId
-                          where x.IsAttempt == "1" && x.CompileDate > Const.DtmarkTime
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.Accident_AccidentPersonRecord
+                              join y in Funs.DB.Base_AccidentType on x.AccidentTypeId equals y.AccidentTypeId
+                              where x.IsAttempt == "1" && x.CompileDate > Const.DtmarkTime
+                              select x).Count();
+                return result;
+            }
+            else {
+                var result = (from x in Funs.DB.Accident_AccidentPersonRecord
+                              join y in Funs.DB.Base_AccidentType on x.AccidentTypeId equals y.AccidentTypeId
+                              where x.IsAttempt == "1" && x.CompileDate > Const.DtmarkTime
+                              && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
+           
         }
     }
 }

SGGL/FineUIPro.Web/common/main_new0.aspx

@@ -217,14 +217,14 @@
                         </div>
                     </div>
                 </div>
-                <div class="y_box js-hover" data-type="yhpc" style="width: 6rem;height: 5.0875rem;">
+                <div class="y_box js-hover" style="width: 6rem;height: 5.0875rem;">
                     <div class="y_box_label y_image_default tab-wrap">隐患排查治理数据
                         <div class="y_tabs y_row">
                             <span class="y_image_default y_tab-action active" data-type="yb"    style="cursor:pointer" onclick="yjClick(0)" id="ybyh_span">一般隐患</span>
                             <span class="y_image_default" data-type="zd"   style="cursor:pointer" onclick="yjClick(1)" id="zdyh_span">重大隐患</span>
                         </div>
                     </div>
-                    <div class="y_box_main">
+                    <div class="y_box_main"  data-type="yhpc" >
                         <div class="pc_box y_row " style="padding-top: .25rem;">
                             <div class="pc-item">
                                 <div class="pc-item-card y_column y_image_default">

SGGL/FineUIPro.Web/common/main_new1.aspx.cs

@@ -18,6 +18,12 @@ namespace FineUIPro.Web.common
         protected string hjallNumber = "0";
         protected string hjfinishNumber = "0";
         protected string hjzgl = "0";
+
+        /// <summary>
+        /// 公司级项目筛选
+        /// </summary>
+        public string[] pids { get; set; }
+
         /// <summary>
         /// 页面加载
         /// </summary>
@@ -27,6 +33,10 @@ namespace FineUIPro.Web.common
         {
             if (!IsPostBack)
             {
+                if (!string.IsNullOrEmpty(CurrUser.CompanyProjectId))
+                {
+                    pids = CurrUser.CompanyProjectId.Split(',');
+                }
                 ProjectService.InitProjectShortNameByStateDropDownList(this.drpProject, this.CurrUser.UserId, BLL.Const.ProjectState_1, false);
                 if (this.drpProject.Items.Count > 0)
                 {
@@ -121,78 +131,139 @@ namespace FineUIPro.Web.common
         /// 获取项目部人数
         /// </summary>
         /// <returns></returns>
-        public static int GetProjectPersonNum()
+        public  int GetProjectPersonNum()
         {
-            int result = (from x in Funs.DB.SitePerson_Person
-                          join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
-                          where y.IsCQMS == true && x.IsUsed == true
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                int result = (from x in Funs.DB.SitePerson_Person
+                              join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
+                              where y.IsCQMS == true && x.IsUsed == true
+                              select x).Count();
+                return result;
+            }
+            else {
+                int result = (from x in Funs.DB.SitePerson_Person
+                              join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
+                              where y.IsCQMS == true && x.IsUsed == true && pids.Contains(x.ProjectId) 
+                              select x).Count();
+                return result;
+            }
+           
         }
 
         /// <summary>
         /// 获取在用计量器具数
         /// </summary>
         /// <returns></returns>
-        public static int GetUseNum()
+        public  int GetUseNum()
         {
-            int result = (from x in Funs.DB.Comprehensive_InspectionMachine
-                          where x.IsOnSite == true && x.InspectionType.Contains("计量")
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                int result = (from x in Funs.DB.Comprehensive_InspectionMachine
+                              where x.IsOnSite == true && x.InspectionType.Contains("计量")
+                              select x).Count();
+                return result;
+            }
+            else {
+                int result = (from x in Funs.DB.Comprehensive_InspectionMachine
+                              where x.IsOnSite == true && x.InspectionType.Contains("计量") && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
+          
         }
         /// <summary>
         /// 获取校准合格数
         /// </summary>
         /// <returns></returns>
-        public static int GetOKNum()
+        public  int GetOKNum()
         {
-            int result = (from x in Funs.DB.Comprehensive_InspectionMachine
-                          where x.IsOnSite == true && x.InspectionType.Contains("计量") && x.IsCheckOK == true
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                int result = (from x in Funs.DB.Comprehensive_InspectionMachine
+                              where x.IsOnSite == true && x.InspectionType.Contains("计量") && x.IsCheckOK == true
+                              select x).Count();
+                return result;
+            }
+            else {
+                int result = (from x in Funs.DB.Comprehensive_InspectionMachine
+                              where x.IsOnSite == true && x.InspectionType.Contains("计量") && x.IsCheckOK == true && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
 
         /// <summary>
         /// 机械预警
         /// </summary>
         /// <returns></returns>
-        public static int GetJxyjNum()
+        public  int GetJxyjNum()
         {
-            int result = 0;
-            //机具报验的到期提醒和过期提醒记录数加一起
-            //机具报验的到期提醒数
-            //var num1 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && DateTime.Now < x.NextTestDate
-            // && ((DateTime)x.NextTestDate).AddDays(-15) < DateTime.Now).Count();
-            //过期提醒记录数
-            var num2 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && x.NextTestDate < DateTime.Now).Count();
-            //result = num1 + num2;
-            result =  num2;
-            return result;
+            if (pids == null)
+            {
+                int result = 0;
+                //机具报验的到期提醒和过期提醒记录数加一起
+                //机具报验的到期提醒数
+                //var num1 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && DateTime.Now < x.NextTestDate
+                // && ((DateTime)x.NextTestDate).AddDays(-15) < DateTime.Now).Count();
+                //过期提醒记录数
+                var num2 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && x.NextTestDate < DateTime.Now).Count();
+                //result = num1 + num2;
+                result = num2;
+                return result;
+            }
+            else {
+                int result = 0;
+                //过期提醒记录数
+                var num2 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && x.NextTestDate < DateTime.Now
+                && pids.Contains(x.ProjectId)).Count();
+                //result = num1 + num2;
+                result = num2;
+                return result;
+            }
         }
 
         /// <summary>
         /// 获取质量培训人次数
         /// </summary>
         /// <returns></returns>
-        public static int GetTrainPersonNum()
+        public  int GetTrainPersonNum()
         {
-            int result = (from x in Funs.DB.Comprehensive_InspectionPerson
-                          where x.IsTrain == true
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                int result = (from x in Funs.DB.Comprehensive_InspectionPerson
+                              where x.IsTrain == true
+                              select x).Count();
+                return result;
+            }
+            else {
+                int result = (from x in Funs.DB.Comprehensive_InspectionPerson
+                              where x.IsTrain == true && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
 
         /// <summary>
         /// 获取技术交底人次数
         /// </summary>
         /// <returns></returns>
-        public static int GetTechnicalDisclosePersonNum()
+        public  int GetTechnicalDisclosePersonNum()
         {
-            var result = (from x in Funs.DB.Comprehensive_DesignDetails
-                          select x.JoinPersonNum ?? 0).ToList().Sum();
-            var q = Funs.GetNewIntOrZero(result.ToString());
-            return q;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.Comprehensive_DesignDetails
+                              select x.JoinPersonNum ?? 0).ToList().Sum();
+                var q = Funs.GetNewIntOrZero(result.ToString());
+                return q;
+            }
+            else {
+                var result = (from x in Funs.DB.Comprehensive_DesignDetails
+                              where   pids.Contains(x.ProjectId)
+                              select x.JoinPersonNum ?? 0).ToList().Sum();
+                var q = Funs.GetNewIntOrZero(result.ToString());
+                return q;
+            }
         }
 
         /// <summary>
@@ -200,13 +271,26 @@ namespace FineUIPro.Web.common
         /// </summary>
         private void getEarlyWarningCounts()
         {
-            int allCount = 0;
-            var getPersonQualitys = from x in Funs.DB.Comprehensive_InspectionPerson
-                                    where x.ValidityDate.HasValue && x.ValidityDate < DateTime.Now && x.IsOnSite == true
-                                    select x;
-            //// 预警人数
-            allCount = getPersonQualitys.Count();
-            this.spanQualityChartAnalysis.InnerHtml = allCount.ToString();
+            if (pids == null)
+            {
+                int allCount = 0;
+                var getPersonQualitys = from x in Funs.DB.Comprehensive_InspectionPerson
+                                        where x.ValidityDate.HasValue && x.ValidityDate < DateTime.Now && x.IsOnSite == true
+                                        select x;
+                //// 预警人数
+                allCount = getPersonQualitys.Count();
+                this.spanQualityChartAnalysis.InnerHtml = allCount.ToString();
+
+            }
+            else {
+                int allCount = 0;
+                var getPersonQualitys = from x in Funs.DB.Comprehensive_InspectionPerson
+                                        where x.ValidityDate.HasValue && x.ValidityDate < DateTime.Now && x.IsOnSite == true && pids.Contains(x.ProjectId)
+                                        select x;
+                //// 预警人数
+                allCount = getPersonQualitys.Count();
+                this.spanQualityChartAnalysis.InnerHtml = allCount.ToString();
+            }
         }
 
         #region 质量验收数据
@@ -214,48 +298,73 @@ namespace FineUIPro.Web.common
         /// 共检总数
         /// </summary>
         /// <returns></returns>
-        public static int getAllInspectionManagement()
+        public  int getAllInspectionManagement()
         {
-            int result = 0;
-            ;
-            //统计所给时间段的全部数量
-            //List<Model.View_CQMS_InspectionManagementDetail> managementListSunNumber =
-            //    BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(
-            //        null, null, DateTime.Parse("2001-01-01"), DateTime.Now, false);
-            var num1 = (from x in Funs.DB.ProcessControl_InspectionManagement
-                        select x).Count();
-            result = num1;
-            //int result = (from x in Funs.DB.Check_CheckControl
-            //              where x.CheckDate <= DateTime.Now && x.State == "7"
-            //              select x).Count();
-            return result;
+            if (pids == null)
+            {
+                int result = 0;
+                //统计所给时间段的全部数量
+                //List<Model.View_CQMS_InspectionManagementDetail> managementListSunNumber =
+                //    BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(
+                //        null, null, DateTime.Parse("2001-01-01"), DateTime.Now, false);
+                var num1 = (from x in Funs.DB.ProcessControl_InspectionManagement
+                            select x).Count();
+                result = num1;
+                //int result = (from x in Funs.DB.Check_CheckControl
+                //              where x.CheckDate <= DateTime.Now && x.State == "7"
+                //              select x).Count();
+                return result;
+            }
+            else {
+                int result = 0;
+                var num1 = (from x in Funs.DB.ProcessControl_InspectionManagement
+                            where  pids.Contains(x.ProjectId)
+                            select x).Count();
+                result = num1;
+              
+                return result;
+            }
         }
         /// <summary>
         /// 次合格数量
         /// </summary>
         /// <returns></returns>
-        public static int getIsOnceInspectionManagement()
+        public  int getIsOnceInspectionManagement()
         {
-            int result = 0;
-            //统计所给时间段的合格数量
-            //List<Model.View_CQMS_InspectionManagementDetail> managementListOneNumber =
-            //    BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(
-            //        null, null, DateTime.Parse("2001-01-01"), DateTime.Now, true);
-            var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
-                        where x.IsOnceQualified == true
-                        select x).Count();
-            result = num2;
+            if (pids == null)
+            {
+                int result = 0;
+                //统计所给时间段的合格数量
+                //List<Model.View_CQMS_InspectionManagementDetail> managementListOneNumber =
+                //    BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(
+                //        null, null, DateTime.Parse("2001-01-01"), DateTime.Now, true);
+                var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
+                            where x.IsOnceQualified == true
+                            select x).Count();
+                result = num2;
 
-            //int result = (from x in Funs.DB.Check_CheckControl
-            //              where x.CheckDate <= DateTime.Now && x.State != "7"
-            //              select x).Count();
-            return result;
+                //int result = (from x in Funs.DB.Check_CheckControl
+                //              where x.CheckDate <= DateTime.Now && x.State != "7"
+                //              select x).Count();
+                return result;
+            }
+            else {
+                int result = 0;
+               
+                var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
+                            where x.IsOnceQualified == true && pids.Contains(x.ProjectId)
+                            select x).Count();
+                result = num2;
+
+                    
+                return result;
+            }
         }
         /// <summary>
         /// 整改率
         /// </summary>
         /// <returns></returns>
-        public static string GetInspectionManagementZgl()
+        public  string GetInspectionManagementZgl()
         {
             string zgl = String.Format("{0:N2}", 100.0 * getIsOnceInspectionManagement() / getAllInspectionManagement());
             return zgl + "%";
@@ -269,30 +378,48 @@ namespace FineUIPro.Web.common
         /// 获取整改完成数
         /// </summary>
         /// <returns></returns>
-        public static int GetProblemCompletedNum()
+        public  int GetProblemCompletedNum()
         {
-            int result = (from x in Funs.DB.Check_CheckControl
-                          where x.CheckDate <= DateTime.Now && x.State == "7"
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                int result = (from x in Funs.DB.Check_CheckControl
+                              where x.CheckDate <= DateTime.Now && x.State == "7"
+                              select x).Count();
+                return result;
+            }
+            else {
+                int result = (from x in Funs.DB.Check_CheckControl
+                              where x.CheckDate <= DateTime.Now && x.State == "7" && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
         /// <summary>
         /// 获取未整改数
         /// </summary>
         /// <returns></returns>
-        public static int GetProblemNotCompletedNum()
+        public  int GetProblemNotCompletedNum()
         {
-            int result = (from x in Funs.DB.Check_CheckControl
-                          where x.CheckDate <= DateTime.Now && x.State != "7"
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                int result = (from x in Funs.DB.Check_CheckControl
+                              where x.CheckDate <= DateTime.Now && x.State != "7"
+                              select x).Count();
+                return result;
+            }
+            else {
+                int result = (from x in Funs.DB.Check_CheckControl
+                              where x.CheckDate <= DateTime.Now && x.State != "7" && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
 
         /// <summary>
         /// 整改率
         /// </summary>
         /// <returns></returns>
-        public static string GetProblemZgl()
+        public  string GetProblemZgl()
         {
             string zgl = String.Format("{0:N2}", 100.0 * GetProblemCompletedNum() / (GetProblemCompletedNum() + GetProblemNotCompletedNum()));
             return zgl + "%";
@@ -316,12 +443,21 @@ namespace FineUIPro.Web.common
         /// 获取问题个数
         /// </summary>
         /// <returns></returns>
-        public static int GetProblemNum()
+        public  int GetProblemNum()
         {
-            int result = (from x in Funs.DB.Check_CheckControl
-                          where x.CheckDate <= DateTime.Now
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                int result = (from x in Funs.DB.Check_CheckControl
+                              where x.CheckDate <= DateTime.Now
+                              select x).Count();
+                return result;
+            }
+            else {
+                int result = (from x in Funs.DB.Check_CheckControl
+                              where x.CheckDate <= DateTime.Now && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
         #endregion
 
@@ -329,114 +465,216 @@ namespace FineUIPro.Web.common
         /// 获取焊工总数
         /// </summary>
         /// <returns></returns>
-        public static int GetWelderNum()
+        public  int GetWelderNum()
         {
-            int result = (from x in Funs.DB.BS_Welder
-                          where x.WED_IfOnGuard == true
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                int result = (from x in Funs.DB.BS_Welder
+                              where x.WED_IfOnGuard == true
+                              select x).Count();
+                return result;
+            }
+            else
+            {
+                int result = (from x in Funs.DB.BS_Welder
+                              where x.WED_IfOnGuard == true && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
         /// <summary>
         /// 获取总达因数
         /// </summary>
         /// <returns></returns>
-        public static int GetTotalDineNum()
+        public  int GetTotalDineNum()
         {
-            int result = 0;
-            var getD1 = from x in Funs.DB.HJGL_FL_TotalQuantity
-                        select x;
-            if (getD1.Count() > 0)
+            if (pids == null)
             {
-                foreach (var item in getD1)
+                int result = 0;
+                var getD1 = from x in Funs.DB.HJGL_FL_TotalQuantity
+                            select x;
+                if (getD1.Count() > 0)
                 {
-                    result += Funs.GetNewIntOrZero(item.TotalWeldQuantity.Split('.')[0]);
+                    foreach (var item in getD1)
+                    {
+                        result += Funs.GetNewIntOrZero(item.TotalWeldQuantity.Split('.')[0]);
+                    }
                 }
+                else
+                {
+                    var getD2 = (from x in Funs.DB.HJGL_FL_Data
+                                 orderby x.CompileDate descending
+                                 select x).FirstOrDefault();
+                    if (getD2 != null)
+                    {
+                        result = Funs.GetNewIntOrZero(getD2.TotalWeldQuantity.Split('.')[0]);
+                    }
+                }
+                return result;
             }
             else
             {
-                var getD2 = (from x in Funs.DB.HJGL_FL_Data
-                             orderby x.CompileDate descending
-                             select x).FirstOrDefault();
-                if (getD2 != null)
+                int result = 0;
+                var getD1 = from x in Funs.DB.HJGL_FL_TotalQuantity
+                            where pids.Contains(x.ProjectId)
+                            select x;
+                if (getD1.Count() > 0)
                 {
-                    result = Funs.GetNewIntOrZero(getD2.TotalWeldQuantity.Split('.')[0]);
+                    foreach (var item in getD1)
+                    {
+                        result += Funs.GetNewIntOrZero(item.TotalWeldQuantity.Split('.')[0]);
+                    }
                 }
+                else
+                {
+                    var getD2 = (from x in Funs.DB.HJGL_FL_Data
+                                 where pids.Contains(x.ProjectId)
+                                 orderby x.CompileDate descending
+                                 select x).FirstOrDefault();
+                    if (getD2 != null)
+                    {
+                        result = Funs.GetNewIntOrZero(getD2.TotalWeldQuantity.Split('.')[0]);
+                    }
+                }
+                return result;
             }
-            return result;
         }
         /// <summary>
         /// 获取完成达因数
         /// </summary>
         /// <returns></returns>
-        public static int GetCompleteDineNum()
+        public  int GetCompleteDineNum()
         {
-            int result = 0;
-
-            var getD1 = from x in Funs.DB.HJGL_FL_TotalQuantity
-
-                        select x;
-            if (getD1.Count() > 0)
+            if (pids == null)
             {
-                foreach (var item in getD1)
-                {
-                    result += Funs.GetNewIntOrZero(item.TotalCompleted.Split('.')[0]);
-                }
-            }
-            else
-            {
-                var getD2 = (from x in Funs.DB.HJGL_FL_Data
-                             orderby x.CompileDate descending
-                             select x).FirstOrDefault();
-                if (getD2 != null)
-                {
-                    result = Funs.GetNewIntOrZero(getD2.TotalCompleted.Split('.')[0]);
-                }
+                int result = 0;
 
+                var getD1 = from x in Funs.DB.HJGL_FL_TotalQuantity
+
+                            select x;
+                if (getD1.Count() > 0)
+                {
+                    foreach (var item in getD1)
+                    {
+                        result += Funs.GetNewIntOrZero(item.TotalCompleted.Split('.')[0]);
+                    }
+                }
+                else
+                {
+                    var getD2 = (from x in Funs.DB.HJGL_FL_Data
+                                 orderby x.CompileDate descending
+                                 select x).FirstOrDefault();
+                    if (getD2 != null)
+                    {
+                        result = Funs.GetNewIntOrZero(getD2.TotalCompleted.Split('.')[0]);
+                    }
+
+                }
+                return result;
+            }
+            else {
+                int result = 0;
+
+                var getD1 = from x in Funs.DB.HJGL_FL_TotalQuantity
+                            where pids.Contains(x.ProjectId)
+                            select x;
+                if (getD1.Count() > 0)
+                {
+                    foreach (var item in getD1)
+                    {
+                        result += Funs.GetNewIntOrZero(item.TotalCompleted.Split('.')[0]);
+                    }
+                }
+                else
+                {
+                    var getD2 = (from x in Funs.DB.HJGL_FL_Data
+                                 where pids.Contains(x.ProjectId)
+                                 orderby x.CompileDate descending
+                                 select x).FirstOrDefault();
+                    if (getD2 != null)
+                    {
+                        result = Funs.GetNewIntOrZero(getD2.TotalCompleted.Split('.')[0]);
+                    }
+
+                }
+                return result;
             }
-            return result;
         }
         /// <summary>
         /// 获取总片数
         /// </summary>
         /// <returns></returns>
-        public static int GetTotalFilmNum()
+        public int GetTotalFilmNum()
         {
-            //int result = Convert.ToInt32((from x in Funs.DB.CH_CheckItem
-            //                              join y in Funs.DB.CH_Check on x.CHT_CheckID equals y.CHT_CheckID
-            //                              select x.CHT_TotalFilm).ToList().Sum());
-            int result = 0;
-
-            var getD2 = (from x in Funs.DB.HJGL_FL_Data
-                         orderby x.CompileDate descending
-                         select x).FirstOrDefault();
-            if (getD2 != null)
+            if (pids == null)
             {
-                result = Funs.GetNewIntOrZero(getD2.OneTimeFilmAmount.Split('.')[0]);
+                //int result = Convert.ToInt32((from x in Funs.DB.CH_CheckItem
+                //                              join y in Funs.DB.CH_Check on x.CHT_CheckID equals y.CHT_CheckID
+                //                              select x.CHT_TotalFilm).ToList().Sum());
+                int result = 0;
+
+                var getD2 = (from x in Funs.DB.HJGL_FL_Data
+                             orderby x.CompileDate descending
+                             select x).FirstOrDefault();
+                if (getD2 != null)
+                {
+                    result = Funs.GetNewIntOrZero(getD2.OneTimeFilmAmount.Split('.')[0]);
+                }
+                return result;
+            }
+            else
+            {
+                int result = 0;
+
+                var getD2 = (from x in Funs.DB.HJGL_FL_Data
+                             where pids.Contains(x.ProjectId)
+                             orderby x.CompileDate descending
+                             select x).FirstOrDefault();
+                if (getD2 != null)
+                {
+                    result = Funs.GetNewIntOrZero(getD2.OneTimeFilmAmount.Split('.')[0]);
+                }
+                return result;
             }
-            return result;
         }
         /// <summary>
         /// 获取合格片数
         /// </summary>
         /// <returns></returns>
-        public static int GetOKFilmNum()
+        public  int GetOKFilmNum()
         {
-            int result = 0;
-            var getD2 = (from x in Funs.DB.HJGL_FL_Data
-                         orderby x.CompileDate descending
-                         select x).FirstOrDefault();
-            if (getD2 != null)
+            if (pids == null)
             {
-                result = Funs.GetNewIntOrZero(getD2.OneTimeFilmQualifiedAmount.Split('.')[0]);
+                int result = 0;
+                var getD2 = (from x in Funs.DB.HJGL_FL_Data
+                             orderby x.CompileDate descending
+                             select x).FirstOrDefault();
+                if (getD2 != null)
+                {
+                    result = Funs.GetNewIntOrZero(getD2.OneTimeFilmQualifiedAmount.Split('.')[0]);
+                }
+                return result;
+            }
+            else
+            {
+                int result = 0;
+                var getD2 = (from x in Funs.DB.HJGL_FL_Data
+                             where pids.Contains(x.ProjectId)
+                             orderby x.CompileDate descending
+                             select x).FirstOrDefault();
+                if (getD2 != null)
+                {
+                    result = Funs.GetNewIntOrZero(getD2.OneTimeFilmQualifiedAmount.Split('.')[0]);
+                }
+                return result;
             }
-            return result;
         }
 
         /// <summary>
         /// 一次拍片合格率
         /// </summary>
         /// <returns></returns>
-        public static string GetOKFilmHgl()
+        public  string GetOKFilmHgl()
         {
             string zgl = "0";
             if (GetOKFilmNum() > 0)
@@ -459,7 +697,10 @@ namespace FineUIPro.Web.common
         private void getInspectionManagementInfo()
         {
 
-            var q = (from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId && x.CNProfessionalId != BLL.Const.CNProfessionalHSEId orderby x.SortIndex select x).ToList();
+            var q=(from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId && x.CNProfessionalId != BLL.Const.CNProfessionalHSEId orderby x.SortIndex select x).ToList();
+            
+            
+
             foreach (var item in q)
             {
                 //获取专业
@@ -469,9 +710,27 @@ namespace FineUIPro.Web.common
                 //            join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
                 //            where y.CNProfessionalId == item.CNProfessionalId
                 //            select x).ToList().Count;
-                var num1 = (from x in Funs.DB.ProcessControl_InspectionManagement
+                var num1 = 0;
+                var num2 = 0;
+                if (pids == null)
+                {
+                    num1 = (from x in Funs.DB.ProcessControl_InspectionManagement
                             where x.CNProfessionalId == item.CNProfessionalId
                             select x).Count();
+                     num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
+                                where x.CNProfessionalId == item.CNProfessionalId && x.IsOnceQualified == true
+                                select x).Count();
+                }
+                else {
+                    num1 = (from x in Funs.DB.ProcessControl_InspectionManagement
+                            where x.CNProfessionalId == item.CNProfessionalId && pids.Contains(x.ProjectId)
+                            select x).Count();
+                    num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
+                            where x.CNProfessionalId == item.CNProfessionalId && x.IsOnceQualified == true && pids.Contains(x.ProjectId)
+                            select x).Count();
+                }
+                    
+                    
                 InspectionManagementSumCount += "'" + num1 + "',";
 
                 //根据专业获取合格数
@@ -479,9 +738,7 @@ namespace FineUIPro.Web.common
                 //            join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
                 //            where y.CNProfessionalId == item.CNProfessionalId &&  y.IsOnceQualified==true
                 //            select x).ToList().Count;
-                var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
-                            where x.CNProfessionalId == item.CNProfessionalId && x.IsOnceQualified == true
-                            select x).Count();
+              
                 InspectionManagementOkCount += "'" + num2 + "',";
 
                 //一次验收合格率
@@ -514,29 +771,56 @@ namespace FineUIPro.Web.common
         protected string ncrCount;
         private void getNcrInfo()
         {
-            //闭环项 有完成日期的
-            //var num1 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.CompleteDate != null).Count();
-            //var num2 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.CompleteDate == null).Count(); 
-            var num1 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.ImplementationFrontState == "已闭合").Count();
-            var num2 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.ImplementationFrontState == "整改中").Count();
-            ncrZgbhx = num1.ToString();
-            ncrwZgbhx = num2.ToString();
-            if ((num1 + num2) > 0)
+            if (pids==null)
             {
-                ncrZgl = String.Format("{0:N2}", 100.0 * num1 / (num1 + num2)) + "%";
-            }
+                //闭环项 有完成日期的
+                //var num1 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.CompleteDate != null).Count();
+                //var num2 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.CompleteDate == null).Count(); 
+                var num1 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.ImplementationFrontState == "已闭合").Count();
+                var num2 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.ImplementationFrontState == "整改中").Count();
+                ncrZgbhx = num1.ToString();
+                ncrwZgbhx = num2.ToString();
+                if ((num1 + num2) > 0)
+                {
+                    ncrZgl = String.Format("{0:N2}", 100.0 * num1 / (num1 + num2)) + "%";
+                }
 
-            //加载专业
-            var list = (from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId && x.CNProfessionalId!=BLL.Const.CNProfessionalHSEId orderby x.SortIndex select x).ToList();
-            foreach (var item in list)
-            {
-                ncrZy += "'" + item.ProfessionalName + "',";
-                //根据专业加载数据量
-                var num3 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.CNProfessionalId == item.CNProfessionalId).Count();
-                ncrCount += "'" + num3 + "',";
+                //加载专业
+                var list = (from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId && x.CNProfessionalId != BLL.Const.CNProfessionalHSEId orderby x.SortIndex select x).ToList();
+                foreach (var item in list)
+                {
+                    ncrZy += "'" + item.ProfessionalName + "',";
+                    //根据专业加载数据量
+                    var num3 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.CNProfessionalId == item.CNProfessionalId).Count();
+                    ncrCount += "'" + num3 + "',";
+                }
+                ncrZy = ncrZy.TrimEnd(',');
+                ncrCount = ncrCount.TrimEnd(',');
             }
-            ncrZy = ncrZy.TrimEnd(',');
-            ncrCount = ncrCount.TrimEnd(',');
+            else
+            {
+                var num1 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.ImplementationFrontState == "已闭合" && pids.Contains(x.ProjectId)).Count();
+                var num2 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.ImplementationFrontState == "整改中" && pids.Contains(x.ProjectId)).Count();
+                ncrZgbhx = num1.ToString();
+                ncrwZgbhx = num2.ToString();
+                if ((num1 + num2) > 0)
+                {
+                    ncrZgl = String.Format("{0:N2}", 100.0 * num1 / (num1 + num2)) + "%";
+                }
+
+                //加载专业
+                var list = (from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId && x.CNProfessionalId != BLL.Const.CNProfessionalHSEId orderby x.SortIndex select x).ToList();
+                foreach (var item in list)
+                {
+                    ncrZy += "'" + item.ProfessionalName + "',";
+                    //根据专业加载数据量
+                    var num3 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.CNProfessionalId == item.CNProfessionalId && pids.Contains(x.ProjectId)).Count();
+                    ncrCount += "'" + num3 + "',";
+                }
+                ncrZy = ncrZy.TrimEnd(',');
+                ncrCount = ncrCount.TrimEnd(',');
+            }
+           
 
         }
         #endregion

SGGL/FineUIPro.Web/index.aspx

@@ -43,13 +43,7 @@
             background-color: transparent !important;
         }
 
-        .projcet-select {
-            float: left;
-            height: 40px;
-            flex: 1;
-            display: flex;
-            justify-content: flex-end;
-        }
+
 
         .bgbtn {
             /*background-image: url(../res/images/login.png) !important;*/
@@ -176,12 +170,122 @@
             border: none !important;
             padding: 0 !important;
         }
-        .f-btn .f-btn-text{
-                        color: #fff;
+
+        .f-btn .f-btn-text {
+            color: #fff;
+        }
+
+        .n-btns-r .n-btn-l-act {
+            background-image: url(./res/images/03.png) !important;
+        }
+    </style>
+    <style>
+        .projcet-select {
+            position: absolute;
+            bottom: -13%;
+            left: 50%;
+            transform: translateX(-50%);
+        }
+
+        h1 {
+        }
+
+        .projcet-select input {
+            padding-right: 23px;
+            font-size: 14px;
+            padding: 0;
+            border:none;
+            color:#ffffff;
+                padding-left: 10px;
+                 background: rgba(0,0,0,0);
 
         }
-        .n-btns-r .n-btn-l-act{
-            background-image: url(./res/images/03.png) !important;
+        .projcet-select input::placeholder {
+  color: #ffffff;
+}
+        .projcet-select .f-field-triggerbox-icons {
+            font-size: 16px;
+            position: absolute;
+            bottom: 3%;
+            margin: 0;
+            padding: 0;
+        }
+        .projcet-select .f-field-triggerbox-icons i{
+            position: absolute;
+    bottom: 0;
+    right: 0;
+        }
+
+       .projcet-select .f-state-hover, .f-widget-content .f-state-hover, .f-widget-header .f-state-hover, .f-state-focus, .f-widget-content .f-state-focus, .f-widget-header .f-state-focus{
+           background: rgba(0,0,0,0);
+           border:none
+        }
+       .projcet-select  .f-panel.f-panel-noheader.f-panel-noborder, .f-panel.f-panel-noheader.f-panel-noborder>.f-panel-bodyct>.f-panel-body{
+           font-size: 14px;
+       }
+      
+       .f-field-body-cell-inner{
+           font-size: 14px;
+       }
+       .grid1_class .f-field-body-cell-inner input{
+           padding: 2px 10px;
+       }
+        .grid1_class .f-state-hover {
+           border: none;
+        }
+        .grid1_toolbar {
+            background:#000231
+        }
+        
+      .grid1_class thead{
+              background: #d7ebf9;
+                color: #18A6F1;
+        }
+
+        .grid1_toolbar input {
+             background:#000231
+        }
+        .grid1_toolbar .f-corner-all {
+             background:#000231
+        }
+
+       /*表格第一行颜色*/
+         .f-grid-row-selected{
+             background-color:#E4F2FF !important;
+             color:black;
+                 
+         }
+         /*表格单行颜色*/
+        .f-grid-row{
+            background-color:#E4F2FF;
+             color:black;
+        }
+
+        /*各行颜色*/
+        .f-grid-row-alt {
+            background-color: #ffffff !important;
+             color:black;
+        }
+
+        .f-state-active, .f-widget-content .f-state-active, .f-widget-header .f-state-active {
+        
+            color:black;
+        }
+
+        .f-state-active .f-icon {
+    color: darkcyan;
+}
+
+        .grid1_class .f-state-hover {
+            color:black;
+            background: #99e7ff !important;
+            background: none;
+        
+        }
+
+        .grid1_class .f-grid-bodyct {
+        
+          background:#000231 !important
         }
     </style>
 </head>
@@ -196,88 +300,151 @@
                         <div class="header">
                             <div class="nav-left">
                                 <div class="nav-btn t-btns">
-                                    <div class="t-btn t-btn-act" id="div_xmgk" onclick="changeHead(0)" style="cursor:pointer">项目概况
+                                    <div class="t-btn t-btn-act" id="div_xmgk" onclick="changeHead(0)" style="cursor: pointer">
+                                        项目概况
                                         <f:Button runat="server" CssClass="bgbtntop" OnClick="btnXmgk_Click" Hidden="true"
-                                                  EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btn_xmgk"
-                                             OnClientClick="parent.removeActiveTab();">
-                                          </f:Button></div>
-                                    <div class="t-btn" id="div_aqsc" onclick="changeHead(1)" style="cursor:pointer">安全生产
-                                        <f:Button runat="server" CssClass="bgbtntop" OnClick="btnAqsc_Click" Hidden="true"
-                                                  EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btn_aqsc"
-                                             OnClientClick="parent.removeActiveTab();">
-                                          </f:Button>
+                                            EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btn_xmgk"
+                                            OnClientClick="parent.removeActiveTab();">
+                                        </f:Button>
                                     </div>
-                                    <div class="t-btn" id="div_zlgl" onclick="changeHead(2)" style="cursor:pointer">质量管理
+                                    <div class="t-btn" id="div_aqsc" onclick="changeHead(1)" style="cursor: pointer">
+                                        安全生产
+                                        <f:Button runat="server" CssClass="bgbtntop" OnClick="btnAqsc_Click" Hidden="true"
+                                            EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btn_aqsc"
+                                            OnClientClick="parent.removeActiveTab();">
+                                        </f:Button>
+                                    </div>
+                                    <div class="t-btn" id="div_zlgl" onclick="changeHead(2)" style="cursor: pointer">
+                                        质量管理
                                         <f:Button runat="server" CssClass="bgbtntop" OnClick="btnZlgl_Click" Hidden="true"
-                                                  EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btn_zlgl"
-                                             OnClientClick="parent.removeActiveTab();">
-                                          </f:Button>
+                                            EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btn_zlgl"
+                                            OnClientClick="parent.removeActiveTab();">
+                                        </f:Button>
                                     </div>
                                 </div>
                                 <div class="nav-btn n-btns-l">
-                                    <div class="n-btn-l" >
-                                        <f:Button runat="server"  Text="项目清单" ID="btnProject" OnClick="btnProject_Click"
-                                                        EnablePostBack="true"  EnableDefaultState="true" EnableDefaultCorner="false" OnClientClick="parent.removeActiveTab();">
-                                                    </f:Button></div>
-                                    <div class="n-btn-l" >
+                                    <div class="n-btn-l">
+                                        <f:Button runat="server" Text="项目清单" ID="btnProject" OnClick="btnProject_Click"
+                                            EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" OnClientClick="parent.removeActiveTab();">
+                                        </f:Button>
+                                    </div>
+                                    <div class="n-btn-l">
                                         <f:Button runat="server" Text="大数据中心" ID="btnDigData" OnClick="btnDigData_Click"
-                                                        EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" OnClientClick="parent.removeActiveTab();">
-                                                    </f:Button></div>
-                                    <div class="n-btn-l" >
+                                            EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" OnClientClick="parent.removeActiveTab();">
+                                        </f:Button>
+                                    </div>
+                                    <div class="n-btn-l">
                                         <f:Button runat="server" Text="总部检查" ID="btnServer" OnClick="btnServer_Click"
-                                                        EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" OnClientClick="parent.removeActiveTab();">
-                                                    </f:Button></div>
+                                            EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" OnClientClick="parent.removeActiveTab();">
+                                        </f:Button>
+                                    </div>
                                 </div>
                             </div>
-                            <div class="nav-center">
+                            <div class="nav-center" style="position: relative;">
                                 <h1>中国五环工程有限公司智慧施工管理信息系统（公司级）<f:Button runat="server" CssClass="bgbtn_head" EnablePostBack="true" OnClick="btnHome_Click"
-                                            EnableDefaultState="true" EnableDefaultCorner="false" ID="btnHome" OnClientClick="parent.removeActiveTab();">
-                                        </f:Button></h1>
+                                    EnableDefaultState="true" EnableDefaultCorner="false" ID="btnHome" OnClientClick="parent.removeActiveTab();">
+                                </f:Button>
+                                </h1>
+
+                                <div class="projcet-select">
+                                    <f:DropDownBox runat="server" ID="drpProject" Label="" EmptyText="如要筛选项目请点击此处选择" MatchFieldWidth="false" LabelAlign="Left"
+                                        AutoPostBack="true" OnTextChanged="drpProject_SelectedIndexChanged" Width="500px" 
+                                        EnableMultiSelect="true">
+                                        <PopPanel>
+                                            <f:Grid ID="Grid1" ShowBorder="false" ShowHeader="false" runat="server" DataIDField="ProjectId" DataTextField="ProjectName"
+                                                DataKeyNames="ProjectId" AllowSorting="true" SortField="ProjectCode" SortDirection="ASC" CssClass="grid1_class"
+                                                Hidden="true" Width="900px" Height="400px" PageSize="300" EnableCheckBoxSelect="true" EnableMultiSelect="true">
+                                                <Toolbars>
+                                                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server" CssClass="grid1_toolbar">
+                                                        <Items>
+                                                            <f:TextBox runat="server" ID="txtProjectName" EmptyText="按名称查询" FocusOnPageLoad="true"
+                                                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="100px" CssClass="txtSearch">
+                                                            </f:TextBox>
+                                                            <f:TextBox runat="server" ID="txtProjectCode" EmptyText="按编号查询" FocusOnPageLoad="true"
+                                                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="100px" CssClass="txtSearch">
+                                                            </f:TextBox>
+                                                            <f:RadioButtonList runat="server" ID="ckState" Width="450px"
+                                                                AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                                                <f:RadioItem Text="在建" Value="1" Selected="true" />
+                                                                <f:RadioItem Text="停工" Value="2" />
+                                                                <f:RadioItem Text="竣工" Value="3" />
+                                                            </f:RadioButtonList>
+                                                        </Items>
+                                                    </f:Toolbar>
+                                                </Toolbars>
+                                                <Columns>
+                                                    <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center" TextAlign="Center" />
+
+                                                    <f:RenderField Width="200px" ColumnID="ProjectCode" DataField="ProjectCode" EnableFilter="true"
+                                                        FieldType="String" HeaderText="项目编号" HeaderTextAlign="Center" SortField="ProjectCode"
+                                                        TextAlign="Left">
+                                                    </f:RenderField>
+                                                    <f:RenderField Width="620px" ColumnID="ProjectName" DataField="ProjectName" EnableFilter="true"
+                                                        FieldType="String" HeaderText="项目名称" HeaderTextAlign="Center"
+                                                        TextAlign="Left">
+                                                    </f:RenderField>
+                                                </Columns>
+                                            </f:Grid>
+                                        </PopPanel>
+                                    </f:DropDownBox>
+                                </div>
                             </div>
+
+
+
+
                             <div class="nav-right">
                                 <div class="btns t-btns t-btn-r">
-                                    <div class=" t-btn1 iconfont icon-yonghu" onclick="PersonalFunction()" style="cursor:pointer"><span>我的
+                                    <div class=" t-btn1 iconfont icon-yonghu" onclick="PersonalFunction()" style="cursor: pointer">
+                                        <span>我的
                                         <f:Button runat="server" CssClass="bgbtntop" IconFont="User" OnClick="btnPersonal_Click" Hidden="true"
-                                                  EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnPersonal" OnClientClick="parent.removeActiveTab();">
-                                          </f:Button>
-                                                                               </span></div>
-                                    <div class="t-btn1 iconfont icon-shezhi" onclick="btnSysSetFunction()" style="cursor:pointer"><span>设置
+                                            EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnPersonal" OnClientClick="parent.removeActiveTab();">
+                                        </f:Button>
+                                        </span>
+                                    </div>
+                                    <div class="t-btn1 iconfont icon-shezhi" onclick="btnSysSetFunction()" style="cursor: pointer">
+                                        <span>设置
                                         <f:Button runat="server" CssClass="bgbtntop" IconFont="Gear" OnClick="btnSysSet_Click" Hidden="true"
-                                                    EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnSysSet" OnClientClick="parent.removeActiveTab();">
-                                                </f:Button>
-                                                                              </span></div>
-                                    <div class="t-btn1 iconfont icon-tuichu" onclick="SignOutFunction()" style="cursor:pointer"><span>退出
+                                            EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnSysSet" OnClientClick="parent.removeActiveTab();">
+                                        </f:Button>
+                                        </span>
+                                    </div>
+                                    <div class="t-btn1 iconfont icon-tuichu" onclick="SignOutFunction()" style="cursor: pointer">
+                                        <span>退出
                                         <f:Button runat="server" CssClass="bgbtntop" IconFont="PowerOff" Hidden="true"
-                                                    EnablePostBack="false" EnableDefaultState="true" EnableDefaultCorner="false" ID="Button18">
-                                                    <Listeners>
-                                                        <f:Listener Event="click" Handler="onToolSignOutClick" />
-                                                    </Listeners>
-                                                </f:Button>
-                                                                                                                                </span></div>
-                                    <div class="t-btn1 iconfont icon-quanping_o ab" style="cursor:pointer"><span>全屏
+                                            EnablePostBack="false" EnableDefaultState="true" EnableDefaultCorner="false" ID="Button18">
+                                            <Listeners>
+                                                <f:Listener Event="click" Handler="onToolSignOutClick" />
+                                            </Listeners>
+                                        </f:Button>
+                                        </span>
+                                    </div>
+                                    <div class="t-btn1 iconfont icon-quanping_o ab" style="cursor: pointer">
+                                        <span>全屏
 
-                                                                                                        </span></div>
+                                        </span>
+                                    </div>
                                     <div>
-                                        <f:Button runat="server" CssClass="bgbtntop" Text="" ToolTip="刷新菜单"  OnClick="btnRetweet_Click"
-                                                    EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnRetweet" OnClientClick="parent.removeActiveTab();">
-                                                </f:Button>
+                                        <f:Button runat="server" CssClass="bgbtntop" Text="" ToolTip="刷新菜单" OnClick="btnRetweet_Click"
+                                            EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnRetweet" OnClientClick="parent.removeActiveTab();">
+                                        </f:Button>
                                     </div>
                                 </div>
                                 <div class="nav-btn n-btns-r">
-                                    <div class="n-btn-r" >
+                                    <div class="n-btn-r">
                                         <f:Button runat="server" Text="通知管理" ID="btnNotice" OnClick="btnNotice_Click"
-                                                        EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" OnClientClick="parent.removeActiveTab();">
-                                                    </f:Button>
+                                            EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" OnClientClick="parent.removeActiveTab();">
+                                        </f:Button>
                                     </div>
-                                    <div class="n-btn-r" >
+                                    <div class="n-btn-r">
                                         <f:Button runat="server" Text="员工管理" ID="btnPerson" OnClick="btnPerson_Click"
-                                                        EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" OnClientClick="parent.removeActiveTab();">
-                                                    </f:Button>
+                                            EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" OnClientClick="parent.removeActiveTab();">
+                                        </f:Button>
                                     </div>
-                                    <div class="n-btn-r" >
+                                    <div class="n-btn-r">
                                         <f:Button runat="server" Text="综合管理" ID="btnZHGL" OnClick="btnZHGL_Click"
-                                                        EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" OnClientClick="parent.removeActiveTab();">
-                                                    </f:Button>
+                                            EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" OnClientClick="parent.removeActiveTab();">
+                                        </f:Button>
                                     </div>
                                 </div>
                             </div>

SGGL/FineUIPro.Web/index.aspx.cs

@@ -1,5 +1,6 @@
 using BLL;
 using System;
+using System.Linq;
 using System.Web;
 using System.Web.UI.WebControls;
 using System.Xml;
@@ -299,6 +300,9 @@ namespace FineUIPro.Web
         {
             if (!IsPostBack)
             {
+                //选择项目为空
+                CurrUser.CompanyProjectId = "";
+
                 this.MenuSwitchMethod(Request.Params["menuType"]);
                 this.InitMenuStyleButton();
                 this.InitMenuModeButton();
@@ -319,6 +323,8 @@ namespace FineUIPro.Web
                     this.Tab1.IFrameUrl = "~/common/main2.aspx";
                     this.hdHomePage.Text = "2";
                 }
+
+                BindGrid(this.ckState.SelectedValue, this.txtProjectName.Text.Trim(), txtProjectCode.Text.Trim());
             }
         }
 
@@ -545,5 +551,55 @@ namespace FineUIPro.Web
         {
             this.Tab1.IFrameUrl = "~/common/main_new1.aspx";
         }
+
+        #region 公司级新增项目筛选
+        /// <summary>
+        /// 项目切换
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void drpProject_SelectedIndexChanged(object sender, EventArgs e) {
+            CurrUser.CompanyProjectId = string.Join(",", drpProject.Values);
+            this.Tab1.RefreshIFrame();
+
+        }
+
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e) {
+            BindGrid(this.ckState.SelectedValue, this.txtProjectName.Text.Trim(), txtProjectCode.Text.Trim());
+        }
+
+        /// <summary>
+        /// 加载项目
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <param name="projectId"></param>
+        /// <param name="ProjectAttribute"></param>
+        /// <param name="projectState"></param>
+        /// <param name="projectName"></param>
+        /// <param name="unitId"></param>
+        /// <param name="ProjectCode"></param>
+        private void BindGrid(string projectState, string projectName,string ProjectCode = "")
+        {
+            var projectlist = BLL.ProjectService.GetUnEndProjectByUserIdDropDownList(projectState, projectName, ProjectCode);
+            foreach (var item in projectlist)
+            {
+                item.ProjectType = BLL.UnitService.GetUnitCodeByUnitId(item.UnitId);
+                item.UnitId = BLL.UnitService.GetUnitNameByUnitId(item.UnitId);
+
+            }
+            //第一级按分公司编号顺序排序第二级排序为项目编号倒序排列。
+            projectlist = projectlist.OrderBy(x => x.ProjectType).ThenByDescending(x => x.ProjectCode).ToList();
+
+            Grid1.RecordCount = projectlist.Count;
+            var table = this.GetPagedDataTable(Grid1, projectlist);
+            Grid1.DataSource = projectlist;
+            Grid1.DataBind();
+        }
+        #endregion
     }
 }

SGGL/FineUIPro.Web/index.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web {
-    
-    
-    public partial class index {
-        
+namespace FineUIPro.Web
+{
+
+
+    public partial class index
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// topPanel 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ContentPanel topPanel;
-        
+
         /// <summary>
         /// ContentPanel1 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ContentPanel ContentPanel1;
-        
+
         /// <summary>
         /// btn_xmgk 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btn_xmgk;
-        
+
         /// <summary>
         /// btn_aqsc 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btn_aqsc;
-        
+
         /// <summary>
         /// btn_zlgl 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btn_zlgl;
-        
+
         /// <summary>
         /// btnProject 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnProject;
-        
+
         /// <summary>
         /// btnDigData 控件。
         /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnDigData;
-        
+
         /// <summary>
         /// btnServer 控件。
         /// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnServer;
-        
+
         /// <summary>
         /// btnHome 控件。
         /// </summary>
@@ -119,7 +121,61 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnHome;
-        
+
+        /// <summary>
+        /// drpProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownBox drpProject;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// txtProjectName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProjectName;
+
+        /// <summary>
+        /// txtProjectCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProjectCode;
+
+        /// <summary>
+        /// ckState 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList ckState;
+
         /// <summary>
         /// btnPersonal 控件。
         /// </summary>
@@ -128,7 +184,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnPersonal;
-        
+
         /// <summary>
         /// btnSysSet 控件。
         /// </summary>
@@ -137,7 +193,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSysSet;
-        
+
         /// <summary>
         /// Button18 控件。
         /// </summary>
@@ -146,7 +202,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button Button18;
-        
+
         /// <summary>
         /// btnRetweet 控件。
         /// </summary>
@@ -155,7 +211,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnRetweet;
-        
+
         /// <summary>
         /// btnNotice 控件。
         /// </summary>
@@ -164,7 +220,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNotice;
-        
+
         /// <summary>
         /// btnPerson 控件。
         /// </summary>
@@ -173,7 +229,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnPerson;
-        
+
         /// <summary>
         /// btnZHGL 控件。
         /// </summary>
@@ -182,7 +238,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnZHGL;
-        
+
         /// <summary>
         /// leftPanel 控件。
         /// </summary>
@@ -191,7 +247,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel leftPanel;
-        
+
         /// <summary>
         /// tbYear 控件。
         /// </summary>
@@ -200,7 +256,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar tbYear;
-        
+
         /// <summary>
         /// drpYear 控件。
         /// </summary>
@@ -209,7 +265,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpYear;
-        
+
         /// <summary>
         /// leftPanelToolCollapse 控件。
         /// </summary>
@@ -218,7 +274,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Tool leftPanelToolCollapse;
-        
+
         /// <summary>
         /// leftPanelToolGear 控件。
         /// </summary>
@@ -227,7 +283,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Tool leftPanelToolGear;
-        
+
         /// <summary>
         /// btnExpandAll 控件。
         /// </summary>
@@ -236,7 +292,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnExpandAll;
-        
+
         /// <summary>
         /// btnCollapseAll 控件。
         /// </summary>
@@ -245,7 +301,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnCollapseAll;
-        
+
         /// <summary>
         /// MenuMode 控件。
         /// </summary>
@@ -254,7 +310,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton MenuMode;
-        
+
         /// <summary>
         /// MenuModeNormal 控件。
         /// </summary>
@@ -263,7 +319,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuCheckBox MenuModeNormal;
-        
+
         /// <summary>
         /// MenuModeCompact 控件。
         /// </summary>
@@ -272,7 +328,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuCheckBox MenuModeCompact;
-        
+
         /// <summary>
         /// MenuModeLarge 控件。
         /// </summary>
@@ -281,7 +337,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuCheckBox MenuModeLarge;
-        
+
         /// <summary>
         /// MenuStyle 控件。
         /// </summary>
@@ -290,7 +346,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton MenuStyle;
-        
+
         /// <summary>
         /// MenuStyleTree 控件。
         /// </summary>
@@ -299,7 +355,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuCheckBox MenuStyleTree;
-        
+
         /// <summary>
         /// MenuStyleMiniModeTree 控件。
         /// </summary>
@@ -308,7 +364,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuCheckBox MenuStyleMiniModeTree;
-        
+
         /// <summary>
         /// MenuStylePlainTree 控件。
         /// </summary>
@@ -317,7 +373,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuCheckBox MenuStylePlainTree;
-        
+
         /// <summary>
         /// MenuLang 控件。
         /// </summary>
@@ -326,7 +382,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton MenuLang;
-        
+
         /// <summary>
         /// MenuLangZHCN 控件。
         /// </summary>
@@ -335,7 +391,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuCheckBox MenuLangZHCN;
-        
+
         /// <summary>
         /// mainTabStrip 控件。
         /// </summary>
@@ -344,7 +400,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TabStrip mainTabStrip;
-        
+
         /// <summary>
         /// Tab1 控件。
         /// </summary>
@@ -353,7 +409,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Tab Tab1;
-        
+
         /// <summary>
         /// toolRefresh 控件。
         /// </summary>
@@ -362,7 +418,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Tool toolRefresh;
-        
+
         /// <summary>
         /// toolNewWindow 控件。
         /// </summary>
@@ -371,7 +427,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Tool toolNewWindow;
-        
+
         /// <summary>
         /// toolMaximize 控件。
         /// </summary>
@@ -380,7 +436,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Tool toolMaximize;
-        
+
         /// <summary>
         /// toolSignOut 控件。
         /// </summary>
@@ -389,7 +445,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Tool toolSignOut;
-        
+
         /// <summary>
         /// windowCustomQuery 控件。
         /// </summary>
@@ -398,7 +454,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window windowCustomQuery;
-        
+
         /// <summary>
         /// hdHomePage 控件。
         /// </summary>
@@ -407,7 +463,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hdHomePage;
-        
+
         /// <summary>
         /// btnChangeHomePage 控件。
         /// </summary>
@@ -416,7 +472,7 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnChangeHomePage;
-        
+
         /// <summary>
         /// XmlDataSource1 控件。
         /// </summary>

SGGL/Model/APIItem/AnBang/PersonInput.cs

@@ -0,0 +1,134 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model.AnBnag
+{
+    public class PersonInput
+    {
+
+        /// <summary>
+        /// 主键id
+        /// </summary>
+        public string ID { get; set; }
+        /// <summary>
+        /// 项目id
+        /// </summary>
+        public string ProjectId { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreateDate { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string CreateUser { get; set; }
+        /// <summary>
+        /// 操作时间
+        /// </summary>
+        public DateTime? OperDate { get; set; }
+        /// <summary>
+        /// 操作人
+        /// </summary>
+        public string OperUser { get; set; } 
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        public string Name { get; set; }
+        /// <summary>
+        /// 性别 1 男 2 女
+        /// </summary>
+        public string Sex { get; set; }
+        /// <summary>
+        /// 出生日期
+        /// </summary>
+        public DateTime? BirthDay { get; set; }
+        /// <summary>
+        /// 地址
+        /// </summary>
+        public string Address { get; set; }
+        /// <summary>
+        ///   民族
+        /// </summary>
+        public string Nation { get; set; }
+        /// <summary>
+        /// 身份证号码
+        /// </summary>
+        public string IdentifyID { get; set; }
+        /// <summary>
+        /// 发证机关
+        /// </summary>
+        public string Police { get; set; }
+        /// <summary>
+        /// 有效期开始时间
+        /// </summary>
+        public string ValidPeriodStart { get; set; }
+        /// <summary>
+        /// 有效期结束时间
+        /// </summary>
+        public string ValidPeriodEnd { get; set; }
+        /// <summary>
+        /// 岗位
+        /// </summary>
+        public string Station { get; set; } 
+        /// <summary>
+        /// 电话
+        /// </summary>
+        public string Telephone { get; set; }
+        /// <summary>
+        /// Age
+        /// </summary>
+        public int? Age { get; set; }
+        /// <summary>
+        /// 工号
+        /// </summary>
+        public string JobNumber { get; set; }  
+        /// <summary>
+        /// 现住址
+        /// </summary>
+        public string NewAddress { get; set; } 
+        /// <summary>
+        /// 登记时间
+        /// </summary>
+        public DateTime? RegisterDate { get; set; } 
+        /// <summary>
+        /// 专业
+        /// </summary>
+        public string Category { get; set; }
+        /// <summary>
+        /// 专业等级
+        /// </summary>
+        public string CategoryLevel { get; set; }
+        /// <summary>
+        /// 入场时间
+        /// </summary>
+        public DateTime? EntranceDate { get; set; }
+        /// <summary>
+        /// 是否离场 1 离场 0 未离场
+        /// </summary>
+        public string IsOut { get; set; }
+        /// <summary>
+        /// 离场时间
+        /// </summary>
+        public DateTime? LeaveDate { get; set; }
+        /// <summary>
+        /// 是否黑名单 1 是 0 否
+        /// </summary>
+        public string IsBlackList { get; set; } 
+        /// <summary>
+        /// 设备编号
+        /// </summary>
+        public string DeviceNumber { get; set; } 
+        /// <summary>
+        /// 所在单位
+        /// </summary>
+        public string DepartName { get; set; } 
+        /// <summary>
+        /// 上传时间
+        /// </summary>
+        public DateTime? UploadTime { get; set; }
+    }
+
+}

SGGL/Model/APIItem/AnBang/PersonTrainRecordInput.cs

@@ -0,0 +1,113 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model.AnBang
+{
+    public class PersonTrainRecordInput
+    {
+        /// <summary>
+        /// 主键id
+        /// </summary>
+        public string ID { get; set; }
+        /// <summary>
+        /// 项目id
+        /// </summary>
+        public string ProjectId { get; set; }
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        public string EmpName { get; set; }
+        /// <summary>
+        /// 身份证号
+        /// </summary>
+        public string IdentifyId { get; set; }
+        /// <summary>
+        /// 工种
+        /// </summary>
+        public string CategoryName { get; set; }
+        /// <summary>
+        /// 所在单位
+        /// </summary>
+        public string DepartName { get; set; }
+        /// <summary>
+        /// 培训学时
+        /// </summary>
+        public string TrainPeriod { get; set; }
+        /// <summary>
+        /// 总分
+        /// </summary>
+        public decimal? TotalScore { get; set; }
+        /// <summary>
+        /// 及格分
+        /// </summary>
+        public decimal? PassScore { get; set; }
+        /// <summary>
+        /// 成绩
+        /// </summary>
+        public decimal? Score { get; set; }
+        /// <summary>
+        /// 是否通过 0否 1是
+        /// </summary>
+        public string IsPass { get; set; }
+        /// <summary>
+        /// 考试批次号
+        /// </summary>
+        public string GroupNo { get; set; }
+        /// <summary>
+        /// 试卷编号
+        /// </summary>
+        public string ExamNo { get; set; }
+        /// <summary>
+        /// 考试次数
+        /// </summary>
+        public string ExamCount { get; set; }
+        /// <summary>
+        /// 设备编号
+        /// </summary>
+        public string DeviceNo { get; set; } 
+        /// <summary>
+        /// 答案
+        /// </summary>
+        public string Answers { get; set; }
+        /// <summary>
+        /// 培训记录名称
+        /// </summary>
+        public string RecordName { get; set; }
+        /// <summary>
+        /// 培训类型
+        /// </summary>
+        public string TrainType { get; set; }
+        /// <summary>
+        /// 出卷类型 0 使用原卷 1 重新出卷
+        /// </summary>
+        public string PaperMode { get; set; }
+        /// <summary>
+        /// 培训方式
+        /// </summary>
+        public string TrainMode { get; set; }
+        /// <summary>
+        /// 培训负责人
+        /// </summary>
+        public string TrainPrincipal { get; set; }
+        /// <summary>
+        /// 培训开始时间
+        /// </summary>
+        public DateTime? TrainStartDate { get; set; }
+        /// <summary>
+        /// 培训结束时间
+        /// </summary>
+        public DateTime? TrainEndDate { get; set; }
+        /// <summary>
+        /// 培训内容
+        /// </summary>
+        public string TrainContent { get; set; }
+        /// <summary>
+        /// 培训详细信息
+        /// </summary>
+        public string TrainDescript { get; set; } 
+    }
+
+}

SGGL/Model/APIItem/AnBang/TrainInput.cs

@@ -0,0 +1,112 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model.AnBnag 
+{
+    public class TrainInput
+    {
+        /// <summary>
+        /// 主键id
+        /// </summary>
+        public string ID { get; set; }
+        /// <summary>
+        /// 项目id
+        /// </summary>
+        public string ProjectId { get; set; }
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string RecordName { get; set; }
+        /// <summary>
+        /// 培训类型
+        /// </summary>
+        public string TrainType { get; set; }
+        /// <summary>
+        /// 出卷类型 0 使用原卷 1 重新出卷
+        /// </summary>
+        public string PaperMode { get; set; }
+        /// <summary>
+        /// 培训方式
+        /// </summary>
+        public string TrainMode { get; set; }
+        /// <summary>
+        /// 培训负责人
+        /// </summary>
+        public string TrainPrincipal { get; set; }
+        /// <summary>
+        ///  培训开始时间
+        /// </summary>
+        public DateTime? TrainStartDate { get; set; }
+        /// <summary>
+        /// 培训结束时间
+        /// </summary>
+        public DateTime? TrainEndDate { get; set; }
+        /// <summary>
+        /// 培训内容
+        /// </summary>
+        public string TrainContent { get; set; }
+        /// <summary>
+        /// 培训详细信息
+        /// </summary>
+        public string TrainDescript { get; set; }
+        /// <summary>
+        /// 培训学时
+        /// </summary>
+        public string TrainPeriod { get; set; }
+        /// <summary>
+        /// 人员数量
+        /// </summary>
+        public int PersonCount { get; set; }
+        /// <summary>
+        /// 合格人数
+        /// </summary>
+        public int PassedCount { get; set; }
+        /// <summary>
+        /// 课程数量
+        /// </summary>
+        public int CourseCount { get; set; }
+        /// <summary>
+        /// 课程总时长
+        /// </summary>
+        public string CourseDuration { get; set; }
+        /// <summary>
+        /// 来源 0 项目 1 课程
+        /// </summary>
+        public string Source { get; set; }
+        /// <summary>
+        /// 备注说明
+        /// </summary>
+        public string Description { get; set; }
+        /// <summary>
+        /// 工具箱编号
+        /// </summary>
+        public string DeviceNo { get; set; } 
+        /// <summary>
+        /// 上传时间
+        /// </summary>
+        public DateTime? UploadTime { get; set; } 
+        /// <summary>
+        /// 培训单位
+        /// </summary>
+        public string TrainDepart { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreateDate { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string CreateUser { get; set; }
+        /// <summary>
+        /// 操作时间
+        /// </summary>
+        public DateTime? OperDate { get; set; }
+        /// <summary>
+        /// 操作人
+        /// </summary>
+        public string OperUser { get; set; }
+    }
+}

SGGL/Model/APIItem/AnBang/TrainPersonInput.cs

@@ -0,0 +1,109 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model.AnBang
+{
+    public class TrainPersonInput
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string ID { get; set; }
+        /// <summary>
+        /// 项目ID
+        /// </summary>
+        public string ProjectId { get; set; }
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        public string EmpName { get; set; }
+        /// <summary>
+        /// 身份证号
+        /// </summary>
+        public string IdentifyId { get; set; }
+        /// <summary>
+        /// 岗位
+        /// </summary>
+        public string Station { get; set; }
+        /// <summary>
+        /// 工种
+        /// </summary>
+        public string CategoryName { get; set; }  
+        /// <summary>
+        /// 所在单位
+        /// </summary>
+        public string DepartName { get; set; }
+        /// <summary>
+        /// 签到时间
+        /// </summary>
+        public DateTime? SignInDate { get; set; }
+        /// <summary>
+        /// 培训学时
+        /// </summary>
+        public string TrainPeriod { get; set; }
+        /// <summary>
+        /// 状态 0 正常 1 补签
+        /// </summary>
+        public string State { get; set; }
+        /// <summary>
+        /// 总分
+        /// </summary>
+        public decimal? TotalScore { get; set; }
+        /// <summary>
+        /// 及格分
+        /// </summary>
+        public decimal? PassScore { get; set; }
+        /// <summary>
+        /// 成绩
+        /// </summary>
+        public decimal? Score { get; set; }
+        /// <summary>
+        ///  是否合格 0 不合格 1 合格
+        /// </summary>
+        public string IsPass { get; set; }
+        /// <summary>
+        /// 考试批次号
+        /// </summary>
+        public string GroupNo { get; set; }
+        /// <summary>
+        /// 试卷编号
+        /// </summary>
+        public string ExamNo { get; set; }
+        /// <summary>
+        /// 考试次数
+        /// </summary>
+        public int? ExamCount { get; set; }
+        /// <summary>
+        /// 设备编号
+        /// </summary>
+        public string DeviceNo { get; set; } 
+        /// <summary>
+        /// 上传时间
+        /// </summary>
+        public DateTime? UploadTime { get; set; }
+        /// <summary>
+        /// 答案
+        /// </summary>
+        public string Answers { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreateDate { get; set; }
+        /// <summary>
+        ///     创建人
+        /// </summary>
+        public string CreateUser { get; set; }
+        /// <summary>
+        /// 操作时间
+        /// </summary>
+        public DateTime? OperDate { get; set; }
+        /// <summary>
+        /// 操作人
+        /// </summary>
+        public string OperUser { get; set; }
+    }
+
+}

SGGL/Model/APIItem/UnitItem.cs

@@ -23,9 +23,18 @@ namespace Model
         public string IsBuild { get; set; }
         public string EMail { get; set; }
         public string IsHide { get; set; }
-        public string IsBranch { get; set; }
+        public bool? IsBranch { get; set; }
         public string ShortUnitName { get; set; }
         public string DataSources { get; set; }
         public string FromUnitId { get; set; }
+        public string IsChina { get; set; }
+        public string CollCropCode { get; set; }
+
+        public string LinkName { get; set; }
+        public string IdcardType { get; set; }
+        public string IdcardNumber { get; set; }
+        public string CollCropStatus { get; set; }
+        public string LinkMobile { get; set; }
+        public string ProjectId { get; set; }
     }
 }

SGGL/Model/Model.cs

@@ -241836,6 +241836,10 @@ namespace Model
 		
 		private System.Nullable<decimal> _DeathEconomy;
 		
+		private System.Nullable<int> _LossCount;
+		
+		private System.Nullable<int> _DeathCount;
+		
 		private EntityRef<Manager_MonthReportC> _Manager_MonthReportC;
 		
     #region 可扩展性方法定义
@@ -241868,6 +241872,10 @@ namespace Model
     partial void OnDeathWorkTimeChanged();
     partial void OnDeathEconomyChanging(System.Nullable<decimal> value);
     partial void OnDeathEconomyChanged();
+    partial void OnLossCountChanging(System.Nullable<int> value);
+    partial void OnLossCountChanged();
+    partial void OnDeathCountChanging(System.Nullable<int> value);
+    partial void OnDeathCountChanged();
     #endregion
 		
 		public Manager_Month_InjuryAccidentC()
@@ -242140,6 +242148,46 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LossCount", DbType="Int")]
+		public System.Nullable<int> LossCount
+		{
+			get
+			{
+				return this._LossCount;
+			}
+			set
+			{
+				if ((this._LossCount != value))
+				{
+					this.OnLossCountChanging(value);
+					this.SendPropertyChanging();
+					this._LossCount = value;
+					this.SendPropertyChanged("LossCount");
+					this.OnLossCountChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DeathCount", DbType="Int")]
+		public System.Nullable<int> DeathCount
+		{
+			get
+			{
+				return this._DeathCount;
+			}
+			set
+			{
+				if ((this._DeathCount != value))
+				{
+					this.OnDeathCountChanging(value);
+					this.SendPropertyChanging();
+					this._DeathCount = value;
+					this.SendPropertyChanged("DeathCount");
+					this.OnDeathCountChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_InjuryAccidentC_Manager_MonthReportC", Storage="_Manager_MonthReportC", ThisKey="MonthReportId", OtherKey="MonthReportId", IsForeignKey=true)]
 		public Manager_MonthReportC Manager_MonthReportC
 		{
@@ -357254,6 +357302,8 @@ namespace Model
 		
 		private string _HomePageType;
 		
+		private string _CompanyProjectId;
+		
 		private EntitySet<Comprehensive_NCRManagement> _Comprehensive_NCRManagement;
 		
 		private EntitySet<Comprehensive_PressurePipe> _Comprehensive_PressurePipe;
@@ -358064,6 +358114,8 @@ namespace Model
     partial void OnRawPasswordChanged();
     partial void OnHomePageTypeChanging(string value);
     partial void OnHomePageTypeChanged();
+    partial void OnCompanyProjectIdChanging(string value);
+    partial void OnCompanyProjectIdChanged();
     #endregion
 		
 		public Sys_User()
@@ -359459,6 +359511,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompanyProjectId", DbType="NVarChar(2000)")]
+		public string CompanyProjectId
+		{
+			get
+			{
+				return this._CompanyProjectId;
+			}
+			set
+			{
+				if ((this._CompanyProjectId != value))
+				{
+					this.OnCompanyProjectIdChanging(value);
+					this.SendPropertyChanging();
+					this._CompanyProjectId = value;
+					this.SendPropertyChanged("CompanyProjectId");
+					this.OnCompanyProjectIdChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="Comprehensive_NCRManagement_Sys_User", Storage="_Comprehensive_NCRManagement", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")]
 		public EntitySet<Comprehensive_NCRManagement> Comprehensive_NCRManagement
 		{

SGGL/Model/Model.csproj

@@ -27,10 +27,11 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;m</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <DocumentationFile>bin\Debug\Model.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -59,6 +60,10 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="APIItem\AnBang\PersonInput.cs" />
+    <Compile Include="APIItem\AnBang\PersonTrainRecordInput.cs" />
+    <Compile Include="APIItem\AnBang\TrainInput.cs" />
+    <Compile Include="APIItem\AnBang\TrainPersonInput.cs" />
     <Compile Include="APIItem\ArchitectureReport.cs" />
     <Compile Include="APIItem\ArchitectureReportItem.cs" />
     <Compile Include="APIItem\BaseInfoItem.cs" />

SGGL/WebAPI/App_Start/SwaggerConfig.cs

@@ -0,0 +1,280 @@
+using System.Linq;
+using System.Web.Http;
+using WebActivatorEx;
+using WebAPI;
+using Swashbuckle.Application;
+using System.Web.Http.Description;
+using System;
+
+[assembly: PreApplicationStartMethod(typeof(SwaggerConfig), "Register")]
+
+namespace WebAPI
+{
+    public class SwaggerConfig
+    {
+        public static void Register()
+        {
+            var thisAssembly = typeof(SwaggerConfig).Assembly;
+
+            GlobalConfiguration.Configuration
+                .EnableSwagger(c =>
+                {
+                    // By default, the service root url is inferred from the request used to access the docs.
+                    // However, there may be situations (e.g. proxy and load-balanced environments) where this does not
+                    // resolve correctly. You can workaround this by providing your own code to determine the root URL.
+                    //
+                    //c.RootUrl(req => GetRootUrlFromAppConfig());
+
+                    // If schemes are not explicitly provided in a Swagger 2.0 document, then the scheme used to access
+                    // the docs is taken as the default. If your API supports multiple schemes and you want to be explicit
+                    // about them, you can use the "Schemes" option as shown below.
+                    //
+                    //c.Schemes(new[] { "http", "https" });
+
+                    // Use "SingleApiVersion" to describe a single version API. Swagger 2.0 includes an "Info" object to
+                    // hold additional metadata for an API. Version and title are required but you can also provide
+                    // additional fields by chaining methods off SingleApiVersion.
+                    //
+                    c.SingleApiVersion("v1", "WebAPI");
+
+
+                    // If you want the output Swagger docs to be indented properly, enable the "PrettyPrint" option.
+                    //
+                    //c.PrettyPrint();
+
+                    // If your API has multiple versions, use "MultipleApiVersions" instead of "SingleApiVersion".
+                    // In this case, you must provide a lambda that tells Swashbuckle which actions should be
+                    // included in the docs for a given API version. Like "SingleApiVersion", each call to "Version"
+                    // returns an "Info" builder so you can provide additional metadata per API version.
+                    //
+                    //c.MultipleApiVersions(
+                    //    (apiDesc, targetApiVersion) => ResolveVersionSupportByRouteConstraint(apiDesc, targetApiVersion),
+                    //    (vc) =>
+                    //    {
+                    //        vc.Version("Cqms", "质量数据同步");
+                    //        vc.Version("Hsse", "安全数据同步");
+                    //        vc.Version("ProjectDataSync", "项目信息数据同步");
+                    //        vc.Version("v1", "Swashbuckle Dummy API V1");
+                    //    });
+
+                    // You can use "BasicAuth", "ApiKey" or "OAuth2" options to describe security schemes for the API.
+                    // See https://github.com/swagger-api/swagger-spec/blob/master/versions/2.0.md for more details.
+                    // NOTE: These only define the schemes and need to be coupled with a corresponding "security" property
+                    // at the document or operation level to indicate which schemes are required for an operation. To do this,
+                    // you'll need to implement a custom IDocumentFilter and/or IOperationFilter to set these properties
+                    // according to your specific authorization implementation
+                    //
+                    //c.BasicAuth("basic")
+                    //    .Description("Basic HTTP Authentication");
+                    //
+                    // NOTE: You must also configure 'EnableApiKeySupport' below in the SwaggerUI section
+                    c.ApiKey("token")
+                        .Description("API Key Authentication")
+                        .Name("token")
+                        .In("header");
+                    //
+                    //c.OAuth2("oauth2")
+                    //    .Description("OAuth2 Implicit Grant")
+                    //    .Flow("implicit")
+                    //    .AuthorizationUrl("http://petstore.swagger.wordnik.com/api/oauth/dialog")
+                    //    //.TokenUrl("https://tempuri.org/token")
+                    //    .Scopes(scopes =>
+                    //    {
+                    //        scopes.Add("read", "Read access to protected resources");
+                    //        scopes.Add("write", "Write access to protected resources");
+                    //    });
+
+                    // Set this flag to omit descriptions for any actions decorated with the Obsolete attribute
+                    //c.IgnoreObsoleteActions();
+
+                    // Each operation be assigned one or more tags which are then used by consumers for various reasons.
+                    // For example, the swagger-ui groups operations according to the first tag of each operation.
+                    // By default, this will be controller name but you can use the "GroupActionsBy" option to
+                    // override with any value.
+                    //
+                    //c.GroupActionsBy(apiDesc => apiDesc.HttpMethod.ToString());
+
+                    // You can also specify a custom sort order for groups (as defined by "GroupActionsBy") to dictate
+                    // the order in which operations are listed. For example, if the default grouping is in place
+                    // (controller name) and you specify a descending alphabetic sort order, then actions from a
+                    // ProductsController will be listed before those from a CustomersController. This is typically
+                    // used to customize the order of groupings in the swagger-ui.
+                    //
+                    //c.OrderActionGroupsBy(new DescendingAlphabeticComparer());
+
+                    // If you annotate Controllers and API Types with
+                    // Xml comments (http://msdn.microsoft.com/en-us/library/b2s063f7(v=vs.110).aspx), you can incorporate
+                    // those comments into the generated docs and UI. You can enable this by providing the path to one or
+                    // more Xml comment files.
+                    //
+
+                    c.IncludeXmlComments(GetXmlCommentsPath("Model"));
+                    c.IncludeXmlComments(GetXmlCommentsPath(thisAssembly.GetName().Name));
+
+                    // Swashbuckle makes a best attempt at generating Swagger compliant JSON schemas for the various types
+                    // exposed in your API. However, there may be occasions when more control of the output is needed.
+                    // This is supported through the "MapType" and "SchemaFilter" options:
+                    //
+                    // Use the "MapType" option to override the Schema generation for a specific type.
+                    // It should be noted that the resulting Schema will be placed "inline" for any applicable Operations.
+                    // While Swagger 2.0 supports inline definitions for "all" Schema types, the swagger-ui tool does not.
+                    // It expects "complex" Schemas to be defined separately and referenced. For this reason, you should only
+                    // use the "MapType" option when the resulting Schema is a primitive or array type. If you need to alter a
+                    // complex Schema, use a Schema filter.
+                    //
+                    //c.MapType<ProductType>(() => new Schema { type = "integer", format = "int32" });
+
+                    // If you want to post-modify "complex" Schemas once they've been generated, across the board or for a
+                    // specific type, you can wire up one or more Schema filters.
+                    //
+                    //c.SchemaFilter<ApplySchemaVendorExtensions>();
+
+                    // In a Swagger 2.0 document, complex types are typically declared globally and referenced by unique
+                    // Schema Id. By default, Swashbuckle does NOT use the full type name in Schema Ids. In most cases, this
+                    // works well because it prevents the "implementation detail" of type namespaces from leaking into your
+                    // Swagger docs and UI. However, if you have multiple types in your API with the same class name, you'll
+                    // need to opt out of this behavior to avoid Schema Id conflicts.
+                    //
+                    c.UseFullTypeNameInSchemaIds();
+
+                    // Alternatively, you can provide your own custom strategy for inferring SchemaId's for
+                    // describing "complex" types in your API.
+                    //
+                    //c.SchemaId(t => t.FullName.Contains('`') ? t.FullName.Substring(0, t.FullName.IndexOf('`')) : t.FullName);
+
+                    // Set this flag to omit schema property descriptions for any type properties decorated with the
+                    // Obsolete attribute
+                    //c.IgnoreObsoleteProperties();
+
+                    // In accordance with the built in JsonSerializer, Swashbuckle will, by default, describe enums as integers.
+                    // You can change the serializer behavior by configuring the StringToEnumConverter globally or for a given
+                    // enum type. Swashbuckle will honor this change out-of-the-box. However, if you use a different
+                    // approach to serialize enums as strings, you can also force Swashbuckle to describe them as strings.
+                    //
+                    //c.DescribeAllEnumsAsStrings();
+
+                    // Similar to Schema filters, Swashbuckle also supports Operation and Document filters:
+                    //
+                    // Post-modify Operation descriptions once they've been generated by wiring up one or more
+                    // Operation filters.
+                    //
+                    //c.OperationFilter<AddDefaultResponse>();
+                    //
+                    // If you've defined an OAuth2 flow as described above, you could use a custom filter
+                    // to inspect some attribute on each action and infer which (if any) OAuth2 scopes are required
+                    // to execute the operation
+                    //
+                    //c.OperationFilter<AssignOAuth2SecurityRequirements>();
+
+                    // Post-modify the entire Swagger document by wiring up one or more Document filters.
+                    // This gives full control to modify the final SwaggerDocument. You should have a good understanding of
+                    // the Swagger 2.0 spec. - https://github.com/swagger-api/swagger-spec/blob/master/versions/2.0.md
+                    // before using this option.
+                    //
+                    //c.DocumentFilter<ApplyDocumentVendorExtensions>();
+
+                    // In contrast to WebApi, Swagger 2.0 does not include the query string component when mapping a URL
+                    // to an action. As a result, Swashbuckle will raise an exception if it encounters multiple actions
+                    // with the same path (sans query string) and HTTP method. You can workaround this by providing a
+                    // custom strategy to pick a winner or merge the descriptions for the purposes of the Swagger docs
+                    //
+                    c.ResolveConflictingActions(apiDescriptions => apiDescriptions.First());
+
+                    // Wrap the default SwaggerGenerator with additional behavior (e.g. caching) or provide an
+                    // alternative implementation for ISwaggerProvider with the CustomProvider option.
+                    //
+                    //c.CustomProvider((defaultProvider) => new CachingSwaggerProvider(defaultProvider));
+                })
+                .EnableSwaggerUi(c =>
+                {
+                    // Use the "DocumentTitle" option to change the Document title.
+                    // Very helpful when you have multiple Swagger pages open, to tell them apart.
+                    //
+                    //c.DocumentTitle("My Swagger UI");
+
+                    // Use the "InjectStylesheet" option to enrich the UI with one or more additional CSS stylesheets.
+                    // The file must be included in your project as an "Embedded Resource", and then the resource's
+                    // "Logical Name" is passed to the method as shown below.
+                    //
+                    //c.InjectStylesheet(containingAssembly, "Swashbuckle.Dummy.SwaggerExtensions.testStyles1.css");
+
+                    // Use the "InjectJavaScript" option to invoke one or more custom JavaScripts after the swagger-ui
+                    // has loaded. The file must be included in your project as an "Embedded Resource", and then the resource's
+                    // "Logical Name" is passed to the method as shown above.
+                    //
+                    //c.InjectJavaScript(thisAssembly, "Swashbuckle.Dummy.SwaggerExtensions.testScript1.js");
+
+                    // The swagger-ui renders boolean data types as a dropdown. By default, it provides "true" and "false"
+                    // strings as the possible choices. You can use this option to change these to something else,
+                    // for example 0 and 1.
+                    //
+                    //c.BooleanValues(new[] { "0", "1" });
+
+                    // By default, swagger-ui will validate specs against swagger.io's online validator and display the result
+                    // in a badge at the bottom of the page. Use these options to set a different validator URL or to disable the
+                    // feature entirely.
+                    //c.SetValidatorUrl("http://localhost/validator");
+                    //c.DisableValidator();
+
+                    // Use this option to control how the Operation listing is displayed.
+                    // It can be set to "None" (default), "List" (shows operations for each resource),
+                    // or "Full" (fully expanded: shows operations and their details).
+                    //
+                    //c.DocExpansion(DocExpansion.List);
+
+                    // Specify which HTTP operations will have the 'Try it out!' option. An empty paramter list disables
+                    // it for all operations.
+                    //
+                    //c.SupportedSubmitMethods("GET", "HEAD");
+
+                    // Use the CustomAsset option to provide your own version of assets used in the swagger-ui.
+                    // It's typically used to instruct Swashbuckle to return your version instead of the default
+                    // when a request is made for "index.html". As with all custom content, the file must be included
+                    // in your project as an "Embedded Resource", and then the resource's "Logical Name" is passed to
+                    // the method as shown below.
+                    //
+                    //c.CustomAsset("index", containingAssembly, "YourWebApiProject.SwaggerExtensions.index.html");
+
+                    // If your API has multiple versions and you've applied the MultipleApiVersions setting
+                    // as described above, you can also enable a select box in the swagger-ui, that displays
+                    // a discovery URL for each version. This provides a convenient way for users to browse documentation
+                    // for different API versions.
+                    //
+                    c.EnableDiscoveryUrlSelector();
+                    // If your API supports the OAuth2 Implicit flow, and you've described it correctly, according to
+                    // the Swagger 2.0 specification, you can enable UI support as shown below.
+                    //
+                    //c.EnableOAuth2Support(
+                    //    clientId: "test-client-id",
+                    //    clientSecret: null,
+                    //    realm: "test-realm",
+                    //    appName: "Swagger UI"
+                    //    //additionalQueryStringParams: new Dictionary<string, string>() { { "foo", "bar" } }
+                    //);
+
+                    // If your API supports ApiKey, you can override the default values.
+                    // "apiKeyIn" can either be "query" or "header"
+                    //
+                    //c.EnableApiKeySupport("token", "header");
+                });
+        }
+
+        /// <summary>
+        /// 返回特定版本下的接口
+        /// </summary>
+        /// <param name="apiDesc"></param>
+        /// <param name="targetApiVersion"></param>
+        /// <returns></returns>
+        private static bool ResolveVersionSupportByRouteConstraint(ApiDescription apiDesc, string targetApiVersion)
+        {
+            //var controllerFullName = apiDesc.ActionDescriptor.ControllerDescriptor.ControllerType.FullName;
+            //return controllerFullName.Split('.').Contains(targetApiVersion, StringComparer.OrdinalIgnoreCase);
+            var controllerFullName = apiDesc.ActionDescriptor.ControllerDescriptor.ControllerName;
+            return controllerFullName.Contains(targetApiVersion);
+        }
+        protected static string GetXmlCommentsPath(string name)
+        {
+            return System.String.Format(@"{0}\bin\{1}.xml", System.AppDomain.CurrentDomain.BaseDirectory, name);
+        }
+    }
+}

SGGL/WebAPI/Controllers/AnBangToolController.cs

@@ -0,0 +1,567 @@
+using BLL;
+using System;
+using System.Linq;
+using System.Web.Http;
+using Model.AnBnag;
+using Model.AnBang;
+
+namespace WebAPI.Controllers
+{
+    /// <summary>
+    /// AnBangTool
+    /// </summary>
+    public class AnBangToolController : ApiController
+    {      
+        /// <summary>
+             /// 添加人员信息
+             /// </summary>
+             /// <param name="personInput"></param>
+             /// <returns></returns>
+        [HttpPost]
+        public Model.ResponeData AddPerson([FromBody] PersonInput personInput)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                if (string.IsNullOrEmpty(personInput.ID))
+                {
+                    responeData.code = 0;
+                    responeData.message = "ID 不能为空";
+                    return responeData;
+                }
+                if (string.IsNullOrEmpty(personInput.ProjectId))
+                {
+                    responeData.code = 0;
+                    responeData.message = "ProjectId 不能为空";
+                    return responeData;
+                }
+                else
+                {
+                    var project  =APIProjectService.getProjectByProjectId(personInput.ProjectId);
+                    if (project == null)
+                    {
+                        responeData.code = 0;
+                        responeData.message = "ProjectId 不存在";
+                        return responeData;
+                    }
+
+                }
+                using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+                {
+                    var getPerson = db.Bo_Sheng_Person.FirstOrDefault(x => x.ID == personInput.ID);
+                    if (getPerson == null)
+                    {
+                        Model.Bo_Sheng_Person table = new Model.Bo_Sheng_Person
+                        {
+                            ID = personInput.ID,
+                            ProjectId = personInput.ProjectId,
+                            CreateDate = personInput.CreateDate,
+                            CreateUser = personInput.CreateUser,
+                            OperDate = personInput.OperDate,
+                            OperUser = personInput.OperUser,
+                            Name = personInput.Name,
+                            Sex = personInput.Sex,
+                            BirthDay = personInput.BirthDay,
+                            Address = personInput.Address,
+                            Nation = personInput.Nation,
+                            IdentifyID = personInput.IdentifyID,
+                            Police = personInput.Police,
+                            ValidPeriodStart = personInput.ValidPeriodStart,
+                            ValidPeriodEnd = personInput.ValidPeriodEnd,
+                            Telephone = personInput.Telephone,
+                            Age = personInput.Age,
+                            JobNumber = personInput.JobNumber,
+                            NewAddress = personInput.NewAddress,
+                            RegisterDate = personInput.RegisterDate,
+                            Station = personInput.Station,
+                            Category = personInput.Category,
+                            CategoryLevel = personInput.CategoryLevel,
+                            EntranceDate = personInput.EntranceDate,
+                            IsOut = personInput.IsOut,
+                            LeaveDate = personInput.LeaveDate,
+                            IsBlackList = personInput.IsBlackList,
+                            DeviceNumber = personInput.DeviceNumber,
+                            DepartName = personInput.DepartName,
+                            UploadTime = personInput.UploadTime
+                        };
+                        db.Bo_Sheng_Person.InsertOnSubmit(table);
+                        db.SubmitChanges();
+                    }
+                    else
+                    {
+                        getPerson.ProjectId = personInput.ProjectId;
+                        getPerson.CreateDate = personInput.CreateDate;
+                        getPerson.CreateUser = personInput.CreateUser;
+                        getPerson.OperDate = personInput.OperDate;
+                        getPerson.OperUser = personInput.OperUser;
+                        getPerson.Name = personInput.Name;
+                        getPerson.Sex = personInput.Sex;
+                        getPerson.BirthDay = personInput.BirthDay;
+                        getPerson.Address = personInput.Address;
+                        getPerson.Nation = personInput.Nation;
+                        getPerson.IdentifyID = personInput.IdentifyID;
+                        getPerson.Police = personInput.Police;
+                        getPerson.ValidPeriodStart = personInput.ValidPeriodStart;
+                        getPerson.ValidPeriodEnd = personInput.ValidPeriodEnd;
+                        getPerson.Telephone = personInput.Telephone;
+                        getPerson.Age = personInput.Age;
+                        getPerson.JobNumber = personInput.JobNumber;
+                        getPerson.NewAddress = personInput.NewAddress;
+                        getPerson.RegisterDate = personInput.RegisterDate;
+                        getPerson.Station = personInput.Station;
+                        getPerson.Category = personInput.Category;
+                        getPerson.CategoryLevel = personInput.CategoryLevel;
+                        getPerson.EntranceDate = personInput.EntranceDate;
+                        getPerson.IsOut = personInput.IsOut;
+                        getPerson.LeaveDate = personInput.LeaveDate;
+                        getPerson.IsBlackList = personInput.IsBlackList;
+                        getPerson.DeviceNumber = personInput.DeviceNumber;
+                        getPerson.DepartName = personInput.DepartName;
+                        getPerson.UploadTime = personInput.UploadTime;
+                        db.SubmitChanges();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.ToString();
+            }
+            return responeData;
+        }
+        /// <summary>
+        /// 删除人员信息
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData DelPerson(string id)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+                {
+                    var getPerson = db.Bo_Sheng_Person.FirstOrDefault(x => x.ID == id);
+                    if (getPerson != null)
+                    {
+                        db.Bo_Sheng_Person.DeleteOnSubmit(getPerson);
+                        db.SubmitChanges();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.ToString();
+            }
+            return responeData;
+        }
+        /// <summary>
+        /// 添加培训记录
+        /// </summary>
+        /// <param name="trainInput"></param>
+        /// <returns></returns>
+        [HttpPost] 
+        public Model.ResponeData AddTrain([FromBody] TrainInput trainInput)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                if (string.IsNullOrEmpty(trainInput.ID))
+                {
+                    responeData.code = 0;
+                    responeData.message = "ID 不能为空"; 
+                    return responeData;
+                }
+                if (string.IsNullOrEmpty(trainInput.ProjectId))
+                {
+                    responeData.code = 0;
+                    responeData.message = "ProjectId 不能为空";
+                    return responeData;
+                }
+                else
+                {
+                    var project = APIProjectService.getProjectByProjectId(trainInput.ProjectId);
+                    if (project == null)
+                    {
+                        responeData.code = 0;
+                        responeData.message = "ProjectId 不存在";
+                        return responeData;
+                    }
+
+                }
+                using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+                {
+                    var getTrain = db.Bo_Sheng_Train.FirstOrDefault(x => x.ID == trainInput.ID);
+                    if (getTrain == null)
+                    {
+                        Model.Bo_Sheng_Train table = new Model.Bo_Sheng_Train
+                        {
+                            ID = trainInput.ID,
+                            ProjectId = trainInput.ProjectId,
+                            RecordName = trainInput.RecordName,
+                            TrainType = trainInput.TrainType,
+                            PaperMode = trainInput.PaperMode,
+                            TrainMode = trainInput.TrainMode,
+                            TrainPrincipal = trainInput.TrainPrincipal,
+                            TrainStartDate = trainInput.TrainStartDate,
+                            TrainEndDate = trainInput.TrainEndDate,
+                            TrainContent = trainInput.TrainContent,
+                            TrainDescript = trainInput.TrainDescript,
+                            TrainPeriod = trainInput.TrainPeriod,
+                            PersonCount = trainInput.PersonCount,
+                            PassedCount = trainInput.PassedCount, 
+                            CourseCount = trainInput.CourseCount,
+                            CourseDuration = trainInput.CourseDuration,
+                            Source = trainInput.Source,
+                            Description = trainInput.Description,
+                            DeviceNo = trainInput.DeviceNo, 
+                            UploadTime = trainInput.UploadTime, 
+                            TrainDepart = trainInput.TrainDepart,
+                            CreateDate = trainInput.CreateDate,
+                            CreateUser = trainInput.CreateUser,
+                            OperDate = trainInput.OperDate,
+                            OperUser = trainInput.OperUser,
+                        };
+                        db.Bo_Sheng_Train.InsertOnSubmit(table);
+                        db.SubmitChanges();
+                    }
+                    else
+                    {
+                        getTrain.ProjectId = trainInput.ProjectId;
+                        getTrain.RecordName = trainInput.RecordName;
+                        getTrain.TrainType = trainInput.TrainType;
+                        getTrain.PaperMode = trainInput.PaperMode;
+                        getTrain.TrainMode = trainInput.TrainMode;
+                        getTrain.TrainPrincipal = trainInput.TrainPrincipal;
+                        getTrain.TrainStartDate = trainInput.TrainStartDate;
+                        getTrain.TrainEndDate = trainInput.TrainEndDate;
+                        getTrain.TrainContent = trainInput.TrainContent;
+                        getTrain.TrainDescript = trainInput.TrainDescript;
+                        getTrain.TrainPeriod = trainInput.TrainPeriod;
+                        getTrain.PersonCount = trainInput.PersonCount;
+                        getTrain.PassedCount = trainInput.PassedCount; 
+                        getTrain.CourseCount = trainInput.CourseCount;
+                        getTrain.CourseDuration = trainInput.CourseDuration;
+                        getTrain.Source = trainInput.Source;
+                        getTrain.Description = trainInput.Description;
+                        getTrain.DeviceNo = trainInput.DeviceNo; 
+                        getTrain.UploadTime = trainInput.UploadTime; 
+                        getTrain.TrainDepart = trainInput.TrainDepart;
+                        getTrain.CreateDate = trainInput.CreateDate;
+                        getTrain.CreateUser = trainInput.CreateUser;
+                        getTrain.OperDate = trainInput.OperDate;
+                        getTrain.OperUser = trainInput.OperUser;
+                        db.SubmitChanges(); 
+                    }
+                        
+                }
+
+            }
+            catch (Exception ex)
+            {
+                responeData.code=0;
+                responeData.message= ex.ToString(); 
+            }
+            return responeData;
+        }
+        /// <summary>
+        /// 删除培训记录
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData DelTrain(string id)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+                {
+                    var getTrain = db.Bo_Sheng_Train.FirstOrDefault(x => x.ID == id);
+                    if (getTrain != null)
+                    {
+                        db.Bo_Sheng_Train.DeleteOnSubmit(getTrain);
+                        db.SubmitChanges();
+                    }
+                }
+            }
+            catch (Exception)
+            {
+
+                throw;
+            }
+            return responeData;
+        }
+        /// <summary>
+        /// 添加培训人员信息
+        /// </summary>
+        /// <param name="trainPersonInput"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public Model.ResponeData AddTrainPerson([FromBody] TrainPersonInput trainPersonInput)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                if (string.IsNullOrEmpty(trainPersonInput.ID))
+                {
+                    responeData.code = 0;
+                    responeData.message = "ID 不能为空";
+                    return responeData;
+                }
+                if (string.IsNullOrEmpty(trainPersonInput.ProjectId))
+                {
+                    responeData.code = 0;
+                    responeData.message = "ProjectId 不能为空";
+                    return responeData;
+                }
+                else
+                {
+                    var project = APIProjectService.getProjectByProjectId(trainPersonInput.ProjectId);
+                    if (project == null)
+                    {
+                        responeData.code = 0;
+                        responeData.message = "ProjectId 不存在";
+                        return responeData;
+                    }
+
+                }
+                using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+                {
+                    var getTrainPerson = db.Bo_Sheng_TrainPerson.FirstOrDefault(x => x.ID == trainPersonInput.ID);
+                    if (getTrainPerson == null)
+                    {
+                        Model.Bo_Sheng_TrainPerson table = new Model.Bo_Sheng_TrainPerson
+                        {
+                            ID = trainPersonInput.ID,
+                            ProjectId = trainPersonInput.ProjectId,
+                            EmpName = trainPersonInput.EmpName,
+                            IdentifyId = trainPersonInput.IdentifyId,
+                            Station = trainPersonInput.Station,
+                            CategoryName = trainPersonInput.CategoryName,
+                            DepartName = trainPersonInput.DepartName,
+                            SignInDate = trainPersonInput.SignInDate,
+                            TrainPeriod = trainPersonInput.TrainPeriod,
+                            State = trainPersonInput.State,
+                            TotalScore = trainPersonInput.TotalScore,
+                            PassScore = trainPersonInput.PassScore,
+                            Score = trainPersonInput.Score,
+                            IsPass = trainPersonInput.IsPass,
+                            GroupNo = trainPersonInput.GroupNo,
+                            ExamNo = trainPersonInput.ExamNo,
+                            ExamCount = trainPersonInput.ExamCount,
+                            DeviceNo = trainPersonInput.DeviceNo,
+                            UploadTime = trainPersonInput.UploadTime,
+                            Answers = trainPersonInput.Answers,
+                            CreateDate = trainPersonInput.CreateDate,
+                            CreateUser = trainPersonInput.CreateUser,
+                            OperDate = trainPersonInput.OperDate,
+                            OperUser = trainPersonInput.OperUser
+                        };
+                        db.Bo_Sheng_TrainPerson.InsertOnSubmit(table);
+                        db.SubmitChanges();
+                    }
+                    else
+                    {
+                        getTrainPerson.ProjectId = trainPersonInput.ProjectId;
+                        getTrainPerson.EmpName = trainPersonInput.EmpName;
+                        getTrainPerson.IdentifyId = trainPersonInput.IdentifyId;
+                        getTrainPerson.Station = trainPersonInput.Station;
+                        getTrainPerson.CategoryName = trainPersonInput.CategoryName;
+                        getTrainPerson.DepartName = trainPersonInput.DepartName;
+                        getTrainPerson.SignInDate = trainPersonInput.SignInDate;
+                        getTrainPerson.TrainPeriod = trainPersonInput.TrainPeriod;
+                        getTrainPerson.State = trainPersonInput.State;
+                        getTrainPerson.TotalScore = trainPersonInput.TotalScore;
+                        getTrainPerson.PassScore = trainPersonInput.PassScore;
+                        getTrainPerson.Score = trainPersonInput.Score;
+                        getTrainPerson.IsPass = trainPersonInput.IsPass;
+                        getTrainPerson.GroupNo = trainPersonInput.GroupNo;
+                        getTrainPerson.ExamNo = trainPersonInput.ExamNo;
+                        getTrainPerson.ExamCount = trainPersonInput.ExamCount;
+                        getTrainPerson.DeviceNo = trainPersonInput.DeviceNo;
+                        getTrainPerson.UploadTime = trainPersonInput.UploadTime;
+                        getTrainPerson.Answers = trainPersonInput.Answers;
+                        getTrainPerson.CreateDate = trainPersonInput.CreateDate;
+                        getTrainPerson.CreateUser = trainPersonInput.CreateUser;
+                        getTrainPerson.OperDate = trainPersonInput.OperDate;
+                        getTrainPerson.OperUser = trainPersonInput.OperUser;
+                        db.SubmitChanges();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.ToString();
+            }
+            return responeData;
+        }
+        /// <summary>
+        /// 删除培训人员信息
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData DelTrainPerson(string id)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+                {
+                    var getTrainPerson = db.Bo_Sheng_TrainPerson.FirstOrDefault(x => x.ID == id);
+                    if (getTrainPerson != null)
+                    {
+                        db.Bo_Sheng_TrainPerson.DeleteOnSubmit(getTrainPerson);
+                        db.SubmitChanges();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.ToString();
+            }
+            return responeData;
+        }
+        /// <summary>
+        /// 添加人员培训记录
+        /// </summary>
+        /// <param name="personTrainRecordInput"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public Model.ResponeData AddTrainPersonRecord([FromBody] PersonTrainRecordInput personTrainRecordInput)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                if (string.IsNullOrEmpty(personTrainRecordInput.ID))
+                {
+                    responeData.code = 0;
+                    responeData.message = "ID 不能为空";
+                    return responeData;
+                }
+                if (string.IsNullOrEmpty(personTrainRecordInput.ProjectId))
+                {
+                    responeData.code = 0;
+                    responeData.message = "ProjectId 不能为空";
+                    return responeData;
+                }
+                else
+                {
+                    var project = APIProjectService.getProjectByProjectId(personTrainRecordInput.ProjectId);
+                    if (project == null)
+                    {
+                        responeData.code = 0;
+                        responeData.message = "ProjectId 不存在";
+                        return responeData;
+                    }
+                }
+
+                using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+                {
+                    var getPersonTrainRecord = db.Bo_Sheng_PersonTrainRecord.FirstOrDefault(x => x.ID == personTrainRecordInput.ID);
+                    if (getPersonTrainRecord == null)
+                    {
+                        Model.Bo_Sheng_PersonTrainRecord table = new Model.Bo_Sheng_PersonTrainRecord
+                        {
+                            ID = personTrainRecordInput.ID,
+                            ProjectId = personTrainRecordInput.ProjectId,
+                            EmpName = personTrainRecordInput.EmpName,
+                            IdentifyId = personTrainRecordInput.IdentifyId,
+                            CategoryName = personTrainRecordInput.CategoryName,
+                            DepartName = personTrainRecordInput.DepartName,
+                            TrainPeriod = personTrainRecordInput.TrainPeriod,
+                            TotalScore = personTrainRecordInput.TotalScore,
+                            PassScore = personTrainRecordInput.PassScore,
+                            Score = personTrainRecordInput.Score,
+                            IsPass = personTrainRecordInput.IsPass,
+                            GroupNo = personTrainRecordInput.GroupNo,
+                            ExamNo = personTrainRecordInput.ExamNo,
+                            ExamCount = personTrainRecordInput.ExamCount,
+                            DeviceNo = personTrainRecordInput.DeviceNo,
+                            Answers = personTrainRecordInput.Answers,
+                            RecordName = personTrainRecordInput.RecordName,
+                            TrainType = personTrainRecordInput.TrainType,
+                            PaperMode = personTrainRecordInput.PaperMode,
+                            TrainMode = personTrainRecordInput.TrainMode,
+                            TrainPrincipal = personTrainRecordInput.TrainPrincipal,
+                            TrainStartDate = personTrainRecordInput.TrainStartDate,
+                            TrainEndDate = personTrainRecordInput.TrainEndDate,
+                            TrainContent = personTrainRecordInput.TrainContent,
+                            TrainDescript = personTrainRecordInput.TrainDescript,
+                        };
+                        db.Bo_Sheng_PersonTrainRecord.InsertOnSubmit(table);
+                        db.SubmitChanges();
+                    }
+                    else
+                    {
+                        getPersonTrainRecord.ProjectId = personTrainRecordInput.ProjectId;
+                        getPersonTrainRecord.EmpName = personTrainRecordInput.EmpName;
+                        getPersonTrainRecord.IdentifyId = personTrainRecordInput.IdentifyId;
+                        getPersonTrainRecord.CategoryName = personTrainRecordInput.CategoryName;
+                        getPersonTrainRecord.DepartName = personTrainRecordInput.DepartName;
+                        getPersonTrainRecord.TrainPeriod = personTrainRecordInput.TrainPeriod;
+                        getPersonTrainRecord.TotalScore = personTrainRecordInput.TotalScore;
+                        getPersonTrainRecord.PassScore = personTrainRecordInput.PassScore;
+                        getPersonTrainRecord.Score = personTrainRecordInput.Score;
+                        getPersonTrainRecord.IsPass = personTrainRecordInput.IsPass;
+                        getPersonTrainRecord.GroupNo = personTrainRecordInput.GroupNo;
+                        getPersonTrainRecord.ExamNo = personTrainRecordInput.ExamNo;
+                        getPersonTrainRecord.ExamCount = personTrainRecordInput.ExamCount;
+                        getPersonTrainRecord.DeviceNo = personTrainRecordInput.DeviceNo;
+                        getPersonTrainRecord.Answers = personTrainRecordInput.Answers;
+                        getPersonTrainRecord.RecordName = personTrainRecordInput.RecordName;
+                        getPersonTrainRecord.TrainType = personTrainRecordInput.TrainType;
+                        getPersonTrainRecord.PaperMode = personTrainRecordInput.PaperMode;
+                        getPersonTrainRecord.TrainMode = personTrainRecordInput.TrainMode;
+                        getPersonTrainRecord.TrainPrincipal = personTrainRecordInput.TrainPrincipal;
+                        getPersonTrainRecord.TrainStartDate = personTrainRecordInput.TrainStartDate;
+                        getPersonTrainRecord.TrainEndDate = personTrainRecordInput.TrainEndDate;
+                        getPersonTrainRecord.TrainContent = personTrainRecordInput.TrainContent;
+                        getPersonTrainRecord.TrainDescript = personTrainRecordInput.TrainDescript;
+                        db.SubmitChanges();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.ToString();
+            }
+            return responeData;
+        }
+        /// <summary>
+        /// 删除人员培训记录
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData DelTrainPersonRecord(string id)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+                {
+                    var getPersonTrainRecord = db.Bo_Sheng_PersonTrainRecord.FirstOrDefault(x => x.ID == id);
+                    if (getPersonTrainRecord != null)
+                    {
+                        db.Bo_Sheng_PersonTrainRecord.DeleteOnSubmit(getPersonTrainRecord);
+                        db.SubmitChanges();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.ToString();
+            }
+            return responeData;
+        }
+
+    }
+}

SGGL/WebAPI/Controllers/BaseInfoController.cs

@@ -78,6 +78,29 @@ namespace WebAPI.Controllers
         }
         #endregion
 
+        #region 根据项目名称获取项目信息
+        /// <summary>
+        ///  根据项目名称获取项目信息
+        /// </summary>
+        /// <param name="projectName"></param>
+        /// <returns></returns>
+        public Model.ResponeData getProjectByName(string projectName)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = BLL.APIBaseInfoService.getProjectByName(projectName);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+        #endregion
+
         #region 根据projectId获取单位工程
         /// <summary>
         ///  根据projectId获取单位工程

SGGL/WebAPI/Controllers/UnitController.cs

@@ -238,5 +238,90 @@ namespace WebAPI.Controllers
             return responeData;
         }
         #endregion
+
+        [HttpPost]
+        public Model.ResponeData AddUnit([FromBody] Model.UnitItem unit)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+                {
+                    Model.Base_Unit newUnit = db.Base_Unit.FirstOrDefault(x => x.CollCropCode == unit.CollCropCode);
+                    if (newUnit == null)
+                    {
+                        newUnit = new Model.Base_Unit
+                        {
+                            UnitId = SQLHelper.GetNewID(typeof(Model.Base_Unit))
+                        };
+                        db.Base_Unit.InsertOnSubmit(newUnit);
+                        newUnit.UnitCode = unit.UnitCode;//代码
+                        newUnit.UnitName = unit.UnitName;//名称
+                        newUnit.Corporate = unit.Corporate;//法人代表
+                        newUnit.Address = unit.Address;//地址
+                        newUnit.Telephone = unit.Telephone;//电话
+                        newUnit.ShortUnitName = unit.ShortUnitName;//单位简称
+                        newUnit.Fax = unit.Fax;//传真
+                        newUnit.EMail = unit.EMail;//邮箱
+
+                        newUnit.IsBranch = unit.IsBranch;//是否分公司  
+                        newUnit.ProjectRange = unit.ProjectRange;//工程范围
+                        newUnit.IsChina = unit.IsChina;//是否中国企业
+                        newUnit.CollCropCode = unit.CollCropCode;//社会统一信用代码
+                        newUnit.LinkName = unit.LinkName;//联系人姓名
+                        if (!string.IsNullOrEmpty(unit.IdcardType))
+                        {
+                            var basicData = db.RealName_BasicData.FirstOrDefault(x => x.DictTypeCode == "ZHENGJIAN_TYPE" && x.DictName == unit.IdcardType);
+                            if (basicData != null)
+                            {
+                                newUnit.IdcardType = basicData.DictCode;//联系人证件类型  (香港永久性身份证  军官证   其他 警官证 台湾居民身份证 身份证 护照)
+                            }
+                        }
+                        newUnit.IdcardNumber = unit.IdcardNumber;//联系人证件号
+                        newUnit.LinkMobile = unit.LinkMobile;//联系人电话
+                        newUnit.CollCropStatus = unit.CollCropStatus;//是否黑名单企业
+                        db.SubmitChanges();
+                    }
+
+                    if (!string.IsNullOrEmpty(unit.ProjectId))
+                    {
+                        Model.Project_ProjectUnit projectUnit = Funs.DB.Project_ProjectUnit.FirstOrDefault(x => x.UnitId == newUnit.UnitId && x.ProjectId == unit.ProjectId);
+                        if (projectUnit == null)
+                        {
+                            projectUnit = new Model.Project_ProjectUnit();
+                            projectUnit.ProjectUnitId = SQLHelper.GetNewID(typeof(Model.Base_Unit));
+                            db.Project_ProjectUnit.InsertOnSubmit(projectUnit);
+
+                            projectUnit.ProjectId = unit.ProjectId;
+                            projectUnit.UnitId = newUnit.UnitId;
+                            projectUnit.InTime = DateTime.Now;
+
+                            if (!string.IsNullOrEmpty(unit.UnitTypeId))
+                            {
+                                var unitTypeList = (from x in Funs.DB.Sys_Const
+                                                    where x.GroupId == ConstValue.Group_ProjectUnitType
+                                                    orderby x.SortIndex
+                                                    select x).ToList();
+                                var unitType = unitTypeList.FirstOrDefault(x => x.ConstText == unit.UnitTypeId);
+                                if (unitType != null)
+                                {
+                                    projectUnit.UnitType = unitType.ConstValue;// 单位类型（监理 施工分包  安装 其他 业主 检测单位 其他 总包）
+                                }
+                            }
+                            //projectUnit.UnitType = newUnit.UnitTypeId;
+
+                            db.SubmitChanges();
+                        }
+                    }
+
+
+                    responeData.data = newUnit.UnitId;
+                }
+
+            }
+            catch (Exception ex) { }
+            return responeData;
+
+        }
     }
 }

SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -6,7 +6,8 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_PublishTargetUrl>E:\Package\中国五环工程有限公司\SGGLAPI</_PublishTargetUrl>
-    <History>True|2024-07-17T02:29:15.9472548Z;</History>
+    <History>True|2024-09-03T08:26:17.4985546Z||;True|2024-07-17T10:29:15.9472548+08:00||;</History>
+    <LastFailureDetails />
   </PropertyGroup>
   <ItemGroup>
     <File Include="Areas/HelpPage/HelpPage.css">
@@ -85,55 +86,55 @@
       <publishTime>09/23/2018 23:07:04</publishTime>
     </File>
     <File Include="bin/App_global.asax.compiled">
-      <publishTime>08/12/2024 09:53:00</publishTime>
+      <publishTime>09/03/2024 16:26:16</publishTime>
     </File>
     <File Include="bin/App_global.asax.dll">
-      <publishTime>08/12/2024 09:53:00</publishTime>
+      <publishTime>09/03/2024 16:26:15</publishTime>
     </File>
     <File Include="bin/Aspose.Words.dll">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>06/25/2024 16:56:55</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>08/12/2024 09:52:20</publishTime>
+      <publishTime>09/03/2024 16:26:10</publishTime>
     </File>
     <File Include="bin/BLL.dll.config">
-      <publishTime>05/15/2024 09:04:09</publishTime>
+      <publishTime>06/25/2024 16:56:51</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>08/12/2024 09:52:20</publishTime>
+      <publishTime>09/03/2024 16:26:10</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
-      <publishTime>12/17/2020 21:32:28</publishTime>
+      <publishTime>12/18/2020 05:32:28</publishTime>
     </File>
     <File Include="bin/EmitMapper.dll">
-      <publishTime>05/10/2011 13:28:12</publishTime>
+      <publishTime>05/10/2011 21:28:12</publishTime>
     </File>
     <File Include="bin/FineUIPro.dll">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>06/25/2024 16:56:54</publishTime>
     </File>
     <File Include="bin/ICSharpCode.SharpZipLib.dll">
-      <publishTime>05/08/2021 17:08:30</publishTime>
+      <publishTime>05/09/2021 01:08:30</publishTime>
     </File>
     <File Include="bin/ICSharpCode.SharpZipLib.pdb">
-      <publishTime>05/08/2021 17:08:30</publishTime>
+      <publishTime>05/09/2021 01:08:30</publishTime>
     </File>
     <File Include="bin/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll">
       <publishTime>05/24/2018 13:38:22</publishTime>
     </File>
     <File Include="bin/Microsoft.Extensions.Logging.Abstractions.dll">
-      <publishTime>06/07/2018 00:26:54</publishTime>
+      <publishTime>06/07/2018 08:26:54</publishTime>
     </File>
     <File Include="bin/Microsoft.Web.Infrastructure.dll">
       <publishTime>07/25/2012 11:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>08/12/2024 09:52:17</publishTime>
+      <publishTime>09/03/2024 16:26:07</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>08/12/2024 09:52:17</publishTime>
+      <publishTime>09/03/2024 16:26:07</publishTime>
     </File>
     <File Include="bin/netstandard.dll">
-      <publishTime>07/07/2022 09:01:04</publishTime>
+      <publishTime>08/13/2024 14:17:23</publishTime>
     </File>
     <File Include="bin/Newtonsoft.Json.dll">
       <publishTime>11/27/2018 18:07:34</publishTime>
@@ -142,34 +143,34 @@
       <publishTime>11/27/2018 17:59:08</publishTime>
     </File>
     <File Include="bin/NPOI.dll">
-      <publishTime>10/23/2021 01:07:54</publishTime>
+      <publishTime>10/23/2021 09:07:54</publishTime>
     </File>
     <File Include="bin/NPOI.OOXML.dll">
-      <publishTime>10/23/2021 01:07:56</publishTime>
-    </File>
-    <File Include="bin/NPOI.OOXML.pdb">
       <publishTime>10/23/2021 09:07:56</publishTime>
     </File>
+    <File Include="bin/NPOI.OOXML.pdb">
+      <publishTime>10/23/2021 17:07:56</publishTime>
+    </File>
     <File Include="bin/NPOI.OpenXml4Net.dll">
-      <publishTime>10/23/2021 01:07:54</publishTime>
+      <publishTime>10/23/2021 09:07:54</publishTime>
     </File>
     <File Include="bin/NPOI.OpenXml4Net.pdb">
-      <publishTime>10/23/2021 09:07:54</publishTime>
+      <publishTime>10/23/2021 17:07:54</publishTime>
     </File>
     <File Include="bin/NPOI.OpenXmlFormats.dll">
-      <publishTime>10/23/2021 01:07:54</publishTime>
+      <publishTime>10/23/2021 09:07:54</publishTime>
     </File>
     <File Include="bin/NPOI.OpenXmlFormats.pdb">
-      <publishTime>10/23/2021 09:07:54</publishTime>
+      <publishTime>10/23/2021 17:07:54</publishTime>
     </File>
     <File Include="bin/NPOI.pdb">
-      <publishTime>10/23/2021 09:07:54</publishTime>
+      <publishTime>10/23/2021 17:07:54</publishTime>
     </File>
     <File Include="bin/Quartz.dll">
-      <publishTime>09/18/2022 09:38:18</publishTime>
+      <publishTime>09/18/2022 17:38:18</publishTime>
     </File>
     <File Include="bin/RestSharp.dll">
-      <publishTime>12/08/2021 14:02:42</publishTime>
+      <publishTime>12/08/2021 22:02:42</publishTime>
     </File>
     <File Include="bin/roslyn/csc.exe">
       <publishTime>05/24/2018 13:38:22</publishTime>
@@ -310,34 +311,37 @@
       <publishTime>05/24/2018 13:38:24</publishTime>
     </File>
     <File Include="bin/SgManager.AI.dll">
-      <publishTime>08/12/2024 09:52:15</publishTime>
+      <publishTime>09/03/2024 16:26:04</publishTime>
     </File>
     <File Include="bin/SgManager.AI.dll.config">
-      <publishTime>05/15/2024 09:04:33</publishTime>
+      <publishTime>06/25/2024 16:56:55</publishTime>
     </File>
     <File Include="bin/SgManager.AI.pdb">
-      <publishTime>08/12/2024 09:52:15</publishTime>
+      <publishTime>09/03/2024 16:26:04</publishTime>
+    </File>
+    <File Include="bin/Swashbuckle.Core.dll">
+      <publishTime>07/08/2017 09:30:56</publishTime>
     </File>
     <File Include="bin/System.Buffers.dll">
-      <publishTime>02/19/2020 10:05:18</publishTime>
+      <publishTime>02/19/2020 18:05:18</publishTime>
     </File>
     <File Include="bin/System.Configuration.ConfigurationManager.dll">
       <publishTime>08/19/2022 19:55:18</publishTime>
     </File>
     <File Include="bin/System.Diagnostics.DiagnosticSource.dll">
-      <publishTime>04/14/2020 22:49:20</publishTime>
+      <publishTime>04/15/2020 06:49:20</publishTime>
     </File>
     <File Include="bin/System.Memory.dll">
-      <publishTime>02/19/2020 10:05:18</publishTime>
+      <publishTime>02/19/2020 18:05:18</publishTime>
     </File>
     <File Include="bin/System.Net.Http.Formatting.dll">
       <publishTime>11/28/2018 13:00:36</publishTime>
     </File>
     <File Include="bin/System.Numerics.Vectors.dll">
-      <publishTime>05/15/2018 13:29:44</publishTime>
+      <publishTime>05/15/2018 21:29:44</publishTime>
     </File>
     <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
-      <publishTime>02/19/2020 10:05:16</publishTime>
+      <publishTime>02/19/2020 18:05:16</publishTime>
     </File>
     <File Include="bin/System.Web.Cors.dll">
       <publishTime>11/28/2018 12:58:44</publishTime>
@@ -373,145 +377,148 @@
       <publishTime>02/01/2018 12:20:56</publishTime>
     </File>
     <File Include="bin/ThoughtWorks.QRCode.dll">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>06/25/2024 16:56:55</publishTime>
+    </File>
+    <File Include="bin/WebActivatorEx.dll">
+      <publishTime>02/09/2013 00:42:28</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>08/12/2024 09:52:21</publishTime>
+      <publishTime>09/03/2024 16:26:11</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>08/12/2024 09:52:21</publishTime>
+      <publishTime>09/03/2024 16:26:11</publishTime>
     </File>
     <File Include="bin/WebAPI.xml">
-      <publishTime>08/12/2024 09:52:21</publishTime>
+      <publishTime>09/03/2024 16:26:11</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
       <publishTime>01/23/2014 13:57:34</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
-      <publishTime>11/29/2018 13:26:02</publishTime>
+      <publishTime>11/29/2018 21:26:02</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Web.Helpers.resources.dll">
-      <publishTime>02/01/2018 12:21:00</publishTime>
+      <publishTime>02/01/2018 20:21:00</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
-      <publishTime>11/29/2018 13:26:30</publishTime>
+      <publishTime>11/29/2018 21:26:30</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Web.Http.WebHost.resources.dll">
-      <publishTime>02/01/2018 12:19:30</publishTime>
+      <publishTime>02/01/2018 20:19:30</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Web.Mvc.resources.dll">
-      <publishTime>02/01/2018 12:16:38</publishTime>
+      <publishTime>02/01/2018 20:16:38</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Web.Optimization.resources.dll">
-      <publishTime>02/11/2014 15:28:40</publishTime>
+      <publishTime>02/11/2014 23:28:40</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Web.Razor.resources.dll">
-      <publishTime>02/01/2018 12:17:00</publishTime>
+      <publishTime>02/01/2018 20:17:00</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Web.WebPages.Deployment.resources.dll">
-      <publishTime>02/01/2018 12:21:00</publishTime>
+      <publishTime>02/01/2018 20:21:00</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Web.WebPages.Razor.resources.dll">
-      <publishTime>02/01/2018 12:21:00</publishTime>
+      <publishTime>02/01/2018 20:21:00</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Web.WebPages.resources.dll">
-      <publishTime>02/01/2018 12:21:00</publishTime>
+      <publishTime>02/01/2018 20:21:00</publishTime>
     </File>
     <File Include="Content/bootstrap-theme.css">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>06/25/2024 16:56:55</publishTime>
     </File>
     <File Include="Content/bootstrap-theme.css.map">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>06/25/2024 16:56:55</publishTime>
     </File>
     <File Include="Content/bootstrap-theme.min.css">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>06/25/2024 16:56:55</publishTime>
     </File>
     <File Include="Content/bootstrap-theme.min.css.map">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>06/25/2024 16:56:55</publishTime>
     </File>
     <File Include="Content/bootstrap.css">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>06/25/2024 16:56:55</publishTime>
     </File>
     <File Include="Content/bootstrap.css.map">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>06/25/2024 16:56:55</publishTime>
     </File>
     <File Include="Content/bootstrap.min.css">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>06/25/2024 16:56:55</publishTime>
     </File>
     <File Include="Content/bootstrap.min.css.map">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>06/25/2024 16:56:55</publishTime>
     </File>
     <File Include="Content/Site.css">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>06/25/2024 16:56:55</publishTime>
     </File>
     <File Include="ErrLog.txt">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>06/25/2024 16:56:55</publishTime>
     </File>
     <File Include="favicon.ico">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>06/25/2024 16:56:55</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.eot">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>06/25/2024 16:56:55</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.svg">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>06/25/2024 16:56:55</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.ttf">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>06/25/2024 16:56:55</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.woff">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>06/25/2024 16:56:55</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.woff2">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>06/25/2024 16:56:55</publishTime>
     </File>
     <File Include="PrecompiledApp.config">
-      <publishTime>08/12/2024 09:52:38</publishTime>
+      <publishTime>09/03/2024 16:26:12</publishTime>
     </File>
     <File Include="Scripts/bootstrap.js">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>06/25/2024 16:56:55</publishTime>
     </File>
     <File Include="Scripts/bootstrap.min.js">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>06/25/2024 16:56:55</publishTime>
     </File>
     <File Include="Scripts/jquery-3.3.1.js">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>06/25/2024 16:56:55</publishTime>
     </File>
     <File Include="Scripts/jquery-3.3.1.min.js">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>06/25/2024 16:56:55</publishTime>
     </File>
     <File Include="Scripts/jquery-3.3.1.min.map">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>06/25/2024 16:56:55</publishTime>
     </File>
     <File Include="Scripts/jquery-3.3.1.slim.js">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>06/25/2024 16:56:55</publishTime>
     </File>
     <File Include="Scripts/jquery-3.3.1.slim.min.js">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>06/25/2024 16:56:55</publishTime>
     </File>
     <File Include="Scripts/jquery-3.3.1.slim.min.map">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>06/25/2024 16:56:55</publishTime>
     </File>
     <File Include="Scripts/modernizr-2.8.3.js">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>06/25/2024 16:56:55</publishTime>
     </File>
     <File Include="Views/Home/Index.cshtml">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>01/25/2024 16:49:07</publishTime>
     </File>
     <File Include="Views/Shared/Error.cshtml">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>01/25/2024 16:49:07</publishTime>
     </File>
     <File Include="Views/Shared/_Layout.cshtml">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>01/25/2024 16:49:07</publishTime>
     </File>
     <File Include="Views/Web.config">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>01/25/2024 16:49:07</publishTime>
     </File>
     <File Include="Views/_ViewStart.cshtml">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>01/25/2024 16:49:07</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>08/08/2024 09:20:35</publishTime>
+      <publishTime>09/03/2024 16:23:55</publishTime>
     </File>
   </ItemGroup>
 </Project>

SGGL/WebAPI/Web.config

@@ -46,7 +46,7 @@
       </system.Web>
   -->
   <system.web>
-    <compilation debug="false" targetFramework="4.6.1"/>
+    <compilation debug="true" targetFramework="4.6.1"/>
     <httpRuntime/>
     <pages controlRenderingCompatibilityVersion="4.0"/>
   </system.web>

SGGL/WebAPI/WebAPI.csproj

@@ -57,6 +57,9 @@
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="Swashbuckle.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cd1bb07a5ac7c7bc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Swashbuckle.Core.5.6.0\lib\net40\Swashbuckle.Core.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -124,6 +127,9 @@
       <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.4\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
+    <Reference Include="WebActivatorEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
+      <HintPath>..\packages\WebActivatorEx.2.0\lib\net40\WebActivatorEx.dll</HintPath>
+    </Reference>
     <Reference Include="WebGrease">
       <Private>True</Private>
       <HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>
@@ -142,7 +148,9 @@
     <Compile Include="App_Start\BundleConfig.cs" />
     <Compile Include="App_Start\FilterConfig.cs" />
     <Compile Include="App_Start\RouteConfig.cs" />
+    <Compile Include="App_Start\SwaggerConfig.cs" />
     <Compile Include="App_Start\WebApiConfig.cs" />
+    <Compile Include="Controllers\AnBangToolController.cs" />
     <Compile Include="Controllers\BaseInfoController.cs" />
     <Compile Include="Controllers\CommonController.cs" />
     <Compile Include="Controllers\CQMS\InspectionManagementController.cs" />

SGGL/WebAPI/WebAPI.csproj.user

@@ -9,9 +9,9 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
-    <Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
-    <Controller_SelectedScaffolderCategoryPath>root/Controller</Controller_SelectedScaffolderCategoryPath>
+    <NameOfLastUsedPublishProfile>D:\数据\诺必达\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+    <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
+    <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
     <WebStackScaffolding_ControllerDialogWidth>600</WebStackScaffolding_ControllerDialogWidth>
     <WebStackScaffolding_IsLayoutPageSelected>True</WebStackScaffolding_IsLayoutPageSelected>
     <WebStackScaffolding_IsPartialViewSelected>False</WebStackScaffolding_IsPartialViewSelected>

SGGL/WebAPI/packages.config

@@ -25,5 +25,8 @@
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net461" />
   <package id="Modernizr" version="2.8.3" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
+  <package id="Swashbuckle" version="5.6.0" targetFramework="net461" />
+  <package id="Swashbuckle.Core" version="5.6.0" targetFramework="net461" />
+  <package id="WebActivatorEx" version="2.0" targetFramework="net461" />
   <package id="WebGrease" version="1.6.0" targetFramework="net461" />
 </packages>