20250329 工作台

DataBase/版本日志/SGGLDB_WH_V2025-03-28（菜单调整）-xiaj.sql

@@ -0,0 +1,46 @@
+
+--菜单调整：
+
+--1、移交管理菜单放到试车管理模块下：预试车和试车管理之间【试车及移交管理】
+IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = 'D98BB86C-CCC4-433B-B367-EFD9E7D2BC39')
+BEGIN
+	--移交管理
+	INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+	VALUES('D98BB86C-CCC4-433B-B367-EFD9E7D2BC39','移交管理','',95,'0','Menu_TestRun',0,0,1)
+END
+GO
+
+
+
+update Sys_Menu 
+set MenuType='Menu_TestRun' , SuperMenu='D98BB86C-CCC4-433B-B367-EFD9E7D2BC39'
+where MenuType='Menu_Transfer' and SuperMenu='0'
+GO
+
+
+update Sys_Menu 
+set MenuType='Menu_TestRun'
+where MenuType='Menu_Transfer' 
+GO
+
+
+
+--2、材料管理菜单放施工管理下面第一个
+IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = '17479694-E342-4046-807A-8905C3B225C1')
+BEGIN
+	--材料管理
+	INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+	VALUES('17479694-E342-4046-807A-8905C3B225C1','材料管理','',1,'0','Menu_JDGL',0,0,1)
+END
+GO
+
+update Sys_Menu 
+set MenuType='Menu_JDGL' , SuperMenu='17479694-E342-4046-807A-8905C3B225C1'
+where MenuType='Menu_CLGL' and SuperMenu='0'
+GO
+
+
+update Sys_Menu 
+set MenuType='Menu_JDGL'
+where MenuType='Menu_CLGL' 
+GO

DataBase/版本日志/SGGLDB_WH_V2025-03-28（项目主数据对接）-xiaj.sql

@@ -0,0 +1,115 @@
+
+
+
+--insert into Sys_Set(SetId,SetName,SetValue)
+--select 3,'PMPToken','eyJhbGciOiJIUzI1NiJ9.eyJjb21wYW55Q29kZSI6bnVsbCwiZGVwdE5hbWUiOiJXRUMiLCJzdWIiOiJ6Z3doIiwib3JnTmFtZSI6IldFQyIsInN5c1VzZXJOYW1lIjoiemd3aCIsImNvbXBhbnlOYW1lIjpudWxsLCJkZXB0SWQiOjIzODY2LCJpc3MiOiLkupHmmbrmlbDnu7QiLCJ0eXBlIjoxLCJvcmdJZCI6MjM4NjYsInVzZXJDb2RlIjpudWxsLCJjb21wYW55SWQiOjAsIm9yZ0NvZGUiOiItMSIsImRpc0lkIjoxMTIsImV4cCI6MTc0MzIxNDI1NSwiaWF0IjoxNzQzMDQxNDU1LCJkZXB0Q29kZSI6Ii0xIiwianRpIjoiMTU1MyJ9.tqYpeG4t7r8r05fGV2h-wBYihoFH9jH-veAmuCXG4EI'
+
+--insert into Sys_Set(SetId,SetName,SetValue)
+--select 4,'PMPTokenExTime','2025/03/27 11:18:00'
+--insert into Sys_Set(SetId,SetName,SetValue)
+--select 5,'PMP接口地址','http://mdm.cwcec.com:8020/'
+
+
+delete Sys_Set where SetName like '%MDM%'
+IF NOT EXISTS (SELECT 1 FROM Sys_Set WHERE SetName = 'PMP接口地址')
+BEGIN
+	insert into Sys_Set(SetId,SetName,SetValue)
+	select 5,'PMP接口地址','http://mdm.cwcec.com:8020/'
+END
+GO
+
+/**********************************************************
+
+
+--drop table MDM_Project;
+
+
+select* from Sys_Set;
+select* from PMP_Project;
+
+***********************************************************/
+
+--PMP项目数据补充开工日期和竣工日期
+IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'PMP_Project' AND COLUMN_NAME = 'realEndDate')
+BEGIN
+	ALTER TABLE PMP_Project ADD realStartDate datetime;
+	ALTER TABLE PMP_Project ADD realEndDate datetime;
+END
+GO
+
+--PMP项目数据
+IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'PMP_Project') AND type = N'U')
+BEGIN
+	CREATE TABLE [dbo].[PMP_Project](
+		[id] [int] NOT NULL,
+		[code] [nvarchar](100) NOT NULL,
+		[stNum] [nvarchar](100) NOT NULL,
+		[disType] [nvarchar](100) NULL,
+		[name] [nvarchar](200) NOT NULL,
+		[projShortName] [nvarchar](100) NULL,
+		[projStepZxnoCode] [nvarchar](100) NULL,
+		[projStepZxnoName] [nvarchar](100) NULL,
+		[stProjectTypeVals] [nvarchar](100) NULL,
+		[stProjectStepVals] [nvarchar](100) NULL,
+		[projStepZxnoVals] [nvarchar](100) NULL,
+		[stProjectPropertyVals] [nvarchar](100) NULL,
+		[remarkC] [nvarchar](100) NULL,
+		[address] [nvarchar](500) NULL,
+		[cityCode] [nvarchar](100) NULL,
+		[cityName] [nvarchar](100) NULL,
+		[countryCode] [nvarchar](100) NULL,
+		[countryName] [nvarchar](100) NULL,
+		[countyCode] [nvarchar](100) NULL,
+		[countyName] [nvarchar](100) NULL,
+		[projectNameEn] [nvarchar](500) NULL,
+		[provinceCode] [nvarchar](100) NULL,
+		[provinceName] [nvarchar](100) NULL,
+		[remarkA] [nvarchar](100) NULL,
+		[remarkB] [nvarchar](100) NULL,
+		[realStartDate] [datetime] NULL,
+		[realEndDate] [datetime] NULL,
+		[CreateTime] [datetime] NOT NULL,
+	 CONSTRAINT [PK_PMP_Project] PRIMARY KEY CLUSTERED 
+	(
+		[id] ASC
+	)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+	) ON [PRIMARY]
+	EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'id'
+	EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'code'
+	EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目号(源头)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'stNum'
+	EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'操作类型' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'disType'
+	EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'name'
+	EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目简称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'projShortName'
+	EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目阶段编码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'projStepZxnoCode'
+	EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目阶段名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'projStepZxnoName'
+	EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目类型一级' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'stProjectTypeVals'
+	EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目类型二级' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'stProjectStepVals'
+	EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目阶段' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'projStepZxnoVals'
+	EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目性质' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'stProjectPropertyVals'
+	EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'备注3_新系统项目ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'remarkC'
+	EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'详细地址' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'address'
+	EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'市编码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'cityCode'
+	EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'市名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'cityName'
+	EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'国家编码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'countryCode'
+	EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'国家名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'countryName'
+	EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'区县编码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'countyCode'
+	EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'区县名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'countyName'
+	EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目英文名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'projectNameEn'
+	EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'省编码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'provinceCode'
+	EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'省名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'provinceName'
+	EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'经度' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'remarkA'
+	EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'纬度' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'remarkB'
+	EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目开工日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'realStartDate'
+	EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目竣工日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'realEndDate'
+	EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'创建时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'CreateTime'
+	EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'PMP项目数据' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project'
+END
+GO
+
+
+--项目人员加邮箱
+IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'SitePerson_Person' AND COLUMN_NAME = 'Email')
+BEGIN
+	ALTER TABLE SitePerson_Person ADD Email nvarchar(200);
+END
+GO

DataBase/版本日志/SUBQHSE_V2025-03-26-geh.sql

@@ -0,0 +1,5 @@
+UPDATE [dbo].[HSSE_Hazard_HazardRegister] SET [Risk_Level] = '一般' WHERE Risk_Level is null or Risk_Level = '';
+go
+
+UPDATE [dbo].[HSSE_Hazard_HazardRegister] SET [ProblemTypes] = '0' WHERE ProblemTypes is null or Risk_Level = '';
+go

SGGL/BLL/BLL.csproj

@@ -626,6 +626,7 @@
     <Compile Include="JDGL\WBS\WbsSetMatchCostControlService.cs" />
     <Compile Include="JDGL\WBS\WbsSetService.cs" />
     <Compile Include="JDGL\WBS\WorkloadStatisticsService.cs" />
+    <Compile Include="PMP\PMPDataService.cs" />
     <Compile Include="Notice\NoticeService.cs" />
     <Compile Include="OfficeCheck\Check\CheckNoticeService.cs" />
     <Compile Include="OfficeCheck\Check\CheckReportService.cs" />

SGGL/BLL/CQMS/Check/CheckControlApproveService.cs

@@ -101,7 +101,7 @@ namespace BLL
         /// <returns>一个质量巡检审批实体</returns>
         public static Model.Check_CheckControlApprove GetCheckControlApproveByCheckControlId(string CheckControlCode)
         {
-            return db.Check_CheckControlApprove.FirstOrDefault(x => x.CheckControlCode == CheckControlCode && x.ApproveType != "S" && x.ApproveDate == null);
+            return db.Check_CheckControlApprove.OrderByDescending(x=>x.ApproveDate).FirstOrDefault(x => x.CheckControlCode == CheckControlCode && x.ApproveType != "S" && x.ApproveDate != null);
         }
         /// <summary>
         /// 修改质量巡检审批信息

SGGL/BLL/Common/Const.cs

@@ -4811,7 +4811,7 @@ namespace BLL
         /// <summary>
         /// 关键事项模板文件原始虚拟路径
         /// </summary>
-        public const string GJSXOutTemplateUrl = "File\\Excel\\DataOut\\关键事项.xlsx";
+        public const string GJSXOutTemplateUrl = "File\\Excel\\DataOut\\关键事项跟踪一览表.xlsx";
 
         #endregion
         #endregion

SGGL/BLL/Common/Funs.cs

@@ -1250,6 +1250,59 @@ namespace BLL
             //return TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1)).AddSeconds(timestamp);
         }
 
+        #region 去除后面多余的零
+
+        /// <summary>
+        /// 去除后面多余的零
+        /// </summary>
+        /// <param name="sResult"></param>
+        /// <returns></returns>
+        public static string RemoveZero(string sResult)
+        {
+            if (sResult.IndexOf(".") < 0)
+                return sResult;
+            int iIndex = sResult.Length - 1;
+            for (int i = sResult.Length - 1; i >= 0; i--)
+            {
+                if (sResult.Substring(i, 1) != "0")
+                {
+                    iIndex = i;
+                    break;
+                }
+            }
+            sResult = sResult.Substring(0, iIndex + 1);
+            if (sResult.EndsWith("."))
+                sResult = sResult.Substring(0, sResult.Length - 1);
+            return sResult;
+        }
+
+        /// <summary>
+        /// 去除后面多余的零
+        /// </summary>
+        /// <param name="dValue"></param>
+        /// <returns></returns>
+        public static string RemoveZero(decimal dValue)
+        {
+            string sResult = dValue.ToString();
+            if (sResult.IndexOf(".") < 0)
+                return sResult;
+            int iIndex = sResult.Length - 1;
+            for (int i = sResult.Length - 1; i >= 0; i--)
+            {
+                if (sResult.Substring(i, 1) != "0")
+                {
+                    iIndex = i;
+                    break;
+                }
+            }
+            sResult = sResult.Substring(0, iIndex + 1);
+            if (sResult.EndsWith("."))
+                sResult = sResult.Substring(0, sResult.Length - 1);
+            return sResult;
+        }
+
+        #endregion
+
         public static string RequestGet(string Baseurl, string Token)
         {
             ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;

SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs

@@ -113,7 +113,7 @@ namespace BLL
                     newHazardRegister.ProblemTypes = hazardRegister.ProblemTypes;
                     newHazardRegister.DIC_ID = hazardRegister.DIC_ID;
                     newHazardRegister.Type = hazardRegister.Type;
-
+                    newHazardRegister.Risk_Level = hazardRegister.Risk_Level;
                     newHazardRegister.HiddenType = hazardRegister.HiddenType;
                     //把附件表的路径复制过来
                     Model.AttachFile file = BLL.AttachFileService.GetAttachFile(hazardRegister.HazardRegisterId, Const.HSSE_HiddenRectificationListMenuId);

SGGL/BLL/HSSE/SitePerson/PersonService.cs

@@ -508,6 +508,7 @@ namespace BLL
                     OutTime = person.OutTime,
                     OutResult = person.OutResult,
                     Telephone = person.Telephone,
+                    Email = person.Email,
                     PositionId = person.PositionId,
                     PostTitleId = person.PostTitleId,
                     PhotoUrl = person.PhotoUrl,
@@ -588,6 +589,7 @@ namespace BLL
                     newPerson.OutTime = person.OutTime;
                     newPerson.OutResult = person.OutResult;
                     newPerson.Telephone = person.Telephone;
+                    newPerson.Email = person.Email;
                     newPerson.PositionId = person.PositionId;
                     newPerson.PostTitleId = person.PostTitleId;                   
                     if (newPerson.PhotoUrl != person.PhotoUrl && !string.IsNullOrEmpty(person.PhotoUrl))
@@ -669,6 +671,7 @@ namespace BLL
                     newPerson.OutTime = person.OutTime;
                     newPerson.OutResult = person.OutResult;
                     newPerson.Telephone = person.Telephone;
+                    newPerson.Email = person.Email;
                     newPerson.PhotoUrl = person.PhotoUrl;
                     newPerson.HeadImage = person.HeadImage;
                     newPerson.IsUsed = person.IsUsed;

SGGL/BLL/SysManage/SysConstSetService.cs

@@ -170,6 +170,130 @@
                 Funs.DB.SubmitChanges();
             }
         }
+
+
+
+
+        public static string WuHuanPMPPath
+        {
+            get
+            {
+                var sysSet5 = (from x in Funs.DB.Sys_Set where x.SetName == "PMP接口地址" select x).ToList().FirstOrDefault();
+                if (sysSet5 != null)
+                {
+                    _CNCECPath = sysSet5.SetValue;
+                }
+                else
+                {
+                    _CNCECPath = "";
+                }
+                return _CNCECPath;
+            }
+            set
+            {
+                _CNCECPath = value;
+            }
+        }
+        public static string WuHuanPMPToken
+        {
+            get
+            {
+                var sysSet5 = (from x in Funs.DB.Sys_Set where x.SetName == "PMPToken" select x).ToList().FirstOrDefault();
+                if (sysSet5 != null)
+                {
+                    _CNCECToken = sysSet5.SetValue;
+                }
+                else
+                {
+                    _CNCECToken = "";
+                }
+                return _CNCECToken;
+            }
+        }
+        public static string WuHuanPMPTokenExTime
+        {
+            get
+            {
+                var sysSet5 = (from x in Funs.DB.Sys_Set where x.SetName == "PMPTokenExTime" select x).ToList().FirstOrDefault();
+                if (sysSet5 != null)
+                {
+                    _CNCECTokenExTime = sysSet5.SetValue;
+                }
+                else
+                {
+                    _CNCECTokenExTime = "";
+                }
+                return _CNCECTokenExTime;
+            }
+        }
+        public static void SetWuHuanPMPToken(string token)
+        {
+            Model.Sys_Set sysSet = Funs.DB.Sys_Set.FirstOrDefault(x => x.SetName == "PMPToken");
+            if (sysSet != null)
+            {
+                if (!string.IsNullOrEmpty(token))
+                {
+                    sysSet.SetValue = token;
+                }
+                Funs.DB.SubmitChanges();
+            }
+            else
+            {
+                Model.Sys_Set newSysSet5 = new Model.Sys_Set();
+                var q = (from x in Funs.DB.Sys_Set orderby x.SetId descending select x).FirstOrDefault();
+                if (q == null)
+                {
+                    newSysSet5.SetId = 1;
+                }
+                else
+                {
+                    newSysSet5.SetId = q.SetId + 1;
+                }
+                if (!string.IsNullOrEmpty(token))
+                {
+                    newSysSet5.SetValue = token;
+                }
+                newSysSet5.SetName = "PMPToken";
+                Funs.DB.Sys_Set.InsertOnSubmit(newSysSet5);
+                Funs.DB.SubmitChanges();
+            }
+        }
+        public static void SetWuHuanPMPTokenExpirationTime(string ExpirationTime)
+        {
+            Model.Sys_Set sysSet = Funs.DB.Sys_Set.FirstOrDefault(x => x.SetName == "PMPTokenExTime");
+            if (sysSet != null)
+            {
+                if (!string.IsNullOrEmpty(ExpirationTime))
+                {
+                    sysSet.SetValue = ExpirationTime;
+                }
+                Funs.DB.SubmitChanges();
+            }
+            else
+            {
+                Model.Sys_Set newSysSet5 = new Model.Sys_Set();
+                var q = (from x in Funs.DB.Sys_Set orderby x.SetId descending select x).FirstOrDefault();
+                if (q == null)
+                {
+                    newSysSet5.SetId = 1;
+                }
+                else
+                {
+                    newSysSet5.SetId = q.SetId + 1;
+                }
+                if (!string.IsNullOrEmpty(ExpirationTime))
+                {
+                    newSysSet5.SetValue = ExpirationTime;
+                }
+                newSysSet5.SetName = "PMPTokenExTime";
+                Funs.DB.Sys_Set.InsertOnSubmit(newSysSet5);
+                Funs.DB.SubmitChanges();
+            }
+        }
+
+
+
+
         /// <summary>
         /// 获取及格分数
         /// </summary>

SGGL/BLL/SysManage/UserService.cs

@@ -218,6 +218,7 @@ namespace BLL
                 PageSize = 10,
                 IsOffice = user.IsOffice,
                 Telephone = user.Telephone,
+                Email = user.Email,
                 DataSources = user.DataSources,
                 SignatureUrl = user.SignatureUrl,
                 DepartId = user.DepartId,
@@ -268,6 +269,7 @@ namespace BLL
                 newUser.IsPost = user.IsPost;
                 newUser.IsOffice = user.IsOffice;
                 newUser.Telephone = user.Telephone;
+                newUser.Email = user.Email;
                 newUser.SignatureUrl = user.SignatureUrl;
                 newUser.DepartId = user.DepartId;
                 newUser.MainCNProfessionalId = user.MainCNProfessionalId;
@@ -298,6 +300,10 @@ namespace BLL
                 newUser.IsPost = user.IsPost;
                 newUser.IsOffice = user.IsOffice;
                 newUser.Telephone = user.Telephone;
+                if (!string.IsNullOrEmpty(user.Email))
+                {
+                    newUser.Email = user.Email;
+                }
                 newUser.SignatureUrl = user.SignatureUrl;
                 newUser.DepartId = user.DepartId;
                 newUser.Politicalstatus = user.Politicalstatus;
@@ -339,7 +345,10 @@ namespace BLL
                 newUser.UserName = user.UserName;
                 newUser.UserCode = user.UserCode;
                 newUser.IdentityCard = user.IdentityCard;
-                newUser.Email = user.Email;
+                if (!string.IsNullOrEmpty(user.Email))
+                {
+                    newUser.Email = user.Email;
+                }
                 newUser.Telephone = user.Telephone;
                 Funs.DB.SubmitChanges();
             }

SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs

@@ -1436,7 +1436,7 @@ namespace BLL
         {
             var result =
                 (from x in Funs.DB.Solution_LargerHazard
-                 where x.ProjectId == projectid && x.IsSuperLargerHazard == true && x.RecordTime > Const.DtmarkTime
+                 where x.ProjectId == projectid && x.IsSuperLargerHazard == true && x.TrainPersonNum != null && x.RecordTime > Const.DtmarkTime
                  select x.TrainPersonNum).ToList().Sum(x => x.Value);
             return result;
         }

SGGL/BLL/ZHGL/RealName/SynchroSetService.cs

@@ -1444,10 +1444,10 @@ namespace BLL
                 string contenttype = "application/json;charset=unicode";
                 var getData = (from x in Funs.DB.SitePerson_Person
                                join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
-                               join z in Funs.DB.RealName_Project on y.ContractNo equals z.ProCode
+                               join z in Funs.DB.RealName_Project on y.JTProjectCode equals z.ProCode
                                join v in Funs.DB.ProjectData_TeamGroup on x.TeamGroupId equals v.TeamGroupId
                                join w in Funs.DB.Base_WorkPost on x.WorkPostId equals w.WorkPostId
-                               where x.IdentityCard == identityCard && y.ContractNo == proCode
+                               where x.IdentityCard == identityCard && y.JTProjectCode == proCode
                                && v.TeamId.HasValue && z.JTproCode != null
                                && ((type == Const.BtnAdd && x.HeadImage != null && x.HeadImage.Length > 0) || (type == Const.BtnModify && x.RealNameAddTime.HasValue))
                                select new
@@ -1507,7 +1507,7 @@ namespace BLL
                         pushContent = JsonConvert.SerializeObject(addlistObject);
                         returndata = BLL.APIGetHttpService.OutsideHttp(Funs.RealNameApiUrl + "/foreignApi/accept/persons", "POST", contenttype, newToken, pushContent);
                     }
-
+                    InsertRealNamePushLog(null, proCode, "推送人员数据", sucess, code, mess, returndata, pushContent);
                     if (!string.IsNullOrEmpty(returndata))
                     {
                         JObject obj = JObject.Parse(returndata);
@@ -1545,8 +1545,7 @@ namespace BLL
                             }
                         }
                     }
-
-                    InsertRealNamePushLog(null, proCode, "推送人员数据", sucess, code, mess, data, pushContent);
+                    //InsertRealNamePushLog(null, proCode, "推送人员数据", sucess, code, mess, data, pushContent);
                     if (data.Contains("已存在") || mess.Contains("已存在"))
                     {
                         using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))

SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx

@@ -174,8 +174,8 @@
     <comment>刷新本页</comment>
   </data>
   <data name="ScheduleManage" xml:space="preserve">
-    <value>Schedule manage</value>
-    <comment>进度管理</comment>
+    <value>Construction management </value>
+    <comment>施工管理</comment>
   </data>
   <data name="SelectLanguage" xml:space="preserve">
     <value>Choice language</value>
@@ -496,8 +496,8 @@
     <comment>停工</comment>
   </data>
   <data name="TestManagement" xml:space="preserve">
-    <value>Test management</value>
-    <comment>试车管理</comment>
+    <value>Commissioning and Turn-over Mgt.</value>
+    <comment>试车及移交管理</comment>
   </data>
   <data name="UnderConstruction" xml:space="preserve">
     <value>Under construction</value>
@@ -1352,4 +1352,8 @@
     <value>Completion status of weekly plan</value>
     <comment>周计划完成情况</comment>
   </data>
+  <data name="mainProject2_QuantityDone" xml:space="preserve">
+    <value>Completion status of engineering quantity</value>
+    <comment>工程量完成情况</comment>
+  </data>
 </root>

SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx

@@ -160,7 +160,7 @@
     <value>刷新本页</value>
   </data>
   <data name="ScheduleManage" xml:space="preserve">
-    <value>进度管理</value>
+    <value>施工管理</value>
   </data>
   <data name="SelectLanguage" xml:space="preserve">
     <value>选择语言</value>
@@ -400,7 +400,7 @@
     <value>停工</value>
   </data>
   <data name="TestManagement" xml:space="preserve">
-    <value>试车管理</value>
+    <value>试车及移交管理</value>
   </data>
   <data name="UnderConstruction" xml:space="preserve">
     <value>在建</value>
@@ -1197,4 +1197,7 @@
   <data name="mainProject2_WeekPlanDone" xml:space="preserve">
     <value>周计划完成情况</value>
   </data>
+  <data name="mainProject2_QuantityDone" xml:space="preserve">
+    <value>工程量完成情况</value>
+  </data>
 </root>

SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx

@@ -160,7 +160,7 @@
     <value>刷新本页</value>
   </data>
   <data name="ScheduleManage" xml:space="preserve">
-    <value>进度管理</value>
+    <value>施工管理</value>
   </data>
   <data name="SelectLanguage" xml:space="preserve">
     <value>选择语言</value>
@@ -400,7 +400,7 @@
     <value>停工</value>
   </data>
   <data name="TestManagement" xml:space="preserve">
-    <value>试车管理</value>
+    <value>试车及移交管理</value>
   </data>
   <data name="UnderConstruction" xml:space="preserve">
     <value>在建</value>
@@ -1194,4 +1194,7 @@
   <data name="mainProject2_WeekPlanDone" xml:space="preserve">
     <value>周计划完成情况</value>
   </data>
+  <data name="mainProject2_QuantityDone" xml:space="preserve">
+    <value>工程量完成情况</value>
+  </data>
 </root>

SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs

@@ -1185,6 +1185,15 @@ namespace Resources {
             }
         }
         
+        /// <summary>
+        ///   查找类似 工程量完成情况 的本地化字符串。
+        /// </summary>
+        internal static string mainProject2_QuantityDone {
+            get {
+                return ResourceManager.GetString("mainProject2_QuantityDone", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 质量安全预警 的本地化字符串。
         /// </summary>
@@ -3004,7 +3013,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   查找类似 进度管理 的本地化字符串。
+        ///   查找类似 施工管理 的本地化字符串。
         /// </summary>
         internal static string ScheduleManage {
             get {
@@ -3067,7 +3076,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  查找类似 欢迎回来 的本地化字符串。
+        ///   查找类似 欢迎回来 的本地化字符串。
         /// </summary>
         internal static string String1 {
             get {
@@ -3076,7 +3085,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  查找类似 分包管理 的本地化字符串。
+        ///   查找类似 分包管理 的本地化字符串。
         /// </summary>
         internal static string SubManagement {
             get {
@@ -3139,7 +3148,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   查找类似 试车管理 的本地化字符串。
+        ///   查找类似 试车及移交管理 的本地化字符串。
         /// </summary>
         internal static string TestManagement {
             get {
@@ -3256,7 +3265,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  查找类似 欢迎回来 的本地化字符串。
+        ///   查找类似 欢迎回来 的本地化字符串。
         /// </summary>
         internal static string Welcome {
             get {
@@ -3265,7 +3274,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///  查找类似 焊接管理 的本地化字符串。
+        ///   查找类似 焊接管理 的本地化字符串。
         /// </summary>
         internal static string WeldingManage {
             get {

SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs

@@ -8,6 +8,7 @@ using System.IO;
 using System.Linq;
 using System.Text; 
 using System.Threading.Tasks;
+using NPOI.SS.UserModel;
 
 namespace FineUIPro.Web.CQMS.Check
 {
@@ -693,6 +694,7 @@ namespace FineUIPro.Web.CQMS.Check
             }
             if (lists != null)
             {
+                lists = lists.OrderByDescending(x => x.CheckDate);
                 string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId);
                 newUrl = uploadfilepath.Replace("质量巡检模板", "质量巡检（" + projectName + DateTime.Now.ToString("yyyyMMdd") + "）");
                 if (File.Exists(newUrl))
@@ -729,9 +731,13 @@ namespace FineUIPro.Web.CQMS.Check
                     // 第二步：创建新数据行
                     row = sheet.CreateRow(i);
                     // 添加数据
+                    // cell = row.CreateCell(0);
+                    // cell.CellStyle = cellStyle;
+                    // cell.SetCellValue(item.DocCode);//质量巡检编号
+                    
                     cell = row.CreateCell(0);
                     cell.CellStyle = cellStyle;
-                    cell.SetCellValue(item.DocCode);//质量巡检编号
+                    cell.SetCellValue(item.CheckDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.CheckDate) : "");//检查日期
 
                     cell = row.CreateCell(1);
                     cell.CellStyle = cellStyle;
@@ -785,23 +791,99 @@ namespace FineUIPro.Web.CQMS.Check
                     }
                     cell.SetCellValue(t);//问题类别                   
 
-                    cell = row.CreateCell(5);
-                    cell.CellStyle = cellStyle;
-                    cell.SetCellValue(item.CheckSite);//部位
+                    
+                    // cell = row.CreateCell(5);
+                    // cell.CellStyle = cellStyle;
+                    // cell.SetCellValue(item.CheckSite);//整改前照片
+                    //整改前照片
+                    var attachFile = Funs.DB.AttachFile
+                        .Where(p => p.MenuId == BLL.Const.CheckListMenuId && p.ToKeyId == item.CheckControlCode)
+                        .FirstOrDefault();
+                    if (attachFile != null)
+                    {
+                        var photoesUrl = attachFile.AttachUrl;
+                        if (photoesUrl != null)
+                        {
+                            string[] arrUrl = photoesUrl.Split(',');
+                            sheet.SetColumnWidth(5, 30 * 256);
+                            row.Height = (short)(90 * 20 * arrUrl.Length);
+                            foreach (string url in arrUrl)
+                            {
+                                var oneUrl = Server.MapPath("~/") + url;
+                                byte[] bytes = System.IO.File.ReadAllBytes(oneUrl);
+                                int pictureIdx = workbook.AddPicture(bytes, PictureType.JPEG);
 
-                    cell = row.CreateCell(6);
-                    cell.CellStyle = cellStyle;
-                    cell.SetCellValue(item.CheckDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.CheckDate) : "");//巡检日期
+                                // 第三步：创建画部
+                                IDrawing patriarch = sheet.CreateDrawingPatriarch();
+                                // 第四步：设置锚点
+                                int rowline = 1; // y方向
+                                // 参数说明：（在起始单元格的X坐标0-1023，Y的坐标0-255，在终止单元格的X坐标0-1023，Y的坐标0-255，起始单元格列数，行数，终止单元格列数，行数）  
+                                IClientAnchor anchor = patriarch.CreateAnchor(0, 0, 0, 0, 5, i, 6, i + 1);
+                                // 第五步：把图片插到相应的位置+1
+                                IPicture pict = patriarch.CreatePicture(anchor, pictureIdx);
+                                //就取第一张,如果后期想取全部 那把下面这个跳出语句去掉
+                                // break;
+                            }
+                        }
+                    }
+
+                    //整改后照片
+                    var attachFile1 = Funs.DB.AttachFile.Where(p =>
+                            p.MenuId == BLL.Const.CheckListMenuId && p.ToKeyId == item.CheckControlCode + "r")
+                        .FirstOrDefault();
+                    if (attachFile1 != null)
+                    {
+                        var photoesUrl1 = attachFile1.AttachUrl;
+                        if (photoesUrl1 != null)
+                        {
+                            string[] arrUrl = photoesUrl1.Split(',');
+                            sheet.SetColumnWidth(6, 30 * 256);
+                            row.Height = (short)(90 * 20 * arrUrl.Length);
+                            foreach (string url in arrUrl)
+                            {
+                                var oneUrl = Server.MapPath("~/") + url;
+                                byte[] bytes = System.IO.File.ReadAllBytes(oneUrl);
+                                int pictureIdx = workbook.AddPicture(bytes, PictureType.JPEG);
+
+                                // 第三步：创建画部
+                                IDrawing patriarch = sheet.CreateDrawingPatriarch();
+                                // 第四步：设置锚点
+                                int rowline = 1; // y方向
+                                // 参数说明：（在起始单元格的X坐标0-1023，Y的坐标0-255，在终止单元格的X坐标0-1023，Y的坐标0-255，起始单元格列数，行数，终止单元格列数，行数）  
+                                IClientAnchor anchor = patriarch.CreateAnchor(0, 0, 0, 0, 6, i, 7, i + 1);
+                                // 第五步：把图片插到相应的位置+1
+                                IPicture pict = patriarch.CreatePicture(anchor, pictureIdx);
+                                //就取第一张,如果后期想取全部 那把下面这个跳出语句去掉
+                                // break;
+                            }
+                        }
+                    }
+                    
+                    // cell = row.CreateCell(6);
+                    // cell.CellStyle = cellStyle;
+                    // cell.SetCellValue(item.CheckSite);//整改后照片
+                    
+                    // cell = row.CreateCell(5);
+                    // cell.CellStyle = cellStyle;
+                    // cell.SetCellValue(item.CheckSite);//部位
 
                     cell = row.CreateCell(7);
                     cell.CellStyle = cellStyle;
+                    cell.SetCellValue(item.QuestionDef);//问题描述
+                    
+                    cell = row.CreateCell(8);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(item.RectifyOpinion);//整改意见
+
+                    cell = row.CreateCell(9);
+                    cell.CellStyle = cellStyle;
                     cell.SetCellValue(item.LimitDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.LimitDate) : "");//整改日期
 
-                    cell = row.CreateCell(8);
+                    cell = row.CreateCell(10);
                     cell.CellStyle = cellStyle;
                     cell.SetCellValue(BLL.UserService.GetUserNameByUserId(item.CheckMan));//检查人
 
-                    cell = row.CreateCell(9);
+                    cell = row.CreateCell(11);
                     cell.CellStyle = cellStyle;
                     string s = string.Empty;
                     if (!string.IsNullOrEmpty(item.State))
@@ -810,7 +892,7 @@ namespace FineUIPro.Web.CQMS.Check
                     }
                     cell.SetCellValue(s);//审批状态
 
-                    cell = row.CreateCell(10);
+                    cell = row.CreateCell(12);
                     cell.CellStyle = cellStyle;
                     string man = string.Empty;
                     if (!string.IsNullOrEmpty(item.CheckControlCode))
@@ -819,7 +901,7 @@ namespace FineUIPro.Web.CQMS.Check
                     }
                     cell.SetCellValue(man);//办理人
 
-                    cell = row.CreateCell(11);
+                    cell = row.CreateCell(13);
                     cell.CellStyle = cellStyle;
                     string status = string.Empty;
                     if (!string.IsNullOrEmpty(item.CheckControlCode))

SGGL/FineUIPro.Web/CQMS/Check/JointCheckStatistics.aspx.cs

@@ -488,58 +488,210 @@ namespace FineUIPro.Web.CQMS.Check
                 NPOI.SS.UserModel.IRow row = sheet.GetRow(0);
                 NPOI.SS.UserModel.ICell cell;
                 int i = 2;
-                foreach (var item in lists)
+                
+                // 将 lists 转换为 DataTable
+                DataTable tb = LINQToDataTable(lists);
+                // 创建一个列表来存储CheckStatisc对象
+            var checkStatiscList = new List<CheckStatisc>();
+            if (this.rbType.SelectedValue == "0")
+            {
+                // 使用LINQ对DataTable进行分组统计----年份
+                var query = from row1 in tb.AsEnumerable()
+                    let checkDate = row1.Field<DateTime>("CheckDate")
+                    let state = row1.Field<int>("OK")
+                    group row1 by new { checkDate.Year, state }
+                    into g
+                    select new
+                    {
+                        Year = g.Key.Year,
+                        State = g.Key.state,
+                        Count = g.Count()
+                    };
+                // 计算每个年份的总记录数
+                var yearlyTotals = query.GroupBy(q => q.Year).ToDictionary(g => g.Key, g => g.Sum(q => q.Count));
+
+                // 创建一个包含年度总数和不同State计数的结果集
+                var result = query.GroupBy(q => q.Year).Select(g => new
+                {
+                    Year = g.Key,
+                    YearlyTotal = yearlyTotals[g.Key],
+                    CompleteNumber = g.Where(q => q.State == 1).Sum(q => q.Count),
+                    NCompleteNumber = g.Where(q => q.State == 0).Sum(q => q.Count)
+                }).ToList();
+                // 遍历结果集并创建CheckStatisc对象
+                foreach (var item in result)
+                {
+                    var checkStatisc = new CheckStatisc
+                    {
+                        TypeName = item.Year.ToString(),
+                        AllNumber = item.YearlyTotal,
+                        CompleteNumber = item.CompleteNumber,
+                        NCompleteNumber = item.NCompleteNumber,
+                        Probability = ((double)item.CompleteNumber / item.YearlyTotal * 100).ToString("F2") + "%"
+                    };
+
+                    checkStatiscList.Add(checkStatisc);
+                }
+            }
+            else if (this.rbType.SelectedValue == "1")
+            {
+                // 使用LINQ对DataTable进行分组统计----年月
+                var queryByMonth = from row1 in tb.AsEnumerable()
+                    let checkDate = row1.Field<DateTime>("CheckDate")
+                    let state = row1.Field<int>("OK")
+                    group row1 by new { checkDate.Year, checkDate.Month, state }
+                    into g
+                    select new
+                    {
+                        Year = g.Key.Year,
+                        Month = g.Key.Month,
+                        State = g.Key.state,
+                        Count = g.Count()
+                    };
+
+                // 计算每个月的总记录数
+                var monthlyTotals = queryByMonth.GroupBy(q => new { q.Year, q.Month }).ToDictionary(
+                    g => new { g.Key.Year, g.Key.Month },
+                    g => g.Sum(q => q.Count));
+
+                // 创建一个包含月度总数和不同State计数的结果集
+                var resultByMonth = queryByMonth.GroupBy(q => new { q.Year, q.Month }).Select(g => new
+                {
+                    Year = g.Key.Year,
+                    Month = g.Key.Month,
+                    MonthlyTotal = monthlyTotals[g.Key],
+                    CompleteNumber = g.Where(q => q.State == 1).Sum(q => q.Count),
+                    NCompleteNumber = g.Where(q => q.State == 0).Sum(q => q.Count)
+                }).ToList();
+
+                // 遍历结果集并创建CheckStatisc对象
+                foreach (var item in resultByMonth)
+                {
+                    var checkStatisc = new CheckStatisc
+                    {
+                        TypeName = $"{item.Year}年{item.Month:D2}月",
+                        AllNumber = item.MonthlyTotal,
+                        CompleteNumber = item.CompleteNumber,
+                        NCompleteNumber = item.NCompleteNumber,
+                        Probability = ((double)item.CompleteNumber / item.MonthlyTotal * 100).ToString("F2") + "%"
+                    };
+
+                    checkStatiscList.Add(checkStatisc);
+                }
+            }
+            else if (this.rbType.SelectedValue == "2")
+            {
+                // 使用LINQ对DataTable进行分组统计----专业名称
+                var queryByProfessionalName = from row1 in tb.AsEnumerable()
+                    let professionalName = row1.Field<string>("ProfessionalName")
+                    let state = row1.Field<int>("OK")
+                    group row1 by professionalName
+                    into g
+                    select new
+                    {
+                        ProfessionalName = g.Key,
+                        TotalCount = g.Count(),
+                        CompleteCount = g.Count(q => q.Field<int>("OK") == 1),
+                        IncompleteCount = g.Count(q => q.Field<int>("OK") != 0)
+                    };
+
+                // 遍历结果集并创建CheckStatisc对象
+                foreach (var item in queryByProfessionalName)
+                {
+                    var checkStatisc = new CheckStatisc
+                    {
+                        TypeName = item.ProfessionalName,
+                        AllNumber = item.TotalCount,
+                        CompleteNumber = item.CompleteCount,
+                        NCompleteNumber = item.IncompleteCount,
+                        Probability = ((double)item.CompleteCount / item.TotalCount * 100).ToString("F2") + "%"
+                    };
+
+                    checkStatiscList.Add(checkStatisc);
+                }
+            }
+            checkStatiscList = checkStatiscList.OrderBy(cs => cs.TypeName).ToList();
+                
+                foreach (var item in checkStatiscList)
                 {
                     // 第二步：创建新数据行
                     row = sheet.CreateRow(i);
                     // 添加数据
                     cell = row.CreateCell(0);
                     cell.CellStyle = cellStyle;
-                    cell.SetCellValue(BLL.UnitService.GetUnitNameByUnitId(item.UnitId));//施工单位
+                    cell.SetCellValue(item.TypeName);//类型名称
 
                     cell = row.CreateCell(1);
                     cell.CellStyle = cellStyle;
-                    cell.SetCellValue(item.CheckDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.CheckDate) : "");
+                    cell.SetCellValue(item.AllNumber);//总数
                     
                     cell = row.CreateCell(2);
                     cell.CellStyle = cellStyle;
-                    cell.SetCellValue(item.CheckTypeStr);
+                    cell.SetCellValue(item.CompleteNumber);//合格数
 
                     cell = row.CreateCell(3);
                     cell.CellStyle = cellStyle;
-                    cell.SetCellValue(item.UnitWorkName);
+                    cell.SetCellValue(item.NCompleteNumber);//不合格数
 
                     cell = row.CreateCell(4);
                     cell.CellStyle = cellStyle;
-                    cell.SetCellValue(item.ProfessionalName);
-
-                    cell = row.CreateCell(5);
-                    cell.CellStyle = cellStyle;
-                    cell.SetCellValue(item.QuestionTypeStr);
-
-                    cell = row.CreateCell(6);
-                    cell.CellStyle = cellStyle;
-                    cell.SetCellValue(item.CheckSite);
-
-                    cell = row.CreateCell(7);
-                    cell.CellStyle = cellStyle;
-                    cell.SetCellValue(item.QuestionDef);
-
-                    cell = row.CreateCell(8);
-                    cell.CellStyle = cellStyle;
-                    cell.SetCellValue(item.HandleWay);
-
-                    cell = row.CreateCell(9);
-                    cell.CellStyle = cellStyle;
-                    string s = string.Empty;
-                    if (!string.IsNullOrEmpty(item.JointCheckDetailId))
-                    {
-                        s = ConvertState(item.JointCheckDetailId);
-                    }
-                    cell.SetCellValue(s);
-
+                    cell.SetCellValue(item.Probability);//合格率
+                    
                     i++;
                 }
+                
+                // foreach (var item in lists)
+                // {
+                //     // 第二步：创建新数据行
+                //     row = sheet.CreateRow(i);
+                //     // 添加数据
+                //     cell = row.CreateCell(0);
+                //     cell.CellStyle = cellStyle;
+                //     cell.SetCellValue(BLL.UnitService.GetUnitNameByUnitId(item.UnitId));//施工单位
+                //
+                //     cell = row.CreateCell(1);
+                //     cell.CellStyle = cellStyle;
+                //     cell.SetCellValue(item.CheckDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.CheckDate) : "");
+                //     
+                //     cell = row.CreateCell(2);
+                //     cell.CellStyle = cellStyle;
+                //     cell.SetCellValue(item.CheckTypeStr);
+                //
+                //     cell = row.CreateCell(3);
+                //     cell.CellStyle = cellStyle;
+                //     cell.SetCellValue(item.UnitWorkName);
+                //
+                //     cell = row.CreateCell(4);
+                //     cell.CellStyle = cellStyle;
+                //     cell.SetCellValue(item.ProfessionalName);
+                //
+                //     cell = row.CreateCell(5);
+                //     cell.CellStyle = cellStyle;
+                //     cell.SetCellValue(item.QuestionTypeStr);
+                //
+                //     cell = row.CreateCell(6);
+                //     cell.CellStyle = cellStyle;
+                //     cell.SetCellValue(item.CheckSite);
+                //
+                //     cell = row.CreateCell(7);
+                //     cell.CellStyle = cellStyle;
+                //     cell.SetCellValue(item.QuestionDef);
+                //
+                //     cell = row.CreateCell(8);
+                //     cell.CellStyle = cellStyle;
+                //     cell.SetCellValue(item.HandleWay);
+                //
+                //     cell = row.CreateCell(9);
+                //     cell.CellStyle = cellStyle;
+                //     string s = string.Empty;
+                //     if (!string.IsNullOrEmpty(item.JointCheckDetailId))
+                //     {
+                //         s = ConvertState(item.JointCheckDetailId);
+                //     }
+                //     cell.SetCellValue(s);
+                //
+                //     i++;
+                // }
                 // 第三步：写入文件流
                 using (FileStream stream = new FileStream(newUrl, FileMode.Create, FileAccess.Write))
                 {

SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs

@@ -2867,7 +2867,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             }
             SaveMethod();
 
-            ShowNotify("保存成功！", MessageBoxIcon.Success);
+            //ShowNotify("保存成功！", MessageBoxIcon.Success);
             //PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
 
             //Model.Report_WeekAndMonthReport_New weekAndMonthReport = WeekAndMonthReportNewService.Detail(this.ReportId);
@@ -3147,14 +3147,21 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             saveTxtContent();
             #endregion
 
+            bool save = false;
             if (AddOrUpdate == "add")
             {
+                save = true;
                 WeekAndMonthReportNewService.Insert(report);
             }
             else
             {
+                save = true;
                 WeekAndMonthReportNewService.Update(report);
             }
+            if (save)
+            {
+                ShowNotify("保存成功！", MessageBoxIcon.Success);
+            }
         }
 
         #region 保存本月质量目标管理情况 

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

@@ -74,7 +74,7 @@ namespace FineUIPro.Web.DataShow
                                 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  Project.ProjectState ='1'
                                 UNION ALL
 
                                 select 
@@ -91,7 +91,8 @@ namespace FineUIPro.Web.DataShow
                                 TrainDepart as UnitName
                                 From Bo_Sheng_Train F
                                 LEFT JOIN Base_Project AS Project ON F.ProjectId=Project.ProjectId 
-                                )f WHERE 1=1 ";
+                                where Project.ProjectState ='1'
+                                )f WHERE 1=1  ";
 
             #region 总数
             var strSqlSum = @"select Count(*)as allCount from(
@@ -112,7 +113,7 @@ namespace FineUIPro.Web.DataShow
                                 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 Project.ProjectState ='1'
                                 UNION ALL
 
                                 select 
@@ -129,7 +130,8 @@ namespace FineUIPro.Web.DataShow
                                 TrainDepart as UnitName
                                 From Bo_Sheng_Train F
                                 LEFT JOIN Base_Project AS Project ON F.ProjectId=Project.ProjectId 
-                                )f WHERE 1=1";
+                                WHERE Project.ProjectState ='1'
+                                )f WHERE 1=1 " ;
             
             #endregion
             if (this.drpProject.SelectedValue != Const._Null)

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

@@ -166,7 +166,7 @@ namespace FineUIPro.Web.DataShow
             {
                 var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
                 var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
-                var getT = Funs.DB.GJSX.Where(x => x.ProjectId == projectId.ToString());
+                var getT = Funs.DB.GJSX.Where(x => x.ProjectId == projectId.ToString() && x.State != "1");
                 if (datetime1.HasValue)
                 {
                     getT = getT.Where(x => x.CreateDate >= datetime1);
@@ -210,7 +210,7 @@ namespace FineUIPro.Web.DataShow
             {
                 var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
                 var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text);
-                var getT = Funs.DB.GJSX.Where(x => x.ProjectId == projectId.ToString() && x.State != "0");
+                var getT = Funs.DB.GJSX.Where(x => x.ProjectId == projectId.ToString() && x.State != "0" && x.State != "1");
                 if (datetime1.HasValue)
                 {
                     getT = getT.Where(x => x.CreateDate >= datetime1);

SGGL/FineUIPro.Web/DataShow/GJSXItem.aspx

@@ -53,7 +53,7 @@
                                         <asp:Label ID="Label2" runat="server" Text='<%# ConvertProgressDetail(Eval("GJSXID")) %>'></asp:Label>
                                     </ItemTemplate>
                                 </f:TemplateField>
-                        <f:RenderField Width="90px" ColumnID="State" DataField="State" SortField="State"
+                        <f:RenderField Width="90px" ColumnID="StateStr" DataField="StateStr" SortField="StateStr"
                             FieldType="String" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="150px" ColumnID="CreateDate" DataField="CreateDate" SortField="CreateDate"

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

@@ -39,7 +39,7 @@ namespace FineUIPro.Web.DataShow
         /// </summary>
         private void BindGrid()
         {
-            string strSql = "";
+            string strSql = "and state <> '1'";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", Request.Params["projectId"]));
 

SGGL/FineUIPro.Web/DataShow/JD.aspx

@@ -23,8 +23,8 @@
         <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="TabStrip1" />
         <f:Panel ID="Panel2" runat="server" ShowHeader="false" ShowBorder="false" ColumnWidth="100%" Margin="5px" BodyPadding="5px">
             <Items>
-                <f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" ShowBorder="true" AutoScroll="true"
-                    TabPosition="Top" MarginBottom="30px" EnableTabCloseMenu="false" runat="server"
+                <f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" ShowBorder="true" AutoScroll="true" AutoPostBack="true"
+                    TabPosition="Top" MarginBottom="30px" EnableTabCloseMenu="false" runat="server" OnTabIndexChanged="TabStrip1_TabIndexChanged"
                     ActiveTabIndex="0">
                     <Tabs>
                         <f:Tab ID="Tab1" Title="各项目基本情况" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server">
@@ -56,10 +56,16 @@
                                         <f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String" HeaderText="项目号" TextAlign="Left"
                                             HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="350px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
+                                        <f:RenderField Width="350px" ColumnID="ProjectName" ExpandUnusedSpace="true" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
                                             HeaderTextAlign="Center">
                                         </f:RenderField>
-                                        <f:RenderField Width="100px" ColumnID="RealNum" DataField="RealNum" FieldType="Float" HeaderText="项目进度" TextAlign="Right"
+                                        <f:RenderField Width="100px" ColumnID="RealNum" DataField="RealNum" FieldType="Float" HeaderText="项目进度(%)" TextAlign="Right"
+                                            HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="MonthPlanRate" DataField="MonthPlanRate" FieldType="Float" HeaderText="月度计划准点率(%)" TextAlign="Right"
+                                            HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="100px" ColumnID="WeekPlanRate" DataField="WeekPlanRate" FieldType="Float" HeaderText="周计划准点率(%)" TextAlign="Right"
                                             HeaderTextAlign="Center">
                                         </f:RenderField>
                                     </Columns>
@@ -77,10 +83,144 @@
                         </f:Tab>
                         <f:Tab ID="Tab2" Title="月度计划统计" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server">
                             <Items>
+                                <f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="各项目基本情况" EnableCollapse="true"
+                                    runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true" MarginRight="15px"
+                                    SortField="ProjectName" SortDirection="ASC" OnSort="Grid2_Sort" EnableColumnLines="true" AllowPaging="true"
+                                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid2_PageIndexChange" ForceFit="true"
+                                    EnableTextSelection="True">
+                                    <Toolbars>
+                                        <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
+                                            <Items>
+                                                <f:DropDownList ID="drpProject2" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
+                                                    EnableEdit="true" OnSelectedIndexChanged="TextBox2_TextChanged" AutoPostBack="true">
+                                                </f:DropDownList>
+                                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                                <f:Button ID="Button1" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
+                                                </f:Button>
+                                            </Items>
+                                        </f:Toolbar>
+                                    </Toolbars>
+                                    <Columns>
+                                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                                            TextAlign="Center">
+                                            <ItemTemplate>
+                                                <asp:Label ID="Label1" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                            </ItemTemplate>
+                                        </f:TemplateField>
+                                        <f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String" HeaderText="项目号" TextAlign="Left"
+                                            HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="350px" ColumnID="ProjectName" ExpandUnusedSpace="true" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
+                                            HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:GroupField HeaderText="上月完成情况" TextAlign="Center">
+                                            <Columns>
+                                                <f:RenderField Width="100px" ColumnID="PlanNum" DataField="PlanNum" FieldType="String" HeaderText="计划项" TextAlign="Right"
+                                                    HeaderTextAlign="Center">
+                                                </f:RenderField>
+                                                <f:RenderField Width="100px" ColumnID="CompletedNum" DataField="CompletedNum" FieldType="String" HeaderText="完成项" TextAlign="Right"
+                                                    HeaderTextAlign="Center">
+                                                </f:RenderField>
+                                                <f:RenderField Width="100px" ColumnID="Rate" DataField="Rate" FieldType="Float" HeaderText="完成比例(%)" TextAlign="Right"
+                                                    HeaderTextAlign="Center">
+                                                </f:RenderField>
+                                            </Columns>
+                                        </f:GroupField>
+                                        <f:GroupField HeaderText="累计完成情况" TextAlign="Center">
+                                            <Columns>
+                                                <f:RenderField Width="100px" ColumnID="TotalPlanNum" DataField="TotalPlanNum" FieldType="String" HeaderText="计划项" TextAlign="Right"
+                                                    HeaderTextAlign="Center">
+                                                </f:RenderField>
+                                                <f:RenderField Width="100px" ColumnID="TotalCompletedNum" DataField="TotalCompletedNum" FieldType="String" HeaderText="完成项" TextAlign="Right"
+                                                    HeaderTextAlign="Center">
+                                                </f:RenderField>
+                                                <f:RenderField Width="100px" ColumnID="TotalRate" DataField="TotalRate" FieldType="Float" HeaderText="完成比例(%)" TextAlign="Right"
+                                                    HeaderTextAlign="Center">
+                                                </f:RenderField>
+                                            </Columns>
+                                        </f:GroupField>
+                                    </Columns>
+                                    <PageItems>
+                                        <f:ToolbarSeparator ID="ToolbarSeparator2" runat="server">
+                                        </f:ToolbarSeparator>
+                                        <f:ToolbarText ID="ToolbarText2" runat="server" Text="每页记录数：">
+                                        </f:ToolbarText>
+                                        <f:DropDownList runat="server" ID="ddlPageSize2" Width="80px" AutoPostBack="true"
+                                            OnSelectedIndexChanged="ddlPageSize2_SelectedIndexChanged">
+                                        </f:DropDownList>
+                                    </PageItems>
+                                </f:Grid>
                             </Items>
                         </f:Tab>
                         <f:Tab ID="Tab3" Title="周度计划统计" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server">
                             <Items>
+                                <f:Grid ID="Grid3" ShowBorder="true" ShowHeader="false" Title="各项目基本情况" EnableCollapse="true"
+                                    runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true" MarginRight="15px"
+                                    SortField="ProjectName" SortDirection="ASC" OnSort="Grid3_Sort" EnableColumnLines="true" AllowPaging="true"
+                                    IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid3_PageIndexChange" ForceFit="true"
+                                    EnableTextSelection="True">
+                                    <Toolbars>
+                                        <f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
+                                            <Items>
+                                                <f:DropDownList ID="drpProject3" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
+                                                    EnableEdit="true" OnSelectedIndexChanged="TextBox3_TextChanged" AutoPostBack="true">
+                                                </f:DropDownList>
+                                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                                <f:Button ID="Button2" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
+                                                </f:Button>
+                                            </Items>
+                                        </f:Toolbar>
+                                    </Toolbars>
+                                    <Columns>
+                                        <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
+                                            TextAlign="Center">
+                                            <ItemTemplate>
+                                                <asp:Label ID="Label2" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                            </ItemTemplate>
+                                        </f:TemplateField>
+                                        <f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String" HeaderText="项目号" TextAlign="Left"
+                                            HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:RenderField Width="350px" ColumnID="ProjectName" ExpandUnusedSpace="true" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
+                                            HeaderTextAlign="Center">
+                                        </f:RenderField>
+                                        <f:GroupField HeaderText="上周完成情况" TextAlign="Center">
+                                            <Columns>
+                                                <f:RenderField Width="100px" ColumnID="PlanNum" DataField="PlanNum" FieldType="String" HeaderText="计划项" TextAlign="Right"
+                                                    HeaderTextAlign="Center">
+                                                </f:RenderField>
+                                                <f:RenderField Width="100px" ColumnID="CompletedNum" DataField="CompletedNum" FieldType="String" HeaderText="完成项" TextAlign="Right"
+                                                    HeaderTextAlign="Center">
+                                                </f:RenderField>
+                                                <f:RenderField Width="100px" ColumnID="Rate" DataField="Rate" FieldType="Float" HeaderText="完成比例(%)" TextAlign="Right"
+                                                    HeaderTextAlign="Center">
+                                                </f:RenderField>
+                                            </Columns>
+                                        </f:GroupField>
+                                        <f:GroupField HeaderText="累计完成情况" TextAlign="Center">
+                                            <Columns>
+                                                <f:RenderField Width="100px" ColumnID="TotalPlanNum" DataField="TotalPlanNum" FieldType="String" HeaderText="计划项" TextAlign="Right"
+                                                    HeaderTextAlign="Center">
+                                                </f:RenderField>
+                                                <f:RenderField Width="100px" ColumnID="TotalCompletedNum" DataField="TotalCompletedNum" FieldType="String" HeaderText="完成项" TextAlign="Right"
+                                                    HeaderTextAlign="Center">
+                                                </f:RenderField>
+                                                <f:RenderField Width="100px" ColumnID="TotalRate" DataField="TotalRate" FieldType="Float" HeaderText="完成比例(%)" TextAlign="Right"
+                                                    HeaderTextAlign="Center">
+                                                </f:RenderField>
+                                            </Columns>
+                                        </f:GroupField>
+                                    </Columns>
+                                    <PageItems>
+                                        <f:ToolbarSeparator ID="ToolbarSeparator3" runat="server">
+                                        </f:ToolbarSeparator>
+                                        <f:ToolbarText ID="ToolbarText3" runat="server" Text="每页记录数：">
+                                        </f:ToolbarText>
+                                        <f:DropDownList runat="server" ID="ddlPageSize3" Width="80px" AutoPostBack="true"
+                                            OnSelectedIndexChanged="ddlPageSize3_SelectedIndexChanged">
+                                        </f:DropDownList>
+                                    </PageItems>
+                                </f:Grid>
                             </Items>
                         </f:Tab>
                         <f:Tab ID="TabOnlineMenuSet" Title="个人完成情况统计" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server" Hidden="True">

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

@@ -14,21 +14,48 @@ namespace FineUIPro.Web.DataShow
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
+                Funs.DropDownPageSize(this.ddlPageSize2);
+                Funs.DropDownPageSize(this.ddlPageSize3);
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                ddlPageSize2.SelectedValue = Grid2.PageSize.ToString();
+                ddlPageSize3.SelectedValue = Grid3.PageSize.ToString();
                 BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                BLL.ProjectService.InitProjectDropDownList(this.drpProject2, true);
+                BLL.ProjectService.InitProjectDropDownList(this.drpProject3, true);
                 BindGrid1();
             }
         }
 
         private void BindGrid1()
         {
-            string strSql = @"select ProjectId,ProjectCode, ProjectName,(select sum(isnull(RealNum,0)) from JDGL_ProgressCompletion a where a.ProjectId=p.ProjectId) as RealNum
- from Base_Project p where ProjectState =1 ";
+            string strSql = @"select p.ProjectId,ProjectCode, ProjectName,(select sum(isnull(RealNum,0)) from JDGL_ProgressCompletion a where a.ProjectId=p.ProjectId) as RealNum,
+ cast((case when isnull(MonthPlan.MonthPlanNum,0)=0 then 0 else isnull(MonthPlanOK.MonthPlanOKNum,0)/(1.0 *isnull(MonthPlan.MonthPlanNum,0))*100 end) as DECIMAL(19,2)) as MonthPlanRate,
+ cast((case when isnull(WeekPlan.WeekPlanNum,0)=0 then 0 else isnull(WeekPlanOK.WeekPlanOKNum,0)/(1.0 *isnull(WeekPlan.WeekPlanNum,0))*100 end) as DECIMAL(19,2)) as WeekPlanRate
+ from Base_Project p 
+ left join (
+	 SELECT COUNT(w.WeekPlanId) AS WeekPlanNum,w.ProjectId FROM JDGL_WeekPlan w 
+	GROUP BY w.ProjectId
+	) AS WeekPlan ON WeekPlan.ProjectId=p.ProjectId 
+	 left join (
+	 SELECT COUNT(w.WeekPlanId) AS WeekPlanOKNum,w.ProjectId FROM JDGL_WeekPlan w 
+	 where w.IsOK=1
+	GROUP BY w.ProjectId
+	) AS WeekPlanOK ON WeekPlanOK.ProjectId=p.ProjectId 
+left join (
+	 SELECT COUNT(w.MonthPlanId) AS MonthPlanNum,w.ProjectId FROM JDGL_MonthPlan w 
+	GROUP BY w.ProjectId
+	) AS MonthPlan ON MonthPlan.ProjectId=p.ProjectId 
+	 left join (
+	 SELECT COUNT(w.MonthPlanId) AS MonthPlanOKNum,w.ProjectId FROM JDGL_MonthPlan w 
+	 where w.RealDate is not null and w.RealDate<=w.PlanDate
+	GROUP BY w.ProjectId
+	) AS MonthPlanOK ON MonthPlanOK.ProjectId=p.ProjectId 
+ where ProjectState =1 ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             string cpara = string.Empty;
             if (this.drpProject.SelectedValue != Const._Null)
             {
-                strSql += " AND p.ProjectId = @projectId";  
+                strSql += " AND p.ProjectId = @projectId";
                 listStr.Add(new SqlParameter("@projectId", this.drpProject.SelectedValue));
             }
             SqlParameter[] parameter = listStr.ToArray();
@@ -39,6 +66,132 @@ namespace FineUIPro.Web.DataShow
             Grid1.DataBind();
         }
 
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid2()
+        {
+            DataTable tb = new DataTable();
+            tb.Columns.Add(new DataColumn("ProjectId", typeof(String)));
+            tb.Columns.Add(new DataColumn("ProjectCode", typeof(String)));
+            tb.Columns.Add(new DataColumn("ProjectName", typeof(String)));
+            tb.Columns.Add(new DataColumn("PlanNum", typeof(decimal)));
+            tb.Columns.Add(new DataColumn("CompletedNum", typeof(decimal)));
+            tb.Columns.Add(new DataColumn("Rate", typeof(decimal)));
+            tb.Columns.Add(new DataColumn("TotalPlanNum", typeof(decimal)));
+            tb.Columns.Add(new DataColumn("TotalCompletedNum", typeof(decimal)));
+            tb.Columns.Add(new DataColumn("TotalRate", typeof(decimal)));
+
+            Model.SGGLDB db = Funs.DB;
+            var projects = from x in db.Base_Project where x.ProjectState == "1" orderby x.ProjectName select x;
+            if (this.drpProject2.SelectedValue != BLL.Const._Null)
+            {
+                projects = projects.Where(x => x.ProjectId == this.drpProject2.SelectedValue).OrderBy(x => x.ProjectName);
+            }
+            //统计月份信息
+            DateTime months = Convert.ToDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.Month.ToString() + "-01");
+            if (DateTime.Now.Day < 26)
+            {
+                months = Convert.ToDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.AddMonths(-1).Month.ToString() + "-01");
+            }
+            //2、获取当前项目指定月所有计划
+            var allMonthPlans = from x in db.JDGL_MonthPlan
+                                where x.Months == months
+                                select x;
+            //3、获取当前项目所有月计划
+            var allPlans = from x in db.JDGL_MonthPlan
+                           where x.Months <= months
+                           select x;
+            foreach (var item in projects)
+            {
+                double planNum = allMonthPlans.Where(x => x.ProjectId == item.ProjectId).Count();
+                double completedNum = allMonthPlans.Where(x => x.ProjectId == item.ProjectId && x.RealDate != null).Count();
+                double rate = planNum > 0 ? Math.Round((completedNum / planNum) * 100, 2) : 0;
+                double totalPlanNum = allPlans.Where(x => x.ProjectId == item.ProjectId).Count();
+                double totalCompletedNum = allPlans.Where(x => x.ProjectId == item.ProjectId && x.RealDate != null).Count();
+                double totalRate = totalPlanNum > 0 ? Math.Round((totalCompletedNum / totalPlanNum) * 100, 2) : 0;
+                DataRow row;
+                row = tb.NewRow();
+                row[0] = item.ProjectId;
+                row[1] = item.ProjectCode;
+                row[2] = item.ProjectName;
+                row[3] = planNum;
+                row[4] = completedNum;
+                row[5] = rate;
+                row[6] = totalPlanNum;
+                row[7] = totalCompletedNum;
+                row[8] = totalRate;
+                tb.Rows.Add(row);
+            }
+            Grid2.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid2, tb);
+            Grid2.DataSource = table;
+            Grid2.DataBind();
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid3()
+        {
+            DataTable tb = new DataTable();
+            tb.Columns.Add(new DataColumn("ProjectId", typeof(String)));
+            tb.Columns.Add(new DataColumn("ProjectCode", typeof(String)));
+            tb.Columns.Add(new DataColumn("ProjectName", typeof(String)));
+            tb.Columns.Add(new DataColumn("PlanNum", typeof(decimal)));
+            tb.Columns.Add(new DataColumn("CompletedNum", typeof(decimal)));
+            tb.Columns.Add(new DataColumn("Rate", typeof(decimal)));
+            tb.Columns.Add(new DataColumn("TotalPlanNum", typeof(decimal)));
+            tb.Columns.Add(new DataColumn("TotalCompletedNum", typeof(decimal)));
+            tb.Columns.Add(new DataColumn("TotalRate", typeof(decimal)));
+
+            Model.SGGLDB db = Funs.DB;
+            var projects = from x in db.Base_Project where x.ProjectState == "1" orderby x.ProjectName select x;
+            if (this.drpProject3.SelectedValue != BLL.Const._Null)
+            {
+                projects = projects.Where(x => x.ProjectId == this.drpProject3.SelectedValue).OrderBy(x => x.ProjectName);
+            }
+            //统计月份信息
+            DateTime months = Convert.ToDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.Month.ToString() + "-01");
+            if (DateTime.Now.Day < 26)
+            {
+                months = Convert.ToDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.AddMonths(-1).Month.ToString() + "-01");
+            }
+            //2、获取当前项目指定月所有计划
+            var allWeekPlans = from x in db.JDGL_WeekPlan
+                               select x;
+            foreach (var item in projects)
+            {
+                var lastWeek = (from x in db.JDGL_WeekPlan where x.ProjectId == item.ProjectId && DateTime.Now > ((DateTime)x.EndDate).AddDays(1) orderby x.EndDate select x).FirstOrDefault();
+                double planNum = 0, completedNum = 0, rate = 0;
+                if (lastWeek != null)
+                {
+                    planNum = allWeekPlans.Where(x => x.ProjectId == item.ProjectId && x.WeekNo == lastWeek.WeekNo).Count();
+                    completedNum = allWeekPlans.Where(x => x.ProjectId == item.ProjectId && x.WeekNo == lastWeek.WeekNo && x.IsOK == true).Count();
+                    rate = planNum > 0 ? Math.Round((completedNum / planNum) * 100, 2) : 0;
+                }
+                double totalPlanNum = allWeekPlans.Where(x => x.ProjectId == item.ProjectId).Count();
+                double totalCompletedNum = allWeekPlans.Where(x => x.ProjectId == item.ProjectId && x.IsOK == true).Count();
+                double totalRate = totalPlanNum > 0 ? Math.Round((totalCompletedNum / totalPlanNum) * 100, 2) : 0;
+                DataRow row;
+                row = tb.NewRow();
+                row[0] = item.ProjectId;
+                row[1] = item.ProjectCode;
+                row[2] = item.ProjectName;
+                row[3] = planNum;
+                row[4] = completedNum;
+                row[5] = rate;
+                row[6] = totalPlanNum;
+                row[7] = totalCompletedNum;
+                row[8] = totalRate;
+                tb.Rows.Add(row);
+            }
+            Grid3.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid3, tb);
+            Grid3.DataSource = table;
+            Grid3.DataBind();
+        }
+
         #region 查询
         /// <summary>
         /// 查询
@@ -83,5 +236,109 @@ namespace FineUIPro.Web.DataShow
             BindGrid1();
         }
         #endregion
+
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox2_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid2();
+        }
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid2_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid2();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid2_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid2();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize2_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid2.PageSize = Convert.ToInt32(ddlPageSize2.SelectedValue);
+            BindGrid2();
+        }
+        #endregion
+
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox3_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid3();
+        }
+
+        #region 表排序、分页、关闭窗口
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid3_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid3();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid3_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid3();
+        }
+
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize3_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid3.PageSize = Convert.ToInt32(ddlPageSize3.SelectedValue);
+            BindGrid3();
+        }
+        #endregion
+
+        protected void TabStrip1_TabIndexChanged(object sender, EventArgs e)
+        {
+            if (TabStrip1.ActiveTabIndex == 1)
+            {
+                if (this.Grid2.Rows.Count == 0)
+                {
+                    BindGrid2();
+                }
+            }
+            else if (TabStrip1.ActiveTabIndex == 2)
+            {
+                if (this.Grid3.Rows.Count == 0)
+                {
+                    BindGrid3();
+                }
+            }
+        }
     }
 }

SGGL/FineUIPro.Web/DataShow/JD.aspx.designer.cs

@@ -138,6 +138,78 @@ namespace FineUIPro.Web.DataShow {
         /// </remarks>
         protected global::FineUIPro.Tab Tab2;
         
+        /// <summary>
+        /// Grid2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid2;
+        
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+        
+        /// <summary>
+        /// drpProject2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject2;
+        
+        /// <summary>
+        /// Button1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button Button1;
+        
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+        
+        /// <summary>
+        /// ToolbarSeparator2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator2;
+        
+        /// <summary>
+        /// ToolbarText2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText2;
+        
+        /// <summary>
+        /// ddlPageSize2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize2;
+        
         /// <summary>
         /// Tab3 控件。
         /// </summary>
@@ -147,6 +219,78 @@ namespace FineUIPro.Web.DataShow {
         /// </remarks>
         protected global::FineUIPro.Tab Tab3;
         
+        /// <summary>
+        /// Grid3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid3;
+        
+        /// <summary>
+        /// Toolbar3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar3;
+        
+        /// <summary>
+        /// drpProject3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProject3;
+        
+        /// <summary>
+        /// Button2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button Button2;
+        
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label2;
+        
+        /// <summary>
+        /// ToolbarSeparator3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator3;
+        
+        /// <summary>
+        /// ToolbarText3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText3;
+        
+        /// <summary>
+        /// ddlPageSize3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize3;
+        
         /// <summary>
         /// TabOnlineMenuSet 控件。
         /// </summary>

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

@@ -41,7 +41,7 @@ namespace FineUIPro.Web.DataShow
                         LEFT JOIN Base_Unit AS Unit ON Person.UnitId =Unit.UnitId
                         LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId =WorkPost.WorkPostId
                         WHERE Person.PersonId in (select distinct PersonId from SitePerson_PersonInOutNow
-where CONVERT(VARCHAR(10), GETDATE(), 23)=CONVERT(VARCHAR(10), ChangeTime, 23)) ";
+where CONVERT(VARCHAR(10), GETDATE(), 23)=CONVERT(VARCHAR(10), ChangeTime, 23))  and Project.ProjectState ='1'";
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (this.drpProject.SelectedValue != Const._Null)
             {

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

@@ -41,7 +41,7 @@ namespace FineUIPro.Web.DataShow
                         LEFT JOIN Base_Unit AS Unit ON Person.UnitId =Unit.UnitId
                         LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId =WorkPost.WorkPostId
                         WHERE Person.PersonId in (select distinct PersonId from SitePerson_PersonInOutNow
-where CONVERT(VARCHAR(10), GETDATE(), 23)=CONVERT(VARCHAR(10), ChangeTime, 23)) and (WorkPost.PostType is null or WorkPost.PostType!='1') ";
+where CONVERT(VARCHAR(10), GETDATE(), 23)=CONVERT(VARCHAR(10), ChangeTime, 23)) and (WorkPost.PostType is null or WorkPost.PostType!='1') and Project.ProjectState ='1'";
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (this.drpProject.SelectedValue != Const._Null)
             {

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

@@ -41,7 +41,7 @@ namespace FineUIPro.Web.DataShow
                         LEFT JOIN Base_Unit AS Unit ON Person.UnitId =Unit.UnitId
                         LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId =WorkPost.WorkPostId
                         WHERE Person.PersonId in (select distinct PersonId from SitePerson_PersonInOutNow
-where CONVERT(VARCHAR(10), GETDATE(), 23)=CONVERT(VARCHAR(10), ChangeTime, 23)) and WorkPost.PostType='1' ";
+where CONVERT(VARCHAR(10), GETDATE(), 23)=CONVERT(VARCHAR(10), ChangeTime, 23)) and WorkPost.PostType='1' and Project.ProjectState ='1'";
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (this.drpProject.SelectedValue != Const._Null)
             {

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

@@ -61,7 +61,7 @@ namespace FineUIPro.Web.DataShow
                  FROM SitePerson_Person AS Person 
                 LEFT JOIN Base_Project AS Project ON Project.ProjectId=Person.ProjectId 
                 LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Person.UnitId 
-                LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId=WorkPost.WorkPostId WHERE Person.IsUsed=1 and WorkPost.IsCQMS=1 ";
+                LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId=WorkPost.WorkPostId WHERE Person.IsUsed=1 and WorkPost.IsCQMS=1 and Project.ProjectState ='1'";
                 if (this.drpProject.SelectedValue  != Const._Null)
                 {
                     strSql += " AND Person.ProjectId = @ProjectId";

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

@@ -40,7 +40,7 @@ namespace FineUIPro.Web.DataShow
                         LEFT JOIN Base_Project AS Project ON Person.ProjectId =Project.ProjectId
                         LEFT JOIN Base_Unit AS Unit ON Person.UnitId =Unit.UnitId
                         LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId =WorkPost.WorkPostId
-                        WHERE IsUsed=1 AND InTime <=GETDATE() AND (OutTime IS NULL OR OutTime > GETDATE()) ";
+                        WHERE IsUsed=1 AND InTime <=GETDATE() AND (OutTime IS NULL OR OutTime > GETDATE()) and Project.ProjectState ='1' ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (this.drpProject.SelectedValue != Const._Null)
             {

SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx

@@ -151,6 +151,8 @@
                                                 </f:RadioButtonList>
                                                       <f:TextBox ID="txtOutResult" runat="server" Label="出场原因" LabelAlign="Right" MaxLength="50">
                                                 </f:TextBox>
+                                                <f:TextBox ID="txtEmail" runat="server" Label="邮箱" RegexPattern="EMAIL" LabelAlign="Right" MaxLength="50">
+                                                </f:TextBox>
                                             </Items>
                                         </f:Panel>
                                         <f:Panel ID="Panel5" Title="面板1" BoxFlex="2" runat="server" ShowBorder="false" ShowHeader="false"

SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs

@@ -165,6 +165,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
                         this.txtIdentityCard.Text = person.IdentityCard;
                         this.txtAddress.Text = person.Address;
                         this.txtTelephone.Text = person.Telephone;
+                        this.txtEmail.Text = person.Email;
                         this.txtOutResult.Text = person.OutResult;
                         if (person.IsForeign.HasValue)
                         {
@@ -510,6 +511,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
             }
             person.Address = this.txtAddress.Text.Trim();
             person.Telephone = this.txtTelephone.Text.Trim();
+            person.Email = this.txtEmail.Text.Trim();
             person.OutResult = this.txtOutResult.Text.Trim();
             if (!string.IsNullOrEmpty(this.txtInTime.Text.Trim()))
             {

SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.SitePerson {
-    
-    
-    public partial class PersonListEdit {
-        
+namespace FineUIPro.Web.HSSE.SitePerson
+{
+
+
+    public partial class PersonListEdit
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel3 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel3;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// btnAttachUrl1 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnAttachUrl1;
-        
+
         /// <summary>
         /// btnAttachUrl5 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnAttachUrl5;
-        
+
         /// <summary>
         /// btnAttachUrl2 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnAttachUrl2;
-        
+
         /// <summary>
         /// btnAttachUrl3 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnAttachUrl3;
-        
+
         /// <summary>
         /// btnAttachUrl4 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnAttachUrl4;
-        
+
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-        
+
         /// <summary>
         /// btnQR 控件。
         /// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnQR;
-        
+
         /// <summary>
         /// btnClose 控件。
         /// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnClose;
-        
+
         /// <summary>
         /// TabStrip1 控件。
         /// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TabStrip TabStrip1;
-        
+
         /// <summary>
         /// Tab1 控件。
         /// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Tab Tab1;
-        
+
         /// <summary>
         /// Panel2 控件。
         /// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel2;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -155,7 +157,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// txtPersonName 控件。
         /// </summary>
@@ -164,7 +166,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtPersonName;
-        
+
         /// <summary>
         /// drpIdcardType 控件。
         /// </summary>
@@ -173,7 +175,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpIdcardType;
-        
+
         /// <summary>
         /// txtIdentityCard 控件。
         /// </summary>
@@ -182,7 +184,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtIdentityCard;
-        
+
         /// <summary>
         /// txtIdcardStartDate 控件。
         /// </summary>
@@ -191,7 +193,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtIdcardStartDate;
-        
+
         /// <summary>
         /// txtIdcardEndDate 控件。
         /// </summary>
@@ -200,7 +202,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtIdcardEndDate;
-        
+
         /// <summary>
         /// txtUnitName 控件。
         /// </summary>
@@ -209,7 +211,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtUnitName;
-        
+
         /// <summary>
         /// txtWorkArea 控件。
         /// </summary>
@@ -218,7 +220,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownBox txtWorkArea;
-        
+
         /// <summary>
         /// gvWorkArea 控件。
         /// </summary>
@@ -227,7 +229,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid gvWorkArea;
-        
+
         /// <summary>
         /// drpMainCNProfessional 控件。
         /// </summary>
@@ -236,7 +238,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpMainCNProfessional;
-        
+
         /// <summary>
         /// drpAuditor 控件。
         /// </summary>
@@ -245,7 +247,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpAuditor;
-        
+
         /// <summary>
         /// ckIsForeign 控件。
         /// </summary>
@@ -254,7 +256,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBox ckIsForeign;
-        
+
         /// <summary>
         /// txtBirthday 控件。
         /// </summary>
@@ -263,7 +265,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtBirthday;
-        
+
         /// <summary>
         /// txtInTime 控件。
         /// </summary>
@@ -272,7 +274,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtInTime;
-        
+
         /// <summary>
         /// txtOutTime 控件。
         /// </summary>
@@ -281,7 +283,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtOutTime;
-        
+
         /// <summary>
         /// ckIsSafetyMonitoring 控件。
         /// </summary>
@@ -290,7 +292,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBox ckIsSafetyMonitoring;
-        
+
         /// <summary>
         /// Panel4 控件。
         /// </summary>
@@ -299,7 +301,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel4;
-        
+
         /// <summary>
         /// txtCardNo 控件。
         /// </summary>
@@ -308,7 +310,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCardNo;
-        
+
         /// <summary>
         /// btnReadIdentityCard 控件。
         /// </summary>
@@ -317,7 +319,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnReadIdentityCard;
-        
+
         /// <summary>
         /// rblSex 控件。
         /// </summary>
@@ -326,7 +328,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList rblSex;
-        
+
         /// <summary>
         /// rblIdcardForever 控件。
         /// </summary>
@@ -335,7 +337,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList rblIdcardForever;
-        
+
         /// <summary>
         /// txtIdcardAddress 控件。
         /// </summary>
@@ -344,7 +346,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtIdcardAddress;
-        
+
         /// <summary>
         /// drpPost 控件。
         /// </summary>
@@ -353,7 +355,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpPost;
-        
+
         /// <summary>
         /// drpTeamGroup 控件。
         /// </summary>
@@ -362,7 +364,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpTeamGroup;
-        
+
         /// <summary>
         /// drpViceCNProfessional 控件。
         /// </summary>
@@ -371,7 +373,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpViceCNProfessional;
-        
+
         /// <summary>
         /// txtAuditorDate 控件。
         /// </summary>
@@ -380,7 +382,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtAuditorDate;
-        
+
         /// <summary>
         /// ckIsOutside 控件。
         /// </summary>
@@ -389,7 +391,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBox ckIsOutside;
-        
+
         /// <summary>
         /// txtTelephone 控件。
         /// </summary>
@@ -398,7 +400,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtTelephone;
-        
+
         /// <summary>
         /// rblIsUsed 控件。
         /// </summary>
@@ -407,7 +409,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList rblIsUsed;
-        
+
         /// <summary>
         /// txtOutResult 控件。
         /// </summary>
@@ -416,7 +418,16 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtOutResult;
-        
+
+        /// <summary>
+        /// txtEmail 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtEmail;
+
         /// <summary>
         /// Panel5 控件。
         /// </summary>
@@ -425,7 +436,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel5;
-        
+
         /// <summary>
         /// imgPhoto 控件。
         /// </summary>
@@ -434,7 +445,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Image imgPhoto;
-        
+
         /// <summary>
         /// filePhoto 控件。
         /// </summary>
@@ -443,7 +454,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.FileUpload filePhoto;
-        
+
         /// <summary>
         /// Tab2 控件。
         /// </summary>
@@ -452,7 +463,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Tab Tab2;
-        
+
         /// <summary>
         /// Form7 控件。
         /// </summary>
@@ -461,7 +472,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form Form7;
-        
+
         /// <summary>
         /// drpPosition 控件。
         /// </summary>
@@ -470,7 +481,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpPosition;
-        
+
         /// <summary>
         /// drpTitle 控件。
         /// </summary>
@@ -479,7 +490,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpTitle;
-        
+
         /// <summary>
         /// drpEduLevel 控件。
         /// </summary>
@@ -488,7 +499,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpEduLevel;
-        
+
         /// <summary>
         /// drpMaritalStatus 控件。
         /// </summary>
@@ -497,7 +508,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpMaritalStatus;
-        
+
         /// <summary>
         /// drpPoliticsStatus 控件。
         /// </summary>
@@ -506,7 +517,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpPoliticsStatus;
-        
+
         /// <summary>
         /// drpNation 控件。
         /// </summary>
@@ -515,7 +526,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpNation;
-        
+
         /// <summary>
         /// drpCountryCode 控件。
         /// </summary>
@@ -524,7 +535,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpCountryCode;
-        
+
         /// <summary>
         /// drpProvinceCode 控件。
         /// </summary>
@@ -533,7 +544,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProvinceCode;
-        
+
         /// <summary>
         /// drpCertificate 控件。
         /// </summary>
@@ -542,7 +553,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpCertificate;
-        
+
         /// <summary>
         /// txtCertificateCode 控件。
         /// </summary>
@@ -551,7 +562,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCertificateCode;
-        
+
         /// <summary>
         /// txtCertificateLimitTime 控件。
         /// </summary>
@@ -560,7 +571,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtCertificateLimitTime;
-        
+
         /// <summary>
         /// rblIsCardUsed 控件。
         /// </summary>
@@ -569,7 +580,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList rblIsCardUsed;
-        
+
         /// <summary>
         /// txtAddress 控件。
         /// </summary>
@@ -578,7 +589,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtAddress;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -587,7 +598,7 @@ namespace FineUIPro.Web.HSSE.SitePerson {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>

SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXFind.aspx.cs

@@ -535,22 +535,31 @@ namespace FineUIPro.Web.PZHGL.GJSX
                 cell.CellStyle = cellStyle;
                 cell.SetCellValue(tb.Rows[j]["GJSXTypeName"].ToString());
                 cell = row.CreateCell(6);
-                var stateCellStyle = cellStyle;
-                //if (state == "0")
-                //{
-                //    stateCellStyle.FillForegroundColor = IndexedColors.Green.Index;
-                //    //stateCellStyle.FillBackgroundColor = IndexedColors.Green.Index;
-                //}
-                //else if (state == "2" || state == "3")
-                //{
-                //    //stateCellStyle.FillForegroundColor = IndexedColors.Blue.Index;
-                //    stateCellStyle.FillBackgroundColor = IndexedColors.Blue.Index;
-                //}
-                //else if (state == "4")
-                //{
-                //    //stateCellStyle.FillForegroundColor = IndexedColors.Red.Index;
-                //    stateCellStyle.FillBackgroundColor = IndexedColors.Red.Index;
-                //}
+
+                NPOI.SS.UserModel.ICellStyle stateCellStyle = workbook.CreateCellStyle();
+                stateCellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
+                stateCellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
+                stateCellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
+                stateCellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
+                stateCellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center;
+                stateCellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center;
+                stateCellStyle.WrapText = true;
+                stateCellStyle.SetFont(font);
+                if (state == "0")
+                {
+                    stateCellStyle.FillForegroundColor = IndexedColors.Green.Index;
+                    stateCellStyle.FillPattern = FillPattern.SolidForeground;	// 填充方式
+                }
+                else if (state == "2" || state == "3")
+                {
+                    stateCellStyle.FillForegroundColor = IndexedColors.SkyBlue.Index;
+                    stateCellStyle.FillPattern = FillPattern.SolidForeground;	// 填充方式
+                }
+                else if (state == "4")
+                {
+                    stateCellStyle.FillForegroundColor = IndexedColors.Red.Index;
+                    stateCellStyle.FillPattern = FillPattern.SolidForeground;	// 填充方式
+                }
                 cell.CellStyle = stateCellStyle;
                 cell.SetCellValue(tb.Rows[j]["StateStr"].ToString());
                 cell = row.CreateCell(7);

SGGL/FineUIPro.Web/Person/PersonSetEdit.aspx

@@ -99,7 +99,6 @@
                         </f:TextBox>
                     </Items>
                 </f:FormRow>
-
                 <f:FormRow>
                     <Items>
                         <f:DatePicker runat="server" Label="进入项目时间" ID="txtIntoProjectDate" LabelWidth="110px" Readonly="true"></f:DatePicker>
@@ -109,6 +108,13 @@
 
                     </Items>
                 </f:FormRow>
+
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtEmail" runat="server" Label="邮箱" RegexPattern="EMAIL" LabelAlign="Right" MaxLength="50">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
                 <f:FormRow>
                     <Items>
                         <f:Image ID="Image2" ImageUrl="~/res/images/Signature0.png" runat="server" Height="35px" Width="110px"

SGGL/FineUIPro.Web/Person/PersonSetEdit.aspx.cs

@@ -105,6 +105,7 @@ namespace FineUIPro.Web.Person
                             this.drpIsPost.SelectedValue = Convert.ToString(user.IsPost);
                         }
                         this.txtTelephone.Text = user.Telephone;
+                        this.txtEmail.Text = user.Email;
                         if (user.IsOffice == true)
                         {
                             this.drpIsOffice.SelectedValue = "True";
@@ -196,6 +197,7 @@ namespace FineUIPro.Web.Person
                 Account = this.txtAccount.Text.Trim(),
                 IdentityCard = this.txtIdentityCard.Text.Trim(),
                 Telephone = this.txtTelephone.Text.Trim(),
+                Email = this.txtEmail.Text.Trim(),
                 Politicalstatus = this.txtPoliticalstatus.Text.Trim(),
                 Hometown = this.txtHometown.Text.Trim(),
                 Education = this.txtEducation.Text.Trim(),

SGGL/FineUIPro.Web/Person/PersonSetEdit.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.Person {
-    
-    
-    public partial class PersonSetEdit {
-        
+namespace FineUIPro.Web.Person
+{
+
+
+    public partial class PersonSetEdit
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// txtUserCode 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtUserCode;
-        
+
         /// <summary>
         /// txtUserName 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtUserName;
-        
+
         /// <summary>
         /// txtWorkNo 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtWorkNo;
-        
+
         /// <summary>
         /// txtAccount 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtAccount;
-        
+
         /// <summary>
         /// txtIdentityCard 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtIdentityCard;
-        
+
         /// <summary>
         /// txtBirthday 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtBirthday;
-        
+
         /// <summary>
         /// drpUnit 控件。
         /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
-        
+
         /// <summary>
         /// drpDepart 控件。
         /// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpDepart;
-        
+
         /// <summary>
         /// rblSex 控件。
         /// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList rblSex;
-        
+
         /// <summary>
         /// drpIsOffice 控件。
         /// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpIsOffice;
-        
+
         /// <summary>
         /// drpRole 控件。
         /// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpRole;
-        
+
         /// <summary>
         /// drpIsPost 控件。
         /// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpIsPost;
-        
+
         /// <summary>
         /// txtPoliticalstatus 控件。
         /// </summary>
@@ -155,7 +157,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtPoliticalstatus;
-        
+
         /// <summary>
         /// txtHometown 控件。
         /// </summary>
@@ -164,7 +166,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtHometown;
-        
+
         /// <summary>
         /// txtEducation 控件。
         /// </summary>
@@ -173,7 +175,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtEducation;
-        
+
         /// <summary>
         /// txtTelephone 控件。
         /// </summary>
@@ -182,7 +184,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtTelephone;
-        
+
         /// <summary>
         /// txtGraduate 控件。
         /// </summary>
@@ -191,7 +193,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtGraduate;
-        
+
         /// <summary>
         /// txtMajor 控件。
         /// </summary>
@@ -200,7 +202,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtMajor;
-        
+
         /// <summary>
         /// drpPostTitle 控件。
         /// </summary>
@@ -209,7 +211,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpPostTitle;
-        
+
         /// <summary>
         /// txtIntoDate 控件。
         /// </summary>
@@ -218,7 +220,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtIntoDate;
-        
+
         /// <summary>
         /// drpCertificate 控件。
         /// </summary>
@@ -227,7 +229,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpCertificate;
-        
+
         /// <summary>
         /// drpWorkPost 控件。
         /// </summary>
@@ -236,7 +238,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpWorkPost;
-        
+
         /// <summary>
         /// txtProjectId 控件。
         /// </summary>
@@ -245,7 +247,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectId;
-        
+
         /// <summary>
         /// txtProjectRoleId 控件。
         /// </summary>
@@ -254,7 +256,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectRoleId;
-        
+
         /// <summary>
         /// txtIntoProjectDate 控件。
         /// </summary>
@@ -263,7 +265,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtIntoProjectDate;
-        
+
         /// <summary>
         /// txtOutProjectDate 控件。
         /// </summary>
@@ -272,7 +274,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtOutProjectDate;
-        
+
         /// <summary>
         /// txtValidityDate 控件。
         /// </summary>
@@ -281,7 +283,16 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtValidityDate;
-        
+
+        /// <summary>
+        /// txtEmail 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtEmail;
+
         /// <summary>
         /// Image2 控件。
         /// </summary>
@@ -290,7 +301,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Image Image2;
-        
+
         /// <summary>
         /// fileSignature 控件。
         /// </summary>
@@ -299,7 +310,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.FileUpload fileSignature;
-        
+
         /// <summary>
         /// BtnRole 控件。
         /// </summary>
@@ -308,7 +319,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button BtnRole;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -317,7 +328,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -326,7 +337,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-        
+
         /// <summary>
         /// btnClose 控件。
         /// </summary>
@@ -335,7 +346,7 @@ namespace FineUIPro.Web.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnClose;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>

SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx

@@ -8,28 +8,71 @@
 </head>
 <body>
     <form id="form1" runat="server">
-    <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
-    <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
-        BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
-        <rows>
-            <f:FormRow>
-                 <Items>
-                   <f:TextBox ID="txtProjectName" runat="server" Label="项目名称" Required="true"  MaxLength="100" 
-                    ShowRedStar="true" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"  FocusOnPageLoad="true" ></f:TextBox>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>
-               <Items>
-                   <f:TextBox ID="txtProjectCode" runat="server" Label="项目号" Required="true" MaxLength="50" 
-                    ShowRedStar="true" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"></f:TextBox>
-                </Items>
-                <Items>
-                   <f:TextBox ID="txtShortName" runat="server" Label="简称" LabelWidth="150px" MaxLength="20" Required="true" ShowRedStar="true"></f:TextBox>
-                </Items>
-            </f:FormRow>   
-            <f:FormRow>
+        <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Rows>
+                <f:FormRow>
                     <Items>
-                        <f:DropDownBox runat="server" ID="drpMasterBox1" Label="主数据项目"  EmptyText="请从下拉表格中选择项目" DataControlID="Grid1"
+                        <%-- <f:TextBox ID="txtProjectName" runat="server" Label="项目名称" Required="true"  MaxLength="100" 
+                    ShowRedStar="true" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"  FocusOnPageLoad="true" ></f:TextBox>--%>
+                        <%-- <f:DropDownList ID="drpProject" runat="server" Label="项目名称"  EnableEdit="true" Required="true" ShowRedStar="true">
+                    </f:DropDownList>--%>
+
+                        <f:DropDownBox runat="server" ID="drpProjectBox" AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Label="项目名称" EmptyText="请从下拉表格中选择PMP系统项目" DataControlID="Grid2"
+                            EnableMultiSelect="false" MatchFieldWidth="false" Required="true" ShowRedStar="true">
+                            <PopPanel>
+                                <f:Panel ID="Panel1" runat="server" BodyPadding="10px" Width="820px" Height="420px" Hidden="true"
+                                    ShowBorder="true" ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+                                    <Items>
+                                        <f:Form ID="Form2" ShowBorder="False" ShowHeader="False" runat="server">
+                                            <Rows>
+                                                <f:FormRow>
+                                                    <Items>
+                                                        <f:TwinTriggerBox Width="200px" runat="server" EmptyText="按项目编号、名称查找" ShowLabel="false" ID="ttbPmpProCodeSearch"
+                                                            ShowTrigger1="false" OnTrigger1Click="ttbPmpProCodeSearch_Trigger1Click" OnTrigger2Click="ttbPmpProCodeSearch_Trigger2Click" Trigger1Icon="Clear" Trigger2Icon="Search">
+                                                        </f:TwinTriggerBox>
+                                                    </Items>
+                                                </f:FormRow>
+                                            </Rows>
+                                        </f:Form>
+                                        <f:Grid ID="Grid2" BoxFlex="1" DataKeyNames="Name"
+                                            DataIDField="Name" DataTextField="Name" EnableMultiSelect="false"
+                                            PageSize="50" ShowBorder="true" ShowHeader="false"
+                                            AllowPaging="true" IsDatabasePaging="true" OnPageIndexChange="Grid2_PageIndexChange" runat="server" EnableCheckBoxSelect="true"
+                                            AllowSorting="false" SortField="StNum" SortDirection="DESC"
+                                            OnSort="Grid2_Sort">
+                                            <Columns>
+                                                <f:TemplateField ColumnID="tfPageIndex" Width="50px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                                                    EnableLock="true" Locked="true">
+                                                    <ItemTemplate>
+                                                        <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid2.PageIndex * Grid2.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                                    </ItemTemplate>
+                                                </f:TemplateField>
+                                                <f:BoundField Width="80px" DataField="StNum" HeaderText="项目编号" />
+                                                <f:BoundField ExpandUnusedSpace="true" MinWidth="200px" DataField="Name" HeaderText="项目名称" />
+                                                <f:BoundField ExpandUnusedSpace="true" MinWidth="200px" DataField="Address" HeaderText="地址" />
+                                            </Columns>
+                                        </f:Grid>
+                                    </Items>
+                                </f:Panel>
+                            </PopPanel>
+                        </f:DropDownBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtProjectCode" runat="server" Label="项目号" Required="true" MaxLength="50"
+                            ShowRedStar="true" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
+                        </f:TextBox>
+                    </Items>
+                    <Items>
+                        <f:TextBox ID="txtShortName" runat="server" Label="简称" LabelWidth="150px" MaxLength="20" Required="true" ShowRedStar="true"></f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownBox runat="server" ID="drpMasterBox1" Label="主数据项目" EmptyText="请从下拉表格中选择集团项目" DataControlID="Grid1"
                             EnableMultiSelect="false" MatchFieldWidth="false">
                             <PopPanel>
                                 <f:Panel ID="Panel7" runat="server" BodyPadding="10px" Width="820px" Height="420px" Hidden="true"
@@ -51,14 +94,14 @@
                                                 </f:FormRow>
                                             </Rows>
                                         </f:Form>
-                                        <f:Grid ID="Grid1" BoxFlex="1" DataKeyNames="SysId" 
+                                        <f:Grid ID="Grid1" BoxFlex="1" DataKeyNames="SysId"
                                             DataIDField="SysId" DataTextField="PrjName" EnableMultiSelect="false"
                                             PageSize="1000" ShowBorder="true" ShowHeader="false"
                                             AllowPaging="false" IsDatabasePaging="false" runat="server" EnableCheckBoxSelect="true"
                                             AllowSorting="false" SortField="PrjName" SortDirection="ASC"
                                             OnSort="Grid1_Sort">
                                             <Columns>
-                                                <f:RowNumberField  TextAlign="Center" />
+                                                <f:RowNumberField TextAlign="Center" />
                                                 <f:BoundField Width="200px" DataField="PrjCode" HeaderText="项目编号" />
                                                 <f:BoundField ExpandUnusedSpace="true" MinWidth="400px" DataField="PrjName" HeaderText="项目名称" />
                                             </Columns>
@@ -69,162 +112,165 @@
                         </f:DropDownBox>
                     </Items>
                 </f:FormRow>
-            <f:FormRow ColumnWidths="50% 25% 25%">
-                 <Items>               
-                   <f:DropDownList ID="drpProjectType" Label="项目类型" runat="server">
-                   </f:DropDownList>
-                       <f:DropDownList ID="drpProjectState" runat="server" Label="项目状态" LabelAlign="Right" LabelWidth="150px">
-                        <f:ListItem Text="在建" Value="1"  Selected="true"/>
-                        <f:ListItem Text="停工" Value="2" />
-                        <f:ListItem Text="竣工" Value="3" />
-                    </f:DropDownList>
-                     <f:DropDownList runat="server" ID="drpProjectState2" Label="细分状态"></f:DropDownList>
-                </Items>                                   
-            </f:FormRow> 
-               <f:FormRow>
-                <Items>
-                    <f:DatePicker runat="server" Label="开工日期" ID="txtStartDate" 
-                        Required="true" ShowRedStar="true" AutoPostBack="true"  OnTextChanged="txtStartDate_Blur"></f:DatePicker>             
-                   <f:DatePicker runat="server" Label="竣工日期" ID="txtEndDate" LabelWidth="150px"
-                       AutoPostBack="true"  OnTextChanged="txtStartDate_Blur"></f:DatePicker>
-               </Items>
-            </f:FormRow>   
-            <f:FormRow>
-                 <Items>               
-                   <f:TextBox ID="txtContractNo" runat="server" Label="合同号"></f:TextBox>            
-                   <f:NumberBox runat="server" ID="txtDuration" Label="项目建设工期(月)"  DecimalPrecision="1"
-                        NoNegative="true" LabelWidth="150px">
-                    </f:NumberBox>
-               </Items>                                         
-            </f:FormRow>   
-            <f:FormRow>              
-               <Items>
-                    <f:DropDownList ID="drpProjectManager" runat="server" Label="项目经理" 
-                        EnableEdit="true" Required="true" ShowRedStar="true">
-                    </f:DropDownList>     
-                      <f:DropDownList ID="drpConstructionManager" runat="server" Label="施工经理" LabelWidth="150px" EnableEdit="true">
-                    </f:DropDownList>     
-                </Items>
-            </f:FormRow>  
-             <f:FormRow>              
-               <Items>
-                    <f:DropDownList ID="drpQAManager" runat="server" Label="质量经理" 
-                        EnableEdit="true" Required="true" ShowRedStar="true">
-                    </f:DropDownList>    
-                      <f:DropDownList ID="drpHSSEManager" runat="server" Label="安全经理" LabelWidth="150px" EnableEdit="true">
-                    </f:DropDownList>     
-                </Items>
-            </f:FormRow>  
-            <f:FormRow>
-                <Items>
-                   <f:DropDownList ID="drpDriveManager" runat="server" Label="开车经理" EnableEdit="true">
-                    </f:DropDownList>     
-                   <f:DropDownList ID="drpUnit" Label="所属单位" runat="server" EnableEdit="true">
-                   </f:DropDownList>
-                </Items>
-            </f:FormRow>  
-            <f:FormRow>
-                <Items>
-                    <f:TextBox ID="txtProjectAddress" runat="server" Label="项目地址" LabelWidth="150px" MaxLength="500" ></f:TextBox>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>
-                 <Items>
-                     <f:TextBox ID="txtJTProjectCode" runat="server" Label="集团项目号"  MaxLength="50" LabelWidth="150px"></f:TextBox>
-                     <f:CheckBox runat="server" ID="ckbIsForeign" Label="海外项目" LabelWidth="150px"></f:CheckBox>                     
-                </Items>
-            </f:FormRow> 
-            <f:FormRow>
-                <Items>
-                    <f:TextArea ID="txtWorkRange" runat="server" Label="工作范围" MaxLength="500" Height="50px"></f:TextArea>
-                </Items>
-            </f:FormRow>
-             <f:FormRow>
-                <Items>
-                    <f:TextArea ID="txtRemark" runat="server" Label="项目概况" MaxLength="500" Height="50px"></f:TextArea>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>
-                 <Items>                   
-                    <f:NumberBox runat="server" ID="txtProjectMoney" Label="合同额(万元)" NoNegative="true" ></f:NumberBox>
-                     <f:NumberBox runat="server" ID="txtConstructionMoney" Label="施工合同额(万元)" LabelWidth="150px"
-                         NoNegative="true" ></f:NumberBox>
-                </Items>
-            </f:FormRow>   
-            <f:FormRow>
-               <Items>
-                   <f:TextBox ID="txtTelephone" runat="server" Label="项目部电话" MaxLength="50" 
-                    ></f:TextBox>
-                </Items>
-                <Items>
-                        <f:DropDownList ID="drpCountry" runat="server" Label="国家" EnableEdit="true"  
+                <f:FormRow ColumnWidths="50% 25% 25%">
+                    <Items>
+                        <f:DropDownList ID="drpProjectType" Label="项目类型" runat="server">
+                        </f:DropDownList>
+                        <f:DropDownList ID="drpProjectState" runat="server" Label="项目状态" LabelAlign="Right" LabelWidth="150px">
+                            <f:ListItem Text="在建" Value="1" Selected="true" />
+                            <f:ListItem Text="停工" Value="2" />
+                            <f:ListItem Text="竣工" Value="3" />
+                        </f:DropDownList>
+                        <f:DropDownList runat="server" ID="drpProjectState2" Label="细分状态"></f:DropDownList>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:DatePicker runat="server" Label="开工日期" ID="txtStartDate"
+                            Required="true" ShowRedStar="true" AutoPostBack="true" OnTextChanged="txtStartDate_Blur">
+                        </f:DatePicker>
+                        <f:DatePicker runat="server" Label="竣工日期" ID="txtEndDate" LabelWidth="150px"
+                            AutoPostBack="true" OnTextChanged="txtStartDate_Blur">
+                        </f:DatePicker>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtContractNo" runat="server" Label="合同号"></f:TextBox>
+                        <f:NumberBox runat="server" ID="txtDuration" Label="项目建设工期(月)" DecimalPrecision="1"
+                            NoNegative="true" LabelWidth="150px">
+                        </f:NumberBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList ID="drpProjectManager" runat="server" Label="项目经理"
+                            EnableEdit="true" Required="true" ShowRedStar="true">
+                        </f:DropDownList>
+                        <f:DropDownList ID="drpConstructionManager" runat="server" Label="施工经理" LabelWidth="150px" EnableEdit="true">
+                        </f:DropDownList>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList ID="drpQAManager" runat="server" Label="质量经理"
+                            EnableEdit="true" Required="true" ShowRedStar="true">
+                        </f:DropDownList>
+                        <f:DropDownList ID="drpHSSEManager" runat="server" Label="安全经理" LabelWidth="150px" EnableEdit="true">
+                        </f:DropDownList>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList ID="drpDriveManager" runat="server" Label="开车经理" EnableEdit="true">
+                        </f:DropDownList>
+                        <f:DropDownList ID="drpUnit" Label="所属单位" runat="server" EnableEdit="true">
+                        </f:DropDownList>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtProjectAddress" runat="server" Label="项目地址" LabelWidth="150px" MaxLength="500"></f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtJTProjectCode" runat="server" Label="集团项目号" MaxLength="50" LabelWidth="150px"></f:TextBox>
+                        <f:CheckBox runat="server" ID="ckbIsForeign" Label="海外项目" LabelWidth="150px"></f:CheckBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextArea ID="txtWorkRange" runat="server" Label="工作范围" MaxLength="500" Height="50px"></f:TextArea>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextArea ID="txtRemark" runat="server" Label="项目概况" MaxLength="500" Height="50px"></f:TextArea>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:NumberBox runat="server" ID="txtProjectMoney" Label="合同额(万元)" NoNegative="true"></f:NumberBox>
+                        <f:NumberBox runat="server" ID="txtConstructionMoney" Label="施工合同额(万元)" LabelWidth="150px"
+                            NoNegative="true">
+                        </f:NumberBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtTelephone" runat="server" Label="项目部电话" MaxLength="50">
+                        </f:TextBox>
+                    </Items>
+                    <Items>
+                        <f:DropDownList ID="drpCountry" runat="server" Label="国家" EnableEdit="true"
                             AutoPostBack="true" OnSelectedIndexChanged="drpCountry_SelectedIndexChanged"
                             ShowRedStar="true" Required="true">
-                    </f:DropDownList>  
-                </Items>
-            </f:FormRow> 
-            <f:FormRow>
-               <Items>
-                   <f:DropDownList ID="drpProvince" runat="server" Label="省份" EnableEdit="true" >
-                    </f:DropDownList>  
-                </Items>
-                <Items>
-                   <f:TextBox ID="txtCity" runat="server" Label="城市" MaxLength="50" LabelWidth="150px"
-                    ></f:TextBox>
-                </Items>
-            </f:FormRow> 
-            <f:FormRow ColumnWidths="40% 10% 50%">   
-                <Items>
-                      <f:TextBox ID="txtMapCoordinates" runat="server" Label="坐标" MaxLength="50"></f:TextBox>                     
-                    <f:ContentPanel ID="bottomPanel"  RegionPosition="Bottom" ShowBorder="false" ShowHeader="false" EnableCollapse="false" runat="server">
-                        <a href="http://api.map.baidu.com/lbsapi/getpoint/index.html" target="_blank" >拾取坐标</a>
-                   </f:ContentPanel>
-                   <f:TextBox ID="txtEnglishRemark" runat="server" Label="英文简称" MaxLength="3" LabelWidth="150px" Width="300px"></f:TextBox>
-                    
-                </Items>
-            </f:FormRow>  
-            <f:FormRow>
-                <Items>
-                    <f:TextBox ID="txtHJProjectCode" runat="server" Label="焊接软件项目编号" LabelWidth="150px" MaxLength="50" ></f:TextBox>
-                    <f:TextBox ID="txtKZProjectCode" runat="server" Label="控制软件项目编号" LabelWidth="150px" MaxLength="50" ></f:TextBox>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>
-                <Items>
-                    <f:TextBox ID="txtProjType" runat="server" Label="控制软件项目类型" LabelWidth="150px" MaxLength="50" ></f:TextBox>
-                    <f:TextBox ID="txtProjPhase" runat="server" Label="控制软件项目阶段" LabelWidth="150px" MaxLength="50" ></f:TextBox>
-                </Items>
-            </f:FormRow>
-            <f:FormRow>
-                 <Items>                   
-                    <f:NumberBox runat="server" ID="txtProgress" Label="项目进度(%)" NoNegative="true" ></f:NumberBox>
-                     <f:Label runat="server"></f:Label>
-                </Items>
-            </f:FormRow>   
-        </rows>
-        <toolbars>
-            <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
-                <Items>
-                    <f:CheckBox ID="ckIsUpTotalMonth" runat="server" Label="上报月总结" Checked="true" Hidden="true">
-                    </f:CheckBox>
-                    <f:Button ID="btnAttachUrl" Text="鸟瞰图" ToolTip="项目鸟瞰图查看及上传" Icon="TableCell" runat="server"
-                              OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1">
-                    </f:Button>
-                    <f:Label runat="server" Text="请上传分辨率为330 * 240 且不大于300KB图片" CssClass="LabelColor"></f:Label>
-                    <f:Button ID="btnSave" Icon="SystemSave" runat="server"  ValidateForms="SimpleForm1" 
-                        OnClick="btnSave_Click">
-                    </f:Button>
-                    <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
-                    </f:Button>
-                     <f:HiddenField ID="hdCompileMan" runat="server"></f:HiddenField>
-                </Items>
-            </f:Toolbar>
-        </toolbars>
-    </f:Form>
-        
+                        </f:DropDownList>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList ID="drpProvince" runat="server" Label="省份" EnableEdit="true">
+                        </f:DropDownList>
+                    </Items>
+                    <Items>
+                        <f:TextBox ID="txtCity" runat="server" Label="城市" MaxLength="50" LabelWidth="150px">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow ColumnWidths="40% 10% 50%">
+                    <Items>
+                        <f:TextBox ID="txtMapCoordinates" runat="server" Label="坐标" MaxLength="50"></f:TextBox>
+                        <f:ContentPanel ID="bottomPanel" RegionPosition="Bottom" ShowBorder="false" ShowHeader="false" EnableCollapse="false" runat="server">
+                            <a href="http://api.map.baidu.com/lbsapi/getpoint/index.html" target="_blank">拾取坐标</a>
+                        </f:ContentPanel>
+                        <f:TextBox ID="txtEnglishRemark" runat="server" Label="英文简称" MaxLength="3" LabelWidth="150px" Width="300px"></f:TextBox>
+
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtHJProjectCode" runat="server" Label="焊接软件项目编号" LabelWidth="150px" MaxLength="50"></f:TextBox>
+                        <f:TextBox ID="txtKZProjectCode" runat="server" Label="控制软件项目编号" LabelWidth="150px" MaxLength="50"></f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtProjType" runat="server" Label="控制软件项目类型" LabelWidth="150px" MaxLength="50"></f:TextBox>
+                        <f:TextBox ID="txtProjPhase" runat="server" Label="控制软件项目阶段" LabelWidth="150px" MaxLength="50"></f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:NumberBox runat="server" ID="txtProgress" Label="项目进度(%)" NoNegative="true"></f:NumberBox>
+                        <f:Label runat="server"></f:Label>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:CheckBox ID="ckIsUpTotalMonth" runat="server" Label="上报月总结" Checked="true" Hidden="true">
+                        </f:CheckBox>
+                        <f:Button ID="btnAttachUrl" Text="鸟瞰图" ToolTip="项目鸟瞰图查看及上传" Icon="TableCell" runat="server"
+                            OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1">
+                        </f:Button>
+                        <f:Label runat="server" Text="请上传分辨率为330 * 240 且不大于300KB图片" CssClass="LabelColor"></f:Label>
+                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" ValidateForms="SimpleForm1"
+                            OnClick="btnSave_Click">
+                        </f:Button>
+                        <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
+                        </f:Button>
+                        <f:HiddenField ID="hdCompileMan" runat="server"></f:HiddenField>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+        </f:Form>
+
         <f:Window ID="WindowAtt" Title="附件上传查看" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-                  Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
-                  Height="500px">
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
+            Height="500px">
         </f:Window>
     </form>
 </body>

SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using System.Collections.Generic;
 using System.Data;
+using FineUIPro.Web.DataShow;
 
 namespace FineUIPro.Web.ProjectData
 {
@@ -34,6 +35,8 @@ namespace FineUIPro.Web.ProjectData
         {
             if (!IsPostBack)
             {
+                BindGrid();
+                BindGrid2();
                 this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 ProjectTypeService.InitProjectTypeDropDownList(this.drpProjectType, true);
                 CountryService.InitCountryDropDownList(this.drpCountry, true);
@@ -67,9 +70,14 @@ namespace FineUIPro.Web.ProjectData
                         {
                             this.drpMasterBox1.Value = project.MasterSysId;
                         }
+                        if (!string.IsNullOrEmpty(project.ProjectName))
+                        {
+                            this.drpProjectBox.Text = project.ProjectName;
+                            this.drpProjectBox.Value = project.ProjectName;
+                        }
+                        //this.txtProjectName.Text = project.ProjectName;
                         this.txtProjectCode.Text = project.ProjectCode;
                         this.txtJTProjectCode.Text = project.JTProjectCode;
-                        this.txtProjectName.Text = project.ProjectName;
                         this.txtProjectAddress.Text = project.ProjectAddress;
                         this.txtWorkRange.Text = project.WorkRange;
                         this.txtContractNo.Text = project.ContractNo;
@@ -200,7 +208,7 @@ namespace FineUIPro.Web.ProjectData
             {
                 ProjectCode = this.txtProjectCode.Text.Trim(),
                 JTProjectCode = this.txtJTProjectCode.Text.Trim(),
-                ProjectName = Regex.Replace(this.txtProjectName.Text, @"\s", ""),
+                //ProjectName = Regex.Replace(this.txtProjectName.Text, @"\s", ""),
                 ProjectAddress = this.txtProjectAddress.Text.Trim(),
                 WorkRange = this.txtWorkRange.Text.Trim(),
                 ContractNo = this.txtContractNo.Text.Trim(),
@@ -219,6 +227,10 @@ namespace FineUIPro.Web.ProjectData
                 ProjType = this.txtProjType.Text.Trim(),
                 ProjPhase = this.txtProjPhase.Text.Trim(),
             };
+            if (!string.IsNullOrWhiteSpace(this.drpProjectBox.Text))
+            {
+                project.ProjectName = this.drpProjectBox.Text;
+            }
             if (string.IsNullOrEmpty(project.JTProjectCode))
             {
                 project.JTProjectCode = project.ProjectCode;
@@ -391,17 +403,38 @@ namespace FineUIPro.Web.ProjectData
         /// <param name="e"></param>
         protected void TextBox_TextChanged(object sender, EventArgs e)
         {
-            var q = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectCode == this.txtProjectCode.Text.Trim() && (x.ProjectId != this.ProjectId || (this.ProjectId == null && x.ProjectId != null)));
-            if (q != null)
-            {
-                ShowNotify("输入的项目编号已存在！", MessageBoxIcon.Warning);
-            }
-
-            var q2 = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectName == this.txtProjectName.Text.Trim() && (x.ProjectId != this.ProjectId || (this.ProjectId == null && x.ProjectId != null)));
+            //this.txtProjectName.Text.Trim()
+            string proName = this.drpProjectBox.Text.Trim();
+            string proCode = this.txtProjectCode.Text.Trim();
+            var q2 = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectName == proName && (x.ProjectId != this.ProjectId || (this.ProjectId == null && x.ProjectId != null)));
             if (q2 != null)
             {
                 ShowNotify("输入的项目名称已存在！", MessageBoxIcon.Warning);
             }
+
+            if (!string.IsNullOrWhiteSpace(proCode))
+            {
+                var q = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectCode == proCode && (x.ProjectId != this.ProjectId || (this.ProjectId == null && x.ProjectId != null)));
+                if (q != null)
+                {
+                    ShowNotify("输入的项目编号已存在！", MessageBoxIcon.Warning);
+                }
+            }
+
+
+            var pmpProject = Funs.DB.PMP_Project.Where(x => x.Name == proName).FirstOrDefault();
+            if (pmpProject != null)
+            {
+                this.txtProjectCode.Text = pmpProject.StNum;
+                this.txtShortName.Text = pmpProject.ProjShortName;
+                this.txtProjectAddress.Text = pmpProject.Address;
+                this.txtCity.Text = pmpProject.CityName;
+                this.txtStartDate.Text = pmpProject.RealStartDate != null ? ((DateTime)pmpProject.RealStartDate).ToString("yyyy-MM-dd") : "";
+                this.txtEndDate.Text = pmpProject.RealEndDate != null ? ((DateTime)pmpProject.RealEndDate).ToString("yyyy-MM-dd") : "";
+                //this.txtEnglishRemark.Text = pmpProject.ProjectNameEn;
+            }
+
+
         }
         #endregion
 
@@ -1686,6 +1719,8 @@ namespace FineUIPro.Web.ProjectData
             PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ProjectAttachUrl&menuId={1}", this.ProjectId, BLL.Const.ProjectSetMenuId)));
         }
 
+        #region 获取集团主项目数据
+
         private void BindGrid()
         {
             var list = ProjectService.GetMasterProjectInfos();
@@ -1714,6 +1749,7 @@ namespace FineUIPro.Web.ProjectData
         {
             BindGrid();
         }
+
         protected void ttbCodeSearch_Trigger1Click(object sender, EventArgs e)
         {
             ttbCodeSearch.Text = string.Empty;
@@ -1736,5 +1772,86 @@ namespace FineUIPro.Web.ProjectData
             ttbNameSearch.ShowTrigger1 = true;
             BindGrid();
         }
+
+        #endregion
+
+        #region 获取五环pmp项目数据
+
+
+        private void BindGrid2()
+        {
+            var lastPmpProject = (from x in Funs.DB.PMP_Project orderby x.CreateTime descending select x).FirstOrDefault();
+            if (lastPmpProject == null || DateTime.Now > lastPmpProject.CreateTime.AddHours(30))
+            {
+                PMPDataService.GetPMPProjectMasterData();
+            }
+            //var pmptoken = PMPDataService.GetToken();
+            var list = (from x in Funs.DB.PMP_Project orderby x.StNum descending select x).ToList();
+            string codeName = ttbPmpProCodeSearch.Text.Trim();
+            //string name = ttbPmpProNameSearch.Text.Trim();
+            if (!string.IsNullOrWhiteSpace(codeName))
+            {
+                list = list.Where(x => x.StNum.Contains(codeName) || x.Name.Contains(codeName)).ToList();
+            }
+            //if (!string.IsNullOrWhiteSpace(name))
+            //{
+            //    list = list.Where(x => x.Name.Contains(name)).ToList();
+            //}
+
+            // 1.设置总项数（特别注意：数据库分页一定要设置总记录数RecordCount）
+            Grid2.RecordCount = list.Count();
+            // 2.获取当前分页数据
+            DataTable table = Funs.LINQToDataTable(list);
+
+            // 3.绑定到Grid
+            //Grid2.DataSource = table;
+            Grid2.DataSource = this.GetPagedDataTable(Grid2, table);
+            Grid2.DataBind();
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid2_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid2();
+        }
+        protected void Grid2_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid2();
+        }
+
+
+        protected void ttbPmpProCodeSearch_Trigger1Click(object sender, EventArgs e)
+        {
+            ttbPmpProCodeSearch.Text = string.Empty;
+            ttbPmpProCodeSearch.ShowTrigger1 = false;
+            BindGrid2();
+        }
+        protected void ttbPmpProCodeSearch_Trigger2Click(object sender, EventArgs e)
+        {
+            ttbPmpProCodeSearch.ShowTrigger1 = true;
+            BindGrid2();
+        }
+        //protected void ttbPmpProCodeSearch_Trigger2Click(object sender, EventArgs e)
+        //{
+        //    ttbCodeSearch.ShowTrigger3 = true;
+        //    BindGrid2();
+        //}
+        //protected void ttbNameSearch_Trigger3Click(object sender, EventArgs e)
+        //{
+        //    ttbNameSearch.Text = string.Empty;
+        //    ttbNameSearch.ShowTrigger3 = false;
+        //    BindGrid2();
+        //}
+        //protected void ttbNameSearch_Trigger4Click(object sender, EventArgs e)
+        //{
+        //    ttbNameSearch.ShowTrigger3 = true;
+        //    BindGrid2();
+        //}
+
+        #endregion
+
     }
 }

SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.ProjectData {
-    
-    
-    public partial class ProjectSetSave {
-        
+namespace FineUIPro.Web.ProjectData
+{
+
+
+    public partial class ProjectSetSave
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -38,16 +40,61 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
-        /// txtProjectName 控件。
+        /// drpProjectBox 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtProjectName;
-        
+        protected global::FineUIPro.DropDownBox drpProjectBox;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Form2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form2;
+
+        /// <summary>
+        /// ttbPmpProCodeSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TwinTriggerBox ttbPmpProCodeSearch;
+
+        /// <summary>
+        /// Grid2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid2;
+
+        /// <summary>
+        /// lblPageIndex 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblPageIndex;
+
         /// <summary>
         /// txtProjectCode 控件。
         /// </summary>
@@ -56,7 +103,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectCode;
-        
+
         /// <summary>
         /// txtShortName 控件。
         /// </summary>
@@ -65,7 +112,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtShortName;
-        
+
         /// <summary>
         /// drpMasterBox1 控件。
         /// </summary>
@@ -74,7 +121,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownBox drpMasterBox1;
-        
+
         /// <summary>
         /// Panel7 控件。
         /// </summary>
@@ -83,7 +130,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel7;
-        
+
         /// <summary>
         /// Form5 控件。
         /// </summary>
@@ -92,7 +139,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form Form5;
-        
+
         /// <summary>
         /// ttbCodeSearch 控件。
         /// </summary>
@@ -101,7 +148,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TwinTriggerBox ttbCodeSearch;
-        
+
         /// <summary>
         /// ttbNameSearch 控件。
         /// </summary>
@@ -110,7 +157,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TwinTriggerBox ttbNameSearch;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -119,7 +166,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// drpProjectType 控件。
         /// </summary>
@@ -128,7 +175,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProjectType;
-        
+
         /// <summary>
         /// drpProjectState 控件。
         /// </summary>
@@ -137,7 +184,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProjectState;
-        
+
         /// <summary>
         /// drpProjectState2 控件。
         /// </summary>
@@ -146,7 +193,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProjectState2;
-        
+
         /// <summary>
         /// txtStartDate 控件。
         /// </summary>
@@ -155,7 +202,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStartDate;
-        
+
         /// <summary>
         /// txtEndDate 控件。
         /// </summary>
@@ -164,7 +211,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndDate;
-        
+
         /// <summary>
         /// txtContractNo 控件。
         /// </summary>
@@ -173,7 +220,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtContractNo;
-        
+
         /// <summary>
         /// txtDuration 控件。
         /// </summary>
@@ -182,7 +229,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtDuration;
-        
+
         /// <summary>
         /// drpProjectManager 控件。
         /// </summary>
@@ -191,7 +238,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProjectManager;
-        
+
         /// <summary>
         /// drpConstructionManager 控件。
         /// </summary>
@@ -200,7 +247,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpConstructionManager;
-        
+
         /// <summary>
         /// drpQAManager 控件。
         /// </summary>
@@ -209,7 +256,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpQAManager;
-        
+
         /// <summary>
         /// drpHSSEManager 控件。
         /// </summary>
@@ -218,7 +265,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpHSSEManager;
-        
+
         /// <summary>
         /// drpDriveManager 控件。
         /// </summary>
@@ -227,7 +274,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpDriveManager;
-        
+
         /// <summary>
         /// drpUnit 控件。
         /// </summary>
@@ -236,7 +283,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
-        
+
         /// <summary>
         /// txtProjectAddress 控件。
         /// </summary>
@@ -245,7 +292,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectAddress;
-        
+
         /// <summary>
         /// txtJTProjectCode 控件。
         /// </summary>
@@ -254,7 +301,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtJTProjectCode;
-        
+
         /// <summary>
         /// ckbIsForeign 控件。
         /// </summary>
@@ -263,7 +310,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBox ckbIsForeign;
-        
+
         /// <summary>
         /// txtWorkRange 控件。
         /// </summary>
@@ -272,7 +319,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtWorkRange;
-        
+
         /// <summary>
         /// txtRemark 控件。
         /// </summary>
@@ -281,7 +328,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtRemark;
-        
+
         /// <summary>
         /// txtProjectMoney 控件。
         /// </summary>
@@ -290,7 +337,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtProjectMoney;
-        
+
         /// <summary>
         /// txtConstructionMoney 控件。
         /// </summary>
@@ -299,7 +346,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtConstructionMoney;
-        
+
         /// <summary>
         /// txtTelephone 控件。
         /// </summary>
@@ -308,7 +355,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtTelephone;
-        
+
         /// <summary>
         /// drpCountry 控件。
         /// </summary>
@@ -317,7 +364,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpCountry;
-        
+
         /// <summary>
         /// drpProvince 控件。
         /// </summary>
@@ -326,7 +373,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProvince;
-        
+
         /// <summary>
         /// txtCity 控件。
         /// </summary>
@@ -335,7 +382,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCity;
-        
+
         /// <summary>
         /// txtMapCoordinates 控件。
         /// </summary>
@@ -344,7 +391,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtMapCoordinates;
-        
+
         /// <summary>
         /// bottomPanel 控件。
         /// </summary>
@@ -353,7 +400,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ContentPanel bottomPanel;
-        
+
         /// <summary>
         /// txtEnglishRemark 控件。
         /// </summary>
@@ -362,7 +409,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtEnglishRemark;
-        
+
         /// <summary>
         /// txtHJProjectCode 控件。
         /// </summary>
@@ -371,7 +418,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtHJProjectCode;
-        
+
         /// <summary>
         /// txtKZProjectCode 控件。
         /// </summary>
@@ -380,7 +427,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtKZProjectCode;
-        
+
         /// <summary>
         /// txtProjType 控件。
         /// </summary>
@@ -389,7 +436,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjType;
-        
+
         /// <summary>
         /// txtProjPhase 控件。
         /// </summary>
@@ -398,7 +445,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjPhase;
-        
+
         /// <summary>
         /// txtProgress 控件。
         /// </summary>
@@ -407,7 +454,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtProgress;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -416,7 +463,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// ckIsUpTotalMonth 控件。
         /// </summary>
@@ -425,7 +472,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBox ckIsUpTotalMonth;
-        
+
         /// <summary>
         /// btnAttachUrl 控件。
         /// </summary>
@@ -434,7 +481,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnAttachUrl;
-        
+
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -443,7 +490,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-        
+
         /// <summary>
         /// btnClose 控件。
         /// </summary>
@@ -452,7 +499,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnClose;
-        
+
         /// <summary>
         /// hdCompileMan 控件。
         /// </summary>
@@ -461,7 +508,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hdCompileMan;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>

SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx

@@ -32,8 +32,14 @@
                         <f:TextBox ID="txtIdentityCard" runat="server" Label="身份证号" MaxLength="50" ShowRedStar="true" Required="true"
                             LabelWidth="90px" RegexPattern="IDENTITY_CARD">
                         </f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
                         <f:TextBox ID="txtTelephone" runat="server" Label="手机号码" MaxLength="50" LabelWidth="90px">
                         </f:TextBox>
+                        <f:TextBox ID="txtEmail" runat="server" Label="邮箱" RegexPattern="EMAIL" MaxLength="50" LabelWidth="90px">
+                        </f:TextBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow runat="server" ID="trServer">

SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.cs

@@ -110,6 +110,7 @@ namespace FineUIPro.Web.SysManage
                             this.drpIsPost.SelectedValue = Convert.ToString(user.IsPost);
                         }
                         this.txtTelephone.Text = user.Telephone;
+                        this.txtEmail.Text = user.Email;
                         if (user.IsOffice == true)
                         {
                             this.drpIsOffice.SelectedValue = "True";
@@ -199,6 +200,7 @@ namespace FineUIPro.Web.SysManage
                 Account = this.txtAccount.Text.Trim(),
                 IdentityCard = this.txtIdentityCard.Text.Trim(),
                 Telephone = this.txtTelephone.Text.Trim(),
+                Email = this.txtEmail.Text.Trim(),
             };
             if (this.drpUnit.SelectedValue != Const._Null)
             {

SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.designer.cs

@@ -95,6 +95,15 @@ namespace FineUIPro.Web.SysManage
         /// </remarks>
         protected global::FineUIPro.TextBox txtTelephone;
 
+        /// <summary>
+        /// txtEmail 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtEmail;
+
         /// <summary>
         /// trServer 控件。
         /// </summary>

SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs

@@ -13,6 +13,8 @@ using System.Data.SqlClient;
 using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
+using System.Net;
+using System.Text;
 using System.Web.Services.Description;
 using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel;
 
@@ -530,189 +532,201 @@ namespace FineUIPro.Web.Transfer
                 ShowNotify("没有要导出的数据！！！", MessageBoxIcon.Warning);
                 return;
             }
-            newUrl = uploadfilepath.Replace("导出模板", "导出数据").Replace(".xlsx", DateTime.Now.ToString("yyyyMMddHHmmss") + ".xlsx");
-            File.Copy(uploadfilepath, newUrl);
-            NPOI.SS.UserModel.IWorkbook workbook;
-            using (FileStream stream = new FileStream(newUrl, FileMode.Open, FileAccess.Read))
+            try
             {
-                workbook = new NPOI.XSSF.UserModel.XSSFWorkbook(stream);
-            }
-
-            NPOI.SS.UserModel.ICellStyle cellStyleC = workbook.CreateCellStyle();
-            cellStyleC.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
-            cellStyleC.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
-            cellStyleC.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
-            cellStyleC.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
-            cellStyleC.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center;
-            cellStyleC.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center;
-            cellStyleC.WrapText = true;
-
-            NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0);
-
-            //var pcList = Funs.DB.AttachFile.Where(p => p.MenuId == BLL.Const.PunchlistFromMenuId && p.AttachUrl != null && p.AttachUrl != "").ToList();
-            var pcList = new List<Model.AttachFile>();
-            if (rbOutType.SelectedValue == "1")
-            {//导出带图片
-                pcList = Funs.DB.AttachFile.Where(p => p.MenuId == BLL.Const.PunchlistFromMenuId && p.AttachUrl != null && p.AttachUrl != "").ToList();
-            }
-            int i = 2;
-            foreach (DataRow tbRow in tb.Rows)
-            {
-                string Id = tbRow["Id"].ToString();
-
-                NPOI.SS.UserModel.IRow row = sheet.CreateRow(i);
-                NPOI.SS.UserModel.ICell cell;
-                cell = row.CreateCell(0);
-                cell.CellStyle = cellStyleC;
-                cell.SetCellValue(tbRow["Num_NO"] == null ? "" : tbRow["Num_NO"].ToString());
-                cell = row.CreateCell(1);
-                cell.CellStyle = cellStyleC;
-                cell.SetCellValue(tbRow["System_No"] == null ? "" : tbRow["System_No"].ToString());
-                cell = row.CreateCell(2);
-                cell.CellStyle = cellStyleC;
-                cell.SetCellValue(tbRow["Sub_Sys_No"] == null ? "" : tbRow["Sub_Sys_No"].ToString());
-                cell = row.CreateCell(3);
-                cell.CellStyle = cellStyleC;
-                cell.SetCellValue(tbRow["DESCRIPTION"] == null ? "" : tbRow["DESCRIPTION"].ToString());
-
-                //Photoes附件
-                var photoesUrl = pcList.FirstOrDefault(p => p.ToKeyId == $"{Id}_A");
-                if (photoesUrl != null && !string.IsNullOrWhiteSpace(photoesUrl.AttachUrl))
+                newUrl = uploadfilepath.Replace("导出模板", "导出数据").Replace(".xlsx", DateTime.Now.ToString("yyyyMMddHHmmss") + ".xlsx");
+                File.Copy(uploadfilepath, newUrl);
+                NPOI.SS.UserModel.IWorkbook workbook;
+                using (FileStream stream = new FileStream(newUrl, FileMode.Open, FileAccess.Read))
                 {
-                    string[] arrUrl = photoesUrl.AttachUrl.Split(',');
-                    sheet.SetColumnWidth(4, 30 * 256);
-                    row.Height = (short)(90 * 20 * arrUrl.Length);
-                    foreach (string url in arrUrl)
-                    {
-                        var oneUrl = Server.MapPath("~/") + url;
-                        byte[] bytes = System.IO.File.ReadAllBytes(oneUrl);
-                        int pictureIdx = workbook.AddPicture(bytes, PictureType.JPEG);
-
-                        // 第三步：创建画部
-                        IDrawing patriarch = sheet.CreateDrawingPatriarch();
-                        // 第四步：设置锚点
-                        int rowline = 1; // y方向
-                                         // 参数说明：（在起始单元格的X坐标0-1023，Y的坐标0-255，在终止单元格的X坐标0-1023，Y的坐标0-255，起始单元格列数，行数，终止单元格列数，行数）  
-                        IClientAnchor anchor = patriarch.CreateAnchor(0, 0, 0, 0, 4, i, 5, i + 1);
-                        // 第五步：把图片插到相应的位置+1
-                        IPicture pict = patriarch.CreatePicture(anchor, pictureIdx);
-                        //就取第一张,如果后期想取全部 那把下面这个跳出语句去掉
-                        break;
-                    }
+                    workbook = new NPOI.XSSF.UserModel.XSSFWorkbook(stream);
                 }
 
-                cell = row.CreateCell(5);
-                cell.CellStyle = cellStyleC;
-                cell.SetCellValue(tbRow["Cat"] == null ? "" : tbRow["Cat"].ToString());
-                cell = row.CreateCell(6);
-                cell.CellStyle = cellStyleC;
-                cell.SetCellValue(tbRow["Raised_By"] == null ? "" : tbRow["Raised_By"].ToString());
-                cell = row.CreateCell(7);
-                cell.CellStyle = cellStyleC;
-                cell.SetCellValue(tbRow["Date_Raised"] == DBNull.Value ? "" : Convert.ToDateTime(tbRow["Date_Raised"]).ToString("yyyy-MM-dd"));
-                cell = row.CreateCell(8);
-                cell.CellStyle = cellStyleC;
-                cell.SetCellValue(tbRow["Disc"] == null ? "" : tbRow["Disc"].ToString());
-                cell = row.CreateCell(9);
-                cell.CellStyle = cellStyleC;
-                cell.SetCellValue(tbRow["IsEngStr"] == null ? "" : tbRow["IsEngStr"].ToString());
-                cell = row.CreateCell(10);
-                cell.CellStyle = cellStyleC;
-                cell.SetCellValue(tbRow["IsMatIStr"] == null ? "" : tbRow["IsMatIStr"].ToString());
-                cell = row.CreateCell(11);
-                cell.CellStyle = cellStyleC;
-                cell.SetCellValue(tbRow["Punch_Type"] == null ? "" : tbRow["Punch_Type"].ToString());
-                cell = row.CreateCell(12);
-                cell.CellStyle = cellStyleC;
-                cell.SetCellValue(tbRow["Required_Date"] == DBNull.Value ? "" : Convert.ToDateTime(tbRow["Required_Date"]).ToString("yyyy-MM-dd"));
-                cell = row.CreateCell(13);
-                cell.CellStyle = cellStyleC;
-                cell.SetCellValue(tbRow["Action_By"] == null ? "" : tbRow["Action_By"].ToString());
-                cell = row.CreateCell(14);
-                cell.CellStyle = cellStyleC;
-                cell.SetCellValue(tbRow["PIC"] == null ? "" : tbRow["PIC"].ToString());
-                cell = row.CreateCell(15);
-                cell.CellStyle = cellStyleC;
-                cell.SetCellValue(tbRow["PIC_WUH"] == null ? "" : tbRow["PIC_WUH"].ToString());
-                cell = row.CreateCell(16);
-                cell.CellStyle = cellStyleC;
-                cell.SetCellValue(tbRow["Correction_Action"] == null ? "" : tbRow["Correction_Action"].ToString());
+                NPOI.SS.UserModel.ICellStyle cellStyleC = workbook.CreateCellStyle();
+                cellStyleC.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStyleC.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStyleC.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStyleC.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStyleC.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center;
+                cellStyleC.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center;
+                cellStyleC.WrapText = true;
 
-                //CorrectedPhotos附件
-                var correctedPhotosUrl = pcList.FirstOrDefault(p => p.ToKeyId == $"{Id}_B");
-                if (correctedPhotosUrl != null && !string.IsNullOrWhiteSpace(correctedPhotosUrl.AttachUrl))
+                NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0);
+
+                //var pcList = Funs.DB.AttachFile.Where(p => p.MenuId == BLL.Const.PunchlistFromMenuId && p.AttachUrl != null && p.AttachUrl != "").ToList();
+                var pcList = new List<Model.AttachFile>();
+                if (rbOutType.SelectedValue == "1")
+                {//导出带图片
+                    pcList = Funs.DB.AttachFile.Where(p => p.MenuId == BLL.Const.PunchlistFromMenuId && p.AttachUrl != null && p.AttachUrl != "").ToList();
+                }
+                int i = 2;
+                foreach (DataRow tbRow in tb.Rows)
                 {
-                    string[] arrUrl = correctedPhotosUrl.AttachUrl.Split(',');
-                    sheet.SetColumnWidth(17, 30 * 256);
-                    row.Height = (short)(90 * 20);
-                    foreach (string url in arrUrl)
-                    {
-                        var oneUrl = Server.MapPath("~/") + url;
-                        byte[] bytes = System.IO.File.ReadAllBytes(oneUrl);
-                        int pictureIdx = workbook.AddPicture(bytes, PictureType.JPEG);
+                    string Id = tbRow["Id"].ToString();
 
-                        // 第三步：创建画部
-                        IDrawing patriarch = sheet.CreateDrawingPatriarch();
-                        // 第四步：设置锚点
-                        int rowline = 1; // y方向
-                                         // 参数说明：（在起始单元格的X坐标0-1023，Y的坐标0-255，在终止单元格的X坐标0-1023，Y的坐标0-255，起始单元格列数，行数，终止单元格列数，行数）  
-                        IClientAnchor anchor = patriarch.CreateAnchor(0, 0, 0, 0, 17, i, 18, i + 1);
-                        // 第五步：把图片插到相应的位置+1
-                        IPicture pict = patriarch.CreatePicture(anchor, pictureIdx);
-                        //就取第一张,如果后期想取全部 那把下面这个跳出语句去掉
-                        break;
+                    NPOI.SS.UserModel.IRow row = sheet.CreateRow(i);
+                    NPOI.SS.UserModel.ICell cell;
+                    cell = row.CreateCell(0);
+                    cell.CellStyle = cellStyleC;
+                    cell.SetCellValue(tbRow["Num_NO"] == null ? "" : tbRow["Num_NO"].ToString());
+                    cell = row.CreateCell(1);
+                    cell.CellStyle = cellStyleC;
+                    cell.SetCellValue(tbRow["System_No"] == null ? "" : tbRow["System_No"].ToString());
+                    cell = row.CreateCell(2);
+                    cell.CellStyle = cellStyleC;
+                    cell.SetCellValue(tbRow["Sub_Sys_No"] == null ? "" : tbRow["Sub_Sys_No"].ToString());
+                    cell = row.CreateCell(3);
+                    cell.CellStyle = cellStyleC;
+                    cell.SetCellValue(tbRow["DESCRIPTION"] == null ? "" : tbRow["DESCRIPTION"].ToString());
+
+                    //Photoes附件
+                    var photoesUrl = pcList.FirstOrDefault(p => p.ToKeyId == $"{Id}_A");
+                    if (photoesUrl != null && !string.IsNullOrWhiteSpace(photoesUrl.AttachUrl))
+                    {
+                        string[] arrUrl = photoesUrl.AttachUrl.Split(',');
+                        sheet.SetColumnWidth(4, 30 * 256);
+                        row.Height = (short)(90 * 20 * arrUrl.Length);
+                        foreach (string url in arrUrl)
+                        {
+                            var oneUrl = Server.MapPath("~/") + url;
+                            byte[] bytes = System.IO.File.ReadAllBytes(oneUrl);
+                            int pictureIdx = workbook.AddPicture(bytes, PictureType.JPEG);
+
+                            // 第三步：创建画部
+                            IDrawing patriarch = sheet.CreateDrawingPatriarch();
+                            // 第四步：设置锚点
+                            int rowline = 1; // y方向
+                                             // 参数说明：（在起始单元格的X坐标0-1023，Y的坐标0-255，在终止单元格的X坐标0-1023，Y的坐标0-255，起始单元格列数，行数，终止单元格列数，行数）  
+                            IClientAnchor anchor = patriarch.CreateAnchor(0, 0, 0, 0, 4, i, 5, i + 1);
+                            // 第五步：把图片插到相应的位置+1
+                            IPicture pict = patriarch.CreatePicture(anchor, pictureIdx);
+                            //就取第一张,如果后期想取全部 那把下面这个跳出语句去掉
+                            break;
+                        }
                     }
+
+                    cell = row.CreateCell(5);
+                    cell.CellStyle = cellStyleC;
+                    cell.SetCellValue(tbRow["Cat"] == null ? "" : tbRow["Cat"].ToString());
+                    cell = row.CreateCell(6);
+                    cell.CellStyle = cellStyleC;
+                    cell.SetCellValue(tbRow["Raised_By"] == null ? "" : tbRow["Raised_By"].ToString());
+                    cell = row.CreateCell(7);
+                    cell.CellStyle = cellStyleC;
+                    cell.SetCellValue(tbRow["Date_Raised"] == DBNull.Value ? "" : Convert.ToDateTime(tbRow["Date_Raised"]).ToString("yyyy-MM-dd"));
+                    cell = row.CreateCell(8);
+                    cell.CellStyle = cellStyleC;
+                    cell.SetCellValue(tbRow["Disc"] == null ? "" : tbRow["Disc"].ToString());
+                    cell = row.CreateCell(9);
+                    cell.CellStyle = cellStyleC;
+                    cell.SetCellValue(tbRow["IsEngStr"] == null ? "" : tbRow["IsEngStr"].ToString());
+                    cell = row.CreateCell(10);
+                    cell.CellStyle = cellStyleC;
+                    cell.SetCellValue(tbRow["IsMatIStr"] == null ? "" : tbRow["IsMatIStr"].ToString());
+                    cell = row.CreateCell(11);
+                    cell.CellStyle = cellStyleC;
+                    cell.SetCellValue(tbRow["Punch_Type"] == null ? "" : tbRow["Punch_Type"].ToString());
+                    cell = row.CreateCell(12);
+                    cell.CellStyle = cellStyleC;
+                    cell.SetCellValue(tbRow["Required_Date"] == DBNull.Value ? "" : Convert.ToDateTime(tbRow["Required_Date"]).ToString("yyyy-MM-dd"));
+                    cell = row.CreateCell(13);
+                    cell.CellStyle = cellStyleC;
+                    cell.SetCellValue(tbRow["Action_By"] == null ? "" : tbRow["Action_By"].ToString());
+                    cell = row.CreateCell(14);
+                    cell.CellStyle = cellStyleC;
+                    cell.SetCellValue(tbRow["PIC"] == null ? "" : tbRow["PIC"].ToString());
+                    cell = row.CreateCell(15);
+                    cell.CellStyle = cellStyleC;
+                    cell.SetCellValue(tbRow["PIC_WUH"] == null ? "" : tbRow["PIC_WUH"].ToString());
+                    cell = row.CreateCell(16);
+                    cell.CellStyle = cellStyleC;
+                    cell.SetCellValue(tbRow["Correction_Action"] == null ? "" : tbRow["Correction_Action"].ToString());
+
+                    //CorrectedPhotos附件
+                    var correctedPhotosUrl = pcList.FirstOrDefault(p => p.ToKeyId == $"{Id}_B");
+                    if (correctedPhotosUrl != null && !string.IsNullOrWhiteSpace(correctedPhotosUrl.AttachUrl))
+                    {
+                        string[] arrUrl = correctedPhotosUrl.AttachUrl.Split(',');
+                        sheet.SetColumnWidth(17, 30 * 256);
+                        row.Height = (short)(90 * 20);
+                        foreach (string url in arrUrl)
+                        {
+                            var oneUrl = Server.MapPath("~/") + url;
+                            byte[] bytes = System.IO.File.ReadAllBytes(oneUrl);
+                            int pictureIdx = workbook.AddPicture(bytes, PictureType.JPEG);
+
+                            // 第三步：创建画部
+                            IDrawing patriarch = sheet.CreateDrawingPatriarch();
+                            // 第四步：设置锚点
+                            int rowline = 1; // y方向
+                                             // 参数说明：（在起始单元格的X坐标0-1023，Y的坐标0-255，在终止单元格的X坐标0-1023，Y的坐标0-255，起始单元格列数，行数，终止单元格列数，行数）  
+                            IClientAnchor anchor = patriarch.CreateAnchor(0, 0, 0, 0, 17, i, 18, i + 1);
+                            // 第五步：把图片插到相应的位置+1
+                            IPicture pict = patriarch.CreatePicture(anchor, pictureIdx);
+                            //就取第一张,如果后期想取全部 那把下面这个跳出语句去掉
+                            break;
+                        }
+                    }
+
+                    cell = row.CreateCell(18);
+                    cell.CellStyle = cellStyleC;
+                    cell.SetCellValue(tbRow["Actual_Date"] == DBNull.Value ? "" : Convert.ToDateTime(tbRow["Actual_Date"]).ToString("yyyy-MM-dd"));
+                    cell = row.CreateCell(19);
+                    cell.CellStyle = cellStyleC;
+                    cell.SetCellValue(tbRow["Cleared_By"] == null ? "" : tbRow["Cleared_By"].ToString());
+                    cell = row.CreateCell(20);
+                    cell.CellStyle = cellStyleC;
+                    cell.SetCellValue(tbRow["Cleared_Date"] == DBNull.Value ? "" : Convert.ToDateTime(tbRow["Cleared_Date"]).ToString("yyyy-MM-dd"));
+                    cell = row.CreateCell(21);
+                    cell.CellStyle = cellStyleC;
+                    cell.SetCellValue(tbRow["Confirmed_By"] == null ? "" : tbRow["Confirmed_By"].ToString());
+                    cell = row.CreateCell(22);
+                    cell.CellStyle = cellStyleC;
+                    cell.SetCellValue(tbRow["Confirmed_Date"] == DBNull.Value ? "" : Convert.ToDateTime(tbRow["Confirmed_Date"]).ToString("yyyy-MM-dd"));
+                    cell = row.CreateCell(23);
+                    cell.CellStyle = cellStyleC;
+                    cell.SetCellValue(tbRow["Verified_By"] == null ? "" : tbRow["Verified_By"].ToString());
+                    cell = row.CreateCell(24);
+                    cell.CellStyle = cellStyleC;
+                    cell.SetCellValue(tbRow["Verified_Date"] == DBNull.Value ? "" : Convert.ToDateTime(tbRow["Verified_Date"]).ToString("yyyy-MM-dd"));
+                    cell = row.CreateCell(25);
+                    cell.CellStyle = cellStyleC;
+                    cell.SetCellValue(tbRow["Status"] == null ? "" : tbRow["Status"].ToString());
+                    cell = row.CreateCell(26);
+                    cell.CellStyle = cellStyleC;
+                    cell.SetCellValue(tbRow["Remark"] == null ? "" : tbRow["Remark"].ToString());
+
+
+                    i++;
                 }
 
-                cell = row.CreateCell(18);
-                cell.CellStyle = cellStyleC;
-                cell.SetCellValue(tbRow["Actual_Date"] == DBNull.Value ? "" : Convert.ToDateTime(tbRow["Actual_Date"]).ToString("yyyy-MM-dd"));
-                cell = row.CreateCell(19);
-                cell.CellStyle = cellStyleC;
-                cell.SetCellValue(tbRow["Cleared_By"] == null ? "" : tbRow["Cleared_By"].ToString());
-                cell = row.CreateCell(20);
-                cell.CellStyle = cellStyleC;
-                cell.SetCellValue(tbRow["Cleared_Date"] == DBNull.Value ? "" : Convert.ToDateTime(tbRow["Cleared_Date"]).ToString("yyyy-MM-dd"));
-                cell = row.CreateCell(21);
-                cell.CellStyle = cellStyleC;
-                cell.SetCellValue(tbRow["Confirmed_By"] == null ? "" : tbRow["Confirmed_By"].ToString());
-                cell = row.CreateCell(22);
-                cell.CellStyle = cellStyleC;
-                cell.SetCellValue(tbRow["Confirmed_Date"] == DBNull.Value ? "" : Convert.ToDateTime(tbRow["Confirmed_Date"]).ToString("yyyy-MM-dd"));
-                cell = row.CreateCell(23);
-                cell.CellStyle = cellStyleC;
-                cell.SetCellValue(tbRow["Verified_By"] == null ? "" : tbRow["Verified_By"].ToString());
-                cell = row.CreateCell(24);
-                cell.CellStyle = cellStyleC;
-                cell.SetCellValue(tbRow["Verified_Date"] == DBNull.Value ? "" : Convert.ToDateTime(tbRow["Verified_Date"]).ToString("yyyy-MM-dd"));
-                cell = row.CreateCell(25);
-                cell.CellStyle = cellStyleC;
-                cell.SetCellValue(tbRow["Status"] == null ? "" : tbRow["Status"].ToString());
-                cell = row.CreateCell(26);
-                cell.CellStyle = cellStyleC;
-                cell.SetCellValue(tbRow["Remark"] == null ? "" : tbRow["Remark"].ToString());
-
-
-                i++;
+                // 第三步：写入文件流
+                using (FileStream stream = new FileStream(newUrl, FileMode.Create, FileAccess.Write))
+                {
+                    workbook.Write(stream);
+                    workbook.Close();
+                }
+                string fileName = Path.GetFileName(newUrl);
+                FileInfo info = new FileInfo(newUrl);
+                long fileSize = info.Length;
+                Response.Clear();
+                Response.ContentType = "application/x-zip-compressed";
+                Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
+                Response.AddHeader("Content-Length", fileSize.ToString());
+                Response.TransmitFile(newUrl, 0, fileSize);
+                Response.Flush();
+                Response.Close();
             }
-
-            // 第三步：写入文件流
-            using (FileStream stream = new FileStream(newUrl, FileMode.Create, FileAccess.Write))
+            catch (WebException ex)
             {
-                workbook.Write(stream);
-                workbook.Close();
             }
-            string fileName = Path.GetFileName(newUrl);
-            FileInfo info = new FileInfo(newUrl);
-            long fileSize = info.Length;
-            Response.Clear();
-            Response.ContentType = "application/x-zip-compressed";
-            Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
-            Response.AddHeader("Content-Length", fileSize.ToString());
-            Response.TransmitFile(newUrl, 0, fileSize);
-            Response.Flush();
-            Response.Close();
-            File.Delete(newUrl);
+            finally
+            {
+                if (File.Exists(newUrl))
+                {
+                    File.Delete(newUrl);
+                }
+            }
         }
     }
 }

SGGL/FineUIPro.Web/common/Menu_JDGL.xml

@@ -1,7 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Tree>
-  <TreeNode id="858E83E9-ADE5-452E-BD65-82D8DFF872C0" Text="工作包及检测点" NavigateUrl="JDGL/WBS/WBSSetAudit.aspx">
-  </TreeNode>
+  <TreeNode id="17479694-E342-4046-807A-8905C3B225C1" Text="材料管理" NavigateUrl="">
+    <TreeNode id="C0C5E48B-4C0D-4657-92AB-25DF0FEE372F" Text="设计请购一览表" NavigateUrl="">
+      <TreeNode id="484E50BA-B6F2-47E0-BB7C-B1C27965E087" Text="合同清单一览表" NavigateUrl="CLGL/ContractList.aspx">
+      </TreeNode>
+<TreeNode id="F0F43F1C-0E73-4A7C-AE43-26950D8D93E4" Text="合同清单汇总表" NavigateUrl="CLGL/ContractListSum.aspx"></TreeNode>
+<TreeNode id="55301756-3313-4876-A1C3-2D1246C4B93C" Text="管道材料状态一览表" NavigateUrl="CLGL/PipelineMaterialList.aspx"></TreeNode>
+<TreeNode id="074B06B2-456A-4F7B-8E40-00F379C6E302" Text="管道材料编码统计一览表" NavigateUrl="CLGL/PipelineMaterialCodeList.aspx"></TreeNode>
+<TreeNode id="AF7EA0E4-92A1-4F8D-A5A0-99B0084F7C75" Text="管道供货商概要一览表" NavigateUrl="CLGL/PipelineSupplierList.aspx"></TreeNode>
+<TreeNode id="8BBFA90C-1F1C-4587-AA94-BE44C5075CBD" Text="MTO明细信息一览表" NavigateUrl="CLGL/MTODetail.aspx"></TreeNode>
+<TreeNode id="44527C92-FF92-4935-B81E-F6C8B8C4D622" Text="管道材料汇总表" NavigateUrl="CLGL/PipelineMaterialSumList.aspx"></TreeNode>
+</TreeNode>
+<TreeNode id="9F944625-2EA3-46A1-8D18-A882CE88F3A5" Text="现场请购到货及出库一览表" NavigateUrl=""><TreeNode id="7D4E3B4D-76FE-41FB-B2F2-23A0D252D4E4" Text="现场请购明细一览表" NavigateUrl="CLGL/RequestDetailList.aspx"></TreeNode>
+<TreeNode id="31134149-CE94-49FD-A1D9-5A70553FAC61" Text="现场到货明细一览表" NavigateUrl="CLGL/ArrivalDetailList.aspx"></TreeNode>
+<TreeNode id="3C30E38D-0BE9-4295-AF70-73D52F7FC4BC" Text="现场出库明细一览表" NavigateUrl="CLGL/CheckOutDetailList.aspx"></TreeNode>
+</TreeNode>
+<TreeNode id="9669E903-C7DD-4E48-8962-B22A7B4972E6" Text="其他" NavigateUrl=""><TreeNode id="414F9650-37F8-4B20-A2BB-EBBD4F620E49" Text="货架信息" NavigateUrl="CLGL/GoodsShelves.aspx"></TreeNode>
+<TreeNode id="4B52E7FF-AA04-489B-B0EE-DC31C5C4F45B" Text="施工单位信息" NavigateUrl="CLGL/SubUnit.aspx"></TreeNode>
+<TreeNode id="43A118BC-0A81-42F1-B008-829D40CFE625" Text="供应商信息" NavigateUrl="CLGL/Supplier.aspx"></TreeNode>
+</TreeNode>
+</TreeNode>
+<TreeNode id="858E83E9-ADE5-452E-BD65-82D8DFF872C0" Text="工作包及检测点" NavigateUrl="JDGL/WBS/WBSSetAudit.aspx"></TreeNode>
 <TreeNode id="82E1EB3B-3589-4C32-9C20-40125CE6EAB4" Text="设备材料分类" NavigateUrl=""><TreeNode id="F2BC1293-8639-4BD6-8759-648BCF6346E9" Text="设备材料大类" NavigateUrl="JDGL/WBS/EquipmentMaterialBigType.aspx"></TreeNode>
 <TreeNode id="D00B3C53-2972-4D24-B88F-B38880D4A24F" Text="设备材料分类" NavigateUrl="JDGL/WBS/EquipmentMaterialType.aspx"></TreeNode>
 </TreeNode>

SGGL/FineUIPro.Web/common/Menu_TestRun.xml

@@ -66,6 +66,22 @@
 <TreeNode id="04E072D1-5BD3-4F6C-9E81-1FE32A4851E9" Text="仪表调试" NavigateUrl="TestRun/BeforeTestRun/BeforeTestRun.aspx?type=8"></TreeNode>
 <TreeNode id="A5D6EBB7-E7C8-48EE-8DBD-735117D3C62D" Text="单机试车" NavigateUrl="TestRun/BeforeTestRun/BeforeTestRun.aspx?type=1"></TreeNode>
 </TreeNode>
+<TreeNode id="D98BB86C-CCC4-433B-B367-EFD9E7D2BC39" Text="移交管理" NavigateUrl=""><TreeNode id="197F9A9A-480C-4CC3-B6B7-3A7D382DC3EB" Text="工艺系统清单" NavigateUrl="Transfer/LHCSystemList.aspx?Type=0"></TreeNode>
+<TreeNode id="022428DC-FC99-4916-B8AF-6A9DC885DFAF" Text="非工艺系统清单" NavigateUrl="Transfer/LHCSystemList.aspx?Type=1"></TreeNode>
+<TreeNode id="3517DBE2-9728-4BA0-9EA5-AE2147DB883B" Text="移交图表" NavigateUrl=""><TreeNode id="2352E44F-BE12-4012-B43F-AAF649EDAC32" Text="尾项完成统计表" NavigateUrl="Transfer/Chart/PunchlistFromChartNew.aspx"></TreeNode>
+<TreeNode id="E305689E-5D84-4C1A-BF67-85FA2D828115" Text="移交统计表" NavigateUrl="Transfer/Chart/Systemstatus.aspx"></TreeNode>
+<TreeNode id="60838E30-4A46-4878-B299-C234900B10B7" Text="移交统计图表" NavigateUrl="Transfer/Chart/SystemstatusChart.aspx"></TreeNode>
+<TreeNode id="25C13642-AE77-42E2-B0FB-32663B68F93F" Text="移交状态汇总表" NavigateUrl="Transfer/Chart/SystemStatusSummary.aspx"></TreeNode>
+</TreeNode>
+<TreeNode id="D94C1BA4-9DFD-4514-AE12-6F886C5D8C9B" Text="管道" NavigateUrl="Transfer/Piping.aspx"></TreeNode>
+<TreeNode id="982F746C-084C-445C-9AE8-8C37BDFE7994" Text="静设备" NavigateUrl="Transfer/StaticEquipment.aspx"></TreeNode>
+<TreeNode id="7E2FB5F9-FB99-4455-B68F-460F1F9A2676" Text="动设备" NavigateUrl="Transfer/RotatingEquipment.aspx"></TreeNode>
+<TreeNode id="88F51059-55B4-4CD5-A38C-36404E5029F6" Text="仪表" NavigateUrl="Transfer/Instrumentation.aspx"></TreeNode>
+<TreeNode id="296E75D2-192A-4D1F-8471-DD34263F8691" Text="电气" NavigateUrl="Transfer/Electrical.aspx"></TreeNode>
+<TreeNode id="95C39F86-C060-452E-BA37-D891C466A39B" Text="土建/建筑/结构" NavigateUrl="Transfer/CivilStructure.aspx"></TreeNode>
+<TreeNode id="58FFBD80-ACB9-4830-A18A-E025D9600D94" Text="电信" NavigateUrl="Transfer/Telecom.aspx"></TreeNode>
+<TreeNode id="016903B1-3B86-4CF5-AFF8-FF8BE389BEE5" Text="尾项管理" NavigateUrl="Transfer/PunchlistFrom.aspx"></TreeNode>
+</TreeNode>
 <TreeNode id="0217CE50-3ABB-44F8-A38A-C9792C436639" Text="试车管理" NavigateUrl=""><TreeNode id="E3E38073-1DF4-4C02-AFC0-5C93EE7C23A8" Text="系统划分" NavigateUrl="TestRun/TestRunManage/DeviceRun.aspx"></TreeNode>
 <TreeNode id="4B964B32-D5CC-48A2-8750-48BC4460C264" Text="工作包设置" NavigateUrl="TestRun/TestRunManage/SetWorkPackage.aspx"></TreeNode>
 <TreeNode id="B6EE8E3B-77E2-416E-8985-3C78A2169B89" Text="工作包裁剪" NavigateUrl="TestRun/TestRunManage/SubSysWorkPackage.aspx"></TreeNode>

SGGL/FineUIPro.Web/common/Menu_Transfer.xml

@@ -1,19 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Tree>
-  <TreeNode id="197F9A9A-480C-4CC3-B6B7-3A7D382DC3EB" Text="工艺系统清单" NavigateUrl="Transfer/LHCSystemList.aspx?Type=0">
-  </TreeNode>
-<TreeNode id="022428DC-FC99-4916-B8AF-6A9DC885DFAF" Text="非工艺系统清单" NavigateUrl="Transfer/LHCSystemList.aspx?Type=1"></TreeNode>
-<TreeNode id="3517DBE2-9728-4BA0-9EA5-AE2147DB883B" Text="移交图表" NavigateUrl=""><TreeNode id="2352E44F-BE12-4012-B43F-AAF649EDAC32" Text="尾项完成统计表" NavigateUrl="Transfer/Chart/PunchlistFromChartNew.aspx"></TreeNode>
-<TreeNode id="E305689E-5D84-4C1A-BF67-85FA2D828115" Text="移交统计表" NavigateUrl="Transfer/Chart/Systemstatus.aspx"></TreeNode>
-<TreeNode id="60838E30-4A46-4878-B299-C234900B10B7" Text="移交统计图表" NavigateUrl="Transfer/Chart/SystemstatusChart.aspx"></TreeNode>
-<TreeNode id="25C13642-AE77-42E2-B0FB-32663B68F93F" Text="移交状态汇总表" NavigateUrl="Transfer/Chart/SystemStatusSummary.aspx"></TreeNode>
-</TreeNode>
-<TreeNode id="D94C1BA4-9DFD-4514-AE12-6F886C5D8C9B" Text="管道" NavigateUrl="Transfer/Piping.aspx"></TreeNode>
-<TreeNode id="982F746C-084C-445C-9AE8-8C37BDFE7994" Text="静设备" NavigateUrl="Transfer/StaticEquipment.aspx"></TreeNode>
-<TreeNode id="7E2FB5F9-FB99-4455-B68F-460F1F9A2676" Text="动设备" NavigateUrl="Transfer/RotatingEquipment.aspx"></TreeNode>
-<TreeNode id="88F51059-55B4-4CD5-A38C-36404E5029F6" Text="仪表" NavigateUrl="Transfer/Instrumentation.aspx"></TreeNode>
-<TreeNode id="296E75D2-192A-4D1F-8471-DD34263F8691" Text="电气" NavigateUrl="Transfer/Electrical.aspx"></TreeNode>
-<TreeNode id="95C39F86-C060-452E-BA37-D891C466A39B" Text="土建/建筑/结构" NavigateUrl="Transfer/CivilStructure.aspx"></TreeNode>
-<TreeNode id="58FFBD80-ACB9-4830-A18A-E025D9600D94" Text="电信" NavigateUrl="Transfer/Telecom.aspx"></TreeNode>
-<TreeNode id="016903B1-3B86-4CF5-AFF8-FF8BE389BEE5" Text="尾项管理" NavigateUrl="Transfer/PunchlistFrom.aspx"></TreeNode>
 </Tree>

SGGL/FineUIPro.Web/common/mainProject2.aspx

@@ -393,6 +393,9 @@
                             <div class="jdtj-btn jdtj-btn-act" id="span_jdtj" onclick="jdtjOnclick(0)" style="cursor: pointer">
                                 <asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_ProgressStatistics %>" />
                             </div>
+                            <div class="jdtj-btn" onclick="jdtjOnclick(3)" id="span_quantityDoneJdtj" style="cursor: pointer">
+                                <asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_QuantityDone %>" />
+                            </div>
                             <div class="jdtj-btn" onclick="jdtjOnclick(1)" id="span_weekJdtj" style="cursor: pointer">
                                 <asp:Literal runat="server" Text="<%$ Resources:Lan,mainProject2_WeekPlanDone %>" />
                             </div>
@@ -698,6 +701,7 @@
     function jdtjOnclick(objval) {
         if (objval == 1) {
             $("#span_jdtj").removeClass("jdtj-btn-act");
+            $("#span_quantityDoneJdtj").removeClass("jdtj-btn-act");
             $("#span_weekJdtj").addClass("jdtj-btn-act");
             $("#span_monthJdtj").removeClass("jdtj-btn-act");
             $("#jdtj-content").show();
@@ -706,14 +710,25 @@
             $("#div_jdtjList").html('<%=WeekJdtjHtml%>');
         } else if (objval == 2) {
             $("#span_jdtj").removeClass("jdtj-btn-act");
+            $("#span_quantityDoneJdtj").removeClass("jdtj-btn-act");
             $("#span_weekJdtj").removeClass("jdtj-btn-act");
             $("#span_monthJdtj").addClass("jdtj-btn-act");
             $("#jdtj-content").show();
             $("#left_one").hide();
             $("#div_jdtjHead").html('<%=MonthJdtjHead%>');
             $("#div_jdtjList").html('<%=MonthJdtjHtml%>');
+        }  else if (objval == 3) {
+            $("#span_jdtj").removeClass("jdtj-btn-act");
+            $("#span_quantityDoneJdtj").addClass("jdtj-btn-act");
+            $("#span_weekJdtj").removeClass("jdtj-btn-act");
+            $("#span_monthJdtj").removeClass("jdtj-btn-act");
+            $("#jdtj-content").show();
+            $("#left_one").hide();
+            $("#div_jdtjHead").html('<%=QuantityDoneJdtjHead%>');
+            $("#div_jdtjList").html('<%=QuantityDoneJdtjHtml%>');
         } else {
             $("#span_jdtj").addClass("jdtj-btn-act");
+            $("#span_quantityDoneJdtj").removeClass("jdtj-btn-act");
             $("#span_weekJdtj").removeClass("jdtj-btn-act");
             $("#span_monthJdtj").removeClass("jdtj-btn-act");
             $("#jdtj-content").hide();
@@ -2124,8 +2139,8 @@
         const list = [
             { TypeName: "<%=majorRisk%>", ValueAmount: <%=riskData4%> },
             { TypeName: "<%=LowRisk%>", ValueAmount: <%=riskData1%> },
-            { TypeName: "<%=GeneralRisk%>", ValueAmount: <%=riskData3%> },
-            { TypeName: "<%=GreaterRisk%>", ValueAmount: <%=riskData2%> },
+            { TypeName: "<%=GeneralRisk%>", ValueAmount: <%=riskData2%> },
+            { TypeName: "<%=GreaterRisk%>", ValueAmount: <%=riskData3%> },
         ]
 
 

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

@@ -109,6 +109,7 @@ namespace FineUIPro.Web.common
                 var personTask = GetPersonAsync();
                 var weekJdtjTask = GetWeekJDAsync();
                 var monthJdtjTask = GetMonthJDAsync();
+                var quantityDoneJDTask = GetQuantityDoneJDAsync();
                 var otherTasks = new List<Task>
                 {
                     BindSafetyStatisticsAsync(),     // 安全统计模块
@@ -148,13 +149,14 @@ namespace FineUIPro.Web.common
 
                     getCNEN(),//中英文翻译
                 };
-                await Task.WhenAll(otherTasks.Concat(new[] { treeTask, personTask }));
+                await Task.WhenAll(otherTasks.Concat(new[] { treeTask, personTask, weekJdtjTask, monthJdtjTask, quantityDoneJDTask }));
 
                 Tree = await treeTask;
                 Person = await personTask;
 
                 WeekJdtjHtml = await weekJdtjTask;
                 MonthJdtjHtml = await monthJdtjTask;
+                QuantityDoneJdtjHtml = await quantityDoneJDTask;
             }
         }
 
@@ -475,7 +477,7 @@ namespace FineUIPro.Web.common
         {
             return await Task.Run(() =>
             {
-                var result = Project_HSSEData_HSSEService.GetFinishedNum(ProjectId);
+                var result = Project_HSSEData_HSSEService.GetCompletedNum(ProjectId);
                 return result;
             });
         }
@@ -553,7 +555,7 @@ namespace FineUIPro.Web.common
         {
             return await Task.Run(() =>
             {
-                var result = Project_HSSEData_HSSEService.GetSuperFinishedNum(ProjectId);
+                var result = Project_HSSEData_HSSEService.GetSuperCompletedNum(ProjectId);
                 return result;
             });
         }
@@ -901,25 +903,62 @@ namespace FineUIPro.Web.common
                 List<double> listdata = new List<double>();
                 double result = 0;
                 Model.SGGLDB db = Funs.DB;
+                // var ndtList =
+                //     (from x in db.ProcessControl_NondestructiveTest_New
+                //      where x.ProfessionalName == "工艺管道" && x.ProjectId == ProjectId
+                //      orderby x.CreateDate descending
+                //      select x).FirstOrDefault();
+                // decimal a = 0, b = 0;
+                // if (ndtList != null)
+                // {
+                //     if (ndtList.TotalQuantity.HasValue)
+                //     {
+                //         a += Math.Floor(ndtList.TotalQuantity.Value * Funs.GetNewDecimalOrZero(ndtList.TotalRate) /
+                //                         100);
+                //         b += ndtList.TotalQuantity.Value;
+                //     }
+                //
+                //     if (!string.IsNullOrEmpty(ndtList.TotalRate))
+                //     {
+                //         result = Convert.ToDouble(ndtList.TotalRate);
+                //     }
+                // }
+                // else
+                // {
+                //     var hjglData =
+                //         (from x in db.HJGL_FL_Data
+                //          where x.ProjectId == ProjectId
+                //          orderby x.CompileDate descending
+                //          select x).FirstOrDefault();
+                //     if (hjglData != null)
+                //     {
+                //         a = Funs.GetNewDecimalOrZero(hjglData.OneTimeFilmQualifiedAmount);
+                //         b = Funs.GetNewDecimalOrZero(hjglData.OneTimeFilmAmount);
+                //         if (a > 0 && b > 0)
+                //         {
+                //             result = Convert.ToDouble(Convert.ToDecimal(100.0) * b / a);
+                //         }
+                //     }
+                // }
+                
                 var ndtList =
                     (from x in db.ProcessControl_NondestructiveTest_New
-                     where x.ProfessionalName == "工艺管道" && x.ProjectId == ProjectId
-                     orderby x.CreateDate descending
-                     select x).FirstOrDefault();
+                     where x.ProjectId == ProjectId
+                     select x).ToList();
                 decimal a = 0, b = 0;
-                if (ndtList != null)
+                if (ndtList.Count > 0)
                 {
-                    if (ndtList.TotalQuantity.HasValue)
+                    foreach (var item in ndtList)
                     {
-                        a += Math.Floor(ndtList.TotalQuantity.Value * Funs.GetNewDecimalOrZero(ndtList.TotalRate) /
-                                        100);
-                        b += ndtList.TotalQuantity.Value;
-                    }
-
-                    if (!string.IsNullOrEmpty(ndtList.TotalRate))
-                    {
-                        result = Convert.ToDouble(ndtList.TotalRate);
+                        if (item.TotalQuantity.HasValue)
+                        {
+                            a += Math.Floor(item.TotalQuantity.Value * Funs.GetNewDecimalOrZero(item.TotalRate) /
+                                          100);
+                            b += item.TotalQuantity.Value;
+                        }
+                        
                     }
+                    result = Convert.ToDouble(Convert.ToDecimal(100.0) * b / a);
                 }
                 else
                 {
@@ -938,7 +977,8 @@ namespace FineUIPro.Web.common
                         }
                     }
                 }
-
+                
+                
                 if (b > 0)
                 {
                     hjallNumber = b.ToString();
@@ -1187,6 +1227,91 @@ namespace FineUIPro.Web.common
 
         #endregion 赢得值曲线
 
+
+        #region 工程量完成情况
+
+        protected string QuantityDoneJdtjHtml;
+        protected string QuantityDoneJdtjHead = "<div class=\"th-p\" >类型</div><div class=\"th-p\" >设计数量</div><div class=\"th-p\"><p>本期</p><p><span>计划</span><span>实际</span><span>完成率</span></p></div><div class=\"th-p\"><p>累计</p><p><span>计划</span><span>实际</span><span>完成率</span></p></div><div class=\"th-p\" >完成率</div>";
+        //protected string QuantityDoneJdtjHead = "<div class=\"th-p\" >类型</div><div class=\"th-p\" >单位</div><div class=\"th-p\" >设计数量</div><div class=\"th-p\"><p>本期</p><p><span>计划完成</span><span>实际完成</span><span>完成率</span></p></div><div class=\"th-p\"><p>累计</p><p><span>计划完成</span><span>实际完成</span><span>完成率</span></p></div><div class=\"th-p\" >完成率</div>";
+
+        /// <summary>
+        /// 工程量完成情况
+        /// </summary>
+        /// <returns></returns>
+        protected async Task<string> GetQuantityDoneJDAsync()
+        {
+            return await Task.Run(() =>
+            {
+                string doneJdtjHtml = string.Empty;
+                string month = string.Format("{0:yyyy-MM-01}", DateTime.Now);
+                //DateTime months = Convert.ToDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.Month.ToString() + "-01");
+                if (DateTime.Now.Day < 26)
+                {
+                    month = string.Format("{0:yyyy-MM-01}", DateTime.Now.AddMonths(-1));
+                    //months = Convert.ToDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.AddMonths(-1).Month.ToString() + "-01");
+                }
+                string strSql = @"select qc.QuantityCompletionId,(select PlanNum from JDGL_QuantityCompletion where QuantityListId=ql.QuantityListId and Months=@month) as PlanNum,
+       (select RealNum from JDGL_QuantityCompletion where QuantityListId=ql.QuantityListId and Months=@month) as RealNum,
+	   (select NextNum from JDGL_QuantityCompletion where QuantityListId=ql.QuantityListId and Months=@month) as NextNum,ql.DesignNum,ql.Name,ql.Unit,ql.SortIndex,
+                            CONVERT(FLOAT, (select sum(ISNULL(PlanNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month)) as TotalPlanNum,
+                            CONVERT(FLOAT, (select sum(ISNULL(RealNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month)) as TotalRealNum,
+                            CONVERT(NVARCHAR(10), ((CAST(CASE ISNULL(qc.PlanNum, 0) WHEN 0 THEN 0
+
+        ELSE 100 * ISNULL(qc.RealNum, 0) / (1.0 * qc.PlanNum) END AS DECIMAL(9, 2))))) + '%'
+
+        AS Rate,
+                            CONVERT(NVARCHAR(10), ((CAST(CASE(select sum(ISNULL(PlanNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month) WHEN 0 THEN 0
+
+        ELSE 100 * (select sum(ISNULL(RealNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month) / (1.0 * (select sum(ISNULL(PlanNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month)) END AS DECIMAL(9, 2)))))+'%'
+
+        AS TotalRate,
+                            CONVERT(NVARCHAR(10), ((CAST(CASE ISNULL(ql.DesignNum, 0) WHEN 0 THEN 0
+        ELSE 100 * (select sum(ISNULL(RealNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months <= @month) / (1.0 * ql.DesignNum) END AS DECIMAL(9, 2)))))+'%'
+
+        AS SumRate,
+                            CONVERT(FLOAT, (select sum(ISNULL(PlanNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months < qc.Months)) as LastTotalPlanNum, 
+                            CONVERT(FLOAT, (select sum(ISNULL(RealNum, 0)) from JDGL_QuantityCompletion where ProjectId = ql.ProjectId and QuantityListId = qc.QuantityListId and Months < qc.Months)) as LastTotalRealNum
+                            from[dbo].JDGL_QuantityList ql
+                           left join dbo.[JDGL_QuantityCompletion] qc on ql.QuantityListId=qc.QuantityListId
+where qc.QuantityCompletionId=(select top 1 QuantityCompletionId from[JDGL_QuantityCompletion] q where q.QuantityListId=qc.QuantityListId and q.Months<=@month order by q.Months desc) and qc.ProjectId=@ProjectId order by ql.SortIndex, ql.Name";
+
+                List<SqlParameter> listStr = new List<SqlParameter>();
+                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+                listStr.Add(new SqlParameter("@month", month));
+                SqlParameter[] parameter = listStr.ToArray();
+                DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+                StringBuilder sb = new StringBuilder();
+                for (int j = 0; j < tb.Rows.Count; j++)
+                {
+                    string name = tb.Rows[j]["Name"].ToString().Trim();
+                    string unit = tb.Rows[j]["Unit"].ToString().Trim();
+                    string designNum = Funs.RemoveZero(tb.Rows[j]["DesignNum"].ToString().Trim());
+                    string planNum = Funs.RemoveZero(tb.Rows[j]["PlanNum"].ToString().Trim());
+                    string realNum = Funs.RemoveZero(tb.Rows[j]["RealNum"].ToString().Trim());
+                    string rate = tb.Rows[j]["Rate"].ToString().Trim();
+                    string nextNum = Funs.RemoveZero(tb.Rows[j]["NextNum"].ToString().Trim());
+                    string totalPlanNum = Funs.RemoveZero(tb.Rows[j]["TotalPlanNum"].ToString().Trim());
+                    string totalRealNum = Funs.RemoveZero(tb.Rows[j]["TotalRealNum"].ToString().Trim());
+                    string totalRate = tb.Rows[j]["TotalRate"].ToString().Trim();
+                    string sumRate = tb.Rows[j]["SumRate"].ToString().Trim();
+                    sb.Append("<div class=\"row\">");
+                    sb.Append($"<div class=\"tr\" >{name}（{unit}）</div>");
+                    //sb.Append($"<div class=\"tr\" >{unit}</div>");
+                    sb.Append($"<div class=\"tr\" >{designNum}</div>");
+                    sb.Append($"<div class=\"tr\" ><p><span>{planNum}</span><span>{realNum}</span><span>{rate}</span></p></div>");
+                    sb.Append($"<div class=\"tr\" ><p><span>{totalPlanNum}</span><span>{totalRealNum}</span><span>{totalRate}</span></p></div>");
+                    sb.Append($"<div class=\"tr\" >{sumRate}</div>");
+                    sb.Append("</div>");
+                }
+                doneJdtjHtml = sb.ToString();
+                return doneJdtjHtml;
+            });
+        }
+
+
+        #endregion
+
         #region 进度统计
 
         protected string WeekJdtjHtml;
@@ -1206,10 +1331,8 @@ namespace FineUIPro.Web.common
             return await Task.Run(() =>
             {
                 string weekGridHtml = string.Empty;
-                //获取当前时间所在周信息
+                //获取当前时间上一个周计划信息
                 var lastWeek = WeekPlanService.GetLastWeekPlan(this.CurrUser.LoginProjectId);
-                ////根据当前时间获取上一个周计划信息
-                //var lastWeekItem = WeekItemService.GetWeekItemByDateNow(this.CurrUser.LoginProjectId);
                 if (lastWeek != null)
                 {
                     Model.SGGLDB db = Funs.DB;
@@ -1534,7 +1657,7 @@ namespace FineUIPro.Web.common
 
                 SqlParameter[] Staticparameter = listStaticListStr.ToArray();
                 DataTable statcitbDataTable = SQLHelper.GetDataTableRunProc("Sp_GJSXStatistic", Staticparameter);
-                var list = from x in Funs.DB.GJSX where x.ProjectId == this.CurrUser.LoginProjectId select x;
+                var list = from x in Funs.DB.GJSX where x.ProjectId == this.CurrUser.LoginProjectId && x.State!="1" select x;
                 var allcount = list.Count(x => x.State == "0") + list.Count(x => x.State != "0" && x.CompleteDate < DateTime.Now);
                 var closecount = list.Count(x => x.State == "0");
                 gjsxRate = String.Format("{0:N2}", 100.0 * closecount / allcount);
@@ -1624,7 +1747,7 @@ namespace FineUIPro.Web.common
                 }
 
                 //设备材料
-                var SbclList = Funs.DB.CLGL_ContractListSum.Where(x => x.C1 == "设备" && x.ProjectId == pid);
+                var SbclList = Funs.DB.CLGL_ContractListSum.Where(x => x.C1 == "管道" && x.ProjectId == pid);
                 foreach (var item in SbclList)
                 {
                     sbclHtml += "<div class=\"row\">";

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

@@ -173,7 +173,29 @@ namespace FineUIPro.Web.common
                     .SelectMany(x => x.persons.DefaultIfEmpty(),
                     (x, person) => new { x.post, person })
                 .Where(x => pids.Contains(x.person.ProjectId));
-                divCqmsManageNum.InnerText = qualityQuery.Count().ToString();
+                
+                //企业总部人员和分支机构人员
+                var query = (from person in db.Person_CompanyBranchPerson
+                    join unit in db.Base_Unit on person.UnitId equals unit.UnitId into unitJoin
+                    from unit in unitJoin.DefaultIfEmpty() // 左连接
+                    join workPost in db.Base_WorkPost on person.WorkPostId equals workPost.WorkPostId into workPostJoin
+                    from workPost in workPostJoin.DefaultIfEmpty() // 左连接
+                    where person.IsOnJob == true && workPost.IsCQMS == true
+                    select new
+                    {
+                        ID = person.CompanyBranchPersonId,
+                        UnitName = unit.UnitName,
+                        PersonName = person.PersonName,
+                        SexStr = person.Sex == "1" ? "男" : "女",
+                        IdentityCard = person.IdentityCard,
+                        WorkPostName = workPost.WorkPostName,
+                        Telephone = person.Telephone,
+                        IsOnJob = person.IsOnJob,
+                        Remark = person.Remark,
+                        ProjectName = ""
+                    }).ToList();
+
+                divCqmsManageNum.InnerText = (qualityQuery.Count() + query.Count()).ToString();
                 // 质量培训人员
             divCqmsPxNum.InnerText = db.Comprehensive_InspectionPerson
                 .Where(x => pids.Contains(x.ProjectId))
@@ -674,16 +696,15 @@ namespace FineUIPro.Web.common
                 if (pids == null)
                 {
                     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"
+                                where  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"
+                                where x.State != "7"
                                 select x).Count();
 
                     var zgl = String.Format("{0:N2}", 100.0 * num2 / (num2 + num3));
@@ -695,16 +716,16 @@ namespace FineUIPro.Web.common
                 else
                 {
                     zlallNumber = (from x in Funs.DB.Check_CheckControl
-                                   where x.CheckDate <= DateTime.Now && pids.Contains(x.ProjectId)
+                                   where  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)
+                                where  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)
+                                where x.State != "7" && pids.Contains(x.ProjectId)
                                 select x).Count();
 
                     var zgl = String.Format("{0:N2}", 100.0 * num2 / (num2 + num3));
@@ -778,7 +799,7 @@ namespace FineUIPro.Web.common
                 List<double> listdata = new List<double>();
                 double result = 0;
                 Model.SGGLDB db = Funs.DB;
-                var ndtLists = from x in db.ProcessControl_NondestructiveTest_New where x.ProfessionalName == "工艺管道" select x;
+                var ndtLists = from x in db.ProcessControl_NondestructiveTest_New  select x;
                 if (pids != null)
                 {
                     ndtLists = ndtLists.Where(x=>pids.Contains(x.ProjectId));
@@ -826,17 +847,17 @@ namespace FineUIPro.Web.common
             {
                 if (pids == null)
                 {
-                    var znum = (from x in Funs.DB.GJSX select x).Count();
+                    var znum = (from x in Funs.DB.GJSX where x.State != "1" select x).Count();
                     divGjsxzj.InnerHtml = znum.ToString();
 
                     var dqnum = (from x in Funs.DB.GJSX
-                                 where x.CompleteDate <= DateTime.Now
+                                 where x.CompleteDate <= DateTime.Now && x.State != "1"
                                  select x).Count().ToString();
                     divGjsxdq.InnerHtml = dqnum;
 
                     var wzdnum = (from x in Funs.DB.GJSX
                                   where x.CompleteDate <= DateTime.Now
-                                  && x.State != "0"
+                                  && x.State != "0" && x.State != "1"
                                   select x).Count().ToString();
                     divGjsxwzd.InnerHtml = wzdnum;
 
@@ -849,18 +870,18 @@ namespace FineUIPro.Web.common
                 else
                 {
                     var znum = (from x in Funs.DB.GJSX
-                                where pids.Contains(x.ProjectId)
+                                where pids.Contains(x.ProjectId) && x.State != "1"
                                 select x).Count();
                     divGjsxzj.InnerHtml = znum.ToString();
 
                     var dqnum = (from x in Funs.DB.GJSX
-                                 where x.CompleteDate <= DateTime.Now && pids.Contains(x.ProjectId)
+                                 where x.CompleteDate <= DateTime.Now && pids.Contains(x.ProjectId) && x.State != "1"
                                  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)
+                                  && x.State != "0" && pids.Contains(x.ProjectId) && x.State != "1"
                                   select x).Count().ToString();
                     divGjsxwzd.InnerHtml = wzdnum;
 

SGGL/FineUIPro.Web/indexProject.aspx

@@ -269,10 +269,10 @@
                                     <div class="n-btn-l p-n-btn-l" onclick="HJGLClick();" style="cursor: pointer">
                                         <asp:Literal runat="server" Text="<%$ Resources:Lan,WeldingManage %>" />
                                     </div>
-                                    <div class="n-btn-l p-n-btn-l" onclick="CLGLClick();" style="cursor: pointer">
+                                    <%--<div class="n-btn-l p-n-btn-l" onclick="CLGLClick();" style="cursor: pointer">
                                         <asp:Literal runat="server" Text="<%$ Resources:Lan,MaterialManagement %>" />
-                                    </div>
-                                    <div class="n-btn-l p-n-btn-l" onclick="TestRunClick();" style="cursor: pointer">
+                                    </div>--%>
+                                    <div class="n-btn-l p-n-btn-l" onclick="TestRunClick();" style="cursor: pointer; width: 1.58rem; height: .305rem; line-height: .35rem;">
                                         <asp:Literal runat="server" Text="<%$ Resources:Lan,TestManagement %>" />
                                     </div>
                                 </div>
@@ -353,9 +353,6 @@
                                     </div>
                                 </div>
                                 <div class="nav-btn n-btns-r">
-                                    <div class="n-btn-r c-n-btn-r" onclick="TransferClick();" style="cursor: pointer">
-                                        <asp:Literal runat="server" Text="<%$ Resources:Lan,TransferManagement %>" />
-                                    </div>
                                     <div class="n-btn-r c-n-btn-r" onclick="PGJSXClick();" style="cursor: pointer; width: 2.225rem; height: .305rem; line-height: .35rem;">
                                         <asp:Literal runat="server" Text="<%$ Resources:Lan,keyc %>" />
                                     </div>

SGGL/Model/Model.cs

@@ -1817,6 +1817,9 @@ namespace Model
     partial void InsertPersonTrain_TrainPlan(PersonTrain_TrainPlan instance);
     partial void UpdatePersonTrain_TrainPlan(PersonTrain_TrainPlan instance);
     partial void DeletePersonTrain_TrainPlan(PersonTrain_TrainPlan instance);
+    partial void InsertPMP_Project(PMP_Project instance);
+    partial void UpdatePMP_Project(PMP_Project instance);
+    partial void DeletePMP_Project(PMP_Project instance);
     partial void InsertPreRun_DecisionConfirmRecords(PreRun_DecisionConfirmRecords instance);
     partial void UpdatePreRun_DecisionConfirmRecords(PreRun_DecisionConfirmRecords instance);
     partial void DeletePreRun_DecisionConfirmRecords(PreRun_DecisionConfirmRecords instance);
@@ -7591,6 +7594,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<PMP_Project> PMP_Project
+		{
+			get
+			{
+				return this.GetTable<PMP_Project>();
+			}
+		}
+		
 		public System.Data.Linq.Table<PreRun_DecisionConfirmRecords> PreRun_DecisionConfirmRecords
 		{
 			get
@@ -10367,6 +10378,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<View_JDGL_QuantityCompletionDone> View_JDGL_QuantityCompletionDone
+		{
+			get
+			{
+				return this.GetTable<View_JDGL_QuantityCompletionDone>();
+			}
+		}
+		
 		public System.Data.Linq.Table<View_JDGL_SteelStructureCompletion> View_JDGL_SteelStructureCompletion
 		{
 			get
@@ -284312,6 +284331,716 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.PMP_Project")]
+	public partial class PMP_Project : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private int _Id;
+		
+		private string _Code;
+		
+		private string _StNum;
+		
+		private string _DisType;
+		
+		private string _Name;
+		
+		private string _ProjShortName;
+		
+		private string _ProjStepZxnoCode;
+		
+		private string _ProjStepZxnoName;
+		
+		private string _StProjectTypeVals;
+		
+		private string _StProjectStepVals;
+		
+		private string _ProjStepZxnoVals;
+		
+		private string _StProjectPropertyVals;
+		
+		private string _RemarkC;
+		
+		private string _Address;
+		
+		private string _CityCode;
+		
+		private string _CityName;
+		
+		private string _CountryCode;
+		
+		private string _CountryName;
+		
+		private string _CountyCode;
+		
+		private string _CountyName;
+		
+		private string _ProjectNameEn;
+		
+		private string _ProvinceCode;
+		
+		private string _ProvinceName;
+		
+		private string _RemarkA;
+		
+		private string _RemarkB;
+		
+		private System.Nullable<System.DateTime> _RealStartDate;
+		
+		private System.Nullable<System.DateTime> _RealEndDate;
+		
+		private System.DateTime _CreateTime;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnIdChanging(int value);
+    partial void OnIdChanged();
+    partial void OnCodeChanging(string value);
+    partial void OnCodeChanged();
+    partial void OnStNumChanging(string value);
+    partial void OnStNumChanged();
+    partial void OnDisTypeChanging(string value);
+    partial void OnDisTypeChanged();
+    partial void OnNameChanging(string value);
+    partial void OnNameChanged();
+    partial void OnProjShortNameChanging(string value);
+    partial void OnProjShortNameChanged();
+    partial void OnProjStepZxnoCodeChanging(string value);
+    partial void OnProjStepZxnoCodeChanged();
+    partial void OnProjStepZxnoNameChanging(string value);
+    partial void OnProjStepZxnoNameChanged();
+    partial void OnStProjectTypeValsChanging(string value);
+    partial void OnStProjectTypeValsChanged();
+    partial void OnStProjectStepValsChanging(string value);
+    partial void OnStProjectStepValsChanged();
+    partial void OnProjStepZxnoValsChanging(string value);
+    partial void OnProjStepZxnoValsChanged();
+    partial void OnStProjectPropertyValsChanging(string value);
+    partial void OnStProjectPropertyValsChanged();
+    partial void OnRemarkCChanging(string value);
+    partial void OnRemarkCChanged();
+    partial void OnAddressChanging(string value);
+    partial void OnAddressChanged();
+    partial void OnCityCodeChanging(string value);
+    partial void OnCityCodeChanged();
+    partial void OnCityNameChanging(string value);
+    partial void OnCityNameChanged();
+    partial void OnCountryCodeChanging(string value);
+    partial void OnCountryCodeChanged();
+    partial void OnCountryNameChanging(string value);
+    partial void OnCountryNameChanged();
+    partial void OnCountyCodeChanging(string value);
+    partial void OnCountyCodeChanged();
+    partial void OnCountyNameChanging(string value);
+    partial void OnCountyNameChanged();
+    partial void OnProjectNameEnChanging(string value);
+    partial void OnProjectNameEnChanged();
+    partial void OnProvinceCodeChanging(string value);
+    partial void OnProvinceCodeChanged();
+    partial void OnProvinceNameChanging(string value);
+    partial void OnProvinceNameChanged();
+    partial void OnRemarkAChanging(string value);
+    partial void OnRemarkAChanged();
+    partial void OnRemarkBChanging(string value);
+    partial void OnRemarkBChanged();
+    partial void OnRealStartDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnRealStartDateChanged();
+    partial void OnRealEndDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnRealEndDateChanged();
+    partial void OnCreateTimeChanging(System.DateTime value);
+    partial void OnCreateTimeChanged();
+    #endregion
+		
+		public PMP_Project()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="id", Storage="_Id", DbType="Int NOT NULL", IsPrimaryKey=true)]
+		public int Id
+		{
+			get
+			{
+				return this._Id;
+			}
+			set
+			{
+				if ((this._Id != value))
+				{
+					this.OnIdChanging(value);
+					this.SendPropertyChanging();
+					this._Id = value;
+					this.SendPropertyChanged("Id");
+					this.OnIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="code", Storage="_Code", DbType="NVarChar(100) NOT NULL", CanBeNull=false)]
+		public string Code
+		{
+			get
+			{
+				return this._Code;
+			}
+			set
+			{
+				if ((this._Code != value))
+				{
+					this.OnCodeChanging(value);
+					this.SendPropertyChanging();
+					this._Code = value;
+					this.SendPropertyChanged("Code");
+					this.OnCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="stNum", Storage="_StNum", DbType="NVarChar(100) NOT NULL", CanBeNull=false)]
+		public string StNum
+		{
+			get
+			{
+				return this._StNum;
+			}
+			set
+			{
+				if ((this._StNum != value))
+				{
+					this.OnStNumChanging(value);
+					this.SendPropertyChanging();
+					this._StNum = value;
+					this.SendPropertyChanged("StNum");
+					this.OnStNumChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="disType", Storage="_DisType", DbType="NVarChar(100)")]
+		public string DisType
+		{
+			get
+			{
+				return this._DisType;
+			}
+			set
+			{
+				if ((this._DisType != value))
+				{
+					this.OnDisTypeChanging(value);
+					this.SendPropertyChanging();
+					this._DisType = value;
+					this.SendPropertyChanged("DisType");
+					this.OnDisTypeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="name", Storage="_Name", DbType="NVarChar(200) NOT NULL", CanBeNull=false)]
+		public string Name
+		{
+			get
+			{
+				return this._Name;
+			}
+			set
+			{
+				if ((this._Name != value))
+				{
+					this.OnNameChanging(value);
+					this.SendPropertyChanging();
+					this._Name = value;
+					this.SendPropertyChanged("Name");
+					this.OnNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="projShortName", Storage="_ProjShortName", DbType="NVarChar(100)")]
+		public string ProjShortName
+		{
+			get
+			{
+				return this._ProjShortName;
+			}
+			set
+			{
+				if ((this._ProjShortName != value))
+				{
+					this.OnProjShortNameChanging(value);
+					this.SendPropertyChanging();
+					this._ProjShortName = value;
+					this.SendPropertyChanged("ProjShortName");
+					this.OnProjShortNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="projStepZxnoCode", Storage="_ProjStepZxnoCode", DbType="NVarChar(100)")]
+		public string ProjStepZxnoCode
+		{
+			get
+			{
+				return this._ProjStepZxnoCode;
+			}
+			set
+			{
+				if ((this._ProjStepZxnoCode != value))
+				{
+					this.OnProjStepZxnoCodeChanging(value);
+					this.SendPropertyChanging();
+					this._ProjStepZxnoCode = value;
+					this.SendPropertyChanged("ProjStepZxnoCode");
+					this.OnProjStepZxnoCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="projStepZxnoName", Storage="_ProjStepZxnoName", DbType="NVarChar(100)")]
+		public string ProjStepZxnoName
+		{
+			get
+			{
+				return this._ProjStepZxnoName;
+			}
+			set
+			{
+				if ((this._ProjStepZxnoName != value))
+				{
+					this.OnProjStepZxnoNameChanging(value);
+					this.SendPropertyChanging();
+					this._ProjStepZxnoName = value;
+					this.SendPropertyChanged("ProjStepZxnoName");
+					this.OnProjStepZxnoNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="stProjectTypeVals", Storage="_StProjectTypeVals", DbType="NVarChar(100)")]
+		public string StProjectTypeVals
+		{
+			get
+			{
+				return this._StProjectTypeVals;
+			}
+			set
+			{
+				if ((this._StProjectTypeVals != value))
+				{
+					this.OnStProjectTypeValsChanging(value);
+					this.SendPropertyChanging();
+					this._StProjectTypeVals = value;
+					this.SendPropertyChanged("StProjectTypeVals");
+					this.OnStProjectTypeValsChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="stProjectStepVals", Storage="_StProjectStepVals", DbType="NVarChar(100)")]
+		public string StProjectStepVals
+		{
+			get
+			{
+				return this._StProjectStepVals;
+			}
+			set
+			{
+				if ((this._StProjectStepVals != value))
+				{
+					this.OnStProjectStepValsChanging(value);
+					this.SendPropertyChanging();
+					this._StProjectStepVals = value;
+					this.SendPropertyChanged("StProjectStepVals");
+					this.OnStProjectStepValsChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="projStepZxnoVals", Storage="_ProjStepZxnoVals", DbType="NVarChar(100)")]
+		public string ProjStepZxnoVals
+		{
+			get
+			{
+				return this._ProjStepZxnoVals;
+			}
+			set
+			{
+				if ((this._ProjStepZxnoVals != value))
+				{
+					this.OnProjStepZxnoValsChanging(value);
+					this.SendPropertyChanging();
+					this._ProjStepZxnoVals = value;
+					this.SendPropertyChanged("ProjStepZxnoVals");
+					this.OnProjStepZxnoValsChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="stProjectPropertyVals", Storage="_StProjectPropertyVals", DbType="NVarChar(100)")]
+		public string StProjectPropertyVals
+		{
+			get
+			{
+				return this._StProjectPropertyVals;
+			}
+			set
+			{
+				if ((this._StProjectPropertyVals != value))
+				{
+					this.OnStProjectPropertyValsChanging(value);
+					this.SendPropertyChanging();
+					this._StProjectPropertyVals = value;
+					this.SendPropertyChanged("StProjectPropertyVals");
+					this.OnStProjectPropertyValsChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="remarkC", Storage="_RemarkC", DbType="NVarChar(100)")]
+		public string RemarkC
+		{
+			get
+			{
+				return this._RemarkC;
+			}
+			set
+			{
+				if ((this._RemarkC != value))
+				{
+					this.OnRemarkCChanging(value);
+					this.SendPropertyChanging();
+					this._RemarkC = value;
+					this.SendPropertyChanged("RemarkC");
+					this.OnRemarkCChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="address", Storage="_Address", DbType="NVarChar(500)")]
+		public string Address
+		{
+			get
+			{
+				return this._Address;
+			}
+			set
+			{
+				if ((this._Address != value))
+				{
+					this.OnAddressChanging(value);
+					this.SendPropertyChanging();
+					this._Address = value;
+					this.SendPropertyChanged("Address");
+					this.OnAddressChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="cityCode", Storage="_CityCode", DbType="NVarChar(100)")]
+		public string CityCode
+		{
+			get
+			{
+				return this._CityCode;
+			}
+			set
+			{
+				if ((this._CityCode != value))
+				{
+					this.OnCityCodeChanging(value);
+					this.SendPropertyChanging();
+					this._CityCode = value;
+					this.SendPropertyChanged("CityCode");
+					this.OnCityCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="cityName", Storage="_CityName", DbType="NVarChar(100)")]
+		public string CityName
+		{
+			get
+			{
+				return this._CityName;
+			}
+			set
+			{
+				if ((this._CityName != value))
+				{
+					this.OnCityNameChanging(value);
+					this.SendPropertyChanging();
+					this._CityName = value;
+					this.SendPropertyChanged("CityName");
+					this.OnCityNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="countryCode", Storage="_CountryCode", DbType="NVarChar(100)")]
+		public string CountryCode
+		{
+			get
+			{
+				return this._CountryCode;
+			}
+			set
+			{
+				if ((this._CountryCode != value))
+				{
+					this.OnCountryCodeChanging(value);
+					this.SendPropertyChanging();
+					this._CountryCode = value;
+					this.SendPropertyChanged("CountryCode");
+					this.OnCountryCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="countryName", Storage="_CountryName", DbType="NVarChar(100)")]
+		public string CountryName
+		{
+			get
+			{
+				return this._CountryName;
+			}
+			set
+			{
+				if ((this._CountryName != value))
+				{
+					this.OnCountryNameChanging(value);
+					this.SendPropertyChanging();
+					this._CountryName = value;
+					this.SendPropertyChanged("CountryName");
+					this.OnCountryNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="countyCode", Storage="_CountyCode", DbType="NVarChar(100)")]
+		public string CountyCode
+		{
+			get
+			{
+				return this._CountyCode;
+			}
+			set
+			{
+				if ((this._CountyCode != value))
+				{
+					this.OnCountyCodeChanging(value);
+					this.SendPropertyChanging();
+					this._CountyCode = value;
+					this.SendPropertyChanged("CountyCode");
+					this.OnCountyCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="countyName", Storage="_CountyName", DbType="NVarChar(100)")]
+		public string CountyName
+		{
+			get
+			{
+				return this._CountyName;
+			}
+			set
+			{
+				if ((this._CountyName != value))
+				{
+					this.OnCountyNameChanging(value);
+					this.SendPropertyChanging();
+					this._CountyName = value;
+					this.SendPropertyChanged("CountyName");
+					this.OnCountyNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="projectNameEn", Storage="_ProjectNameEn", DbType="NVarChar(500)")]
+		public string ProjectNameEn
+		{
+			get
+			{
+				return this._ProjectNameEn;
+			}
+			set
+			{
+				if ((this._ProjectNameEn != value))
+				{
+					this.OnProjectNameEnChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectNameEn = value;
+					this.SendPropertyChanged("ProjectNameEn");
+					this.OnProjectNameEnChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="provinceCode", Storage="_ProvinceCode", DbType="NVarChar(100)")]
+		public string ProvinceCode
+		{
+			get
+			{
+				return this._ProvinceCode;
+			}
+			set
+			{
+				if ((this._ProvinceCode != value))
+				{
+					this.OnProvinceCodeChanging(value);
+					this.SendPropertyChanging();
+					this._ProvinceCode = value;
+					this.SendPropertyChanged("ProvinceCode");
+					this.OnProvinceCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="provinceName", Storage="_ProvinceName", DbType="NVarChar(100)")]
+		public string ProvinceName
+		{
+			get
+			{
+				return this._ProvinceName;
+			}
+			set
+			{
+				if ((this._ProvinceName != value))
+				{
+					this.OnProvinceNameChanging(value);
+					this.SendPropertyChanging();
+					this._ProvinceName = value;
+					this.SendPropertyChanged("ProvinceName");
+					this.OnProvinceNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="remarkA", Storage="_RemarkA", DbType="NVarChar(100)")]
+		public string RemarkA
+		{
+			get
+			{
+				return this._RemarkA;
+			}
+			set
+			{
+				if ((this._RemarkA != value))
+				{
+					this.OnRemarkAChanging(value);
+					this.SendPropertyChanging();
+					this._RemarkA = value;
+					this.SendPropertyChanged("RemarkA");
+					this.OnRemarkAChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="remarkB", Storage="_RemarkB", DbType="NVarChar(100)")]
+		public string RemarkB
+		{
+			get
+			{
+				return this._RemarkB;
+			}
+			set
+			{
+				if ((this._RemarkB != value))
+				{
+					this.OnRemarkBChanging(value);
+					this.SendPropertyChanging();
+					this._RemarkB = value;
+					this.SendPropertyChanged("RemarkB");
+					this.OnRemarkBChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="realStartDate", Storage="_RealStartDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> RealStartDate
+		{
+			get
+			{
+				return this._RealStartDate;
+			}
+			set
+			{
+				if ((this._RealStartDate != value))
+				{
+					this.OnRealStartDateChanging(value);
+					this.SendPropertyChanging();
+					this._RealStartDate = value;
+					this.SendPropertyChanged("RealStartDate");
+					this.OnRealStartDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="realEndDate", Storage="_RealEndDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> RealEndDate
+		{
+			get
+			{
+				return this._RealEndDate;
+			}
+			set
+			{
+				if ((this._RealEndDate != value))
+				{
+					this.OnRealEndDateChanging(value);
+					this.SendPropertyChanging();
+					this._RealEndDate = value;
+					this.SendPropertyChanged("RealEndDate");
+					this.OnRealEndDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreateTime", DbType="DateTime NOT NULL")]
+		public System.DateTime CreateTime
+		{
+			get
+			{
+				return this._CreateTime;
+			}
+			set
+			{
+				if ((this._CreateTime != value))
+				{
+					this.OnCreateTimeChanging(value);
+					this.SendPropertyChanging();
+					this._CreateTime = value;
+					this.SendPropertyChanged("CreateTime");
+					this.OnCreateTimeChanged();
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.PreRun_DecisionConfirmRecords")]
 	public partial class PreRun_DecisionConfirmRecords : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -343506,6 +344235,8 @@ namespace Model
 		
 		private System.Nullable<bool> _IsBlacklist;
 		
+		private string _Email;
+		
 		private EntitySet<Accident_AccidentPersonRecord> _Accident_AccidentPersonRecord;
 		
 		private EntitySet<Accident_AccidentReportOtherItem> _Accident_AccidentReportOtherItem;
@@ -343692,6 +344423,8 @@ namespace Model
     partial void OnIsSafetyMonitoringChanged();
     partial void OnIsBlacklistChanging(System.Nullable<bool> value);
     partial void OnIsBlacklistChanged();
+    partial void OnEmailChanging(string value);
+    partial void OnEmailChanged();
     #endregion
 		
 		public SitePerson_Person()
@@ -345000,6 +345733,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Email", DbType="NVarChar(200)")]
+		public string Email
+		{
+			get
+			{
+				return this._Email;
+			}
+			set
+			{
+				if ((this._Email != value))
+				{
+					this.OnEmailChanging(value);
+					this.SendPropertyChanging();
+					this._Email = value;
+					this.SendPropertyChanged("Email");
+					this.OnEmailChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentPersonRecord_SitePerson_Person", Storage="_Accident_AccidentPersonRecord", ThisKey="PersonId", OtherKey="PersonId", DeleteRule="NO ACTION")]
 		public EntitySet<Accident_AccidentPersonRecord> Accident_AccidentPersonRecord
 		{
@@ -350495,7 +351248,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Address", DbType="NVarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Address", DbType="NVarChar(500)")]
 		public string Address
 		{
 			get
@@ -437486,6 +438239,87 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_JDGL_QuantityCompletionDone")]
+	public partial class View_JDGL_QuantityCompletionDone
+	{
+		
+		private string _QuantityListId;
+		
+		private string _ProjectId;
+		
+		private System.Nullable<System.DateTime> _Months;
+		
+		private System.Nullable<decimal> _Rate;
+		
+		public View_JDGL_QuantityCompletionDone()
+		{
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QuantityListId", DbType="NVarChar(50)")]
+		public string QuantityListId
+		{
+			get
+			{
+				return this._QuantityListId;
+			}
+			set
+			{
+				if ((this._QuantityListId != value))
+				{
+					this._QuantityListId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+		public string ProjectId
+		{
+			get
+			{
+				return this._ProjectId;
+			}
+			set
+			{
+				if ((this._ProjectId != value))
+				{
+					this._ProjectId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Months", DbType="DateTime")]
+		public System.Nullable<System.DateTime> Months
+		{
+			get
+			{
+				return this._Months;
+			}
+			set
+			{
+				if ((this._Months != value))
+				{
+					this._Months = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Rate", DbType="Decimal(25,12)")]
+		public System.Nullable<decimal> Rate
+		{
+			get
+			{
+				return this._Rate;
+			}
+			set
+			{
+				if ((this._Rate != value))
+				{
+					this._Rate = value;
+				}
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_JDGL_SteelStructureCompletion")]
 	public partial class View_JDGL_SteelStructureCompletion
 	{

SGGL/Model/Model.csproj

@@ -230,6 +230,7 @@
     <Compile Include="JDGL\WBSDetailItem.cs" />
     <Compile Include="JDGL\WBSSetInitItem.cs" />
     <Compile Include="JDGL\WBSSetItem.cs" />
+    <Compile Include="PMP\PMPProject.cs" />
     <Compile Include="Model.cs" />
     <Compile Include="ModelProc.cs" />
     <Compile Include="Num.cs" />

SGGL/Model/PMP/PMPProject.cs

@@ -0,0 +1,227 @@
+// <auto-generated />
+//
+// To parse this JSON data, add NuGet 'Newtonsoft.Json' then do:
+//
+//    using Model;
+//
+//    var response = Response.FromJson(jsonString);
+
+
+namespace Model
+{
+    using System;
+    using System.Collections.Generic;
+
+    using System.Globalization;
+    using Newtonsoft.Json;
+    using Newtonsoft.Json.Converters;
+
+
+    /// <summary>
+    /// 项目
+    /// </summary>
+    public partial class PMPResponseData
+    {
+        /// <summary>
+        /// 返回状态
+        /// </summary>
+        [JsonProperty("code")]
+        public int code { get; set; }
+        /// <summary>
+        /// 数组总条数
+        /// </summary>
+        [JsonProperty("total")]
+        public int total { get; set; }
+
+        /// <summary>
+        /// 权限数组
+        /// </summary>
+        [JsonProperty("data")]
+        public ResponseData data { get; set; }
+        /// <summary>
+        /// 返回状态
+        /// </summary>
+        [JsonProperty("rows")]
+        public System.Collections.Generic.List<PMPProject> rows { get; set; }
+        /// <summary>
+        /// 返回消息
+        /// </summary>
+        [JsonProperty("msg")]
+        public string msg { get; set; }
+    }
+
+
+    public partial class ResponseData
+    {
+        /// <summary>
+        /// 权限信息
+        /// </summary>
+        [JsonProperty("userColumnPermissions")]
+        public string userColumnPermissions { get; set; }
+    }
+    /// <summary>
+    /// 项目
+    /// </summary>
+    public partial class PMPProject
+    {
+        /// <summary>
+        /// 主键ID
+        /// </summary>
+        [JsonProperty("id")]
+        public int id { get; set; }
+        /// <summary>
+        /// 项目ID
+        /// </summary>
+        [JsonProperty("code")]
+        public string code { get; set; }
+        /// <summary>
+        /// 项目号(源头)
+        /// </summary>
+        [JsonProperty("stNum")]
+        public string stNum { get; set; }
+        /// <summary>
+        /// 名称
+        /// </summary>
+        [JsonProperty("name")]
+        public string name { get; set; }
+        /// <summary>
+        /// 项目简称
+        /// </summary>
+        [JsonProperty("projShortName")]
+        public string projShortName { get; set; }
+        /// <summary>
+        /// 项目开工日期
+        /// </summary>
+        [JsonProperty("realStartDate")]
+        public DateTime? realStartDate { get; set; }
+        /// <summary>
+        /// 项目竣工日期
+        /// </summary>
+        [JsonProperty("realEndDate")]
+        public DateTime? realEndDate { get; set; }
+        /// <summary>
+        /// 操作类型
+        /// </summary>
+        [JsonProperty("disType")]
+        public string disType { get; set; }
+        /// <summary>
+        /// 项目阶段编码
+        /// </summary>
+        [JsonProperty("projStepZxnoCode")]
+        public string projStepZxnoCode { get; set; }
+        /// <summary>
+        /// 项目阶段名称
+        /// </summary>
+        [JsonProperty("projStepZxnoName")]
+        public string projStepZxnoName { get; set; }
+        /// <summary>
+        /// 项目类型一级
+        /// </summary>
+        [JsonProperty("stProjectTypeVals")]
+        public string stProjectTypeVals { get; set; }
+        /// <summary>
+        /// 项目类型二级
+        /// </summary>
+        [JsonProperty("stProjectStepVals")]
+        public string stProjectStepVals { get; set; }
+        /// <summary>
+        /// 项目阶段
+        /// </summary>
+        [JsonProperty("projStepZxnoVals")]
+        public string projStepZxnoVals { get; set; }
+        /// <summary>
+        /// 项目性质
+        /// </summary>
+        [JsonProperty("stProjectPropertyVals")]
+        public string stProjectPropertyVals { get; set; }
+        /// <summary>
+        /// 备注3_新系统项目ID
+        /// </summary>
+        [JsonProperty("remarkC")]
+        public string remarkC { get; set; }
+        /// <summary>
+        /// 详细地址
+        /// </summary>
+        [JsonProperty("address")]
+        public string address { get; set; }
+        /// <summary>
+        /// 市编码
+        /// </summary>
+        [JsonProperty("cityCode")]
+        public string cityCode { get; set; }
+        /// <summary>
+        /// 市名称
+        /// </summary>
+        [JsonProperty("cityName")]
+        public string cityName { get; set; }
+        /// <summary>
+        /// 国家编码
+        /// </summary>
+        [JsonProperty("countryCode")]
+        public string countryCode { get; set; }
+        /// <summary>
+        /// 国家名称
+        /// </summary>
+        [JsonProperty("countryName")]
+        public string countryName { get; set; }
+        /// <summary>
+        /// 区县编码
+        /// </summary>
+        [JsonProperty("countyCode")]
+        public string countyCode { get; set; }
+        /// <summary>
+        /// 区县名称
+        /// </summary>
+        [JsonProperty("countyName")]
+        public string countyName { get; set; }
+        /// <summary>
+        /// 项目英文名称
+        /// </summary>
+        [JsonProperty("projectNameEn")]
+        public string projectNameEn { get; set; }
+        /// <summary>
+        /// 省编码
+        /// </summary>
+        [JsonProperty("provinceCode")]
+        public string provinceCode { get; set; }
+        /// <summary>
+        /// 省名称
+        /// </summary>
+        [JsonProperty("provinceName")]
+        public string provinceName { get; set; }
+        /// <summary>
+        /// 经度
+        /// </summary>
+        [JsonProperty("remarkA")]
+        public string remarkA { get; set; }
+
+        /// <summary>
+        /// 纬度
+        /// </summary>
+        [JsonProperty("remarkB")]
+        public string remarkB { get; set; }
+
+    }
+
+    public partial class PMPResponseData
+    {
+        public static PMPResponseData FromJson(string json)
+        {
+            return JsonConvert.DeserializeObject<PMPResponseData>(json, Model.Converter.Settings);
+        }
+    }
+
+    internal static class Converter
+    {
+        public static readonly JsonSerializerSettings Settings = new JsonSerializerSettings
+        {
+            MetadataPropertyHandling = MetadataPropertyHandling.Ignore,
+            DateParseHandling = DateParseHandling.None,
+            Converters =
+            {
+                new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AssumeUniversal }
+            },
+        };
+    }
+}
+

SGGL/Model/SingleSerie.cs

@@ -25,4 +25,13 @@ namespace Model
         public List<PieData> pieData { get; set; }
         public List<string> loc { get; set; }
     }
+
+    public class Serie
+    {
+        public string name { get; set; }
+        public string type { get; set; }
+        public string stack { get; set; }
+        //public List<double> data { get; set; }
+        public List<string> data { get; set; }
+    }
 }

SGGL/Model/TokenItem.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
+
 namespace Model
 {
     public  class TokenItem