Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

DataBase/版本日志/SGGLDB_V2025-07-10-001_lc.sql

@@ -0,0 +1,30 @@
+
+
+
+--指挥调度中心菜单移动到安全检查下面-智慧巡检
+update Sys_Menu
+set MenuName='智慧巡检',SortIndex=140,SuperMenu='467A0CB9-737D-4451-965E-869EBC3A4BD6',MenuType='Menu_HSSE'
+where MenuId ='09E6A03F-65C8-4FAC-9659-7A0B56D8CC19'
+GO
+
+
+--182BC982-F98F-41B3-A2D2-9DD834BF5833	Menu_CommandDispatchCenter	指挥调度中心	11	MenuType_P	NULL
+--select*from Sys_Const
+--where GroupId ='MenuType_P'
+
+delete Sys_Const
+where GroupId ='MenuType_P' and ID='182BC982-F98F-41B3-A2D2-9DD834BF5833'
+GO
+
+IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = 'DE0CA5F1-AE72-4752-A244-D474F3F5F9C8')
+BEGIN
+INSERT INTO [dbo].[Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed]) 
+VALUES (N'DE0CA5F1-AE72-4752-A244-D474F3F5F9C8', N'塔吊记录', NULL, N'HSSE/TowerCrane/TowerCraneRecord.aspx', '130', N'28C8EDB9-F1C2-4287-8013-28A976B093E2', N'Menu_HSSE', '1', '1', '1');
+END
+GO
+
+Alter TABLE [dbo].[Base_Project]add
+	[AQMAccount] [nvarchar](50) NULL,
+	[AQMPwd] [nvarchar](50) NULL 
+
+	GO

DataBase/版本日志/SGGLDB_WH_2025-06-26.sql

@@ -0,0 +1,12 @@
+
+
+
+
+
+update HSSE_Hazard_HazardRegister set Risk_Level='一般事故隐患'
+where Risk_Level='一般'
+update HSSE_Hazard_HazardRegister set Risk_Level='重大事故隐患'
+where Risk_Level='重大'
+GO
+
+

DataBase/版本日志/SGGLDB_WH_2025-06-27.sql

@@ -0,0 +1,40 @@
+
+
+
+--质量危大工程补充方案名称、作业人数
+
+alter table dbo.Comprehensive_MajorPlanApproval add OperativesNum int
+go
+
+
+exec sp_addextendedproperty 'MS_Description', N'作业人员数', 'SCHEMA', 'dbo', 'TABLE', 'Comprehensive_MajorPlanApproval',
+     'COLUMN', 'OperativesNum'
+go
+
+exec sp_addextendedproperty 'MS_Description', N'方案名称', 'SCHEMA', 'dbo', 'TABLE', 'Solution_LargerHazard',
+     'COLUMN', 'HazardName'
+go
+
+
+
+ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value1 NVARCHAR(1000);
+ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value2 NVARCHAR(1000);
+ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value3 NVARCHAR(1000);
+ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value4 NVARCHAR(1000);
+ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value5 NVARCHAR(1000);
+ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value6 NVARCHAR(1000);
+ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value7 NVARCHAR(1000);
+ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value8 NVARCHAR(1000);
+ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value9 NVARCHAR(1000);
+ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value10 NVARCHAR(1000);
+ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value11 NVARCHAR(1000);
+ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value12 NVARCHAR(1000);
+ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value13 NVARCHAR(1000);
+ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value14 NVARCHAR(1000);
+ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value15 NVARCHAR(1000);
+ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value16 NVARCHAR(1000);
+ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value17 NVARCHAR(1000);
+ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value18 NVARCHAR(1000);
+ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value19 NVARCHAR(1000);
+ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value20 NVARCHAR(1000);
+

DataBase/版本日志/SGGLDB_WH_2025-07-01.sql

@@ -0,0 +1,11 @@
+
+
+--1、企业总部人员表补充排序
+IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Person_CompanyBranchPerson' AND COLUMN_NAME = 'SortIndex')
+BEGIN
+	ALTER TABLE Person_CompanyBranchPerson ADD SortIndex int;
+END
+GO
+
+
+

DataBase/版本日志/SGGLDB_WH_2025-07-04.sql

@@ -0,0 +1,3 @@
+
+
+ALTER TABLE License_EquipmentSafetyList DROP CONSTRAINT [FK_License_EquipmentSafetyList_ProjectData_WorkArea];

DataBase/版本日志/SUBQHSE_V2025-07-10-gf.sql

@@ -0,0 +1,38 @@
+alter table Information_ActionWorkLedger add KeyWorkNum int null
+alter table Information_ActionWorkLedger add KeyWorkOKNum int null
+alter table Information_ActionWorkLedger add KeyWorkOKRate nvarchar(20) null
+GO
+
+
+
+ALTER VIEW [dbo].[View_Information_ActionWorkLedger]  AS 
+SELECT 
+	Report.ActionWorkLedgerId, 
+	Report.UnitId, 
+	Report.ReportDate,
+	Report.YearId,
+	Report.Quarter,
+	Report.UpState,
+	Report.HandleState,
+	Report.KeyWorkNum,
+	Report.KeyWorkOKNum,
+	Report.KeyWorkOKRate,
+	(ISNULL(Group_0008.ConstText,'-') + ISNULL(Group_0011.ConstText,'-')) AS Quarters,
+	u.UnitName,
+	Report.HandleMan,
+	US.UserName
+FROM dbo.Information_ActionWorkLedger AS Report
+LEFT JOIN Sys_Const  AS Group_0008 ON Group_0008.GroupId='0008' AND Group_0008.ConstValue =Report.YearId
+LEFT JOIN Sys_Const  AS Group_0011 ON Group_0011.GroupId='0011' AND Group_0011.ConstValue =Report.Quarter
+Left join Base_Unit as u on u.UnitId=Report.UnitId
+LEFT JOIN Sys_User AS US ON US.UserId=Report.HandleMan
+
+
+
+
+
+
+
+GO
+
+

DataBase/版本日志/SUBQHSE_V2025-07-11-xiaj（IDP）.sql

@@ -0,0 +1,10 @@
+
+
+
+--IDP諉諳華硊
+IF NOT EXISTS (SELECT 1 FROM Sys_Set WHERE SetName = 'IDP諉諳華硊')
+BEGIN
+	insert into Sys_Set(SetId,SetName,SetValue)
+	select 6,'IDP諉諳華硊','https://idp.cwcec.com/'
+END
+GO

DataBase/版本日志/SUBQHSE_V2025-07-12-xiaj.sql

@@ -0,0 +1,14 @@
+
+
+ALTER TABLE Bo_Sheng_Unit
+ALTER COLUMN DepartName NVARCHAR(200);
+
+
+GO
+
+
+ALTER TABLE Bo_Sheng_Unit
+ALTER COLUMN Remark NVARCHAR(1000);
+
+
+GO

SGGL/BLL/BLL.csproj

@@ -592,6 +592,7 @@
     <Compile Include="HSSE\Technique\SpecialSchemeService.cs" />
     <Compile Include="HSSE\Technique\Technique_CheckItemDetailService.cs" />
     <Compile Include="HSSE\Technique\Technique_CheckItemSetService.cs" />
+    <Compile Include="IDP\IDPDataService.cs" />
     <Compile Include="JDGL\Check\ElectricalCompletionService.cs" />
     <Compile Include="JDGL\Check\EquipmentCompletionService.cs" />
     <Compile Include="JDGL\Check\LowTankCompletionService.cs" />

SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs

@@ -126,6 +126,7 @@ namespace BLL
             newMajorPlanApproval.HazardType = majorPlanApproval.HazardType;
             newMajorPlanApproval.ExpectedTime = majorPlanApproval.ExpectedTime;
             newMajorPlanApproval.TrainPersonNum = majorPlanApproval.TrainPersonNum;
+            newMajorPlanApproval.OperativesNum = majorPlanApproval.OperativesNum;
             newMajorPlanApproval.States = majorPlanApproval.States;
             db.Comprehensive_MajorPlanApproval.InsertOnSubmit(newMajorPlanApproval);
             db.SubmitChanges();
@@ -169,6 +170,7 @@ namespace BLL
                 newMajorPlanApproval.HazardType = majorPlanApproval.HazardType;
                 newMajorPlanApproval.ExpectedTime = majorPlanApproval.ExpectedTime;
                 newMajorPlanApproval.TrainPersonNum = majorPlanApproval.TrainPersonNum;
+                newMajorPlanApproval.OperativesNum = majorPlanApproval.OperativesNum;
                 newMajorPlanApproval.States = majorPlanApproval.States;
                 newMajorPlanApproval.IsReview = majorPlanApproval.IsReview;
                 db.SubmitChanges();
@@ -212,6 +214,7 @@ namespace BLL
             {
                 HazardId = majorPlanApproval.MajorPlanApprovalId,
                 HazardCode = majorPlanApproval.PlanCode,
+                HazardName = majorPlanApproval.PlanName,
                 HazardType = majorPlanApproval.HazardType,
                 ProjectId = majorPlanApproval.ProjectId,
                 Address = majorPlanApproval.UnitWorkId,
@@ -221,6 +224,7 @@ namespace BLL
                 RecardMan = majorPlanApproval.CompileMan,
                 States = majorPlanApproval.States,
                 TrainPersonNum = majorPlanApproval.TrainPersonNum,
+                OperativesNum = majorPlanApproval.OperativesNum,
                 IsSuperLargerHazard = majorPlanApproval.SchemeType == "超危大工程" ? true : false,
             };
 
@@ -238,6 +242,7 @@ namespace BLL
             if (newLargerHazard != null)
             {
                 newLargerHazard.HazardCode = majorPlanApproval.PlanCode;
+                newLargerHazard.HazardName = majorPlanApproval.PlanName;
                 newLargerHazard.HazardType = majorPlanApproval.HazardType;
                 newLargerHazard.ProjectId = majorPlanApproval.ProjectId;
                 newLargerHazard.Address = majorPlanApproval.UnitWorkId;
@@ -246,6 +251,7 @@ namespace BLL
                 newLargerHazard.RecordTime = majorPlanApproval.ApprovalDate;
                 newLargerHazard.States = majorPlanApproval.States;
                 newLargerHazard.TrainPersonNum = majorPlanApproval.TrainPersonNum;
+                newLargerHazard.OperativesNum = majorPlanApproval.OperativesNum;
                 newLargerHazard.IsSuperLargerHazard = majorPlanApproval.SchemeType == "超危大工程" ? true : false;
                 db.SubmitChanges();
             }

SGGL/BLL/Common/Const.cs

@@ -527,7 +527,9 @@ namespace BLL
         /// <summary>
         /// 项目安全总监岗位Id
         /// </summary>
-        public static string WorkPost_ProjectHSSEDirector = "5e6e259e-ea0a-4a63-8f52-df4a19a6c9fa";
+        public static string WorkPost_ProjectHSSEDirector = "8A7C2CDF-AFB5-4826-9951-343253342DAC";
+        //public static string WorkPost_ProjectHSSEDirector = "5e6e259e-ea0a-4a63-8f52-df4a19a6c9fa";
+
         /// <summary>
         /// HSE经理岗位Id
         /// </summary>

SGGL/BLL/EnvironmentalCheckService.cs

@@ -21,7 +21,7 @@ namespace BLL
         public static ReturnData PushEnvironmentalCheckData()
         {
             var db = Funs.DB;
-            var items = (from x in db.EnvironmentalCheck where x.IsPushed == false select x).ToList();
+            var items = (from x in db.EnvironmentalCheck where x.IsPushed == null || x.IsPushed == false orderby x.CreateTime descending select x).ToList();
             Model.ReturnData responeData = new Model.ReturnData();
             if (items.Count() > 0)
             {

SGGL/BLL/HSSE/Solution/LargerHazardService.cs

@@ -132,6 +132,7 @@ namespace BLL
             Model.Comprehensive_MajorPlanApproval newMajorPlanApproval = new Model.Comprehensive_MajorPlanApproval();
             newMajorPlanApproval.MajorPlanApprovalId = largerHazard.HazardId;
             newMajorPlanApproval.PlanCode = largerHazard.HazardCode;
+            newMajorPlanApproval.PlanName = largerHazard.HazardName;
             newMajorPlanApproval.HazardType = largerHazard.HazardType;
             newMajorPlanApproval.ProjectId = largerHazard.ProjectId;
             newMajorPlanApproval.UnitWorkId = largerHazard.Address;
@@ -141,6 +142,7 @@ namespace BLL
             newMajorPlanApproval.CompileMan = largerHazard.RecardMan;
             newMajorPlanApproval.States = largerHazard.States;
             newMajorPlanApproval.TrainPersonNum = largerHazard.TrainPersonNum;
+            newMajorPlanApproval.OperativesNum = largerHazard.OperativesNum;
             newMajorPlanApproval.SchemeType = largerHazard.IsSuperLargerHazard.HasValue ? "超危大工程" : "危大工程";
             db.Comprehensive_MajorPlanApproval.InsertOnSubmit(newMajorPlanApproval);
             db.SubmitChanges();
@@ -155,6 +157,7 @@ namespace BLL
             {
                 newMajorPlanApproval.MajorPlanApprovalId = largerHazard.HazardId;
                 newMajorPlanApproval.PlanCode = largerHazard.HazardCode;
+                newMajorPlanApproval.PlanName = largerHazard.HazardName;
                 newMajorPlanApproval.HazardType = largerHazard.HazardType;
                 newMajorPlanApproval.ProjectId = largerHazard.ProjectId;
                 newMajorPlanApproval.UnitWorkId = largerHazard.Address;
@@ -163,6 +166,7 @@ namespace BLL
                 newMajorPlanApproval.ApprovalDate = largerHazard.RecordTime;
                 newMajorPlanApproval.States = largerHazard.States;
                 newMajorPlanApproval.TrainPersonNum = largerHazard.TrainPersonNum;
+                newMajorPlanApproval.OperativesNum = largerHazard.OperativesNum;
                 newMajorPlanApproval.SchemeType = largerHazard.IsSuperLargerHazard.HasValue ? "超危大工程" : "危大工程";
                 db.SubmitChanges();
             }

SGGL/BLL/IDP/IDPDataService.cs

@@ -0,0 +1,170 @@
+using Apache.NMS.ActiveMQ.Commands;
+using Microsoft.SqlServer.Dts.Runtime;
+using Model;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Org.BouncyCastle.Ocsp;
+using SgManager.AI;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace BLL
+{
+    public static class IDPDataService
+    {
+        //private static readonly string IDPApiUrl = "https://idp.cwcec.com/";
+        private static readonly string IDPApiUrl = SysConstSetService.WuHuanIDPPath;
+        ////private static readonly string publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQChnc2YD0YzJPx6QTh+/n7XzjR1ugFzrsmPolJhpCfWMKrSGbT7iX/Kgcm1AI+T95K4Jzv3KS42QTecZ1ziJ4Rr9Luzw+9ZCSjMZgrmAUbY5IeBaA6GzaSk8UWHZ4n5PL+GUGq+2f+COL7+KCS2AxEpaqDZVrJrIfg/UektdgNyzwIDAQAB";
+        private static readonly string publicKey = "<RSAKeyValue><Modulus>g1sk7Xtc1TJouHdY4+FAe5atGCu2n17NhoKVDV57pki1IL+9+S7BY4gxAjmMkUU2/cbCCdbPoUJLBrCBCjX7yI3UJW6FZwQWkn3kVoeulLEwdPCIq/GUjMXaWf3Iaaad5wBUFbfXAzv15VN6z48Nt1IY/O8YEzhIpuZdtEgDdos=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue>";
+
+        /// <summary>
+        /// 第三方加密认证接口
+        /// </summary>
+        /// 五环IDP系统SessionId有效期30分钟
+        /// <returns></returns>
+        public static SessionItem GetAuthenticationSession()
+        {
+            //// 创建RSA加密服务提供者
+            ////using (RSA rsa = RSA.Create())
+            //using (RSACryptoServiceProvider rsa = new RSACryptoServiceProvider())
+            //{
+            //// 获取公钥false表示只导出公钥
+            //string publicKey = rsa.ToXmlString(false);
+            //// 获取私钥true表示导出公钥和私钥
+            //string privateKey = rsa.ToXmlString(true);
+
+            SessionItem session = new SessionItem();
+
+            ////用户名加密
+            //string encryptedUsername = EncryptData("dataviewer", publicKey);
+            ////密码加密
+            //string encryptedPassword = EncryptData("a3365$!", publicKey);
+
+            //用户名加密后的密文
+            string encryptedUsername = "k0N0tx/hfRPY0v2lq1G8eH6hCO+UiMqlSZi1PD6bhGf4YpP/koJq5hfMsDSzdn3dZjzExrwyrjFWp/1jZLde0+gRbQ0D7tzm0R5D6AmriodD2cJvrEiwtDy7SeGNloSaNmpTEMuycpuueiOeGhMkKnTwWfRkEw73lxEpTmaahq4=";
+            //密码加密后的密文
+            string encryptedPassword = "HLLroiNJJzyTWJt9td1xgChbVzyQkoxWCGGXqdwI2cvlUF/A30FAPaInszSwEhNRQlJZZ01EODElemkgv36DMF+XGwfDi0BfIq9jKG+/+wq0TVOHNhiu2NPzpn5Ji2X3yXIXpH1zv6XEtkvx/qiLToZYfRQCufsl5vH1cZxk2fQ=";
+
+            string url = $"{IDPApiUrl}UAMS/authEncrypt";
+            string contenttype = "application/json;charset=utf-8";
+            var body = new
+            {
+                encryptedUsername = encryptedUsername,
+                encryptedPassword = encryptedPassword
+            };
+
+            string pushContent = JsonConvert.SerializeObject(body);
+            //var returndata = BLL.APIGetHttpService.OutsideHttp(url, "POST", null, null, pushContent);
+            string strJosn = APIGetHttpService.Http(url, "POST", contenttype, null, pushContent);
+            JObject obj = JObject.Parse(strJosn);
+            if (!string.IsNullOrEmpty(strJosn))
+            {
+                string value = obj["value"].ToString();
+                string name = obj["name"].ToString();
+                session.value = value;
+                session.name = name;
+            }
+            return session;
+            //}
+        }
+
+        /// <summary>
+        /// 加密字符串
+        /// </summary>
+        /// <param name="data">加密信息</param>
+        /// <param name="publicKey">公钥</param>
+        /// <returns></returns>
+        public static string EncryptData(string data, string publicKey)
+        {
+            using (RSACryptoServiceProvider rsa = new RSACryptoServiceProvider())
+            {
+                string result = string.Empty;
+                try
+                {
+                    rsa.FromXmlString(publicKey); //从字符串加载公钥
+                    byte[] dataBytes = Encoding.UTF8.GetBytes(data);
+                    byte[] encryptedBytes = rsa.Encrypt(dataBytes, false); //使用公钥加密数据，false表示使用OAEP填充方式
+                    result = Convert.ToBase64String(encryptedBytes); //返回Base64编码的加密数据
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine("Error encrypting: {0}", ex.Message);
+                }
+                return result;
+            }
+        }
+
+
+        /// <summary>
+        /// 获取工作包结构化数据
+        /// </summary>
+        public static void GetIDPProjectMasterData()
+        {
+            string projectId = string.Empty;//五环主数据项目Id
+            string wbsCode = string.Empty;//五环主数据wbs编码
+            string workitemCode = string.Empty;//五环主数据文件类别码
+
+            //https://idp.cwcec.com/OSS/projects/9100168/wbs/000000/workitems/CP2100/objects/latest
+            //string url = $"{IDPApiUrl}/OSS/projects/{projectId}/wbs/{wbsCode}/workitems/{workitemCode}/objects/latest";
+            string url = $"{IDPApiUrl}/OSS/projects/9100168/wbs/000000/workitems/CP2100/objects/latest";
+
+            try
+            {
+                var session = GetAuthenticationSession();
+
+                ErrLogInfo.WriteLog($"Session——name：{session.name}；value：{session.value}");
+                Hashtable newToken = new Hashtable { { session.name, session.value } };
+                var returndata = BLL.APIGetHttpService.OutsideHttp(url, "GET", null, newToken, null);
+
+            }
+            catch (WebException ex)
+            {
+
+            }
+            finally
+            {
+
+            }
+
+        }
+
+
+        //public static void AddPMP_Project(List<Model.PMP_Project> newtables)
+        //{
+        //    Model.SGGLDB db = Funs.DB;
+        //    db.PMP_Project.InsertAllOnSubmit(newtables);
+        //    db.SubmitChanges();
+        //}
+
+        //public static void DeleteAllPMP_Project()
+        //{
+        //    Model.SGGLDB db = Funs.DB;
+        //    if (db.PMP_Project.FirstOrDefault() != null)
+        //    {
+        //        db.PMP_Project.DeleteAllOnSubmit(db.PMP_Project);
+        //        db.SubmitChanges();
+        //    }
+        //}
+
+
+    }
+
+
+    public class SessionItem
+    {
+        /// <summary>
+        /// value
+        /// </summary>
+        public string value { get; set; }
+        /// <summary>
+        /// name
+        /// </summary>
+        public string name { get; set; }
+    }
+}

SGGL/BLL/JDGL/Check/WeekPlanService.cs

@@ -10,7 +10,7 @@ namespace BLL
     /// </summary>
     public class WeekPlanService
     {
-        public static Model.SGGLDB db = Funs.DB;
+        //public static Model.SGGLDB db = Funs.DB;
 
         /// <summary>
         /// 根据主键获取周计划情况
@@ -19,6 +19,7 @@ namespace BLL
         /// <returns></returns>
         public static Model.JDGL_WeekPlan GetWeekPlanById(string WeekPlanId)
         {
+            Model.SGGLDB db = Funs.DB;
             return db.JDGL_WeekPlan.FirstOrDefault(e => e.WeekPlanId == WeekPlanId);
         }
 
@@ -29,6 +30,7 @@ namespace BLL
         /// <returns></returns>
         public static List<Model.JDGL_WeekPlan> GetWeekPlansByWeeks(string projectId, string weekNo)
         {
+            Model.SGGLDB db = Funs.DB;
             return (from x in db.JDGL_WeekPlan where x.ProjectId == projectId && x.WeekNo == weekNo select x).ToList();
         }
 
@@ -38,6 +40,7 @@ namespace BLL
         /// <param name="WeekPlan"></param>
         public static void AddWeekPlan(Model.JDGL_WeekPlan WeekPlan)
         {
+            Model.SGGLDB db = Funs.DB;
             Model.JDGL_WeekPlan newWeekPlan = new Model.JDGL_WeekPlan
             {
                 WeekPlanId = WeekPlan.WeekPlanId,
@@ -67,6 +70,7 @@ namespace BLL
         /// <param name="WeekPlan"></param>
         public static void UpdateWeekPlan(Model.JDGL_WeekPlan WeekPlan)
         {
+            Model.SGGLDB db = Funs.DB;
             Model.JDGL_WeekPlan newWeekPlan = db.JDGL_WeekPlan.FirstOrDefault(e => e.WeekPlanId == WeekPlan.WeekPlanId);
             if (newWeekPlan != null)
             {
@@ -92,6 +96,7 @@ namespace BLL
         /// <param name="WeekPlanId"></param>
         public static void DeleteWeekPlanByWeekPlanId(string WeekPlanId)
         {
+            Model.SGGLDB db = Funs.DB;
             var q = (from x in db.JDGL_WeekPlan where x.WeekPlanId == WeekPlanId select x).FirstOrDefault();
             if (q != null)
             {
@@ -107,6 +112,7 @@ namespace BLL
         /// <returns></returns>
         public static JDGL_WeekPlan GetLastWeekPlan(string projectId)
         {
+            Model.SGGLDB db = Funs.DB;
             return (from x in db.JDGL_WeekPlan where x.ProjectId == projectId && DateTime.Now > ((DateTime)x.EndDate).AddDays(1) orderby x.EndDate select x).FirstOrDefault();
         }
 
@@ -118,6 +124,7 @@ namespace BLL
         /// <param name="weekNo"></param>
         public static void DeleteAllWeekPlan(string projectId, string weekNo)
         {
+            Model.SGGLDB db = Funs.DB;
             var q = from x in db.JDGL_WeekPlan where x.ProjectId == projectId && x.WeekNo == weekNo select x;
             if (q != null)
             {
@@ -134,6 +141,7 @@ namespace BLL
         /// <returns></returns>
         public static List<string> GetWeekPlanUnitIdListByProjectIdWeekNo(string projectId)
         {
+            Model.SGGLDB db = Funs.DB;
             var lstUnit = (from x in db.JDGL_WeekPlan where x.ProjectId == projectId orderby x.UnitId select x.UnitId).Distinct().ToList();
             return lstUnit;
         }

SGGL/BLL/PMP/PMPDataService.cs

@@ -64,7 +64,7 @@ namespace BLL
             }
             catch (Exception eee)
             {
-                ErrLogInfo.WriteLog("获取五环PMP系统Token出错1：" + eee.StackTrace + eee.Message);
+                ErrLogInfo.WriteLog("获取五环PMP系统Token出错：" + eee.StackTrace + eee.Message);
             }
             return tokenItem;
         }

SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs

@@ -14,13 +14,131 @@ using System.Net.Security;
 using System.Security.Cryptography.X509Certificates;
 using System.Threading.Tasks;
 using System.Threading;
+using Quartz.Util;
 
 
 namespace BLL
 {
     public static class GJSXMonitorService
     {
-        public static Model.SGGLDB db = Funs.DB;
+        //public static Model.SGGLDB db = Funs.DB;
+
+        /// <summary>
+        /// 关键事项通知提醒责任人
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <param name="gjsxId"></param>
+        public static void GJSXNoticeSendEmail(string userId, string gjsxId)
+        {
+            string strSql = $@"select 
+                                    DATEDIFF(DAY, CompleteDate, isnull(CloseDate,getdate())) AS DateDiffDays
+                                    ,a.GJSXID,a.ProjectId,a.Detail,a.createDate,Base_Project.ProjectName,Base_Unit.UnitName,a.CloseDate,a.IsManypeople,a.CompleteDate,a.AttachUrl
+                                    ,case a.state when 2 then '正在进行' when 3 then '待办' when 0 then '已关闭' when 1 then '开放' end as state
+                                    ,CNProfessionalName = STUFF((SELECT ',' + Base_CNProfessional.ProfessionalName FROM dbo.Base_CNProfessional where PATINDEX('%,' + RTRIM(Base_CNProfessional.CNProfessionalId) + ',%', ',' + a.CNProfessional_ID + ',') > 0 FOR XML PATH('')), 1, 1,'')
+                                    ,QuestionTypeName = STUFF((SELECT ',' + Base_QuestionType.QuestionTypeName FROM dbo.Base_QuestionType where PATINDEX('%,' + RTRIM(Base_QuestionType.QuestionTypeID) + ',%', ',' + a.QuestionTypeID + ',') > 0 FOR XML PATH('')), 1, 1,'')
+                                    ,GJSXTypeName = STUFF((SELECT ',' + Base_GJSXType.GJSXTypeName FROM dbo.Base_GJSXType where PATINDEX('%,' + RTRIM(Base_GJSXType.GJSXTypeID) + ',%', ',' + a.GJSXTypeID + ',') > 0 FOR XML PATH('')), 1, 1,'')
+                                    ,a.UserID,b.UserName 
+                                    --,b.Email as UserEmail
+                                    ,a.User_ReceiveID as User_ReceiveUserId
+                                    ,User_ReceiveUserName = STUFF((SELECT ',' + p2.UserName FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%', ',' + a.User_ReceiveID + ',') > 0 FOR XML PATH('')), 1, 1,'') 
+                                    --,User_ReceiveUserEmail = STUFF((SELECT ',' + p2.Email FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%', ',' + a.User_ReceiveID + ',') > 0 FOR XML PATH('')), 1, 1,'') 
+                                    ,a.user_Acceptance as User_AcceptanceUserId
+                                    ,User_AcceptanceUserName = STUFF((SELECT ',' + p2.UserName FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%', ',' + a.user_Acceptance + ',') > 0 FOR XML PATH('')), 1, 1,'') 
+                                    --,User_AcceptanceUserEmail = STUFF((SELECT ',' + p2.Email FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%', ',' + a.user_Acceptance + ',') > 0 FOR XML PATH('')), 1, 1,'') 
+                                    ,a.CsUsers as User_CsUserIds
+                                    ,User_CsUsers = STUFF((SELECT ',' + p2.UserName FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%', ',' + a.CsUsers + ',') > 0 FOR XML PATH('')), 1, 1,'') 
+                                    --,User_CsUsersUserEmail = STUFF((SELECT ',' + p2.Email FROM dbo.Sys_User as p2 where PATINDEX('%,' + RTRIM(p2.UserId) + ',%', ',' + a.CsUsers + ',') > 0 FOR XML PATH('')), 1, 1,'') 
+                                    from GJSX as a 
+                                    left join Sys_User as b on a.UserId = b.UserId
+                                    left join[dbo].[Base_Project] on a.ProjectId = Base_Project.ProjectId
+                                    left join[dbo].[Base_Unit] on a.UnitId = Base_Unit.UnitId
+                                where 1=1 and a.GJSXID = '{gjsxId}'  ";
+
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            SqlParameter[] parameter = listStr.ToArray();
+
+            DataTable table = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            // 使用LINQ将DataTable转换为List<GJSXItem>
+            var lstOverdue = table.AsEnumerable().Select(row => new GJSXItem
+            {
+                DateDiffDays = Convert.ToInt32(row["DateDiffDays"]),
+                GJSXID = row["GJSXID"].ToString(),
+                ProjectId = row["ProjectId"].ToString(),
+                ProjectName = row["ProjectName"].ToString(),
+                UnitName = row["UnitName"].ToString(),
+                Detail = row["Detail"].ToString(),
+                CNProfessionalName = row["CNProfessionalName"].ToString(),
+                QuestionTypeName = row["QuestionTypeName"].ToString(),
+                GJSXTypeName = row["GJSXTypeName"].ToString(),
+                UserID = row["UserID"].ToString(),
+                UserName = row["UserName"].ToString(),
+                //UserEmail = row["UserEmail"].ToString(),
+                User_ReceiveUserId = row["User_ReceiveUserId"].ToString(),
+                User_ReceiveUserName = row["User_ReceiveUserName"].ToString(),
+                //User_ReceiveUserEmail = row["User_ReceiveUserEmail"].ToString(),
+                User_AcceptanceUserId = row["User_AcceptanceUserId"].ToString(),
+                User_AcceptanceUserName = row["User_AcceptanceUserName"].ToString(),
+                //User_AcceptanceUserEmail = row["User_AcceptanceUserEmail"].ToString(),
+                User_CsUserIds = row["User_CsUserIds"].ToString(),
+                User_CsUsers = row["User_CsUsers"].ToString(),
+                //User_CsUsersUserEmail = row["User_CsUsersUserEmail"].ToString(),
+                CompleteDate = Convert.ToDateTime(row["CompleteDate"].ToString())
+            }).ToList();
+
+            var gItem = lstOverdue.FirstOrDefault();
+            var user = UserService.GetUserByUserId(userId);
+            if (gItem != null && !string.IsNullOrWhiteSpace(user.Email))
+            {
+                MailMessage mail = new MailMessage();
+                //邮件主题
+                mail.Subject = $"你有新的关键事项了——{gItem.ProjectName}";
+                mail.To.Add(user.Email);
+                //mail.To.Add("test@test.com");
+                mail.IsBodyHtml = true;//确保邮件正文被当作HTML解析
+                //邮件正文
+                string bodyStr = $@"<html>
+<head>
+<style>
+
+</style>
+</head>
+<body>
+<h2>新的关键事项信息</h2>
+<p>项目名称：{gItem.ProjectName}</p>
+<p>事项编号：{gItem.GJSXID}</p>
+<p>责任单位：{gItem.UnitName}</p>
+<p>专业：{gItem.CNProfessionalName}</p>
+<p>事项类别：{gItem.GJSXTypeName}</p>
+<p>紧急程度：{gItem.QuestionTypeName}</p>
+<p>事项描述：{gItem.Detail}</p>
+<p>提出人：{gItem.UserName}</p>
+<p>责任人：{gItem.User_AcceptanceUserName}</p>
+<p>跟踪人：{gItem.User_ReceiveUserName}</p>
+<p>抄送人：{gItem.User_CsUsers}</p>
+<p>约定完成日期：{gItem.CompleteDate.ToShortDateString()}</p>
+
+<h2>智慧施工管理信息系统</h2>
+<a href='https://zhgd.cwcec.com/'>请点击此处，进入智慧施工管理信息系统，查看事项详情</a>
+<p>登录账号：{user.Account}</p>
+<p>登录密码：CWCEC.+身份证号后四位（示例：CWCEC.1234）</p>
+
+</body>
+</html>";
+//< p > 登录密码：{ user.RawPassword}</ p >
+                mail.Body = bodyStr;
+
+                try
+                {
+                    bool send = PushEmail(mail);
+                }
+                catch (Exception ex)
+                {
+                    ErrLogInfo.WriteLog($"关键事项通知提醒责任人；项目名称：{gItem.ProjectName}，事项编号：{gItem.GJSXID}", ex);
+                }
+            }
+        }
+
 
         /// <summary>
         /// 关键事项超期预警定时提醒发送邮箱
@@ -179,7 +297,7 @@ namespace BLL
         <th>序号</th>
         <th>类型</th>
         <th>责任单位</th>
-        <th>事项ID</th>
+        <th>事项编号</th>
         <th>事项描述</th>
         <th>事项类别</th>
         <th>发起人</th>
@@ -245,7 +363,7 @@ namespace BLL
                 }
                 catch (Exception ex)
                 {
-                    ErrLogInfo.WriteLog("关键事项发送邮件预警", ex);
+                    ErrLogInfo.WriteLog(mail.Subject, ex);
                     return false;
                     //Console.WriteLine("Email sending failed: " + ex.Message);
                 }

SGGL/BLL/SysManage/SysConstSetService.cs

@@ -172,7 +172,40 @@
         }
 
 
+        #region 五环IDP
 
+        private static string _WuHuanIDPPath;
+        //private static string _IDPToken;
+        //private static string _IDPTokenExTime;
+
+        public static string WuHuanIDPPath
+        {
+            get
+            {
+                var sysSet5 = (from x in Funs.DB.Sys_Set where x.SetName == "IDP接口地址" select x).ToList().FirstOrDefault();
+                if (sysSet5 != null)
+                {
+                    _WuHuanIDPPath = sysSet5.SetValue;
+                }
+                else
+                {
+                    _WuHuanIDPPath = "";
+                }
+                return _WuHuanIDPPath;
+            }
+            set
+            {
+                _WuHuanIDPPath = value;
+            }
+        }
+        #endregion
+
+        #region 五环PMP
+
+
+        private static string _WuHuanPMPPath;
+        private static string _PMPToken;
+        private static string _PMPTokenExTime;
 
         public static string WuHuanPMPPath
         {
@@ -181,17 +214,17 @@
                 var sysSet5 = (from x in Funs.DB.Sys_Set where x.SetName == "PMP接口地址" select x).ToList().FirstOrDefault();
                 if (sysSet5 != null)
                 {
-                    _CNCECPath = sysSet5.SetValue;
+                    _WuHuanPMPPath = sysSet5.SetValue;
                 }
                 else
                 {
-                    _CNCECPath = "";
+                    _WuHuanPMPPath = "";
                 }
-                return _CNCECPath;
+                return _WuHuanPMPPath;
             }
             set
             {
-                _CNCECPath = value;
+                _WuHuanPMPPath = value;
             }
         }
         public static string WuHuanPMPToken
@@ -201,13 +234,13 @@
                 var sysSet5 = (from x in Funs.DB.Sys_Set where x.SetName == "PMPToken" select x).ToList().FirstOrDefault();
                 if (sysSet5 != null)
                 {
-                    _CNCECToken = sysSet5.SetValue;
+                    _PMPToken = sysSet5.SetValue;
                 }
                 else
                 {
-                    _CNCECToken = "";
+                    _PMPToken = "";
                 }
-                return _CNCECToken;
+                return _PMPToken;
             }
         }
         public static string WuHuanPMPTokenExTime
@@ -217,13 +250,13 @@
                 var sysSet5 = (from x in Funs.DB.Sys_Set where x.SetName == "PMPTokenExTime" select x).ToList().FirstOrDefault();
                 if (sysSet5 != null)
                 {
-                    _CNCECTokenExTime = sysSet5.SetValue;
+                    _PMPTokenExTime = sysSet5.SetValue;
                 }
                 else
                 {
-                    _CNCECTokenExTime = "";
+                    _PMPTokenExTime = "";
                 }
-                return _CNCECTokenExTime;
+                return _PMPTokenExTime;
             }
         }
         public static void SetWuHuanPMPToken(string token)
@@ -291,6 +324,7 @@
             }
         }
 
+        #endregion
 
 
 

SGGL/BLL/SysManage/UserService.cs

@@ -374,6 +374,37 @@ namespace BLL
             }
         }
 
+        /// <summary>
+        /// 根据用户Id判断用户是否有维护邮箱
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public static bool IsUserHaveEmail(string userId)
+        {
+            bool result = false;
+            if (!string.IsNullOrWhiteSpace(userId))
+            {
+                var userEmail = (from x in Funs.DB.Sys_User where x.UserId == userId select x.Email).FirstOrDefault();
+                result = !string.IsNullOrWhiteSpace(userEmail);
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 根据用户Id获取用户邮箱
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public static string GetUserEmailByUserId(string userId)
+        {
+            string result = string.Empty;
+            Model.Sys_User user = Funs.DB.Sys_User.FirstOrDefault(e => e.UserId == userId);
+            if (user != null)
+            {
+                result = user.Email;
+            }
+            return result;
+        }
         /// <summary>
         /// 获取有邮箱的用户
         /// </summary>

SGGL/BLL/WebService/CNCECHSSEWebService.cs

@@ -3274,6 +3274,7 @@
                                     RectifyName = item.RectifyName,
                                     SupRectifyId = item.SupRectifyId,
                                     IsEndLever = item.IsEndLever,
+                                    RectifyType = "0",//安全
                                     IsBuild = true
                                 };
                                 newLists.Add(newList);
@@ -3354,6 +3355,9 @@
                                        Quarter = x.Quarter,
                                        YearId = x.YearId,
                                        CompileMan = x.CompileMan,
+                                       KeyWorkNum = x.KeyWorkNum,
+                                       KeyWorkOKNum = x.KeyWorkOKNum,
+                                       KeyWorkOKRate = x.KeyWorkOKRate,
                                    };
 
                     var upReportItem = from x in db.Information_ActionWorkLedgerItem
@@ -3406,6 +3410,7 @@
                 return code;
             }
         }
+
         /// <summary>
         /// DrillConductedQuarterlyReportApi调用
         /// </summary>

SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs

@@ -688,7 +688,7 @@ namespace BLL
                 EquipmentInspectionNum = inspectionEquipmentList.Count(),
                 EquipmentInspectionQualifiedNum = inspectionEquipmentList.Where(x => x.SamplingResult == "1").Count(),
                 PersonInspectionNum = inspectionPersonList.Count(),
-                PersonInspectionQualifiedNum = inspectionPersonList.Where(x => x.IsOnSite.HasValue && x.IsOnSite == true).Count(),
+                PersonInspectionQualifiedNum = inspectionPersonList.Where(x => x.ValidityDate == null || (x.ValidityDate.HasValue && x.ValidityDate >= DateTime.Now)).Count(),
                 MachineInspectionNum = inspectionMachineList.Count(),
                 MachineInspectionQualifiedNum = inspectionMachineList.Where(x => x.IsCheckOK.HasValue && x.IsCheckOK == true).Count(),
                 InspectionMachineNum = inspectionMachineEquipmentList.Count(),
@@ -761,7 +761,7 @@ namespace BLL
                     EquipmentInspectionNum = inspectionEquipmentList.Count(x => x.ProjectId == projectid),
                     EquipmentInspectionQualifiedNum = inspectionEquipmentList.Where(x => x.SamplingResult == "1" && x.ProjectId == projectid).Count(),
                     PersonInspectionNum = inspectionPersonList.Count(x => x.ProjectId == projectid),
-                    PersonInspectionQualifiedNum = inspectionPersonList.Where(x => x.IsOnSite.HasValue && x.IsOnSite == true && x.ProjectId == projectid).Count(),
+                    PersonInspectionQualifiedNum = inspectionPersonList.Where(x => (x.ValidityDate == null || (x.ValidityDate.HasValue && x.ValidityDate >= DateTime.Now)) && x.ProjectId == projectid).Count(),
                     MachineInspectionNum = inspectionMachineList.Count(x => x.ProjectId == projectid),
                     MachineInspectionQualifiedNum = inspectionMachineList.Where(x => x.IsCheckOK.HasValue && x.IsCheckOK == true && x.ProjectId == projectid).Count(),
                     MaterialInspectionNum = inspectionEquipmentList.Count(x => x.ProjectId == projectid),
@@ -1167,13 +1167,13 @@ namespace BLL
         }
 
         /// <summary>
-        /// 获取人员报验
+        /// 获取人员报验（总数取在场人员）
         /// </summary>
         /// <returns></returns>
         public static List<Model.Comprehensive_InspectionPerson> GetComprehensive_InspectionPerson()
         {
             var result = (from x in Funs.DB.Comprehensive_InspectionPerson
-                          where BeUnderConstructionList.Contains(x.ProjectId) && x.CompileDate > Const.DtmarkTime
+                          where BeUnderConstructionList.Contains(x.ProjectId) && x.IsOnSite.HasValue && x.IsOnSite == true && x.CompileDate > Const.DtmarkTime
                           select x).ToList();
             return result;
         }

SGGL/BLL/ZHGL/DataSync/HJGLData_HJGLService.cs

@@ -1,6 +1,9 @@
-using FineUIPro;
+using Aspose.Words.Lists;
+using EmitMapper;
+using FineUIPro;
 using Model;
 using Newtonsoft.Json;
+using NPOI.SS.Formula.Functions;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -249,6 +252,67 @@ namespace BLL
             return responeData;
         }
 
+
+        public static HJGLData StatisticalData()
+        {
+            var data = new HJGLData();
+            var thisUnitId = string.Empty;
+            var thisUnit = CommonService.GetIsThisUnit();
+            if (thisUnit != null) thisUnitId = thisUnit.UnitId;
+            var baseUnit = UnitService.GetUnitByUnitId(thisUnitId);
+            var ProjectData = (from x in Funs.DB.Project_HJGLData_HJGL
+                               where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date
+                               select x).ToList();
+            Project_HJGLData_HJGLService.StatisticalAllProjectData();
+            Project_HJGLData_DefectService.StatisticalAllProjectData();
+
+            var table = new HJGLData_HJGL
+            {
+                UnitId = thisUnitId,
+                CollCropCode = baseUnit.CollCropCode,
+                UnitName = baseUnit.UnitName,
+                ReportDate = DateTime.Now.Date,
+                WelderNum = ProjectData.Sum(x => x.WelderNum),
+                TotalDineNum = ProjectData.Sum(x => x.TotalDineNum),
+                CompleteDineNum = ProjectData.Sum(x => x.CompleteDineNum),
+                TotalFilmNum = ProjectData.Sum(x => x.TotalFilmNum),
+                OKFilmNum = ProjectData.Sum(x => x.OKFilmNum),
+                CreateMan = Const.sysglyId,
+                CreateDate = DateTime.Now
+            };
+            if (IsReportByToday())
+            {
+                table.Id = GetTodayData().Id;
+                table.State = Const.CNCEC_State_1;
+                UpdateHJGLData_HJGL(table);
+            }
+            else
+            {
+                table.Id = SQLHelper.GetNewID();
+                table.State = Const.CNCEC_State_0;
+
+                AddHJGLData_HJGL(table);
+            }
+
+            var item = new HJGLDataItem();
+            item.CollCropCode = table.CollCropCode;
+            item.CompleteDineNum = table.CompleteDineNum;
+            item.Id = table.Id;
+            item.OKFilmNum = table.OKFilmNum;
+            item.ReportDate = table.ReportDate.Value.ToShortDateString();
+            item.TotalDineNum = table.TotalDineNum;
+            item.TotalFilmNum = table.TotalFilmNum;
+            item.UnitId = table.UnitId;
+            item.WelderNum = table.WelderNum;
+            item.HJGLDataDefectItems = Project_HJGLData_DefectService.getTodayProject_HJGLData_Defect();
+            var hJGLDataItems = new List<HJGLDataItem>();
+            hJGLDataItems.Add(item);
+
+            data.HJGLDataItems = hJGLDataItems;
+            return data;
+        }
+
+
         public static async Task<HJGLData> StatisticalDataAsync()
         {
             var data = new HJGLData();
@@ -256,8 +320,10 @@ namespace BLL
             var thisUnit = CommonService.GetIsThisUnit();
             if (thisUnit != null) thisUnitId = thisUnit.UnitId;
             var baseUnit = UnitService.GetUnitByUnitId(thisUnitId);
+
             Project_HJGLData_DefectService.StatisticalAllProjectData();
-            // 并行执行异步方法
+
+            //// 并行执行异步方法
             var welderNumTask = HJGLData_HJGLService.GetWelderNumAsync(); //获取焊工总数
             var dineInfoListTask = HJGLData_HJGLService.GetDineInfoAsync(); //获达因数信息
             var chCheckItemListTask = HJGLData_HJGLService.GetCHCheckItemAsync(); //获取焊接检查信息
@@ -289,7 +355,6 @@ namespace BLL
                 CreateMan = Const.sysglyId,
                 CreateDate = DateTime.Now
             };
-
             Project_HJGLData_HJGLService.DeleteProject_HJGLData_HJGLByDate(DateTime.Now.Date);
             // 预先对 dineInfoList 和 chCheckItemList 按 ProjectId 进行分组
             var dineInfoDict = dineInfoList
@@ -344,6 +409,154 @@ namespace BLL
             }
 
 
+            if (IsReportByToday())
+            {
+                table.Id = GetTodayData().Id;
+                table.State = Const.CNCEC_State_1;
+                UpdateHJGLData_HJGL(table);
+            }
+            else
+            {
+                table.Id = SQLHelper.GetNewID();
+                table.State = Const.CNCEC_State_0;
+
+                AddHJGLData_HJGL(table);
+            }
+            var mapper = ObjectMapperManager.DefaultInstance.GetMapper<HJGLData_HJGL, HJGLDataItem>();
+            var item = mapper.Map(table);
+            // 手动处理特殊字段
+            item.ReportDate = table.ReportDate.Value.ToShortDateString();
+            item.HJGLDataDefectItems = Project_HJGLData_DefectService.getTodayProject_HJGLData_Defect();
+            var hJGLDataItems = new List<HJGLDataItem>();
+            hJGLDataItems.Add(item);
+
+            data.HJGLDataItems = hJGLDataItems;
+            return data;
+
+            //var item = new HJGLDataItem();
+            //item.CollCropCode = table.CollCropCode;
+            //item.CompleteDineNum = table.CompleteDineNum;
+            //item.Id = table.Id;
+            //item.OKFilmNum = table.OKFilmNum;
+            //item.ReportDate = table.ReportDate.Value.ToShortDateString();
+            //item.TotalDineNum = table.TotalDineNum;
+            //item.TotalFilmNum = table.TotalFilmNum;
+            //item.UnitId = table.UnitId;
+            //item.WelderNum = table.WelderNum;
+            //item.HJGLDataDefectItems = Project_HJGLData_DefectService.getTodayProject_HJGLData_Defect();
+            //var hJGLDataItems = new List<HJGLDataItem>();
+            //hJGLDataItems.Add(item);
+
+            //data.HJGLDataItems = hJGLDataItems;
+            //return data;
+        }
+
+        public static async Task<HJGLData> StatisticalDataAsyncold()
+        {
+            var data = new HJGLData();
+            var thisUnitId = string.Empty;
+            var thisUnit = CommonService.GetIsThisUnit();
+            if (thisUnit != null) thisUnitId = thisUnit.UnitId;
+            var baseUnit = UnitService.GetUnitByUnitId(thisUnitId);
+
+            Project_HJGLData_HJGLService.StatisticalAllProjectData();
+            Project_HJGLData_DefectService.StatisticalAllProjectData();
+            // 并行执行异步方法
+            var projectHJGLDataListTask = HJGLData_HJGLService.GetProjectHJGLDataAsync(); //获取焊接检查信息
+
+            //// 并行执行异步方法
+            //var welderNumTask = HJGLData_HJGLService.GetWelderNumAsync(); //获取焊工总数
+            //var dineInfoListTask = HJGLData_HJGLService.GetDineInfoAsync(); //获达因数信息
+            var chCheckItemListTask = HJGLData_HJGLService.GetCHCheckItemAsync(); //获取焊接检查信息
+
+            // 等待所有异步方法执行完成
+            await Task.WhenAll(
+                projectHJGLDataListTask,
+                //welderNumTask,
+                //dineInfoListTask,
+                chCheckItemListTask
+            );
+
+            // 统一获取异步方法的返回值
+            var projectHJGLDataList = await projectHJGLDataListTask;
+            //var welderNum = await welderNumTask;
+            //var dineInfoList = await dineInfoListTask;
+            var chCheckItemList = await chCheckItemListTask;
+
+
+            var table = new HJGLData_HJGL
+            {
+                UnitId = thisUnitId,
+                CollCropCode = baseUnit.CollCropCode,
+                UnitName = baseUnit.UnitName,
+                ReportDate = DateTime.Now.Date,
+                WelderNum = projectHJGLDataList.Sum(x => x.WelderNum),
+                TotalDineNum = projectHJGLDataList.Sum(x => x.TotalDineNum),
+                CompleteDineNum = projectHJGLDataList.Sum(x => x.CompleteDineNum),
+                //TotalFilmNum = projectHJGLDataList.Sum(x => x.TotalFilmNum),
+                //OKFilmNum = projectHJGLDataList.Sum(x => x.OKFilmNum),
+                //WelderNum = welderNum.Count(),
+                //TotalDineNum = Convert.ToInt32(dineInfoList.Sum(x => x.Size)),
+                //CompleteDineNum = Convert.ToInt32(dineInfoList.Sum(x => x.DoneDin)),
+                TotalFilmNum = Convert.ToInt32(chCheckItemList.Sum(x => x.CHT_TotalFilm)),
+                OKFilmNum = Convert.ToInt32(chCheckItemList.Sum(x => x.CHT_PassFilm)),
+                CreateMan = Const.sysglyId,
+                CreateDate = DateTime.Now
+            };
+            //Project_HJGLData_HJGLService.DeleteProject_HJGLData_HJGLByDate(DateTime.Now.Date);
+            //// 预先对 dineInfoList 和 chCheckItemList 按 ProjectId 进行分组
+            //var dineInfoDict = dineInfoList
+            //    .Where(x => BeUnderConstructionList.Contains(x.ProjectId))
+            //    .GroupBy(x => x.ProjectId)
+            //    .ToDictionary(g => g.Key, g => new
+            //    {
+            //        TotalDineNum = g.Sum(x => x.Size),
+            //        CompleteDineNum = g.Sum(x => x.DoneDin)
+            //    });
+
+            //var chCheckItemDict = chCheckItemList
+            //    .Where(x => BeUnderConstructionList.Contains(x.ProjectId))
+            //    .GroupBy(x => x.ProjectId)
+            //    .ToDictionary(g => g.Key, g => new
+            //    {
+            //        TotalFilmNum = g.Sum(x => x.CHT_TotalFilm),
+            //        OKFilmNum = g.Sum(x => x.CHT_PassFilm)
+            //    });
+
+            //foreach (var projectid in BeUnderConstructionList)
+            //{
+            //    // 获取焊工数量
+            //    int welderCount = welderNum.Count(x => x.ProjectId == projectid);
+
+            //    // 获取达因信息
+            //    var dineInfo = dineInfoDict.TryGetValue(projectid, out var dineData)
+            //        ? dineData
+            //        : new { TotalDineNum = (double?)0, CompleteDineNum = (double?)0 };
+
+            //    // 获取拍片信息
+            //    var chCheckItem = chCheckItemDict.TryGetValue(projectid, out var checkData)
+            //        ? checkData
+            //        : new { TotalFilmNum = (int?)0, OKFilmNum = (int?)0 };
+
+            //    var projectCqmsData = new Project_HJGLData_HJGL()
+            //    {
+            //        Id = SQLHelper.GetNewID(),
+            //        ProjectId = projectid,
+            //        UnitId = thisUnitId,
+            //        CollCropCode = baseUnit.CollCropCode,
+            //        UnitName = baseUnit.UnitName,
+            //        ReportDate = DateTime.Now.Date,
+            //        WelderNum = welderCount,
+            //        TotalDineNum = Convert.ToInt32(dineInfo.TotalDineNum),
+            //        CompleteDineNum = Convert.ToInt32(dineInfo.CompleteDineNum),
+            //        TotalFilmNum = chCheckItem.TotalFilmNum,
+            //        OKFilmNum = chCheckItem.OKFilmNum,
+            //    };
+
+            //    Project_HJGLData_HJGLService.AddProject_HJGLData_HJGL(projectCqmsData);
+            //}
+
+
             if (IsReportByToday())
             {
                 table.Id = GetTodayData().Id;
@@ -416,9 +629,13 @@ namespace BLL
                               ProjectId = x.ProjectId,
                               UnitId = x.WED_Unit,
                               WEDCode = x.WED_Code,
+                              WEDWorkCode = x.WED_WorkCode,
                               WEDName = x.WED_Name
                               //UnitName = UnitService.getUnitNamesUnitIds(x.UnitIds),
-                          }).ToList();
+                          })
+                          .GroupBy(p => p.WEDWorkCode)
+                         .Select(g => g.First())
+                         .ToList();
             return result;
         }
         /// <summary>
@@ -434,42 +651,106 @@ namespace BLL
         /// 获取总达因数和完成达因数
         /// </summary>
         /// <returns></returns>
-        public static IEnumerable<WeldDineOutput> GetDineInfo()
+        public static List<WeldDineOutput> GetDineInfo()
         {
-            var result = (from x in Funs.DB.HJGL_FL_TotalQuantity
-                          where BeUnderConstructionList.Contains(x.ProjectId)
-                          group x by x.ProjectId into g
-                          select new Model.WeldDineOutput()
-                          {
-                              ProjectId = g.Key,
-                              Size = g.Sum(x => Convert.ToDouble(x.TotalWeldQuantity)),
-                              DoneDin = g.Sum(x => Convert.ToDouble(x.TotalCompleted))
-                          });
+            var result = new List<WeldDineOutput>();
+            var getD1 = from x in Funs.DB.HJGL_FL_TotalQuantity
+                        where BeUnderConstructionList.Contains(x.ProjectId)
+                        select x;
+            var projectIds = getD1.Select(x => x.ProjectId).Distinct();
+            foreach (var pro in projectIds)
+            {
+                double pTotalWeldQuantity = 0;
+                double pTotalCompleted = 0;
+                var proD1 = getD1.Where(x => x.ProjectId == pro);
+                foreach (var item in getD1)
+                {
+                    var dAll = !string.IsNullOrWhiteSpace(item.TotalWeldQuantity) ? Convert.ToDouble(item.TotalWeldQuantity) : 0;
+                    var dCompleted = !string.IsNullOrWhiteSpace(item.TotalCompleted) ? Convert.ToDouble(item.TotalCompleted) : 0;
+                    pTotalWeldQuantity += dAll;
+                    pTotalCompleted += dCompleted;
+                }
+                result.Add(new WeldDineOutput
+                {
+                    ProjectId = pro,
+                    Size = pTotalWeldQuantity,
+                    DoneDin = pTotalCompleted
+                });
+            }
+
+            var differenceProjectIds = BeUnderConstructionList.Except(projectIds).ToList();
+            foreach (var pro in differenceProjectIds)
+            {
+                double pTotalWeldQuantity = 0;
+                double pTotalCompleted = 0;
+
+                var getD2 = (from x in Funs.DB.HJGL_FL_Data
+                             where x.ProjectId == pro
+                             orderby x.CompileDate descending
+                             select x).FirstOrDefault();
+                if (getD2 != null)
+                {
+                    pTotalWeldQuantity = !string.IsNullOrWhiteSpace(getD2.TotalWeldQuantity) ? Convert.ToDouble(getD2.TotalWeldQuantity) : 0;
+                    pTotalCompleted = !string.IsNullOrWhiteSpace(getD2.TotalCompleted) ? Convert.ToDouble(getD2.TotalCompleted) : 0;
+                }
+
+                result.Add(new WeldDineOutput
+                {
+                    ProjectId = pro,
+                    Size = pTotalWeldQuantity,
+                    DoneDin = pTotalCompleted
+                });
+            }
+
             return result;
         }
-        public static async Task<IEnumerable<WeldDineOutput>> GetDineInfoAsync()
+
+        /// <summary>
+        /// 获取总达因数和完成达因数
+        /// </summary>
+        /// <returns></returns>
+        public static async Task<List<WeldDineOutput>> GetDineInfoAsync()
         {
             return await Task.Run(GetDineInfo);
         }
+
         /// <summary>
         /// 获取焊接检查信息
         /// </summary>
         /// <returns></returns>
         public static List<CHCheckItemOutput> GetCHCheckItem()
         {
-            var result = (from x in Funs.DB.CH_CheckItem
-                          join y in Funs.DB.CH_Check on x.CHT_CheckID equals y.CHT_CheckID
-                          where BeUnderConstructionList.Contains(y.ProjectId)
-                          select new Model.CHCheckItemOutput()
-                          {
-                              Id = x.CHT_CheckItemID,
-                              ProjectId = y.ProjectId,
-                              UnitId = y.UnitId,
-                              CHT_TotalFilm = x.CHT_TotalFilm,
-                              CHT_PassFilm = x.CHT_PassFilm
-                              //UnitName = UnitService.getUnitNamesUnitIds(x.UnitIds),
-                          }).ToList();
-            return result;
+            List<CHCheckItemOutput> list = new List<CHCheckItemOutput>();
+            var ndtLists = (from x in Funs.DB.ProcessControl_NondestructiveTest_New where BeUnderConstructionList.Contains(x.ProjectId) select x).ToList();
+
+            if (ndtLists.Count() > 0)
+            {
+                //取每个项目、单位、专业最新的一条数据
+                var datalist = ndtLists.GroupBy(r => new { r.ProjectId, r.UnitId, r.ProfessionalName }).Select(g => g.OrderByDescending(r => r.CreateDate).First()).ToList();
+                foreach (var project in BeUnderConstructionList)
+                {
+                    decimal a = 0, b = 0;
+                    var projectDataList = datalist.Where(x => x.ProjectId == project);
+                    foreach (var item in projectDataList)
+                    {
+                        if (item.TotalQuantity.HasValue)
+                        {
+                            a += Math.Floor(item.TotalQuantity.Value * Funs.GetNewDecimalOrZero(item.TotalRate) / 100);
+                            b += item.TotalQuantity.Value;
+                        }
+                    }
+                    list.Add(new CHCheckItemOutput
+                    {
+                        Id = project,
+                        ProjectId = project,
+                        //UnitId = y.UnitId,
+                        CHT_TotalFilm = (int)Math.Round(b),
+                        CHT_PassFilm = (int)Math.Round(a)
+                    });
+                }
+            }
+
+            return list;
         }
         /// <summary>
         /// 获取焊接检查信息(异步)
@@ -479,5 +760,25 @@ namespace BLL
         {
             return await Task.Run(GetCHCheckItem);
         }
+
+        /// <summary>
+        /// 获取项目焊接信息
+        /// </summary>
+        /// <returns></returns>
+        public static List<Project_HJGLData_HJGL> GetProjectHJGLData()
+        {
+            var result = (from x in Funs.DB.Project_HJGLData_HJGL
+                          where BeUnderConstructionList.Contains(x.ProjectId) && x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date
+                          select x).ToList();
+            return result;
+        }
+        /// <summary>
+        /// 获取项目焊接信息(异步)
+        /// </summary>
+        /// <returns></returns>
+        public static async Task<List<Project_HJGLData_HJGL>> GetProjectHJGLDataAsync()
+        {
+            return await Task.Run(GetProjectHJGLData);
+        }
     }
 }

SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs

@@ -544,116 +544,6 @@ namespace BLL
             return result;
         }
 
-        public static HSSEData StatisticalData()
-        {
-            var thisUnitId = string.Empty;
-            var thisUnit = CommonService.GetIsThisUnit();
-            if (thisUnit != null) thisUnitId = thisUnit.UnitId;
-            var baseUnit = UnitService.GetUnitByUnitId(thisUnitId);
-            Project_HSSEData_HiddenDangerDetailService.StatisticalAllProjectData();
-
-            var totalEnergyConsumption = ChemicalReportItemService.GetLatstTimeTotalEnergyConsumption();
-            var incomeComprehensiveEnergyConsumption =
-                ChemicalReportItemService.GetLatstTimeIncomeComprehensiveEnergyConsumption();
-            var newWaterConsumption = ChemicalReportItemService.GetLatstTimeNewWaterConsumption();
-
-            var table = new HSSEData_HSSE
-            {
-                UnitId = thisUnitId,
-                CollCropCode = baseUnit.CollCropCode,
-                UnitName = baseUnit.UnitName,
-                ReportDate = DateTime.Now.Date,
-                BeUnderConstructionNum = GetBeUnderConstruction().Count,
-                ShutdownNum = GetShutdown().Count,
-                JoinConstructionPersonNum = GetJoinConstructionPerson().Count,
-                MajorProjectsUnderConstructionNum = GetMajorProjectsUnderConstruction().Count,
-                TotalWorkingHour = GetTotalWorkingHour(),
-                LostWorkingHour = GetLostWorkingHour(),
-                SafeWorkingHour = GetSafeWorkingHour(),
-                SafeTrainNum = GetSafeTrain().Sum(x => x.TrainPersonNum) + GetBoShengSafeTrain().Sum(x => x.TrainPersonNum),
-                SpecialTrainNum = GetSpecialTrain().Sum(x => x.TrainPersonNum),
-                SpecialOperationTrainNum = GetSpecialOperationTrain().Sum(x => x.TrainPersonNum),
-                EnvironmentalTrainNum = 0,
-                TotalEnergyConsumption = totalEnergyConsumption,
-                IncomeComprehensiveEnergyConsumption = incomeComprehensiveEnergyConsumption,
-                NewWaterConsumption = newWaterConsumption,
-                HeadOfficeInspectorGeneralNum = GetHeadOfficeInspectorGeneral().Count,
-                HeadOfficeFullTimeNum = GetHeadOfficeFullTime().Count,
-                BranchInspectorGeneralNum = GetBranchInspectorGeneral().Count,
-                BranchFullTimeNum = GetBranchFullTime().Count,
-                ProjectInspectorGeneralNum = GetProjectInspectorGeneral().Count,
-                ProjectFullTimeNum = GetProjectFullTime().Count,
-                ProjectSafetyMonitorNum = GetProjectSafetyMonitor().Count,
-                SafetyInjectionEngineer = GetSafetyInjectionEngineer().Count,
-                CertificateANum = GetCertificateA().Count,
-                CertificateBNum = GetCertificateB().Count,
-                CertificateCNum = GetCertificateC().Count,
-                SafetyCommitteeMeetingNum = GetSafetyCommitteeMeeting().Count,
-                EnterpriseTopicsMeetingNum = GetEnterpriseTopicsMeeting().Count,
-                ProjectSafetyLeadingGroupMeetingNum = GetProjectSafetyLeadingGroupMeeting().Count,
-                ProjectSafetyMeetingNum = GetProjectSafetyMeeting().Count,
-                CompanyLeadShiftCheckNum = GetCompanyLeadShiftCheck().Count,
-                CompanyComprehensiveCheckNum = GetCompanyComprehensiveCheck().Count,
-                CompanySpecialCheckNum = GetCompanySpecialCheck().Count,
-                ProjectLeadShiftCheckNum = GetProjectLeadShiftCheck().Count,
-                ProjectSpecialCheckNum = GetProjectSpecialCheck().Count,
-                ProjectMajorCheckNum = GetProjectMajorCheck().Count,
-                NearMissNum = GetNearMiss().Count,
-                RecordableEventNum = GetRecordableEvent().Count,
-                GeneralAccidentNum = GetGeneralAccident().Count,
-                MajorAccidentNum = GetMajorAccident().Count,
-                SeriousAccidentNum = GetSeriousAccident().Count,
-                SpecialSeriousAccidentNum = GetSpecialSeriousAccident().Count,
-                CompanyComprehensivePlanNum = GetCompanyComprehensivePlan().Count,
-                CompanySpecialPlanNum = GetCompanySpecialPlan().Count,
-                CompanyOnSiteDisposalPlan = GetCompanyOnSiteDisposalPlan().Count,
-                CompanyDrillNum = GetCompanyDrill().Count,
-                ProjectComprehensivePlanNum = GetProjectComprehensivePlan().Count,
-                ProjectSpecialPlanNum = GetProjectSpecialPlan().Count,
-                ProjectOnSiteDisposalPlan = GetProjectOnSiteDisposalPlan().Count,
-                ProjectDrillNum = GetProjectDrill().Count,
-                CostExtract = Convert.ToInt32(GetCostExtract().Sum(x => x.SUMCost)),
-                CostUse = Convert.ToInt32(GetCostUse().Sum(x => x.SUMCost)),
-                UseEquipmentNum = GetUseEquipment().Count,
-                SpecialEquipmentNum = GetSpecialEquipment().Count,
-                LicensesNum = GetLicenses().Count,
-                LicensesCloseNum = GetLicensesClose().Count,
-                GeneralClosedNum = GetGeneralHiddenRectificationOutputs().Sum(x => x.RecNum),
-                GeneralNotClosedNum = GetGeneralHiddenRectificationOutputs().Sum(x => x.NoRecNum),
-                MajorClosedNum = GetMajorHiddenRectificationOutputs().Sum(x => x.RecNum),
-                MajorNotClosedNum = GetMajorHiddenRectificationOutputs().Sum(x => x.NoRecNum),
-                GeneralRiskNum = GetSecurityRiskOutputs().Sum(x => x.GeneralRiskNum),
-                LowRiskNum = GetSecurityRiskOutputs().Sum(x => x.LowRiskNum),
-                MediumRiskNum = GetSecurityRiskOutputs().Sum(x => x.MediumRiskNum),
-                HighRiskNum = GetSecurityRiskOutputs().Sum(x => x.HighRiskNum),
-                CompletedNum = GetLargeEngineeringOutputs().Sum(x => x.CompletedNum),
-                TrainPersonNum = GetLargeEngineeringOutputs().Sum(x => x.TrainPersonNum),
-                ConstructionNum = GetLargeEngineeringOutputs().Sum(x => x.ConstructionNum),
-                FinishedNum = GetLargeEngineeringOutputs().Sum(x => x.FinishedNum),
-                SuperCompletedNum = GetLargeEngineeringOutputs().Sum(x => x.SuperCompletedNum),
-                SuperTrainPersonNum = GetLargeEngineeringOutputs().Sum(x => x.SuperTrainPersonNum),
-                SuperConstructionNum = GetLargeEngineeringOutputs().Sum(x => x.SuperConstructionNum),
-                SuperFinishedNum = GetLargeEngineeringOutputs().Sum(x => x.SuperFinishedNum),
-                CreateMan = Const.sysglyId,
-                CreateDate = DateTime.Now
-            };
-            if (IsReportByToday())
-            {
-                table.Id = GetTodayData().Id;
-                table.State = Const.CNCEC_State_1;
-                UpdateHSSEData_HSSE(table);
-            }
-            else
-            {
-                table.Id = SQLHelper.GetNewID();
-                table.State = Const.CNCEC_State_0;
-                AddHSSEData_HSSE(table);
-            }
-
-            var data = GetItemByHSSEData_HSSE(table, Project_HSSEData_HiddenDangerDetailService.GetTodayModel());
-            return data;
-        }
-
         /// <summary>
         /// 统计数据(异步)
         /// </summary>
@@ -687,6 +577,7 @@ namespace BLL
             var lostWorkingHourTask = HSSEData_HSSEService.GetLostWorkingHourAsync();
             var safeWorkingHourTask = HSSEData_HSSEService.GetSafeWorkingHourAsync();
             var safeTrainTask = HSSEData_HSSEService.GetSafeTrainAsync();
+            var safeTrainBoShengTask = HSSEData_HSSEService.GetBoShengSafeTrainAsync();
             var specialTrainTask = HSSEData_HSSEService.GetSpecialTrainAsync();
             var specialOperationTrainTask = HSSEData_HSSEService.GetSpecialOperationTrainAsync();
             var hseTechnicalTask = HSSEData_HSSEService.GetHseTechnicalAsync();
@@ -754,6 +645,7 @@ namespace BLL
                 lostWorkingHourTask,
                 safeWorkingHourTask,
                 safeTrainTask,
+                safeTrainBoShengTask,
                 specialTrainTask,
                 specialOperationTrainTask, hseTechnicalTask,
                 headOfficeInspectorGeneralTask,
@@ -821,6 +713,7 @@ namespace BLL
             var lostWorkingHour = await lostWorkingHourTask;
             var safeWorkingHour = await safeWorkingHourTask;
             var safeTrainList = await safeTrainTask;
+            var safeTrainBoShengList = await safeTrainBoShengTask;
             var specialTrainList = await specialTrainTask;
             var specialOperationTrainList = await specialOperationTrainTask;
             var hseTechnicalList = await hseTechnicalTask;
@@ -890,7 +783,7 @@ namespace BLL
                 TotalWorkingHour = totalWorkingHour,
                 LostWorkingHour = lostWorkingHour,
                 SafeWorkingHour = safeWorkingHour,
-                SafeTrainNum = safeTrainList.Sum(x => x.TrainPersonNum),
+                SafeTrainNum = safeTrainList.Sum(x => x.TrainPersonNum) + safeTrainBoShengList.Sum(x => x.TrainPersonNum),
                 SpecialTrainNum = specialTrainList.Sum(x => x.TrainPersonNum),
                 SpecialOperationTrainNum = specialOperationTrainList.Sum(x => x.TrainPersonNum),
                 HseTechnicalNum = hseTechnicalList.Count(),
@@ -1037,7 +930,7 @@ namespace BLL
                     TotalWorkingHour = 0,//工时数据取自集团报表，项目无法提取
                     LostWorkingHour = 0,
                     SafeWorkingHour = 0,
-                    SafeTrainNum = safeTrainList.Where(x => x.ProjectId == projectid).Sum(x => x.TrainPersonNum),
+                    SafeTrainNum = safeTrainList.Where(x => x.ProjectId == projectid).Sum(x => x.TrainPersonNum) + safeTrainBoShengList.Where(x => x.ProjectId == projectid).Sum(x => x.TrainPersonNum),
                     SpecialTrainNum = specialTrainList.Where(x => x.ProjectId == projectid).Sum(x => x.TrainPersonNum),
                     SpecialOperationTrainNum = specialOperationTrainList.Where(x => x.ProjectId == projectid).Sum(x => x.TrainPersonNum),
                     HseTechnicalNum = hseTechnicalList.Count(x => x.ProjectId == projectid),
@@ -1799,17 +1692,22 @@ namespace BLL
         /// <returns></returns>
         public static List<Model.OfSafetySupervisorsOutput> GetQualityPersonNum()
         {
-            var result = (from x in Funs.DB.QualityAudit_PersonQuality
-                          join p in Funs.DB.SitePerson_Person on x.PersonId equals p.PersonId into pGroup
-                          from p in pGroup.DefaultIfEmpty()
+            var result = (from p in Funs.DB.SitePerson_Person
                           join bp in Funs.DB.Base_Project on p.ProjectId equals bp.ProjectId into bpGroup
                           from bp in bpGroup.DefaultIfEmpty()
                           join u in Funs.DB.Base_Unit on p.UnitId equals u.UnitId into uGroup
                           from u in uGroup.DefaultIfEmpty()
-                          join y in Funs.DB.QualityAudit_PersonQuality on x.PersonId equals y.PersonId
+                          join q in Funs.DB.QualityAudit_PersonQuality on p.PersonId equals q.PersonId into qGroup
+                          from q in qGroup.DefaultIfEmpty()
                           join m in Funs.DB.Base_WorkPost on p.WorkPostId equals m.WorkPostId into mGroup
                           from m in mGroup.DefaultIfEmpty()
-                          where BeUnderConstructionList.Contains(p.ProjectId) && p.IsUsed == true && m.PostType == Const.PostType_2 && (x.LimitDate == null || x.LimitDate < DateTime.Now)
+                          join su in Funs.DB.Sys_User on q.CompileMan equals su.UserId into suGroup
+                          from su in suGroup.DefaultIfEmpty()
+                          join bc in Funs.DB.Base_Certificate on q.CertificateId equals bc.CertificateId into bcGroup
+                          from bc in bcGroup.DefaultIfEmpty()
+                          join su1 in Funs.DB.Sys_User on q.AuditorId equals su1.UserId into su1Group
+                          from su1 in su1Group.DefaultIfEmpty()
+                          where BeUnderConstructionList.Contains(p.ProjectId) && m.PostType == Const.PostType_2 && p.IsUsed == true
                           select new Model.OfSafetySupervisorsOutput
                           {
                               ProjectId = p.ProjectId,
@@ -1824,6 +1722,7 @@ namespace BLL
                           }).ToList();
             return result;
         }
+
         /// <summary>
         /// 获取在岗特种作业人员数量(异步)
         /// </summary>
@@ -3213,7 +3112,7 @@ namespace BLL
             var result = (from x in Funs.DB.Bo_Sheng_Train
                           join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into pGroup
                           from p in pGroup.DefaultIfEmpty()
-                          where BeUnderConstructionList.Contains(p.ProjectId) && (x.TrainType == "入场（厂）培训" || x.TrainType == "入厂（场）级培训")
+                          where BeUnderConstructionList.Contains(p.ProjectId) && (x.TrainType.Contains("入场") || x.TrainType.Contains("入厂"))
                                 && (x.DeleteTag == "False" || x.DeleteTag == null) && x.TrainStartDate > Const.DtmarkTime
                           select new Model.EduTrainOutput()
                           {
@@ -3703,6 +3602,61 @@ namespace BLL
         /// <returns></returns>
         public static List<Model.ConstructionEquipmentOutput> GetUseEquipment()
         {
+            var query = (from item in Funs.DB.QualityAudit_EquipmentQuality
+                             //join eq in Funs.DB.InApproveManager_EquipmentIn on item.EquipmentInId equals eq.EquipmentInId into eqGroup
+                             //from eq in eqGroup.DefaultIfEmpty()
+                             //join spe in Funs.DB.Base_SpecialEquipment on item.SpecialEquipmentId equals spe.SpecialEquipmentId into speGroup
+                             //from spe in speGroup.DefaultIfEmpty()
+                         join p in Funs.DB.Base_Project on item.ProjectId equals p.ProjectId into pGroup
+                         from p in pGroup.DefaultIfEmpty()
+                         join unit in Funs.DB.Base_Unit on item.UnitId equals unit.UnitId into unitGroup
+                         from unit in unitGroup.DefaultIfEmpty()
+                         where BeUnderConstructionList.Contains(item.ProjectId)
+                         select new ConstructionEquipmentOutput
+                         {
+                             Id = item.EquipmentQualityId,
+                             ProjectId = item.ProjectId,
+                             //ProjectCode = p.ProjectCode,
+                             ProjectName = p.ProjectName,
+                             //UnitId = item.UnitId,
+                             UnitName = unit.UnitName,
+                             SpecialEquipmentName = item.EquipmentQualityName,
+                             //SizeModel = item.SizeModel,
+                             CertificateNum = item.CertificateCode,
+                             CompileDate = item.CompileDate,
+                             EQType = "特种设备"
+                         })
+            .Union(
+                  from item in Funs.DB.QualityAudit_GeneralEquipmentQuality
+                  join eq in Funs.DB.Base_SpecialEquipment on item.GeneralEquipmentQualityId equals eq.SpecialEquipmentId into eqGroup
+                  from eq in eqGroup.DefaultIfEmpty()
+                      //join spe in Funs.DB.Base_SpecialEquipment on item.SpecialEquipmentId equals spe.SpecialEquipmentId into speGroup
+                      //from spe in speGroup.DefaultIfEmpty()
+                  join p in Funs.DB.Base_Project on item.ProjectId equals p.ProjectId into pGroup
+                  from p in pGroup.DefaultIfEmpty()
+                  join unit in Funs.DB.Base_Unit on item.UnitId equals unit.UnitId into unitGroup
+                  from unit in unitGroup.DefaultIfEmpty()
+                  where BeUnderConstructionList.Contains(item.ProjectId)
+                  select new ConstructionEquipmentOutput
+                  {
+                      Id = item.GeneralEquipmentQualityId,
+                      ProjectId = item.ProjectId,
+                      // ProjectCode = p.ProjectCode,
+                      ProjectName = p.ProjectName,
+                      // UnitId = item.UnitId,
+                      UnitName = unit.UnitName,
+                      // SpecialEquipmentId = item.SpecialEquipmentId,
+                      SpecialEquipmentName = eq.SpecialEquipmentName,
+                      //SizeModel = eq.SizeModel,
+                      //OwnerCheck = item.OwnerCheck,
+                      CertificateNum = item.GeneralEquipmentQualityCode,
+                      //IsUsed = item.IsUsed,
+                      CompileDate = item.CompileDate,
+                      EQType = "一般设备"
+                  }
+              );
+
+            /* 通用版业务逻辑【弃用】
             var query = (from item in Funs.DB.InApproveManager_EquipmentInItem
                          join eq in Funs.DB.InApproveManager_EquipmentIn on item.EquipmentInId equals eq.EquipmentInId into eqGroup
                          from eq in eqGroup.DefaultIfEmpty()
@@ -3759,6 +3713,7 @@ namespace BLL
                       EQType = "一般设备"
                   }
               );
+            */
 
             return query.ToList();
         }
@@ -3775,6 +3730,31 @@ namespace BLL
         /// <returns></returns>
         public static List<Model.ConstructionEquipmentOutput> GetSpecialEquipment()
         {
+            var query = (from item in Funs.DB.QualityAudit_EquipmentQuality
+                             //join eq in Funs.DB.InApproveManager_EquipmentIn on item.EquipmentInId equals eq.EquipmentInId into eqGroup
+                             //from eq in eqGroup.DefaultIfEmpty()
+                             //join spe in Funs.DB.Base_SpecialEquipment on item.SpecialEquipmentId equals spe.SpecialEquipmentId into speGroup
+                             //from spe in speGroup.DefaultIfEmpty()
+                         join p in Funs.DB.Base_Project on item.ProjectId equals p.ProjectId into pGroup
+                         from p in pGroup.DefaultIfEmpty()
+                         join unit in Funs.DB.Base_Unit on item.UnitId equals unit.UnitId into unitGroup
+                         from unit in unitGroup.DefaultIfEmpty()
+                         where BeUnderConstructionList.Contains(item.ProjectId)
+                         select new ConstructionEquipmentOutput
+                         {
+                             Id = item.EquipmentQualityId,
+                             ProjectId = item.ProjectId,
+                             //ProjectCode = p.ProjectCode,
+                             ProjectName = p.ProjectName,
+                             //UnitId = item.UnitId,
+                             UnitName = unit.UnitName,
+                             SpecialEquipmentName = item.EquipmentQualityName,
+                             SizeModel = item.SizeModel,
+                             CertificateNum = item.CertificateCode,
+                             CompileDate = item.CompileDate,
+                             EQType = "特种设备"
+                         });
+            /* 通用版业务逻辑【弃用】
             var query = (from item in Funs.DB.InApproveManager_EquipmentInItem
                          join eq in Funs.DB.InApproveManager_EquipmentIn on item.EquipmentInId equals eq.EquipmentInId into
                              eqGroup
@@ -3804,6 +3784,7 @@ namespace BLL
                              CompileDate = eq.CompileDate,
                              EQType = "特种设备"
                          });
+            */
             return query.ToList();
         }
         public static async Task<List<Model.ConstructionEquipmentOutput>> GetSpecialEquipmentAsync()
@@ -3895,7 +3876,7 @@ namespace BLL
             var query = (from x in Funs.DB.Base_Project
                          join y in Funs.DB.HSSE_Hazard_HazardRegister on x.ProjectId equals y.ProjectId into yGroup
                          from y in yGroup.DefaultIfEmpty()
-                         where BeUnderConstructionList.Contains(x.ProjectId) && y.ProblemTypes == "1" && y.Risk_Level == "一般" && y.CheckTime > Const.DtmarkTime
+                         where BeUnderConstructionList.Contains(x.ProjectId) && y.ProblemTypes == "1" && y.Risk_Level == "一般事故隐患" && y.CheckTime > Const.DtmarkTime
                          group y by new { x.ProjectId, x.ProjectName, x.ProjectCode } into gg
                          select new HiddenRectificationOutput
                          {
@@ -3930,7 +3911,7 @@ namespace BLL
             var query = (from x in Funs.DB.Base_Project
                          join y in Funs.DB.HSSE_Hazard_HazardRegister on x.ProjectId equals y.ProjectId into yGroup
                          from y in yGroup.DefaultIfEmpty()
-                         where BeUnderConstructionList.Contains(x.ProjectId) && y.ProblemTypes == "1" && y.Risk_Level == "重大" && y.CheckTime > Const.DtmarkTime
+                         where BeUnderConstructionList.Contains(x.ProjectId) && y.ProblemTypes == "1" && y.Risk_Level == "重大事故隐患" && y.CheckTime > Const.DtmarkTime
                          group y by new { x.ProjectId, x.ProjectName, x.ProjectCode } into gg
                          select new HiddenRectificationOutput
                          {
@@ -4006,13 +3987,15 @@ namespace BLL
                              ProjectId = gg.Key.ProjectId,
                              ProjectName = gg.Key.ProjectName,
                              ProjectCode = gg.Key.ProjectCode,
-                             CompletedNum = gg.Count(x => x.States == "1" && x.IsSuperLargerHazard == false),
+                             OperativesNum = gg.Where(x => x.IsSuperLargerHazard == false).Sum(x => x.OperativesNum) ?? 0,
                              TrainPersonNum = gg.Where(x => x.IsSuperLargerHazard == false).Sum(x => x.TrainPersonNum) ?? 0,
+                             CompletedNum = gg.Count(x => x.States == "1" && x.IsSuperLargerHazard == false),
                              ConstructionNum = gg.Count(x => x.States == "2" && x.IsSuperLargerHazard == false),
                              FinishedNum = gg.Count(x => x.States == "3" && x.IsSuperLargerHazard == false),
                              ArgumentNum = gg.Count(x => x.IsArgument == true && x.IsSuperLargerHazard == false),
-                             SuperCompletedNum = gg.Count(x => x.States == "1" && x.IsSuperLargerHazard == true),
+                             SuperOperativesNum = gg.Where(x => x.IsSuperLargerHazard == true).Sum(x => x.OperativesNum) ?? 0,
                              SuperTrainPersonNum = gg.Where(x => x.IsSuperLargerHazard == true).Sum(x => x.TrainPersonNum) ?? 0,
+                             SuperCompletedNum = gg.Count(x => x.States == "1" && x.IsSuperLargerHazard == true),
                              SuperConstructionNum = gg.Count(x => x.States == "2" && x.IsSuperLargerHazard == true),
                              SuperFinishedNum = gg.Count(x => x.States == "3" && x.IsSuperLargerHazard == true),
                              SuperArgumentNum = gg.Count(x => x.IsArgument == true && x.IsSuperLargerHazard == true),

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

@@ -86,30 +86,29 @@ namespace BLL
         {
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
+                var table = new Project_HJGLData_Defect
+                {
+                    Id = newtable.Id,
+                    ProjectId = newtable.ProjectId,
+                    UnitId = newtable.UnitId,
+                    CollCropCode = newtable.CollCropCode,
+                    UnitName = newtable.UnitName,
+                    ReportDate = newtable.ReportDate,
+                    DefectName = newtable.DefectName,
+                    DefectNum = newtable.DefectNum
+                };
+                db.Project_HJGLData_Defect.InsertOnSubmit(table);
+                db.SubmitChanges();
             }
-
-            var table = new Project_HJGLData_Defect
-            {
-                Id = newtable.Id,
-                ProjectId = newtable.ProjectId,
-                UnitId = newtable.UnitId,
-                CollCropCode = newtable.CollCropCode,
-                UnitName = newtable.UnitName,
-                ReportDate = newtable.ReportDate,
-                DefectName = newtable.DefectName,
-                DefectNum = newtable.DefectNum
-            };
-            db.Project_HJGLData_Defect.InsertOnSubmit(table);
-            db.SubmitChanges();
         }
 
         public static void AddBulkProject_HJGLData_Defect(List<Project_HJGLData_Defect> newtables)
         {
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
+                db.Project_HJGLData_Defect.InsertAllOnSubmit(newtables);
+                db.SubmitChanges();
             }
-            db.Project_HJGLData_Defect.InsertAllOnSubmit(newtables);
-            db.SubmitChanges();
         }
 
         public static void UpdateProject_HJGLData_Defect(Project_HJGLData_Defect newtable)
@@ -260,7 +259,8 @@ namespace BLL
         {
             var db = Funs.DB;
 
-            var projectids = ProjectService.GetProjectWorkList().Select(x => x.ProjectId).ToList();
+            var projectids = HJGLData_HJGLService.BeUnderConstructionList;
+            //var projectids = ProjectService.GetProjectWorkList().Select(x => x.ProjectId).ToList();
             var thisUnitId = string.Empty;
             var thisUnit = CommonService.GetIsThisUnit();
             if (thisUnit != null) thisUnitId = thisUnit.UnitId;

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

@@ -281,10 +281,11 @@ namespace BLL
             }
             if (hJGLDateType == HJGLDateType.NumberOfFilms || hJGLDateType == HJGLDateType.All)
             {
-                table.TotalFilmNum = GetTotalFilmNum(projectid);
-                table.OKFilmNum = GetOKFilmNum(projectid);
-
-
+                //table.TotalFilmNum = GetTotalFilmNum(projectid);
+                //table.OKFilmNum = GetOKFilmNum(projectid);
+                var filmObj = GetFilm(projectid);
+                table.TotalFilmNum = filmObj.CHT_TotalFilm;
+                table.OKFilmNum = filmObj.CHT_PassFilm;
             }
             if (hJGLDateType == HJGLDateType.DefectAnalysis || hJGLDateType == HJGLDateType.All)
             {
@@ -310,7 +311,10 @@ namespace BLL
         {
             int result = (from x in Funs.DB.BS_Welder
                           where x.ProjectId == projectid && x.WED_IfOnGuard == true
-                          select x).Count();
+                          select x)
+                        .GroupBy(p => p.WED_WorkCode)
+                        .Select(g => g.First())
+                        .Count();
             return result;
         }
         /// <summary>
@@ -320,6 +324,27 @@ namespace BLL
         public static int GetTotalDineNum(string projectid)
         {
             int result = 0;
+            var getD1 = from x in Funs.DB.HJGL_FL_TotalQuantity
+                        where x.ProjectId == projectid
+                        select x;
+            if (getD1.Count() > 0)
+            {
+                foreach (var item in getD1)
+                {
+                    result += Funs.GetNewIntOrZero(item.TotalWeldQuantity.Split('.')[0]);
+                }
+            }
+            else
+            {
+                var getD2 = (from x in Funs.DB.HJGL_FL_Data
+                             where x.ProjectId == projectid
+                             orderby x.CompileDate descending
+                             select x).FirstOrDefault();
+                if (getD2 != null)
+                {
+                    result = Funs.GetNewIntOrZero(getD2.TotalWeldQuantity.Split('.')[0]);
+                }
+            }
             return result;
         }
         /// <summary>
@@ -329,18 +354,71 @@ namespace BLL
         public static int GetCompleteDineNum(string projectid)
         {
             int result = 0;
+            var getD1 = from x in Funs.DB.HJGL_FL_TotalQuantity
+                        where x.ProjectId == projectid
+                        select x;
+            if (getD1.Count() > 0)
+            {
+                foreach (var item in getD1)
+                {
+                    result += Funs.GetNewIntOrZero(item.TotalCompleted.Split('.')[0]);
+                }
+            }
+            else
+            {
+                var getD2 = (from x in Funs.DB.HJGL_FL_Data
+                             where x.ProjectId == projectid
+                             orderby x.CompileDate descending
+                             select x).FirstOrDefault();
+                if (getD2 != null)
+                {
+                    result = Funs.GetNewIntOrZero(getD2.TotalCompleted.Split('.')[0]);
+                }
+            }
             return result;
         }
+
+        /// <summary>
+        /// 获取焊接总片数信息数据
+        /// </summary>
+        /// <param name="projectid"></param>
+        /// <returns></returns>
+        public static CHCheckItemOutput GetFilm(string projectid)
+        {
+            var result = new CHCheckItemOutput();
+            var ndtLists = (from x in Funs.DB.ProcessControl_NondestructiveTest_New where x.ProjectId == projectid select x).ToList();
+
+            if (ndtLists.Count() > 0)
+            {
+                //取每个项目、单位、专业最新的一条数据
+                var datalist = ndtLists.GroupBy(r => new { r.UnitId, r.ProfessionalName }).Select(g => g.OrderByDescending(r => r.CreateDate).First()).ToList();
+                decimal a = 0, b = 0;
+                foreach (var item in datalist)
+                {
+                    if (item.TotalQuantity.HasValue)
+                    {
+                        a += Math.Floor(item.TotalQuantity.Value * Funs.GetNewDecimalOrZero(item.TotalRate) / 100);
+                        b += item.TotalQuantity.Value;
+                    }
+                }
+                result.CHT_TotalFilm = (int)Math.Round(b);
+                result.CHT_PassFilm = (int)Math.Round(a);
+            }
+
+            return result;
+        }
+
         /// <summary>
         /// 获取总片数
         /// </summary>
         /// <returns></returns>
         public static int GetTotalFilmNum(string projectid)
         {
-            int result = Convert.ToInt32((from x in Funs.DB.CH_CheckItem
-                                          join y in Funs.DB.CH_Check on x.CHT_CheckID equals y.CHT_CheckID
-                                          where y.ProjectId == projectid
-                                          select x.CHT_TotalFilm).ToList().Sum());
+            int result = Convert.ToInt32((from x in Funs.DB.ProcessControl_NondestructiveTest_New
+                                          where x.ProjectId == projectid && x.ProfessionalName == "工艺管道"
+                                          orderby x.CreateDate descending
+                                          select x.TotalQuantity
+                                          ).FirstOrDefault());
             return result;
         }
         /// <summary>
@@ -349,10 +427,15 @@ namespace BLL
         /// <returns></returns>
         public static int GetOKFilmNum(string projectid)
         {
-            int result = Convert.ToInt32((from x in Funs.DB.CH_CheckItem
-                                          join y in Funs.DB.CH_Check on x.CHT_CheckID equals y.CHT_CheckID
-                                          where y.ProjectId == projectid
-                                          select x.CHT_PassFilm).ToList().Sum());
+            int result = 0;
+            var ndt = (from x in db.ProcessControl_NondestructiveTest_New where x.ProjectId == projectid && x.ProfessionalName == "工艺管道" orderby x.CreateDate descending select x).FirstOrDefault();
+            if (ndt != null)
+            {
+                if (ndt.TotalQuantity.HasValue)
+                {
+                    result = Convert.ToInt32(ndt.TotalQuantity.Value * Funs.GetNewDecimalOrZero(ndt.TotalRate) / 100);
+                }
+            }
             return result;
         }
 

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

@@ -3,6 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using FineUIPro;
+using Microsoft.SqlServer.Dts.Runtime;
 using Model;
 using Newtonsoft.Json;
 
@@ -455,7 +456,7 @@ namespace BLL
 
             if (hSseDateType == HSSEDateType.EducationAndTraining || hSseDateType == HSSEDateType.All)
             {
-                table.SafeTrainNum = GetSafeTrainNum(projectid);
+                table.SafeTrainNum = GetSafeTrainNum(projectid) + GetBoShengSafeTrain(projectid);
                 table.SpecialTrainNum = GetSpecialTrainNum(projectid);
                 table.SpecialOperationTrainNum = GetSpecialOperationTrainNum(projectid);
             }
@@ -748,6 +749,21 @@ namespace BLL
             return result;
         }
 
+        /// <summary>
+        ///     获取三级安全教育培训数——博晟培训
+        /// </summary>
+        /// <returns></returns>
+        public static int GetBoShengSafeTrain(string projectid)
+        {
+            var result = (from x in Funs.DB.Bo_Sheng_Train
+                          join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into pGroup
+                          from p in pGroup.DefaultIfEmpty()
+                          where x.ProjectId == projectid && (x.TrainType.Contains("入场") || x.TrainType.Contains("入厂"))
+                                && (x.DeleteTag == "False" || x.DeleteTag == null) && x.TrainStartDate > Const.DtmarkTime
+                          select x.PersonCount ?? 0).ToList().Sum();
+            return result;
+        }
+
         /// <summary>
         ///     获取专项培训数
         /// </summary>
@@ -945,7 +961,7 @@ namespace BLL
             var result = (from x in Funs.DB.SitePerson_Person
                           join y in Funs.DB.QualityAudit_PersonQuality on x.PersonId equals y.PersonId
                           join m in Funs.DB.Base_WorkPost on x.WorkPostId equals m.WorkPostId
-                          where x.ProjectId == projectid && m.PostType == Const.PostType_2 && x.IsUsed == true && (y.LimitDate == null || y.LimitDate < DateTime.Now)
+                          where x.ProjectId == projectid && m.PostType == Const.PostType_2 && x.IsUsed == true
                           select x).Count();
             return result;
         }
@@ -1318,15 +1334,21 @@ namespace BLL
         /// <returns></returns>
         public static int GetUseEquipmentNum(string projectid)
         {
-            var result = (from x in Funs.DB.InApproveManager_EquipmentInItem
-                          join y in Funs.DB.InApproveManager_EquipmentIn on x.EquipmentInId equals y.EquipmentInId
-                          where y.ProjectId == projectid && x.IsUsed == true
+            var result = (from x in Funs.DB.QualityAudit_EquipmentQuality
+                          where x.ProjectId == projectid
                           select x).Count() +
-                         (from x in Funs.DB.InApproveManager_GeneralEquipmentInItem
-                          join y in Funs.DB.InApproveManager_GeneralEquipmentIn on x.GeneralEquipmentInId equals y
-                              .GeneralEquipmentInId
-                          where y.ProjectId == projectid && x.IsUsed == true
+                         (from x in Funs.DB.QualityAudit_GeneralEquipmentQuality
+                          where x.ProjectId == projectid
                           select x).Count();
+            //var result = (from x in Funs.DB.InApproveManager_EquipmentInItem
+            //              join y in Funs.DB.InApproveManager_EquipmentIn on x.EquipmentInId equals y.EquipmentInId
+            //              where y.ProjectId == projectid && x.IsUsed == true
+            //              select x).Count() +
+            //             (from x in Funs.DB.InApproveManager_GeneralEquipmentInItem
+            //              join y in Funs.DB.InApproveManager_GeneralEquipmentIn on x.GeneralEquipmentInId equals y
+            //                  .GeneralEquipmentInId
+            //              where y.ProjectId == projectid && x.IsUsed == true
+            //              select x).Count();
             return result;
         }
 
@@ -1336,10 +1358,13 @@ namespace BLL
         /// <returns></returns>
         public static int GetSpecialEquipmentNum(string projectid)
         {
-            var result = (from x in Funs.DB.InApproveManager_EquipmentInItem
-                          join y in Funs.DB.InApproveManager_EquipmentIn on x.EquipmentInId equals y.EquipmentInId
-                          where y.ProjectId == projectid && x.IsUsed == true
+            var result = (from x in Funs.DB.QualityAudit_EquipmentQuality
+                          where x.ProjectId == projectid
                           select x).Count();
+            //var result = (from x in Funs.DB.InApproveManager_EquipmentInItem
+            //              join y in Funs.DB.InApproveManager_EquipmentIn on x.EquipmentInId equals y.EquipmentInId
+            //              where y.ProjectId == projectid && x.IsUsed == true
+            //              select x).Count();
             return result;
         }
 
@@ -1375,7 +1400,7 @@ namespace BLL
         public static int GetGeneralClosedNum(string projectid)
         {
             var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
-                          where x.ProjectId == projectid && x.Risk_Level == "一般" && x.States == "3" &&
+                          where x.ProjectId == projectid && x.Risk_Level == "一般事故隐患" && x.States == "3" &&
                                 x.CheckTime > Const.DtmarkTime
                           select x).Count();
             return result;
@@ -1388,7 +1413,7 @@ namespace BLL
         public static int GetGeneralNotClosedNum(string projectid)
         {
             var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
-                          where x.ProjectId == projectid && x.Risk_Level == "一般" && x.States != "3" && x.States != "-1" &&
+                          where x.ProjectId == projectid && x.Risk_Level == "一般事故隐患" && x.States != "3" && x.States != "-1" &&
                                 x.CheckTime > Const.DtmarkTime
                           select x).Count();
             return result;
@@ -1401,7 +1426,7 @@ namespace BLL
         public static int GetMajorClosedNum(string projectid)
         {
             var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
-                          where x.ProjectId == projectid && x.Risk_Level == "重大" && x.States == "3" &&
+                          where x.ProjectId == projectid && x.Risk_Level == "重大事故隐患" && x.States == "3" &&
                                 x.CheckTime > Const.DtmarkTime
                           select x).Count();
             return result;
@@ -1414,7 +1439,7 @@ namespace BLL
         public static int GetMajorNotClosedNum(string projectid)
         {
             var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
-                          where x.ProjectId == projectid && x.Risk_Level == "重大" && x.States != "3" && x.States != "-1" &&
+                          where x.ProjectId == projectid && x.Risk_Level == "重大事故隐患" && x.States != "3" && x.States != "-1" &&
                                 x.CheckTime > Const.DtmarkTime
                           select x).Count();
             return result;
@@ -1504,7 +1529,7 @@ namespace BLL
         {
             var result = (from x in Funs.DB.Solution_LargerHazard
                           where x.ProjectId == projectid && x.IsSuperLargerHazard == false && x.RecordTime > Const.DtmarkTime
-                          select x.OperativesNum).ToList().Sum(x => x.Value);
+                          select x).ToList().Sum(x => x.OperativesNum ?? 0);
             return result;
         }
 
@@ -1567,7 +1592,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.OperativesNum != null && x.RecordTime > Const.DtmarkTime
                  select x.OperativesNum).ToList().Sum(x => x.Value);
             return result;
         }
@@ -2091,6 +2116,7 @@ namespace BLL
                              Address = x.Address,
                              Descriptions = x.Descriptions,
                              TrainPersonNum = x.TrainPersonNum,
+                             OperativesNum = x.OperativesNum,
                              RecordTime = x.RecordTime,
                              ExpectedTime = x.ExpectedTime,
                              States = x.States,

SGGL/BLL/ZHGL/Information/ActionWorkLedgerService.cs

@@ -81,6 +81,9 @@ namespace BLL
                 newActionWorkLedger.UpState = ActionWorkLedger.UpState;
                 newActionWorkLedger.HandleState = ActionWorkLedger.HandleState;
                 newActionWorkLedger.HandleMan = ActionWorkLedger.HandleMan;
+                newActionWorkLedger.KeyWorkNum = ActionWorkLedger.KeyWorkNum;
+                newActionWorkLedger.KeyWorkOKNum = ActionWorkLedger.KeyWorkOKNum;
+                newActionWorkLedger.KeyWorkOKRate = ActionWorkLedger.KeyWorkOKRate;
                 Funs.DB.SubmitChanges();
             }
         }

SGGL/BLL/ZHGL/Person/CompanyBranchPersonService.cs

@@ -53,6 +53,7 @@ namespace BLL
                 Address = CompanyBranchPerson.Address,
                 IsOnJob = CompanyBranchPerson.IsOnJob,
                 Remark = CompanyBranchPerson.Remark,
+                SortIndex = CompanyBranchPerson.SortIndex,
             };
             db.Person_CompanyBranchPerson.InsertOnSubmit(newCompanyBranchPerson);
             db.SubmitChanges();
@@ -77,6 +78,7 @@ namespace BLL
                 newCompanyBranchPerson.Address = CompanyBranchPerson.Address;
                 newCompanyBranchPerson.IsOnJob = CompanyBranchPerson.IsOnJob;
                 newCompanyBranchPerson.Remark = CompanyBranchPerson.Remark;
+                newCompanyBranchPerson.SortIndex = CompanyBranchPerson.SortIndex;
                 db.SubmitChanges();
             }
         }

SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx

@@ -94,7 +94,7 @@
                 </f:Grid>
             </Items>
         </f:Panel>
-        <f:Window ID="Window1" Title="设计交底管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        <f:Window ID="Window1" Title="施工技术交底管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
             Width="900px" Height="430px">
         </f:Window>

SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx

@@ -10,13 +10,16 @@
         .f-grid-row.Red {
             background-color: red;
         }
+
         .f-grid-row.Yellow {
             background-color: yellow;
         }
+
         .LabelColor {
             color: Red;
             font-size: small;
         }
+
         .f-grid-row.Gray {
             background-color: gray;
         }
@@ -32,7 +35,7 @@
                     runat="server" BoxFlex="1" DataKeyNames="InspectionPersonId" AllowCellEditing="true" EnableColumnLines="true"
                     ClicksToEdit="2" DataIDField="InspectionPersonId" AllowSorting="true" SortField="RemarkCode"
                     SortDirection="ASC" OnSort="Grid1_Sort" OnRowCommand="Grid1_RowCommand"
-                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"   OnRowDataBound="Grid1_RowDataBound"
+                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" OnRowDataBound="Grid1_RowDataBound"
                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true" OnPreRowDataBound="Grid1_PreRowDataBound">
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
@@ -41,6 +44,12 @@
                                 </f:DropDownList>
                                 <f:DropDownList ID="sdrpPost" runat="server" Label="工种" LabelAlign="Right" LabelWidth="60px"></f:DropDownList>
                                 <f:TextBox runat="server" ID="stxtPersonName" Label="姓名" LabelAlign="Right" LabelWidth="60px"></f:TextBox>
+                                <f:RadioButtonList ID="rblOnSite" runat="server" AutoPostBack="true" Width="220px"
+                                    OnSelectedIndexChanged="TextBox_TextChanged" AutoColumnWidth="true">
+                                    <f:RadioItem Value="-1" Text="全部" Selected="true" />
+                                    <f:RadioItem Value="1" Text="在场" />
+                                    <f:RadioItem Value="0" Text="不在场" />
+                                </f:RadioButtonList>
                                 <f:Button ID="btnSearch" Icon="SystemSearch"
                                     EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
                                 </f:Button>
@@ -81,6 +90,9 @@
                         <f:RenderField ColumnID="PersonName" DataField="PersonName" FieldType="String" HeaderText="姓名" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
+                        <f:RenderField ColumnID="IsOnSiteStr" DataField="IsOnSiteStr" FieldType="String" HeaderText="是否在场" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="100px">
+                        </f:RenderField>
                         <f:RenderField ColumnID="CertificateNumber" DataField="CertificateNumber" FieldType="String" HeaderText="证书编号" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
@@ -96,17 +108,17 @@
                         <f:RenderField ColumnID="DepartureTime" DataField="DepartureTime" FieldType="Date" Renderer="Date" HeaderText="离场时间" TextAlign="Center"
                             HeaderTextAlign="Center" Width="110px">
                         </f:RenderField>
-                               <%--<f:TemplateField ColumnID="Status" Width="120px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center">
+                        <%--<f:TemplateField ColumnID="Status" Width="120px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center">
                             <ItemTemplate>
                                 <asp:Label ID="txtStatus" runat="server" Text='<%# ConvertState(Eval("Status")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>--%>
-                                   <%--<f:WindowField TextAlign="Center" Width="80px" WindowID="WindowAtt" 
-                        Text="审批列表" ToolTip="审批列表" DataIFrameUrlFields="InspectionPersonId" DataIFrameUrlFormatString="./InspectionPersonApprove.aspx?Id={0}"/>--%>     
-                        <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left" >
+                        <%--<f:WindowField TextAlign="Center" Width="80px" WindowID="WindowAtt" 
+                        Text="审批列表" ToolTip="审批列表" DataIFrameUrlFields="InspectionPersonId" DataIFrameUrlFormatString="./InspectionPersonApprove.aspx?Id={0}"/>--%>
+                        <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left">
                             <ItemTemplate>
                                 <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink"
-                                                 Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("InspectionPersonId")) %>'   ToolTip="附件查看"></asp:LinkButton>
+                                    Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("InspectionPersonId")) %>' ToolTip="附件查看"></asp:LinkButton>
                             </ItemTemplate>
                         </f:TemplateField>
                         <f:LinkButtonField TextAlign="Center" HeaderText="焊工资质"
@@ -138,10 +150,10 @@
             Width="1200px" Height="600px">
         </f:Window>
         <f:Window ID="Window3" Title="编辑焊工资质信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-            Target="Parent" EnableResize="false" runat="server" IsModal="true" 
+            Target="Parent" EnableResize="false" runat="server" IsModal="true"
             Width="1100px" Height="650px">
         </f:Window>
-           <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true"
+        <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true"
             EnableMaximize="true" Target="Parent" EnableResize="false" runat="server"
             IsModal="true" Width="700px" Height="500px">
         </f:Window>

SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs

@@ -35,7 +35,7 @@ namespace FineUIPro.Web.Comprehensive
             string strSql = @"select InspectionPersonId, InspectionPersonCode, PersonName, Status,
                               CertificateNumber, QualifiedProjectCode, ValidityDate, ApprovalTime, 
                               DepartureTime, AttachUrl,CompileMan, CompileDate, 
-                              IsOnSite, UnitWorkId,U.UnitName,CN.ProfessionalName ,P.PostName,C.RemarkCode
+                              IsOnSite, (case C.IsOnSite when '1' then '是' else  '否' end) as IsOnSiteStr,UnitWorkId,U.UnitName,CN.ProfessionalName ,P.PostName,C.RemarkCode
                               from Comprehensive_InspectionPerson C 
                               left join Base_Unit U on C.UnitId=U.UnitId
                               left join Base_CNProfessional CN on C.CNProfessionalId=CN.CNProfessionalId 
@@ -58,6 +58,13 @@ namespace FineUIPro.Web.Comprehensive
                 strSql += " AND PersonName like @PersonName";
                 listStr.Add(new SqlParameter("@PersonName", "%" + this.stxtPersonName.Text.Trim() + "%"));
             }
+            int OnSite = int.Parse(this.rblOnSite.SelectedValue);
+            if (OnSite > -1)
+            {
+                strSql += " AND C.IsOnSite=@IsOnSite";
+                listStr.Add(new SqlParameter("@IsOnSite", OnSite));
+            }
+
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             Grid1.RecordCount = tb.Rows.Count;
@@ -113,6 +120,15 @@ namespace FineUIPro.Web.Comprehensive
         {
             BindGrid();
         }
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
         #endregion
 
         #region 关闭弹出窗口
@@ -423,7 +439,7 @@ namespace FineUIPro.Web.Comprehensive
                 var font = workbook.CreateFont();
                 font.FontHeightInPoints = 11;
                 cellStyle.SetFont(font);
-               
+
                 // 第二步：创建新数据行
                 NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0);
                 NPOI.SS.UserModel.IRow row = sheet.GetRow(0);

SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.Comprehensive {
-    
-    
-    public partial class InspectionPerson {
-        
+namespace FineUIPro.Web.Comprehensive
+{
+
+
+    public partial class InspectionPerson
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// ToolSearch 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar ToolSearch;
-        
+
         /// <summary>
         /// sdrpUnitId 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList sdrpUnitId;
-        
+
         /// <summary>
         /// sdrpPost 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList sdrpPost;
-        
+
         /// <summary>
         /// stxtPersonName 控件。
         /// </summary>
@@ -83,7 +85,16 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox stxtPersonName;
-        
+
+        /// <summary>
+        /// rblOnSite 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rblOnSite;
+
         /// <summary>
         /// btnSearch 控件。
         /// </summary>
@@ -92,7 +103,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSearch;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -101,7 +112,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnImport 控件。
         /// </summary>
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
-        
+
         /// <summary>
         /// Label2 控件。
         /// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label2;
-        
+
         /// <summary>
         /// lbtnFileUrl 控件。
         /// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -173,7 +184,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -182,7 +193,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window2;
-        
+
         /// <summary>
         /// Window3 控件。
         /// </summary>
@@ -191,7 +202,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window3;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
@@ -200,7 +211,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -209,7 +220,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuModify 控件。
         /// </summary>
@@ -218,7 +229,7 @@ namespace FineUIPro.Web.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuModify;
-        
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>

SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataInNew.aspx.cs

@@ -578,20 +578,40 @@ namespace FineUIPro.Web.CQMS.Comprehensive
 
                             if (tempData.Value6.Trim() == "焊工")
                             {
-                                Model.BS_Welder welder = new Model.BS_Welder();
-                                welder.WED_Unit = Ins.UnitId;
-                                welder.WED_Name = Ins.PersonName;
-                                welder.WED_Code = tempData.Value2.Trim();
-                                welder.LimitDate = Ins.ValidityDate;
-                                welder.LeaveDate = Ins.DepartureTime; // Convert.ToDateTime(this.txtDepartureTime.Text.ToString());
-                                welder.PostDate = Ins.ApprovalTime;// Convert.ToDateTime(this.txtApprovalTime.Text.ToString());
-                                welder.WED_WorkCode = Ins.CertificateNumber;// this.txtCertificateNumber.Text.Trim();
-                                welder.WED_Class = Ins.QualifiedProjectCode;// this.txtQualifiedProjectCode.Text.Trim();
-                                welder.WED_IfOnGuard = Ins.IsOnSite;
-                                welder.WED_Remark = Ins.Remark;
-                                welder.ProjectId = this.CurrUser.LoginProjectId;
-                                // 焊工部分
-                                BLL.PersonManageService.AddBSWelder(welder);
+                                var welder = PersonManageService.GetBSWelderByProjectIdUnitIdAndWED_Code(this.CurrUser.LoginProjectId, Ins.UnitId, tempData.Value2.Trim());
+                                if (welder == null)
+                                {
+                                    welder = new Model.BS_Welder();
+                                    welder.WED_Unit = Ins.UnitId;
+                                    welder.WED_Name = Ins.PersonName;
+                                    welder.WED_Code = tempData.Value2.Trim();
+                                    welder.LimitDate = Ins.ValidityDate;
+                                    welder.LeaveDate = Ins.DepartureTime; // Convert.ToDateTime(this.txtDepartureTime.Text.ToString());
+                                    welder.PostDate = Ins.ApprovalTime;// Convert.ToDateTime(this.txtApprovalTime.Text.ToString());
+                                    welder.WED_WorkCode = Ins.CertificateNumber;// this.txtCertificateNumber.Text.Trim();
+                                    welder.WED_Class = Ins.QualifiedProjectCode;// this.txtQualifiedProjectCode.Text.Trim();
+                                    welder.WED_IfOnGuard = Ins.IsOnSite;
+                                    welder.WED_Remark = Ins.Remark;
+                                    welder.ProjectId = this.CurrUser.LoginProjectId;
+                                    // 焊工部分
+                                    BLL.PersonManageService.AddBSWelder(welder);
+                                }
+                                else
+                                {
+                                    welder.WED_Unit = Ins.UnitId;
+                                    welder.WED_Name = Ins.PersonName;
+                                    welder.WED_Code = tempData.Value2.Trim();
+                                    welder.LimitDate = Ins.ValidityDate;
+                                    welder.LeaveDate = Ins.DepartureTime; // Convert.ToDateTime(this.txtDepartureTime.Text.ToString());
+                                    welder.PostDate = Ins.ApprovalTime;// Convert.ToDateTime(this.txtApprovalTime.Text.ToString());
+                                    welder.WED_WorkCode = Ins.CertificateNumber;// this.txtCertificateNumber.Text.Trim();
+                                    welder.WED_Class = Ins.QualifiedProjectCode;// this.txtQualifiedProjectCode.Text.Trim();
+                                    welder.WED_IfOnGuard = Ins.IsOnSite;
+                                    welder.WED_Remark = Ins.Remark;
+                                    welder.ProjectId = this.CurrUser.LoginProjectId;
+                                    // 焊工部分
+                                    BLL.PersonManageService.UpdateBSWelder(welder);
+                                }
                             }
                         }
                         BLL.Sys_CQMS_DataInTempService.DeleteDataInTempByDataInTempID(tempData.TempId);

SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx

@@ -71,7 +71,7 @@
                     <Items>
                         <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="预计施工" ID="txtExpectedTime" LabelWidth="130px">
                         </f:DatePicker>
-                        <f:NumberBox runat="server" ID="txtTrainPersonNum" NoDecimal="true" NoNegative="true" Label="培训人数" LabelWidth="130px"></f:NumberBox>
+                        <f:NumberBox runat="server" ID="txtTrainPersonNum" NoDecimal="true" NoNegative="true" Label="培训人数" LabelWidth="130px" Required="true" ShowRedStar="true"></f:NumberBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
@@ -81,6 +81,7 @@
                             <f:ListItem Text="作业中" Value="2"/>
                             <f:ListItem Text="已关闭" Value="3"/>
                         </f:DropDownList>
+                        <f:NumberBox runat="server" ID="txtOperativesNum" NoDecimal="true" NoNegative="true" Label="作业人员数" LabelWidth="130px" Required="true" ShowRedStar="true"></f:NumberBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>

SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.cs

@@ -89,6 +89,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                     this.AttachUrl6.InnerHtml = BLL.UploadAttachmentService.ShowAttachment("../../", getUrl(this.MajorPlanApprovalId + "_6"));
 
                     this.txtTrainPersonNum.Text = majorPlanApproval.TrainPersonNum.HasValue ? majorPlanApproval.TrainPersonNum.ToString() : "";
+                    this.txtOperativesNum.Text = majorPlanApproval.OperativesNum.HasValue ? majorPlanApproval.OperativesNum.ToString() : "";
                     this.txtAuditMan.Text = majorPlanApproval.AuditMan;
                     this.txtApprovalMan.Text = majorPlanApproval.ApprovalMan;
                     //this.txtImplementationDeviation.Text = majorPlanApproval.ImplementationDeviation;
@@ -155,7 +156,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                 majorPlanApproval.States = this.drpStates.SelectedValue;
             }
             majorPlanApproval.TrainPersonNum = Funs.GetNewInt(this.txtTrainPersonNum.Text.Trim());
-
+            majorPlanApproval.OperativesNum = Funs.GetNewInt(this.txtOperativesNum.Text.Trim());
 
             if (this.drpSchemeType.SelectedValue == "超危大工程" && this.drpStates.SelectedValue != "1")
             {

SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.designer.cs

@@ -194,6 +194,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// </remarks>
         protected global::FineUIPro.DropDownList drpStates;
 
+        /// <summary>
+        /// txtOperativesNum 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtOperativesNum;
+
         /// <summary>
         /// Panel2 控件。
         /// </summary>

SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx

@@ -13,7 +13,7 @@
         <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
             ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="图纸收发记录" EnableCollapse="true"
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="图纸会审管理" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="Id" AllowSorting="true"
                     SortField="RemarkCode" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">

SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx

@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>现场控制点裁剪</title>
     <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
     <style>
@@ -28,10 +28,12 @@
                     RegionPercent="20%" Title="现场控制点裁剪" TitleToolTip="现场控制点裁剪" ShowBorder="true" ShowHeader="true"
                     BodyPadding="10px">
                     <Items>
-                        <f:Tree ID="trWBS" EnableCollapse="true" ShowHeader="true" OnNodeCheck="trWBS_NodeCheck"  OnlyLeafCheck="true"
+                        <f:Tree ID="trWBS" EnableCollapse="true" ShowHeader="true" OnNodeCheck="trWBS_NodeCheck" OnlyLeafCheck="true"
                             OnNodeCommand="trWBS_NodeCommand" OnNodeExpand="trWBS_NodeExpand" AutoLeafIdentification="true"
                             runat="server">
-                           
+                            <Listeners>
+                                <f:Listener Event="beforenodecontextmenu" Handler="onTreeNodeContextMenu" />
+                            </Listeners>
                         </f:Tree>
                         <f:HiddenField runat="server" ID="hdSelectId">
                         </f:HiddenField>
@@ -44,11 +46,11 @@
                     <Items>
                         <f:Grid ID="Grid1" Width="870px" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
                             runat="server" BoxFlex="1" DataKeyNames="BreakdownProjectId" AllowSorting="true" EnableColumnLines="true"
-                            SortField="BreakdownCode" SortDirection="ASC" AllowCellEditing="true" ClicksToEdit="1"  KeepCurrentSelection="true"
+                            SortField="BreakdownCode" SortDirection="ASC" AllowCellEditing="true" ClicksToEdit="1" KeepCurrentSelection="true"
                             ForceFit="true" OnRowCommand="Grid1_RowCommand"
                             ShowSelectedCell="true" DataIDField="BreakdownProjectId" AllowPaging="true" IsDatabasePaging="true"
                             PageSize="100" OnPageIndexChange="Grid1_PageIndexChange" AllowFilters="true" OnFilterChange="Grid1_FilterChange">
-                            
+
                             <Columns>
                                 <f:RenderField Width="70px" ColumnID="BreakdownCode" DataField="BreakdownCode" FieldType="String"
                                     HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center">
@@ -93,9 +95,11 @@
                                 <f:RenderField Width="40px" ColumnID="ModelURL" DataField="ModelURL" FieldType="String" Hidden="true"
                                     HeaderText="模板附件" HeaderTextAlign="Center" TextAlign="Center">
                                 </f:RenderField>
-                                <f:LinkButtonField HeaderText="附件" ColumnID="download" Width="40px"  Text="附件" CommandName="download" />
+                                <f:LinkButtonField HeaderText="附件" ColumnID="download" Width="40px" Text="附件" CommandName="download" />
                             </Columns>
-                           
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
                             <PageItems>
                                 <f:ToolbarSeparator ID="ToolbarSeparator2" runat="server">
                                 </f:ToolbarSeparator>
@@ -112,20 +116,70 @@
                 </f:Panel>
             </Items>
         </f:Panel>
-        
-         <f:Window ID="Windowtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+
+        <f:Window ID="Window1" Title="编辑" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Self" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
+            Width="800px" Height="300px">
+        </f:Window>
+        <f:Window ID="Window3" Title="编辑" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Self" EnableResize="false" runat="server" OnClose="Window3_Close" IsModal="true"
+            Width="1000px" Height="600px">
+        </f:Window>
+        <f:Window ID="Windowtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
             Height="500px">
         </f:Window>
-        
-       
+        <f:Menu ID="Menu1" runat="server">
+            <%-- <f:MenuButton ID="btnMenuAdd" OnClick="btnMenuAdd_Click" EnablePostBack="true" runat="server" Hidden="true" Icon="Add"
+                Text="增加">
+            </f:MenuButton>--%>
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true" Hidden="true" Icon="Pencil"
+                runat="server" Text="修改">
+            </f:MenuButton>
+            <%--<f:MenuButton ID="btnMenuCopy" OnClick="btnMenuCopy_Click" EnablePostBack="true" Icon="PageCopy"
+                runat="server" Text="复制">
+            </f:MenuButton>       
+            <f:MenuButton ID="btnMenuPaste" OnClick="btnMenuPaste_Click" EnablePostBack="true" Icon="PagePaste"
+                runat="server" Text="粘贴">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true" Hidden="true" Icon="Delete"
+                ConfirmText="确认删除选中项？" ConfirmTarget="Top" runat="server" Text="删除">
+            </f:MenuButton>--%>
+        </f:Menu>
+        <f:Menu ID="Menu2" runat="server">
+            <Items>
+                <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true" Text="修改" Icon="Pencil"
+                    OnClick="btnMenuModify_Click">
+                </f:MenuButton>
+                <%--<f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Hidden="true" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
+                    OnClick="btnMenuDel_Click">
+                </f:MenuButton>--%>
+            </Items>
+        </f:Menu>
+
+
     </form>
     <script type="text/javascript">
         var treeID = '<%= trWBS.ClientID %>';
+        var menuID = '<%= Menu1.ClientID %>';
+        var menuID2 = '<%= Menu2.ClientID %>';
         // 保存当前菜单对应的树节点ID
         var currentNodeId;
 
-       
+        // 返回false，来阻止浏览器右键菜单
+        function onTreeNodeContextMenu(event, nodeId) {
+            currentNodeId = nodeId;
+            F(menuID).show();
+            return false;
+        }
+        // 设置所有菜单项的禁用状态
+        function setMenuItemsDisabled(disabled) {
+            var menu = F(menuID);
+            $.each(menu.items, function (index, item) {
+                item.setDisabled(disabled);
+            });
+        }
+
         // 显示菜单后，检查是否禁用菜单项
         function onMenuShow() {
             if (currentNodeId) {

SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx.cs

@@ -240,7 +240,8 @@ namespace FineUIPro.Web.CQMS.WBS
                                       orderby x.SortIndex
                                       select x).ToList();
                 foreach (var q in childDivisions)
-                {if (q.IsSelected == true)
+                {
+                    if (q.IsSelected == true)
                     {
                         TreeNode newNode = new TreeNode();
                         newNode.Text = q.DivisionName;
@@ -438,8 +439,8 @@ namespace FineUIPro.Web.CQMS.WBS
             return id;
         }
 
-       
-         
+
+
 
         #region 删除
         /// <summary>
@@ -528,8 +529,8 @@ namespace FineUIPro.Web.CQMS.WBS
             tb = GetFilteredTable(Grid1.FilteredData, tb);
             var table = this.GetPagedDataTable(Grid1, tb);
             Grid1.DataSource = table;
-            Grid1.DataBind();            
-             
+            Grid1.DataBind();
+
         }
         #endregion
 
@@ -989,7 +990,7 @@ namespace FineUIPro.Web.CQMS.WBS
         }
         #endregion
 
-         
+
 
         #region 获取按钮权限
         /// <summary>
@@ -1005,9 +1006,83 @@ namespace FineUIPro.Web.CQMS.WBS
             }
             var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectControlPointMenuId);
             if (buttonList.Count() > 0)
-            {  
+            {
+                if (buttonList.Contains(BLL.Const.BtnModify))
+                {
+                    this.btnMenuEdit.Hidden = false;
+                    this.btnMenuModify.Hidden = false;
+                }
             }
         }
         #endregion
+
+        #region 右键增加、修改、删除方法
+
+        /// <summary>
+        /// 右键修改事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuEdit_Click(object sender, EventArgs e)
+        {
+            if (this.trWBS.SelectedNode != null)
+            {
+                if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectControlPointMenuId, BLL.Const.BtnModify))
+                {
+                    if (this.trWBS.SelectedNode.CommandName != "ProjectType" && this.trWBS.SelectedNode.CommandName != "UnitWork" && this.trWBS.SelectedNode.CommandName != "CNProfessional")   //非工程类型和单位工程、专业节点可以修改
+                    {
+                        this.hdSelectId.Text = this.trWBS.SelectedNode.NodeID;
+                        string unitWorkId = this.GetUnitWorkId(this.trWBS.SelectedNode);
+                        string openUrl = String.Format("EditDivisionProject.aspx?type=modify&selectedCode={0}&unitWorkId={1}", this.trWBS.SelectedNode.NodeID, unitWorkId, "编辑 - ");
+                        PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdSelectId.ClientID)
+                                    + Window1.GetShowReference(openUrl));
+                    }
+                    else
+                    {
+                        Alert.ShowInTop("单位工程、工程类型和专业节点无法修改！", MessageBoxIcon.Warning);
+                    }
+                }
+                else
+                {
+                    Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
+                }
+            }
+            else
+            {
+                Alert.ShowInTop("请选择树节点！", MessageBoxIcon.Warning);
+            }
+        }
+
+        #endregion
+
+        #region Grid双击事件
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            btnMenuModify_Click(null, null);
+        }
+        #endregion
+
+        #region 编辑
+        /// <summary>
+        /// 编辑按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuModify_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("EditBreakdownProject.aspx?type=modify&breakdownProjectId={0}&divisionProjectId={1}", this.Grid1.SelectedRowID, this.trWBS.SelectedNodeID, "新增 - ")));
+        }
+        #endregion
+
     }
 }

SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx.designer.cs

@@ -122,6 +122,24 @@ namespace FineUIPro.Web.CQMS.WBS
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
 
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Window3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window3;
+
         /// <summary>
         /// Windowtt 控件。
         /// </summary>
@@ -130,5 +148,41 @@ namespace FineUIPro.Web.CQMS.WBS
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Windowtt;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnMenuEdit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuEdit;
+
+        /// <summary>
+        /// Menu2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu2;
+
+        /// <summary>
+        /// btnMenuModify 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuModify;
     }
 }

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -1436,6 +1436,7 @@
     <Content Include="HSSE\Technique\SpecialScheme.aspx" />
     <Content Include="HSSE\Technique\SpecialSchemeEdit.aspx" />
     <Content Include="HSSE\Technique\SpecialSchemeSelectCloumn.aspx" />
+    <Content Include="HSSE\TowerCrane\TowerCraneRecord.aspx" />
     <Content Include="HSSE\TowerCrane\TowerCrane.aspx" />
     <Content Include="HSSE\TowerCrane\TowerCraneEdit.aspx" />
     <Content Include="HSSE\TowerCrane\TowerCraneState.aspx" />
@@ -14496,6 +14497,13 @@
     <Compile Include="HSSE\Technique\SpecialSchemeSelectCloumn.aspx.designer.cs">
       <DependentUpon>SpecialSchemeSelectCloumn.aspx</DependentUpon>
     </Compile>
+    <Compile Include="HSSE\TowerCrane\TowerCraneRecord.aspx.cs">
+      <DependentUpon>TowerCraneRecord.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HSSE\TowerCrane\TowerCraneRecord.aspx.designer.cs">
+      <DependentUpon>TowerCraneRecord.aspx</DependentUpon>
+    </Compile>
     <Compile Include="HSSE\TowerCrane\TowerCrane.aspx.cs">
       <DependentUpon>TowerCrane.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx

@@ -44,7 +44,7 @@
 
                         <f:RadioButtonList ID="rblIsSuperLargerHazard" runat="server" Label="超危大工程" LabelWidth="100px" Required="true" ShowRedStar="true">
                         </f:RadioButtonList>
-                        <f:NumberBox runat="server" ID="txtTrainPersonNum" NoDecimal="true" NoNegative="true" Label="培训人次" LabelWidth="100px"></f:NumberBox>
+                        <f:NumberBox runat="server" ID="txtTrainPersonNum" NoDecimal="true" NoNegative="true" Label="培训人次" LabelWidth="100px" Required="true" ShowRedStar="true"></f:NumberBox>
                         <f:DropDownList ID="drpStates" runat="server" Label="状态" LabelAlign="Right">
                             <f:ListItem Text="审批完成" Value="1" />
                             <f:ListItem Text="作业中" Value="2" />
@@ -55,7 +55,7 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:NumberBox runat="server" ID="txtOperativesNum" NoDecimal="true" NoNegative="true" Label="作业人员数" LabelWidth="100px"></f:NumberBox>
+                        <f:NumberBox runat="server" ID="txtOperativesNum" NoDecimal="true" NoNegative="true" Label="作业人员数" LabelWidth="100px" Required="true" ShowRedStar="true"></f:NumberBox>
                         <f:Label runat="server" ID="txtOperativesNum1"></f:Label>
                         <f:Label runat="server" ID="txtOperativesNum2"></f:Label>
                     </Items>

SGGL/FineUIPro.Web/HSSE/Technique/Rectify.aspx.cs

@@ -557,5 +557,24 @@ namespace FineUIPro.Web.HSSE.Technique
             }
         }
         #endregion
+
+
+        /// <summary>
+        /// 从集团获取
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnGet_Click(object sender, EventArgs e)
+        {
+            var returnValue = CNCECHSSEWebService.getTechnique_RectifyList();
+            if (returnValue.code == 1)
+            {
+                ShowNotify(returnValue.message, MessageBoxIcon.Success);
+            }
+            else
+            {
+                Alert.ShowInTop(returnValue.message, MessageBoxIcon.Success);
+            }
+        }
     }
 }

SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneRecord.aspx

@@ -0,0 +1,145 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TowerCraneRecord.aspx.cs" Inherits="FineUIPro.Web.HSSE.TowerCrane.TowerCraneRecord" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>塔吊</title>
+ 
+</head>
+<body>
+    <form id="form1" runat="server">
+    <f:PageManager ID="PageManager1" AutoSizePanelID="Panel2" runat="server" />
+    <f:Panel ID="Panel2" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"  
+                    EnableCollapse="true" Width="300px" Title="塔吊状态" ShowBorder="true" Layout="HBox"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:TextBox ID="txtIsono" runat="server" Label="塔吊" EmptyText="输入查询条件" AutoPostBack="true"
+                                    OnTextChanged="Tree_TextChanged" Width="250px" LabelWidth="70px" LabelAlign="Right">
+                                </f:TextBox>
+                                <f:HiddenField ID="hfTowerCraneId" ClientIDMode="Static" runat="server"></f:HiddenField>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Items>
+                        <f:Tree ID="tvControlItem" ShowHeader="false" Height="500px" Title="塔吊状态" OnNodeCommand="tvControlItem_NodeCommand"
+                            runat="server" ShowBorder="false" EnableCollapse="true"   
+                            AutoLeafIdentification="true" EnableSingleExpand="true" EnableTextSelection="true" >
+                        </f:Tree>
+                    </Items>
+                </f:Panel>
+
+                <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+                ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">       
+                     <Items>
+                    <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="塔吊" EnableCollapse="true"
+                        runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="TowerCraneRecordId"
+                        AllowCellEditing="true" ClicksToEdit="2" DataIDField="TowerCraneRecordId" AllowSorting="true"
+                        SortField="Date" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
+                        IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                          EnableTextSelection="True">
+                        <Toolbars>
+                            <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                                <Items>       
+                                                
+                                       <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="开始日期" ID="txtStartTime"
+                                              LabelAlign="right" >
+                                        </f:DatePicker>
+                                          <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="结束日期" ID="txtEndTime"
+                                              LabelAlign="right"  >
+                                        </f:DatePicker> 
+                                    <f:Button ID="btnQuery" OnClick="btnQuery_Click" ToolTip="查询"    Icon="SystemSearch" EnablePostBack="true" runat="server" >
+                                        </f:Button>
+                                    <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                    </f:ToolbarFill> 
+                                </Items>
+                            </f:Toolbar>
+                        </Toolbars>
+                        <Columns>
+                            <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
+                                TextAlign="Center">
+                                <ItemTemplate>
+                                    <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                </ItemTemplate>
+                            </f:TemplateField>                  
+                            <f:RenderField Width="220px" ColumnID="AlarmType" DataField="AlarmType"
+                                 SortField="AlarmType" FieldType="String" HeaderText="报警数据"
+                                HeaderTextAlign="Center" TextAlign="Center">
+                            </f:RenderField>
+                            <f:RenderField Width="100px" ColumnID="AmountHoist" DataField="AmountHoist"
+                                SortField="AmountHoist" FieldType="Float" HeaderText="额度吊重" HeaderTextAlign="Center"
+                                TextAlign="Left" >
+                            </f:RenderField>
+
+                            <f:RenderField Width="100px" ColumnID="Camber" DataField="Camber"
+                                SortField="Camber" FieldType="Float" HeaderText="前倾角" HeaderTextAlign="Center"
+                                TextAlign="Center">
+                            </f:RenderField>
+                            <f:RenderField Width="100px" ColumnID="Height" DataField="Height"
+                                SortField="Height" FieldType="Float" HeaderText="高度" HeaderTextAlign="Center"
+                                TextAlign="Center" >
+                            </f:RenderField>
+                            <f:RenderField Width="100px" ColumnID="Hoist" DataField="Hoist"
+                                SortField="Hoist" FieldType="Float" HeaderText="吊重" HeaderTextAlign="Center"
+                                TextAlign="Center" >
+                            </f:RenderField>
+                            <f:RenderField Width="100px" ColumnID="Moment" DataField="Moment"
+                                SortField="Moment" FieldType="String" HeaderText="力矩" HeaderTextAlign="Center"
+                                TextAlign="Center" >
+                            </f:RenderField>
+                             <f:RenderField Width="100px" ColumnID="Range" DataField="Range"
+                                SortField="Range" FieldType="Float" HeaderText="幅度" HeaderTextAlign="Center"
+                                TextAlign="Center" >
+                            </f:RenderField>
+                              <f:RenderField Width="100px" ColumnID="RotationAngle" DataField="RotationAngle"
+                                SortField="RotationAngle" FieldType="Float" HeaderText="回转角度" HeaderTextAlign="Center"
+                                TextAlign="Center" >
+                            </f:RenderField>
+                              <f:RenderField Width="100px" ColumnID="WindSpeed" DataField="WindSpeed"
+                                SortField="WindSpeed" FieldType="Float" HeaderText="风速" HeaderTextAlign="Center"
+                                TextAlign="Center" >
+                            </f:RenderField>
+                            <f:RenderField Width="100px" ColumnID="Date" DataField="Date"
+                                SortField="Date" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm"
+                                HeaderText="时间" HeaderTextAlign="Center" TextAlign="Center">
+                            </f:RenderField>
+                   
+                            <f:RenderField Width="150px" ColumnID="Remark" DataField="Remark"
+                                SortField="Remark" FieldType="String" HeaderText="备注" HeaderTextAlign="Center" ExpandUnusedSpace="true"
+                                TextAlign="Center">
+                            </f:RenderField>
+                    
+                        </Columns>
+                        
+                        <PageItems>
+                            <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                            </f:ToolbarSeparator>
+                            <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                            </f:ToolbarText>
+                            <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                <f:ListItem Text="10" Value="10" />
+                                <f:ListItem Text="15" Value="15" />
+                                <f:ListItem Text="20" Value="20" />
+                                <f:ListItem Text="25" Value="25" />
+                                <f:ListItem Text="所有行" Value="100000" />
+                            </f:DropDownList>
+                        </PageItems>
+                    </f:Grid>
+                </Items>
+                </f:Panel>
+
+        </Items>
+
+    </f:Panel>
+
+    
+    </form>
+    
+</body>
+</html>

SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneRecord.aspx.cs

@@ -0,0 +1,219 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using BLL;
+using AspNet = System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.HSSE.TowerCrane
+{
+    public partial class TowerCraneRecord : PageBase
+    {
+        #region 定义项
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
+
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.InitTreeMenu();//加载树 
+            }
+        }
+        #region 加载树装置-单位-工作区
+        /// <summary>
+        /// 加载树
+        /// </summary>
+        private void InitTreeMenu()
+        {
+            this.tvControlItem.Nodes.Clear();
+
+            ////塔吊
+            var towerCranes = (from x in Funs.DB.HSSE_TowerCrane
+                               where x.ProjectId == this.CurrUser.LoginProjectId
+                               && (string.IsNullOrEmpty(txtIsono.Text) || x.TowerCraneName.Contains(txtIsono.Text))
+                               orderby x.CreateDate
+                               select x).ToList();
+
+            foreach (var item in towerCranes)
+            {
+                TreeNode rootNode = new TreeNode();
+                rootNode.Text = item.TowerCraneName;
+                rootNode.NodeID = item.TowerCraneId;
+                rootNode.EnableClickEvent = true;
+                this.tvControlItem.Nodes.Add(rootNode);
+            }
+
+        }
+        #endregion
+
+      
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Tree_TextChanged(object sender, EventArgs e)
+        {
+            this.InitTreeMenu();
+
+        }
+
+        
+        /// <summary>
+        /// 树展开事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
+        { 
+
+            BindGrid();
+        }
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string TowerCraneId = this.tvControlItem.SelectedNodeID;
+            if (!string.IsNullOrEmpty(TowerCraneId))
+            {
+                string strSql = @"SELECT * from  HSSE_TowerCraneRecord WHERE ";
+                List<SqlParameter> listStr = new List<SqlParameter>();
+                strSql += " TowerCraneId = @TowerCraneId";
+                listStr.Add(new SqlParameter("@TowerCraneId", TowerCraneId));
+
+
+                strSql += " order by Date desc";
+                SqlParameter[] parameter = listStr.ToArray();
+                DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+                Grid1.RecordCount = tb.Rows.Count;
+                //tb = GetFilteredTable(Grid1.FilteredData, tb);
+                var table = this.GetPagedDataTable(Grid1, tb);
+                if (table != null && table.Rows.Count > 0)
+                {
+                    Dictionary<string, string> alarmMap = new Dictionary<string, string>();
+
+                    alarmMap.Add("111", "重量预警");
+                    alarmMap.Add("112", "重量报警");
+                    alarmMap.Add("121", "风速预警");
+                    alarmMap.Add("122", "风速报警");
+                    alarmMap.Add("131", "内限位报警");
+                    alarmMap.Add("132", "内限位预警");
+                    alarmMap.Add("133", "外限位预警");
+                    alarmMap.Add("134", "外限位报警");
+                    alarmMap.Add("141", "倾角预警");
+                    alarmMap.Add("142", "倾角报警");
+                    alarmMap.Add("151", "上限位预警");
+                    alarmMap.Add("152", "上限位报警");
+                    alarmMap.Add("201", "障碍物碰撞报警");
+                    alarmMap.Add("202", "塔机群碰撞报警");
+
+                    foreach (DataRow row in table.Rows)
+                    {
+                        string AlarmType = row["AlarmType"].ToString();
+                        if (!string.IsNullOrEmpty(AlarmType))
+                        {
+                            var alarms = AlarmType.Replace("[", "").Replace("]", "").Split(',');
+                            string res = "";
+                            foreach (string alarm in alarms)
+                            {
+                                if (alarmMap.ContainsKey(alarm))
+                                {
+                                    res += alarmMap[alarm] + ",";
+                                }
+                            }
+                            row["AlarmType"] = res.TrimEnd(',');
+                        }
+
+                    }
+                }
+                Grid1.DataSource = table;
+                Grid1.DataBind();
+            }
+            else
+            {
+                Grid1.DataSource = null;
+                Grid1.DataBind();
+            }
+        }
+
+        #region 分页 排序
+        /// <summary>
+        /// 改变索引事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页下拉选择事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+         
+
+         
+ 
+
+        protected void btnQuery_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+    }
+}

SGGL/FineUIPro.Web/HSSE/TowerCrane/TowerCraneRecord.aspx.designer.cs

@@ -0,0 +1,188 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HSSE.TowerCrane
+{
+
+
+    public partial class TowerCraneRecord
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel2;
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// txtIsono 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtIsono;
+
+        /// <summary>
+        /// hfTowerCraneId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hfTowerCraneId;
+
+        /// <summary>
+        /// tvControlItem 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tree tvControlItem;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// txtStartTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartTime;
+
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+
+        /// <summary>
+        /// btnQuery 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnQuery;
+
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// lblNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblNumber;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+    }
+}

SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx

@@ -25,22 +25,18 @@
                             <f:Form ID="Form_edit" ShowBorder="false" ShowHeader="false" AutoScroll="true"
                                 BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
                                 <Rows>
-                                    <f:FormRow>
+                                    <f:FormRow Hidden="true">
                                         <Items>
                                             <f:TextBox ID="txtGJSXID" runat="server" Label="编号" Hidden="true" MaxLength="20" LabelWidth="110px">
                                             </f:TextBox>
-                                            <f:DropDownList ID="DropUnitId" runat="server" Label="责任单位" AutoPostBack="true" OnSelectedIndexChanged="DropUnitId_SelectedIndexChanged" MaxLength="50" LabelWidth="110px">
-                                            </f:DropDownList>
-                                            <f:DropDownList ID="DropCNProfessional_ID" runat="server" Label="专业" MaxLength="50" LabelWidth="110px" EnableCheckBoxSelect="true" EnableMultiSelect="true">
-                                            </f:DropDownList>
                                         </Items>
                                     </f:FormRow>
                                     <f:FormRow>
                                         <Items>
-                                            <f:TextBox ID="txtUserID" runat="server" Label="提出人" MaxLength="20" Readonly="true"  AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelWidth="110px">
-                                            </f:TextBox>
-                                            <f:DatePicker ID="Date_CreateDate" runat="server" Label="提出日期" Readonly="true" LabelWidth="110px">
-                                            </f:DatePicker>
+                                            <f:DropDownList ID="DropUnitId" runat="server" Label="责任单位" AutoPostBack="true" OnSelectedIndexChanged="DropUnitId_SelectedIndexChanged" MaxLength="50" LabelWidth="110px" Required="true" ShowRedStar="true">
+                                            </f:DropDownList>
+                                            <f:DropDownList ID="DropCNProfessional_ID" runat="server" Label="专业" MaxLength="50" LabelWidth="110px" EnableCheckBoxSelect="true" EnableMultiSelect="true">
+                                            </f:DropDownList>
                                         </Items>
                                     </f:FormRow>
                                     <f:FormRow>
@@ -56,12 +52,28 @@
                                             <f:DropDownList ID="DropUser_Acceptance" runat="server" Label="责任人" EmptyText="支持模糊匹配" AutoSelectFirstItem="false" Required="true" ShowRedStar="true" MaxLength="50" LabelWidth="110px"
                                                 EnableCheckBoxSelect="true" EnableEdit="true">
                                             </f:DropDownList>
-                                            <f:DatePicker ID="Date_CompleteDate" runat="server" Label="要求完成日期"  MinDate="<%# DateTime.Now.AddDays(1) %>" ShowRedStar="true" LabelWidth="110px">
-                                            </f:DatePicker>
+                                            <f:RadioButtonList ID="rblNotice" runat="server" Label="即时邮件通知" LabelWidth="110px" Width="320px" AutoColumnWidth="true">
+                                                <f:RadioItem Value="1" Text="是" Selected="true" />
+                                                <f:RadioItem Value="0" Text="否" />
+                                            </f:RadioButtonList>
+                                        </Items>
+                                    </f:FormRow>
+                                    <f:FormRow>
+                                        <Items>
                                             <f:DropDownList ID="DropUser_ReceiveID" runat="server" Label="跟踪人" EmptyText="支持模糊匹配" AutoSelectFirstItem="false" MaxLength="50" LabelWidth="110px"
                                                 EnableCheckBoxSelect="true" EnableEdit="true"
                                                 OnSelectedIndexChanged="DropUser_ReceiveID_TextChanged" AutoPostBack="true">
                                             </f:DropDownList>
+                                            <f:DatePicker ID="Date_CompleteDate" runat="server" Label="要求完成日期" MinDate="<%# DateTime.Now.AddDays(1) %>" ShowRedStar="true" LabelWidth="110px">
+                                            </f:DatePicker>
+                                        </Items>
+                                    </f:FormRow>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:TextBox ID="txtUserID" runat="server" Label="提出人" MaxLength="20" Readonly="true" AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelWidth="110px">
+                                            </f:TextBox>
+                                            <f:DatePicker ID="Date_CreateDate" runat="server" Label="提出日期" Readonly="true" LabelWidth="110px">
+                                            </f:DatePicker>
                                         </Items>
                                     </f:FormRow>
                                     <f:FormRow>

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

@@ -705,6 +705,8 @@ namespace FineUIPro.Web.PZHGL.GJSX
         /// <param name="e"></param>
         protected void btnsubmit_Click(object sender, EventArgs e)
         {
+            #region 数据验证
+
             if (this.DropUnitId.SelectedValue == Const._Null)
             {
                 Alert.ShowInParent("请选择单位！", MessageBoxIcon.Warning);
@@ -725,7 +727,8 @@ namespace FineUIPro.Web.PZHGL.GJSX
                 Alert.ShowInParent("事项类别！", MessageBoxIcon.Warning);
                 return;
             }
-            if (this.DropUser_Acceptance.SelectedValue == null || this.DropUser_Acceptance.SelectedValue == Const._Null)
+            var DropUser_AcceptanceId = this.DropUser_Acceptance.SelectedValue;
+            if (DropUser_AcceptanceId == null || DropUser_AcceptanceId == Const._Null)
             {
                 Alert.ShowInParent("请选择责任人！", MessageBoxIcon.Warning);
                 return;
@@ -741,12 +744,33 @@ namespace FineUIPro.Web.PZHGL.GJSX
                 return;
             }
 
+            string rNotice = this.rblNotice.SelectedValue;
+            //勾选邮件即时通知责任人，先判断责任人是否已维护邮箱
+            if (rNotice == "1")
+            {
+                if (!BLL.UserService.IsUserHaveEmail(DropUser_AcceptanceId))
+                {
+                    Alert.ShowInParent("请先给责任人维护邮箱！", MessageBoxIcon.Warning);
+                    return;
+                }
+            }
+
+            #endregion
+
             string EditType = Request.Params["EditType"];
 
             string ID = Request.Params["ID"];
             if (string.IsNullOrEmpty(ID))
             {
                 save("2");
+                //勾选邮件即时通知责任人，邮箱通知提醒关键事项
+                if (rNotice == "1")
+                {
+                    if (BLL.UserService.IsUserHaveEmail(DropUser_AcceptanceId))
+                    {
+                        GJSXMonitorService.GJSXNoticeSendEmail(DropUser_AcceptanceId, this.txtGJSXID.Text.Trim());
+                    }
+                }
             }
             else
             {
@@ -755,6 +779,14 @@ namespace FineUIPro.Web.PZHGL.GJSX
                 if (state == "1")
                 {
                     save("2");
+                    //勾选邮件即时通知责任人，邮箱通知提醒关键事项
+                    if (rNotice == "1")
+                    {
+                        if (BLL.UserService.IsUserHaveEmail(DropUser_AcceptanceId))
+                        {
+                            GJSXMonitorService.GJSXNoticeSendEmail(DropUser_AcceptanceId, this.txtGJSXID.Text.Trim());
+                        }
+                    }
                 }
                 else
                 {

SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.designer.cs

@@ -86,24 +86,6 @@ namespace FineUIPro.Web.PZHGL.GJSX
         /// </remarks>
         protected global::FineUIPro.DropDownList DropCNProfessional_ID;
 
-        /// <summary>
-        /// txtUserID 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtUserID;
-
-        /// <summary>
-        /// Date_CreateDate 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DatePicker Date_CreateDate;
-
         /// <summary>
         /// DropQuestionTypeID 控件。
         /// </summary>
@@ -132,13 +114,13 @@ namespace FineUIPro.Web.PZHGL.GJSX
         protected global::FineUIPro.DropDownList DropUser_Acceptance;
 
         /// <summary>
-        /// Date_CompleteDate 控件。
+        /// rblNotice 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DatePicker Date_CompleteDate;
+        protected global::FineUIPro.RadioButtonList rblNotice;
 
         /// <summary>
         /// DropUser_ReceiveID 控件。
@@ -149,6 +131,33 @@ namespace FineUIPro.Web.PZHGL.GJSX
         /// </remarks>
         protected global::FineUIPro.DropDownList DropUser_ReceiveID;
 
+        /// <summary>
+        /// Date_CompleteDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker Date_CompleteDate;
+
+        /// <summary>
+        /// txtUserID 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtUserID;
+
+        /// <summary>
+        /// Date_CreateDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker Date_CreateDate;
+
         /// <summary>
         /// drpCsUsers 控件。
         /// </summary>

SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx

@@ -144,6 +144,26 @@
                                 </f:Form>
                             </Items>
                         </f:GroupPanel>
+
+                         <f:GroupPanel ID="GroupPanel4" Layout="Anchor" Title="安全帽平台" runat="server">
+                            <Items>
+                                <f:Form ID="Form5" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+                                    Layout="VBox" BodyPadding="10px" runat="server" RedStarPosition="BeforeText"
+                                    LabelAlign="Right">
+                                    <Rows>
+                                        <f:FormRow>
+                                            <Items>
+                                               <f:TextBox ID="txtAQMAccount" runat="server" Label="账号"  MaxLength="50" >
+                                                </f:TextBox>
+                                                <f:TextBox ID="txtAQMPwd" runat="server" Label="密码"    MaxLength="50">
+                                                </f:TextBox>
+                                            </Items>
+                                        </f:FormRow>
+                                        
+                                    </Rows>
+                                </f:Form>
+                            </Items>
+                        </f:GroupPanel>
                     </Items>
                     <Toolbars>
                         <f:Toolbar ID="Toolbar1" Position="Top" ToolbarAlign="Right" runat="server">

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

@@ -54,6 +54,8 @@ namespace FineUIPro.Web.common.ProjectSet
             if (getProject != null )
             {
                 getProject.IsFace = this.ckbIsFace.Checked;
+                getProject.AQMAccount = this.txtAQMAccount.Text;
+                getProject.AQMPwd = this.txtAQMPwd.Text;
                 Funs.DB.SubmitChanges();
             }
             #endregion
@@ -294,9 +296,20 @@ namespace FineUIPro.Web.common.ProjectSet
         {
             ///通用
             var getProject = ProjectService.GetProjectByProjectId(projectId);
-            if (getProject != null && getProject.IsFace == true)
+            if (getProject != null )
             {
-                this.ckbIsFace.Checked = true;
+                if (getProject.IsFace == true)
+                {
+                    this.ckbIsFace.Checked = true;
+                }
+                if (!string.IsNullOrEmpty(getProject.AQMPwd))
+                {
+                    this.txtAQMPwd.Text = getProject.AQMPwd;
+                }
+                if (!string.IsNullOrEmpty(getProject.AQMAccount))
+                {
+                    this.txtAQMAccount.Text = getProject.AQMAccount;
+                }
             }
 
             var q = from x in Funs.DB.Project_Sys_Set where x.ProjectId == projectId select x;

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

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.common.ProjectSet {
-    
-    
-    public partial class ProjectSysSet {
-        
+namespace FineUIPro.Web.common.ProjectSet
+{
+
+
+    public partial class ProjectSysSet
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// RegionPanel1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RegionPanel RegionPanel1;
-        
+
         /// <summary>
         /// Region2 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Region Region2;
-        
+
         /// <summary>
         /// GroupPanel0 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.GroupPanel GroupPanel0;
-        
+
         /// <summary>
         /// Form4 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form Form4;
-        
+
         /// <summary>
         /// ckbIsFace 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBox ckbIsFace;
-        
+
         /// <summary>
         /// btnSetMap 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSetMap;
-        
+
         /// <summary>
         /// GroupPanel1 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.GroupPanel GroupPanel1;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// txtRemindDay 控件。
         /// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtRemindDay;
-        
+
         /// <summary>
         /// txtStarTime 控件。
         /// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtStarTime;
-        
+
         /// <summary>
         /// txtEndTime 控件。
         /// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtEndTime;
-        
+
         /// <summary>
         /// GroupPanel2 控件。
         /// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.GroupPanel GroupPanel2;
-        
+
         /// <summary>
         /// Form2 控件。
         /// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form Form2;
-        
+
         /// <summary>
         /// ckbPdms 控件。
         /// </summary>
@@ -155,7 +157,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBox ckbPdms;
-        
+
         /// <summary>
         /// ckbDayReport 控件。
         /// </summary>
@@ -164,7 +166,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBox ckbDayReport;
-        
+
         /// <summary>
         /// ckbPoint 控件。
         /// </summary>
@@ -173,7 +175,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBox ckbPoint;
-        
+
         /// <summary>
         /// robStandard 控件。
         /// </summary>
@@ -182,7 +184,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList robStandard;
-        
+
         /// <summary>
         /// Label4 控件。
         /// </summary>
@@ -191,7 +193,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label Label4;
-        
+
         /// <summary>
         /// Label1 控件。
         /// </summary>
@@ -200,7 +202,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label Label1;
-        
+
         /// <summary>
         /// cb1 控件。
         /// </summary>
@@ -209,7 +211,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBox cb1;
-        
+
         /// <summary>
         /// cb2 控件。
         /// </summary>
@@ -218,7 +220,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBox cb2;
-        
+
         /// <summary>
         /// cb3 控件。
         /// </summary>
@@ -227,7 +229,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBox cb3;
-        
+
         /// <summary>
         /// cb4 控件。
         /// </summary>
@@ -236,7 +238,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBox cb4;
-        
+
         /// <summary>
         /// cb5 控件。
         /// </summary>
@@ -245,7 +247,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBox cb5;
-        
+
         /// <summary>
         /// cb6 控件。
         /// </summary>
@@ -254,7 +256,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBox cb6;
-        
+
         /// <summary>
         /// cb7 控件。
         /// </summary>
@@ -263,7 +265,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBox cb7;
-        
+
         /// <summary>
         /// GroupPanel3 控件。
         /// </summary>
@@ -272,7 +274,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.GroupPanel GroupPanel3;
-        
+
         /// <summary>
         /// Form3 控件。
         /// </summary>
@@ -281,7 +283,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form Form3;
-        
+
         /// <summary>
         /// rbWeightsSet 控件。
         /// </summary>
@@ -290,7 +292,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList rbWeightsSet;
-        
+
         /// <summary>
         /// nbCompleteAndReal 控件。
         /// </summary>
@@ -299,7 +301,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox nbCompleteAndReal;
-        
+
         /// <summary>
         /// Label2 控件。
         /// </summary>
@@ -308,7 +310,43 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label Label2;
-        
+
+        /// <summary>
+        /// GroupPanel4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.GroupPanel GroupPanel4;
+
+        /// <summary>
+        /// Form5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form5;
+
+        /// <summary>
+        /// txtAQMAccount 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtAQMAccount;
+
+        /// <summary>
+        /// txtAQMPwd 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtAQMPwd;
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -317,7 +355,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -326,7 +364,7 @@ namespace FineUIPro.Web.common.ProjectSet {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>

SGGL/FineUIPro.Web/ZHDD/ZHDD.aspx

@@ -8,22 +8,25 @@
     <title>意见收集</title>
     <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
     <style>
-        container-title-tt {
-            display: none !important
-        }
+        container-title-tt{display:none !important}
     </style>
 </head>
+    
 <body>
     <form id="form1" runat="server">
         <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
         <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
             ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
-                <f:ContentPanel ID="ContentPanel1" CssClass="bodyregion" ShowBorder="false" ShowHeader="false" runat="server" Height="800">
-                    <iframe id="ifZHDD" runat="server" allow="microphone;camera;midi;encrypted-media;" allowfullscreen="true" width="100%" height="878" frameborder="0" style="margin-top: -78px"></iframe>
-                </f:ContentPanel>
+                   <f:ContentPanel ID="ContentPanel1" CssClass="bodyregion" ShowBorder="false" ShowHeader="false" runat="server" Height="800">
+                       <iframe  id="ifZHDD"  runat="server" allow="microphone;camera;midi;encrypted-media;"  allowfullscreen="true" width="100%"  height="878" frameborder="0"  style="margin-top:-78px">
+                       </iframe>
+                        
+                   </f:ContentPanel>
             </Items>
         </f:Panel>
+      
     </form>
+    
 </body>
 </html>

SGGL/FineUIPro.Web/ZHDD/ZHDD.aspx.cs

@@ -13,6 +13,8 @@ namespace FineUIPro.Web.ZHDD
 {
     public partial class ZHDD : PageBase
     {
+        
+
         #region 加载页面
         /// <summary>
         /// 加载页面
@@ -23,22 +25,23 @@ namespace FineUIPro.Web.ZHDD
         {
             if (!IsPostBack)
             {
-                //string username = "rdys_test";
-                //string password = "Runde.2024";
-                string username = "合肥诺必达";
-                string password = "Hf123456@";
-                var res1 = APIGetHttpService.Http("https://caps.runde.pro/api/index.php?ctl=tool&act=get_pkey&user_name=" + username + "&pwd=" + password, "POST");
+                var project = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectId == CurrUser.LoginProjectId);
+                string username = project.AQMAccount;// "bruce";
+                string password = project.AQMPwd;// "Admin!@%2316891#16891";
+                var res1 = APIGetHttpService.Http("https://aqm.cwcec.com/api/index.php", "POST", "application/x-www-form-urlencoded", null,"ctl=tool&act=get_pkey&user_name=" + username + "&pwd="+ password);
                 var j1 = JsonConvert.DeserializeObject<dynamic>(res1);
                 string data = j1.data;
 
-                var res2 = APIGetHttpService.Http("https://caps.runde.pro/api/index.php?ctl=tool&act=get_token&user_name=" + username + "&pkey=" + j1.data, "POST");
+                var res2 = APIGetHttpService.Http("https://aqm.cwcec.com/api/index.php?ctl=tool&act=get_token&user_name=" + username + "&pkey="+j1.data, "POST");
                 var j2 = JsonConvert.DeserializeObject<dynamic>(res2);
                 string session_id = j2.session_id;
                 string token = j2.token;
-                ifZHDD.Src = "https://caps.runde.pro/login/#token=" + session_id + "&user_name=" + username + "target=home";
+                ifZHDD.Src = "https://aqm.cwcec.com/login/#token=" + session_id+"&user_name=" + username + "target=home";
             }
         }
-        #endregion
 
+         #endregion
+
+   
     }
 }

SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx

@@ -80,14 +80,26 @@
                                     <Items>
                                         <f:Label ID="txtUnitName" runat="server" Hidden="true">
                                         </f:Label>
-                                        <f:Label ID="txtQuarter" runat="server">
+                                        <f:Label ID="txtQuarter" runat="server" LabelWidth="130px">
                                         </f:Label>
-                                        <f:Label ID="txtCompileDate" runat="server">
+                                        <f:Label ID="txtCompileDate" runat="server" LabelWidth="130px">
                                         </f:Label>
                                         <f:Label ID="lbHandleMan" runat="server">
                                         </f:Label>
                                     </Items>
                                 </f:FormRow>
+                                <f:FormRow>
+                                    <Items>
+                                        <f:Label ID="Label1" runat="server" Hidden="true">
+                                        </f:Label>
+                                        <f:Label ID="txtKeyWorkNum" runat="server" Label="重点工作任务数" LabelWidth="130px">
+                                        </f:Label>
+                                        <f:Label ID="txtKeyWorkOKNum" runat="server" Label="重点工作完成数" LabelWidth="130px">
+                                        </f:Label>
+                                        <f:Label ID="txtKeyWorkOKRate" runat="server" Label="综合完成率">
+                                        </f:Label>
+                                    </Items>
+                                </f:FormRow>
                             </Rows>
                         </f:Form>
                         <f:Grid ID="Grid1" Width="870px" ShowBorder="true" ShowHeader="false" EnableCollapse="true"

SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx.cs

@@ -62,6 +62,9 @@ namespace FineUIPro.Web.ZHGL.Information
             txtUnitName.Text = string.Empty;
             txtQuarter.Text = string.Empty;
             txtCompileDate.Text = string.Empty;
+            txtKeyWorkNum.Text = string.Empty;
+            txtKeyWorkOKNum.Text = string.Empty;
+            txtKeyWorkOKRate.Text = string.Empty;
             this.lbHandleMan.Text = string.Empty;
             Grid1.DataSource = null;
             Grid1.DataBind();
@@ -105,6 +108,18 @@ namespace FineUIPro.Web.ZHGL.Information
                 this.ActionWorkLedgerId = report.ActionWorkLedgerId;
                 txtUnitName.Text = "单位：" + report.UnitName;
                 txtQuarter.Text = "季度：" + report.Quarters;
+                if (report.KeyWorkNum != null)
+                {
+                    txtKeyWorkNum.Text = report.KeyWorkNum.ToString();
+                }
+                if (report.KeyWorkOKNum != null)
+                {
+                    txtKeyWorkOKNum.Text = report.KeyWorkOKNum.ToString();
+                }
+                if (!string.IsNullOrEmpty(report.KeyWorkOKRate))
+                {
+                    txtKeyWorkOKRate.Text = report.KeyWorkOKRate;
+                }
                 if (report.HandleState == BLL.Const.HandleState_1 || report.UpState == BLL.Const.UpState_3)
                 {
                     this.lbHandleMan.Hidden = true;

SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx.designer.cs

@@ -228,6 +228,42 @@ namespace FineUIPro.Web.ZHGL.Information {
         /// </remarks>
         protected global::FineUIPro.Label lbHandleMan;
         
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label1;
+        
+        /// <summary>
+        /// txtKeyWorkNum 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label txtKeyWorkNum;
+        
+        /// <summary>
+        /// txtKeyWorkOKNum 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label txtKeyWorkOKNum;
+        
+        /// <summary>
+        /// txtKeyWorkOKRate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label txtKeyWorkOKRate;
+        
         /// <summary>
         /// Grid1 控件。
         /// </summary>

SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx

@@ -27,6 +27,15 @@
                         </f:DatePicker>
                     </Items>
                 </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:NumberBox runat="server" ID="txtKeyWorkNum" Label="重点工作任务数" NoDecimal="true" LabelWidth="130px" NoNegative="true" Required="true" ShowRedStar="true" AutoPostBack="true" OnTextChanged="txtKeyWorkNum_TextChanged"></f:NumberBox>
+                        <f:NumberBox runat="server" ID="txtKeyWorkOKNum" Label="重点工作完成数" NoDecimal="true" LabelWidth="130px" NoNegative="true" Required="true" ShowRedStar="true" AutoPostBack="true" OnTextChanged="txtKeyWorkNum_TextChanged"></f:NumberBox>
+                        <f:TextBox ID="txtKeyWorkOKRate" runat="server" Label="综合完成率" Readonly="true">
+                        </f:TextBox>
+                        <f:Label runat="server"></f:Label>
+                    </Items>
+                </f:FormRow>
                 <f:FormRow>
                     <Items>
                         <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" runat="server"

SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx.cs

@@ -99,6 +99,18 @@ namespace FineUIPro.Web.ZHGL.Information
                         {
                             this.dpkCompileDate.Text = string.Format("{0:yyyy-MM-dd}", ActionWorkLedger.ReportDate);
                         }
+                        if (ActionWorkLedger.KeyWorkNum != null)
+                        {
+                            this.txtKeyWorkNum.Text = ActionWorkLedger.KeyWorkNum.ToString();
+                        }
+                        if (ActionWorkLedger.KeyWorkOKNum != null)
+                        {
+                            this.txtKeyWorkOKNum.Text = ActionWorkLedger.KeyWorkOKNum.ToString();
+                        }
+                        if (!string.IsNullOrEmpty(ActionWorkLedger.KeyWorkOKRate))
+                        {
+                            this.txtKeyWorkOKRate.Text = ActionWorkLedger.KeyWorkOKRate;
+                        }
                     }
                 }
                 else
@@ -237,6 +249,9 @@ namespace FineUIPro.Web.ZHGL.Information
             }
             ActionWorkLedger.YearId = Funs.GetNewIntOrZero(this.ddlYearId.SelectedValue);
             ActionWorkLedger.Quarter = Funs.GetNewIntOrZero(this.ddlQuarter.SelectedValue);
+            ActionWorkLedger.KeyWorkNum = Funs.GetNewIntOrZero(this.txtKeyWorkNum.Text.Trim());
+            ActionWorkLedger.KeyWorkOKNum = Funs.GetNewIntOrZero(this.txtKeyWorkOKNum.Text.Trim());
+            ActionWorkLedger.KeyWorkOKRate = this.txtKeyWorkOKRate.Text.Trim();
             if (string.IsNullOrEmpty(this.ActionWorkLedgerId))
             {
                 this.ActionWorkLedgerId = SQLHelper.GetNewID(typeof(Model.Information_ActionWorkLedger)); ActionWorkLedger.ActionWorkLedgerId = this.ActionWorkLedgerId;
@@ -530,5 +545,17 @@ namespace FineUIPro.Web.ZHGL.Information
             }
         }
         #endregion
+
+        protected void txtKeyWorkNum_TextChanged(object sender, EventArgs e)
+        {
+            decimal keyWorkNum = Funs.GetNewDecimalOrZero(this.txtKeyWorkNum.Text.Trim());
+            decimal keyWorkOKNum = Funs.GetNewDecimalOrZero(this.txtKeyWorkOKNum.Text.Trim());
+            string rate = string.Empty;
+            if (keyWorkNum > 0)
+            {
+                rate = (decimal.Round(keyWorkOKNum / keyWorkNum, 4) * 100).ToString("0.##") + "%";
+            }
+            this.txtKeyWorkOKRate.Text = rate;
+        }
     }
 }

SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx.designer.cs

@@ -75,6 +75,33 @@ namespace FineUIPro.Web.ZHGL.Information {
         /// </remarks>
         protected global::FineUIPro.DatePicker dpkCompileDate;
         
+        /// <summary>
+        /// txtKeyWorkNum 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtKeyWorkNum;
+        
+        /// <summary>
+        /// txtKeyWorkOKNum 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtKeyWorkOKNum;
+        
+        /// <summary>
+        /// txtKeyWorkOKRate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtKeyWorkOKRate;
+        
         /// <summary>
         /// Grid1 控件。
         /// </summary>

SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs

@@ -82,7 +82,7 @@ namespace FineUIPro.Web.ZHGL.Information
                         if (report.UpState == BLL.Const.UpState_3)
                         {
                             this.btnSave.Hidden = true;
-                            this.btnUpdata.Hidden = true;
+                            //this.btnUpdata.Hidden = true;
                         }
                         drpMonth.SelectedValue = report.Month.ToString();
                         drpYear.SelectedValue = report.Year.ToString();
@@ -329,6 +329,7 @@ namespace FineUIPro.Web.ZHGL.Information
                     string code = CNCECHSSEWebService.UpMillionsMonthlyReport(report.MillionsMonthlyReportId, this.CurrUser);
                     if (code == "1")
                     {
+                        //WorkflowTodoitemsService.DoneWorkflow_TodoItems(report.MillionsMonthlyReportId, this.CurrUser.UserId);//完成当前人待办
                         ShowNotify("同步成功！", MessageBoxIcon.Success);
                         PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
                         return;
@@ -348,21 +349,100 @@ namespace FineUIPro.Web.ZHGL.Information
             {
                 PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ReportSubmit.aspx?Type=MillionsMonthlyReport&Id={0}", report.MillionsMonthlyReportId, "编辑 - ")));
             }
+            else if (type == "add")
+            {
+                ShowNotify("保存成功！", MessageBoxIcon.Success);
+                PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+                return;
+            }
         }
 
         protected void btnSave_Click(object sender, EventArgs e)
         {
-            Save("add");
+            string err = AuditData();
+            if (string.IsNullOrEmpty(err))
+            {
+                Save("add");
+            }
+            else
+            {
+                ShowNotify(err, MessageBoxIcon.Warning);
+            }
         }
 
         protected void btnUpdata_Click(object sender, EventArgs e)
         {
-            Save("updata");
+            string err = AuditData();
+            if (string.IsNullOrEmpty(err))
+            {
+                Save("updata");
+            }
+            else
+            {
+                ShowNotify(err, MessageBoxIcon.Warning);
+            }
         }
 
         protected void btnSubmit_Click(object sender, EventArgs e)
         {
-            Save("submit");
+            string err = AuditData();
+            if (string.IsNullOrEmpty(err))
+            {
+                Save("submit");
+            }
+            else
+            {
+                ShowNotify(err, MessageBoxIcon.Warning);
+            }
+        }
+
+        private string AuditData()
+        {
+            string err = string.Empty;
+            Model.SGGLDB db = Funs.DB;
+            var reports = from x in db.Information_MillionsMonthlyReport
+                          where x.FillingDate < DateTime.Now
+                          orderby x.FillingDate descending
+                          select x;
+            if (!string.IsNullOrEmpty(this.MillionsMonthlyReportId))
+            {
+                reports = from x in reports
+                          where x.MillionsMonthlyReportId != this.MillionsMonthlyReportId
+                          orderby x.FillingDate descending
+                          select x;
+            }
+            var reportIds = reports.Select(x => x.MillionsMonthlyReportId).Take(3).ToList();
+            //var items = from x in db.Information_MillionsMonthlyReportItem
+            //            where reportIds.Contains(x.MillionsMonthlyReportId)
+            //            select new { x.Name, x.TotalWorkNum };
+            var items = from x in db.Information_MillionsMonthlyReportItem
+                        where reportIds.Contains(x.MillionsMonthlyReportId)
+                        select new { x.Name, x.TotalWorkNum };
+            foreach (JObject mergedRow in Grid1.GetMergedData())
+            {
+                JObject values = mergedRow.Value<JObject>("values");
+                if (!string.IsNullOrEmpty(values["Name"].ToString()) && !string.IsNullOrEmpty(values["TotalWorkNum"].ToString()))
+                {
+                    string name = values.Value<string>("Name");
+                    decimal d = values.Value<decimal>("TotalWorkNum");
+                    var list = items.Where(x => x.Name == name);
+                    decimal a = 0;
+                    if (list.Count() > 0)
+                    {
+                        foreach (var item in list)
+                        {
+                            a += item.TotalWorkNum ?? 0;
+                        }
+                    }
+                    decimal b = a / list.Count();
+                    if (d > b * 5)
+                    {
+                        err = name + "的总工时数超过前三个月平均值5倍，请核对后重新录入！";
+                        break;
+                    }
+                }
+            }
+            return err;
         }
         #endregion
 
@@ -813,10 +893,10 @@ namespace FineUIPro.Web.ZHGL.Information
             };
             items.Add(item2);
             var projects = (from x in Funs.DB.Base_Project
-                            where projectIds.Contains(x.ProjectId)
+                            where projectIds.Contains(x.ProjectId) && (x.IsDelete == null || x.IsDelete == false)
                             select x).ToList();
 
-            if (this.CurrUser.UnitId == BLL.Const.UnitId_CWCEC)
+            if (this.CurrUser.UnitId == CommonService.GetThisUnitId())
             {
                 projects = BLL.ProjectService.GetProjectWorkList();
             }
@@ -924,6 +1004,16 @@ namespace FineUIPro.Web.ZHGL.Information
             Grid1.DataSource = items;
             Grid1.DataBind();
         }
+
+        protected void drpDate_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            items.Clear();
+            GetNewItems(drpYear.SelectedValue, drpMonth.SelectedValue);
+            Grid1.DataSource = items;
+            Grid1.DataBind();
+        }
+
+
         #endregion
 
         #region 获取按钮权限

SGGL/FineUIPro.Web/ZHGL/Person/CompanyPerson.aspx

@@ -16,7 +16,7 @@
             <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="企业总部人员" EnableCollapse="true"
                 runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="CompanyBranchPersonId"
                  DataIDField="CompanyBranchPersonId" AllowSorting="true" ForceFit="true"
-                SortField="PersonName" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true"
+                SortField="SortIndex" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true"
                 IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                 EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
                 <Toolbars>

SGGL/FineUIPro.Web/ZHGL/Person/CompanyPerson.aspx.cs

@@ -40,7 +40,7 @@ namespace FineUIPro.Web.ZHGL.Person
         /// </summary>
         private void BindGrid()
         {
-            string strSql = @"SELECT CompanyBranchPerson.CompanyBranchPersonId,CompanyBranchPerson.PersonName,case CompanyBranchPerson.Sex when '1' then '男' else '女' end as SexStr,CompanyBranchPerson.IdentityCard,WorkPost.WorkPostName,CompanyBranchPerson.Telephone,CompanyBranchPerson.IsOnJob,CompanyBranchPerson.Remark "
+            string strSql = @"SELECT CompanyBranchPerson.CompanyBranchPersonId,CompanyBranchPerson.PersonName,SortIndex,case CompanyBranchPerson.Sex when '1' then '男' else '女' end as SexStr,CompanyBranchPerson.IdentityCard,WorkPost.WorkPostName,CompanyBranchPerson.Telephone,CompanyBranchPerson.IsOnJob,CompanyBranchPerson.Remark "
                 + @" FROM Person_CompanyBranchPerson AS CompanyBranchPerson "
                 + @" LEFT JOIN Base_WorkPost AS WorkPost ON CompanyBranchPerson.WorkPostId=WorkPost.WorkPostId WHERE 1=1 ";
             List<SqlParameter> listStr = new List<SqlParameter>();

SGGL/FineUIPro.Web/ZHGL/Person/CompanyPersonEdit.aspx

@@ -30,25 +30,30 @@
                             LabelWidth="90px" RegexPattern="IDENTITY_CARD">
                         </f:TextBox>
                         <f:DropDownList ID="drpWorkPost" runat="server" Label="岗位" LabelAlign="Right" Required="True" ShowRedStar="True" EnableEdit="true">
-                                                </f:DropDownList>
+                        </f:DropDownList>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
                         <f:TextBox ID="txtTelephone" runat="server" Label="电话" MaxLength="50" LabelWidth="90px">
                         </f:TextBox>
-                        <f:TextBox ID="txtAddress" runat="server" Label="家庭地址" MaxLength="500" LabelAlign="Right" >
-                                                </f:TextBox>
+                        <f:TextBox ID="txtAddress" runat="server" Label="家庭地址" MaxLength="500" LabelAlign="Right">
+                        </f:TextBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:RadioButtonList ID="rblIsOnJob" runat="server" Label="在职" LabelAlign="Right" Required="True" ShowRedStar="True">
+                        <f:RadioButtonList ID="rblIsOnJob" runat="server" Label="在职" LabelAlign="Right" Required="True" ShowRedStar="True" LabelWidth="90px">
                             <f:RadioItem Value="True" Text="是" Selected="true" />
                             <f:RadioItem Value="False" Text="否" />
                         </f:RadioButtonList>
-                        <f:TextBox ID="txtRemark" runat="server" Label="备注" MaxLength="500" LabelAlign="Right" >
-                                                </f:TextBox>
+                        <f:NumberBox ID="txtSortIndex" runat="server" Label="排序" LabelAlign="Right"  Required="true" ShowRedStar="true" NoDecimal="true" NoNegative="true"></f:NumberBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtRemark" runat="server" Label="备注" MaxLength="500" LabelAlign="Right" LabelWidth="90px">
+                        </f:TextBox>
                     </Items>
                 </f:FormRow>
             </Rows>
@@ -56,8 +61,8 @@
                 <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
                     <Items>
                         <f:Button ID="btnAttachUrl" Text="附件" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
-                        OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1">
-                    </f:Button>
+                            OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1">
+                        </f:Button>
                         <f:ToolbarFill runat="server"></f:ToolbarFill>
                         <f:HiddenField runat="server" ID="hdCompanyBranchPersonId"></f:HiddenField>
                         <f:Button ID="btnSave" Icon="SystemSave" runat="server" ValidateForms="SimpleForm1" Hidden="true" Text="保存"
@@ -70,9 +75,9 @@
             </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">
-    </f:Window>
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
+            Height="500px">
+        </f:Window>
     </form>
 </body>
 </html>

SGGL/FineUIPro.Web/ZHGL/Person/CompanyPersonEdit.aspx.cs

@@ -5,6 +5,7 @@ using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 using BLL;
+using FineUIPro.Web.Comprehensive;
 
 namespace FineUIPro.Web.ZHGL.Person
 {
@@ -83,6 +84,7 @@ namespace FineUIPro.Web.ZHGL.Person
                             this.rblIsOnJob.SelectedValue = "False";
                         }
                         this.txtRemark.Text = CompanyBranchPerson.Remark;
+                        this.txtSortIndex.Text = CompanyBranchPerson.SortIndex.HasValue ? CompanyBranchPerson.SortIndex.ToString() : "";
                     }
                 }
             }
@@ -116,6 +118,7 @@ namespace FineUIPro.Web.ZHGL.Person
                 IsOnJob = Convert.ToBoolean(this.rblIsOnJob.SelectedValue),
                 Remark = this.txtRemark.Text.Trim()
             };
+            newCompanyBranchPerson.SortIndex = Funs.GetNewInt(this.txtSortIndex.Text.Trim());
             if (this.drpWorkPost.SelectedValue != Const._Null)
             {
                 newCompanyBranchPerson.WorkPostId = this.drpWorkPost.SelectedValue;

SGGL/FineUIPro.Web/ZHGL/Person/CompanyPersonEdit.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.ZHGL.Person {
-    
-    
-    public partial class CompanyPersonEdit {
-        
+namespace FineUIPro.Web.ZHGL.Person
+{
+
+
+    public partial class CompanyPersonEdit
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.ZHGL.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.ZHGL.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.ZHGL.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// txtPersonName 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.ZHGL.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtPersonName;
-        
+
         /// <summary>
         /// rblSex 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.ZHGL.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList rblSex;
-        
+
         /// <summary>
         /// txtIdentityCard 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.ZHGL.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtIdentityCard;
-        
+
         /// <summary>
         /// drpWorkPost 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.ZHGL.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpWorkPost;
-        
+
         /// <summary>
         /// txtTelephone 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.ZHGL.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtTelephone;
-        
+
         /// <summary>
         /// txtAddress 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.ZHGL.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtAddress;
-        
+
         /// <summary>
         /// rblIsOnJob 控件。
         /// </summary>
@@ -101,7 +103,16 @@ namespace FineUIPro.Web.ZHGL.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList rblIsOnJob;
-        
+
+        /// <summary>
+        /// txtSortIndex 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtSortIndex;
+
         /// <summary>
         /// txtRemark 控件。
         /// </summary>
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.ZHGL.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtRemark;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.ZHGL.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// btnAttachUrl 控件。
         /// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.ZHGL.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnAttachUrl;
-        
+
         /// <summary>
         /// hdCompanyBranchPersonId 控件。
         /// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.ZHGL.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hdCompanyBranchPersonId;
-        
+
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.ZHGL.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-        
+
         /// <summary>
         /// btnClose 控件。
         /// </summary>
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.ZHGL.Person {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnClose;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>

SGGL/FineUIPro.Web/ZHGL/Supervise/SuperviseCheckRectify.aspx.cs

@@ -288,13 +288,13 @@ namespace FineUIPro.Web.ZHGL.Supervise
                 }
 
             }
-            if (string.IsNullOrEmpty(CurrUser.LoginProjectId))
-            {
-                btnDelete.Hidden = true;
-                btnEdit.Hidden = true;
-                btnMenuDelete.Hidden = true;
-                btnMenuEdit.Hidden = true;
-            }
+            //if (string.IsNullOrEmpty(CurrUser.LoginProjectId))
+            //{
+            //    btnDelete.Hidden = true;
+            //    btnEdit.Hidden = true;
+            //    btnMenuDelete.Hidden = true;
+            //    btnMenuEdit.Hidden = true;
+            //}
         }
         #endregion
 

SGGL/FineUIPro.Web/common/Menu_HSSE.xml

@@ -73,6 +73,7 @@
 <TreeNode id="7B272C3F-39D2-496D-A87C-E2C89A20E4EF" Text="HSE巡检统计(图表)" NavigateUrl="HSSE/HiddenInspection/RiskAnalysisChart.aspx"></TreeNode>
 <TreeNode id="4E312813-1A2E-4AF7-8106-9210A6E83926" Text="隐患整改统计" NavigateUrl="HSSE/Check/RectifyNoticesStatistics.aspx"></TreeNode>
 <TreeNode id="5DC49905-6A1C-4353-A06C-D9D1A8D6B6F9" Text="隐患排查与治理统计" NavigateUrl="HSSE/Check/HiddenTroubleManager.aspx"></TreeNode>
+<TreeNode id="09E6A03F-65C8-4FAC-9659-7A0B56D8CC19" Text="智慧巡检" NavigateUrl="ZHDD/ZHDD.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="5309E7E0-395E-4F11-8F5E-D52E11526A2A" Text="HSE会议" NavigateUrl=""><TreeNode id="DFB56743-17BA-40BA-82EA-FCB9B0DBFAFF" Text="安全领导小组会议" NavigateUrl="HSSE/Meeting/SafetyLeaderGroupMeeting.aspx"></TreeNode>
 <TreeNode id="5236B1D9-8B57-495E-8644-231DF5D066CE" Text="HSE周例会" NavigateUrl="HSSE/Meeting/WeekMeeting.aspx"></TreeNode>
@@ -108,6 +109,7 @@
 </TreeNode>
 <TreeNode id="9DE9B74A-0823-4857-8B50-2DAA5E635EC4" Text="塔吊" NavigateUrl="HSSE/TowerCrane/TowerCrane.aspx"></TreeNode>
 <TreeNode id="960812BA-ADE3-41C2-AE4A-BF24A58DE4CB" Text="塔吊状态" NavigateUrl="HSSE/TowerCrane/TowerCraneState.aspx"></TreeNode>
+<TreeNode id="DE0CA5F1-AE72-4752-A244-D474F3F5F9C8" Text="塔吊记录" NavigateUrl="HSSE/TowerCrane/TowerCraneRecord.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="012DF857-AD6B-49AA-87A8-030CD5F66D4C" Text="HSE奖惩" NavigateUrl=""><TreeNode id="96F21A83-6871-4CC4-8901-1B99C376395C" Text="奖励通知单" NavigateUrl="HSSE/Check/IncentiveNotice.aspx"></TreeNode>
 <TreeNode id="C13F1CE7-DAEF-4604-A13F-192621D28DF5" Text="奖励统计" NavigateUrl="HSSE/Check/IncentiveNoticeStatistics.aspx"></TreeNode>

SGGL/FineUIPro.Web/common/Menu_JDGL.xml

@@ -20,7 +20,7 @@
 <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="5E34DEB4-10E6-4964-B91A-4C1A978677DB" Text="施工进度" NavigateUrl=""><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>
@@ -29,8 +29,11 @@
 <TreeNode id="59AAE0F0-2DB6-4065-B304-7E2C56EC3E5D" Text="赢得值曲线" NavigateUrl="JDGL/CostAnalysis/EarnedValueCurve.aspx"></TreeNode>
 <TreeNode id="D1FC6ACA-C789-401C-B9FB-3A96FFE4C8AC" Text="进度报表" NavigateUrl="JDGL/CostAnalysis/JDReport.aspx"></TreeNode>
 <TreeNode id="9CAF311E-C234-4DA4-B235-D4E478FBD80E" Text="里程碑" NavigateUrl="JDGL/WBS/MilePost.aspx"></TreeNode>
-<TreeNode id="94287B92-7E96-4B90-BC6F-DAF30AE3B314" Text="月度计划情况" NavigateUrl="JDGL/Check/MonthPlan.aspx"></TreeNode>
+</TreeNode>
+<TreeNode id="AF2EBE09-739A-4618-9925-44D5C8B94C84" Text="施工计划" NavigateUrl=""><TreeNode id="94287B92-7E96-4B90-BC6F-DAF30AE3B314" Text="月度计划情况" NavigateUrl="JDGL/Check/MonthPlan.aspx"></TreeNode>
 <TreeNode id="56A54B4B-BBA3-4249-9FFC-3A60DAC79059" Text="周进度计划" NavigateUrl="JDGL/Check/WeekPlan.aspx"></TreeNode>
+</TreeNode>
+<TreeNode id="1BCD283A-F33C-488C-8FCA-F7B7B9C1A003" Text="施工人力" NavigateUrl=""></TreeNode>
 <TreeNode id="92CBD072-20F8-45B1-9D17-6F7494DD2020" Text="数据导入" NavigateUrl=""><TreeNode id="F3AA42B3-5776-4992-A625-1216C579FEDE" Text="项目进度情况" NavigateUrl="JDGL/Check/ProgressCompletion.aspx"></TreeNode>
 <TreeNode id="2AE9D982-A499-497F-8F54-ADDA5856887E" Text="工程量完成情况" NavigateUrl="JDGL/Check/QuantityCompletion.aspx"></TreeNode>
 <TreeNode id="82E513B9-1A6F-495A-A633-EBC89CE5273A" Text="低温储罐完成情况" NavigateUrl="JDGL/Check/LowTankCompletion.aspx"></TreeNode>

SGGL/FineUIPro.Web/common/Menu_ZHGL.xml

@@ -39,7 +39,7 @@
 <TreeNode id="70E51ABF-81C8-49CB-89AC-CF0542A201D6" Text="HSSE管理工作报告" NavigateUrl=""><TreeNode id="D67D1C85-3798-47A9-A0DB-B4DB47FF2E7D" Text="报表上报情况" NavigateUrl="ZHGL/ManagementReport/ReportRemind.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="CD9FC4C8-4B02-4619-8B02-50DA6AE6146E" Text="企业大检查" NavigateUrl=""><TreeNode id="40387C48-95A0-435C-82FB-57AF0A81B9D4" Text="监督检查报告" NavigateUrl="ZHGL/Supervise/SuperviseCheckReport.aspx"></TreeNode>
-<TreeNode id="A02E0365-383C-49A0-BF1A-B3E42052959B" Text="安全监督检查整改" NavigateUrl="ZHGL/Supervise/SuperviseCheckRectify.aspx"></TreeNode>
+<TreeNode id="A02E0365-383C-49A0-BF1A-B3E42052959B" Text="监督检查整改" NavigateUrl="ZHGL/Supervise/SuperviseCheckRectify.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="DEAA1931-C0D7-4277-9B34-23963D1C538A" Text="集团安全监督" NavigateUrl=""><TreeNode id="1969C3C3-9257-49CD-977D-546CA18DC91C" Text="安全监督检查通知单" NavigateUrl="ZHGL/ServerCheck/CheckNotice.aspx"></TreeNode>
 <TreeNode id="B9950CB5-C47A-4C0A-A6CC-C7DDBBDE7D1E" Text="企业上报监督检查报告" NavigateUrl="ZHGL/ServerCheck/UpCheckReport.aspx"></TreeNode>

SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx

@@ -526,6 +526,35 @@
                     fontSize: 10,
                 }
             },
+            dataZoom: [
+                {
+                    type: 'slider',
+                    // start: 0,
+                    // end: 60
+                    maxValueSpan: 6,
+                    show: true,
+                    xAxisIndex: [0],
+                    bottom: 0, height: 10,
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    borderColor: 'none',
+                    brushSelect: false,
+                    textStyle: {
+                        color: 'rgba(0,0,0,0)'
+                    },
+                    selectedDataBackground: {
+                        areaStyle: {
+                            color: 'red',
+                            borderWidth: 0
+                        }
+                    },
+                    handleStyle: {  // 缩放手柄的样式
+                        color: "#0a1449"
+                    },
+                    moveHandleStyle: {
+                        color: '#0a1449'
+                    }
+                }
+            ],
             xAxis: {
                 axisTick: {
                     show: false
@@ -541,6 +570,7 @@
                         color: 'rgba(255, 255, 255, 0.8)'
                     },
                     interval: 0,
+                    rotate: -15,   
                     formatter: function (value) {
                         var ret = "";//拼接加\n返回的类目项  
                         var maxLength = num;//每项显示文字个数  
@@ -590,7 +620,6 @@
                 top: '20%',
                 left: '0%',
                 right: '0%',
-                bottom: '0%',
                 containLabel: true,
                 backgroundColor: 'rgba(0,162,233, 0.01)',
                 // borderColor: 'rgba(0,162,233, 1)'
@@ -675,6 +704,35 @@
                     fontSize: '10'
                 }
             },
+            dataZoom: [
+                {
+                    type: 'slider',
+                    // start: 0,
+                    // end: 60
+                    maxValueSpan: 6,
+                    show: true,
+                    yAxisIndex: [0],
+                    left: 0, width: 10, height: '100%',
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    borderColor: 'none',
+                    brushSelect: false,
+                    textStyle: {
+                        color: 'rgba(0,0,0,0)'
+                    },
+                    selectedDataBackground: {
+                        areaStyle: {
+                            color: 'red',
+                            borderWidth: 0
+                        }
+                    },
+                    handleStyle: {  // 缩放手柄的样式
+                        color: "#0a1449"
+                    },
+                    moveHandleStyle: {
+                        color: '#0a1449'
+                    }
+                }
+            ],
             yAxis: {
                 axisTick: {
                     show: false
@@ -793,6 +851,35 @@
                     color: '#ffffff'
                 }
             },
+            dataZoom: [
+                {
+                    type: 'slider',
+                    // start: 0,
+                    // end: 60
+                    maxValueSpan: 6,
+                    show: true,
+                    xAxisIndex: [0],
+                    bottom: 0, height: 10,
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    borderColor: 'none',
+                    brushSelect: false,
+                    textStyle: {
+                        color: 'rgba(0,0,0,0)'
+                    },
+                    selectedDataBackground: {
+                        areaStyle: {
+                            color: 'red',
+                            borderWidth: 0
+                        }
+                    },
+                    handleStyle: {  // 缩放手柄的样式
+                        color: "#0a1449"
+                    },
+                    moveHandleStyle: {
+                        color: '#0a1449'
+                    }
+                }
+            ],
             xAxis: {
                 axisTick: {
                     show: false
@@ -808,6 +895,7 @@
                         color: 'rgba(255, 255, 255, 0.8)'
                     },
                     interval: 0,
+                    rotate: -15,
                     formatter: function (value) {
                         var ret = "";//拼接加\n返回的类目项  
                         var maxLength = 5;//每项显示文字个数  
@@ -856,7 +944,7 @@
                 top: '15%',
                 left: '0%',
                 right: '0%',
-                bottom: '0%',
+                bottom: 28,
                 containLabel: true,
                 backgroundColor: 'rgba(0,162,233, 0.01)',
                 // borderColor: 'rgba(0,162,233, 1)'

SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx

@@ -395,6 +395,35 @@
                 show: true
             },
             tooltip: {},
+            dataZoom: [
+                {
+                    type: 'slider',
+                    // start: 0,
+                    // end: 60
+                    maxValueSpan: 6,
+                    show: true,
+                    xAxisIndex: [0],
+                    bottom: 0, height: 10,
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    borderColor: 'none',
+                    brushSelect: false,
+                    textStyle: {
+                        color: 'rgba(0,0,0,0)'
+                    },
+                    selectedDataBackground: {
+                        areaStyle: {
+                            color: 'red',
+                            borderWidth: 0
+                        }
+                    },
+                    handleStyle: {  // 缩放手柄的样式
+                        color: "#0a1449"
+                    },
+                    moveHandleStyle: {
+                        color: '#0a1449'
+                    }
+                }
+            ],
             legend: {
                 left: '10%',
                 show: true,
@@ -418,6 +447,7 @@
                         color: 'rgba(255, 255, 255, 0.8)'
                     },
                     interval: 0,
+                    rotate: -15,
                     formatter: function (value) {
                         var ret = "";//拼接加\n返回的类目项  
                         var maxLength = num;//每项显示文字个数  
@@ -467,7 +497,7 @@
                 top: '20%',
                 left: '0%',
                 right: '0%',
-                bottom: '0%',
+                bottom: 40,
                 containLabel: true,
                 backgroundColor: 'rgba(0,162,233, 0.01)',
                 // borderColor: 'rgba(0,162,233, 1)'
@@ -527,6 +557,35 @@
                 //data: ['销量'],
                 show: false
             },
+            dataZoom: [
+                {
+                    type: 'slider',
+                    // start: 0,
+                    // end: 60
+                    maxValueSpan: 6,
+                    show: true,
+                    xAxisIndex: [0],
+                    bottom: 0, height: 10,
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    borderColor: 'none',
+                    brushSelect: false,
+                    textStyle: {
+                        color: 'rgba(0,0,0,0)'
+                    },
+                    selectedDataBackground: {
+                        areaStyle: {
+                            color: 'red',
+                            borderWidth: 0
+                        }
+                    },
+                    handleStyle: {  // 缩放手柄的样式
+                        color: "#0a1449"
+                    },
+                    moveHandleStyle: {
+                        color: '#0a1449'
+                    }
+                }
+            ],
             xAxis: {
                 axisTick: {
                     show: false
@@ -536,7 +595,10 @@
                         color: 'rgba(255, 255, 255, 0.3)'
                     }
                 },
+         
                 axisLabel: {
+                    interval: 0,      // 坐标轴刻度标签的显示间隔
+                    rotate: -15,        // 标签倾斜的角度
                     show: true,
                     textStyle: {
                         color: 'rgba(255, 255, 255, 0.8)'
@@ -593,7 +655,7 @@
                 top: '25%',
                 left: '0%',
                 right: '0%',
-                bottom: '0%',
+                bottom: 40,
                 containLabel: true,
                 backgroundColor: 'rgba(0,162,233, 0.01)',
                 // borderColor: 'rgba(0,162,233, 1)'

SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx

@@ -412,6 +412,35 @@ var basePath = '<%= ResolveUrl("~/") %>';
             legend: {
                 show: false
             },
+            dataZoom: [
+                {
+                    type: 'slider',
+                    // start: 0,
+                    // end: 60
+                    maxValueSpan: 6,
+                    show: true,
+                    xAxisIndex: [0],
+                    bottom: 0, height: 10,
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    borderColor: 'none',
+                    brushSelect: false,
+                    textStyle: {
+                        color: 'rgba(0,0,0,0)'
+                    },
+                    selectedDataBackground: {
+                        areaStyle: {
+                            color: 'red',
+                            borderWidth: 0
+                        }
+                    },
+                    handleStyle: {  // 缩放手柄的样式
+                        color: "#0a1449"
+                    },
+                    moveHandleStyle: {
+                        color: '#0a1449'
+                    }
+                }
+            ],
             xAxis: {
                 axisTick: {
                     show: false
@@ -423,7 +452,8 @@ var basePath = '<%= ResolveUrl("~/") %>';
                 },
                 axisLabel: {
                     show: true,
-                    /*interval: 0,*/
+                    interval: 0,
+                    rotate: -15, 
                     textStyle: {
                         color: 'rgba(255, 255, 255, 0.8)'
                     }
@@ -453,7 +483,7 @@ var basePath = '<%= ResolveUrl("~/") %>';
                 top: '15%',
                 left: '10',
                 right: '10',
-                bottom: '0%',
+                bottom: 30,
                 containLabel: true,
                 backgroundColor: 'rgba(0,162,233, 0.01)',
                 // borderColor: 'rgba(0,162,233, 1)'
@@ -546,7 +576,7 @@ var basePath = '<%= ResolveUrl("~/") %>';
                 top: '15%',
                 left: '10',
                 right: '10',
-                bottom: '0%',
+                bottom: 30,
                 containLabel: true,
                 backgroundColor: 'rgba(0,162,233, 0.01)',
                 // borderColor: 'rgba(0,162,233, 1)'
@@ -600,6 +630,35 @@ var basePath = '<%= ResolveUrl("~/") %>';
                     fontSize: 10,
                 }
             },
+            dataZoom: [
+                {
+                    type: 'slider',
+                    // start: 0,
+                    // end: 60
+                    maxValueSpan: 6,
+                    show: true,
+                    xAxisIndex: [0],
+                    bottom: 0, height: 10,
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    borderColor: 'none',
+                    brushSelect: false,
+                    textStyle: {
+                        color: 'rgba(0,0,0,0)'
+                    },
+                    selectedDataBackground: {
+                        areaStyle: {
+                            color: 'red',
+                            borderWidth: 0
+                        }
+                    },
+                    handleStyle: {  // 缩放手柄的样式
+                        color: "#0a1449"
+                    },
+                    moveHandleStyle: {
+                        color: '#0a1449'
+                    }
+                }
+            ],
             xAxis: {
                 axisTick: {
                     show: false
@@ -612,6 +671,7 @@ var basePath = '<%= ResolveUrl("~/") %>';
                 axisLabel: {
                     show: true,
                     interval: 0,
+                    rotate: -15,
                     textStyle: {
                         color: 'rgba(255, 255, 255, 0.8)'
                     }
@@ -641,7 +701,7 @@ var basePath = '<%= ResolveUrl("~/") %>';
                 top: '25%',
                 left: '0%',
                 right: '0%',
-                bottom: '0%',
+                bottom: 30,
                 containLabel: true,
                 backgroundColor: 'rgba(0,162,233, 0.01)',                
                 // borderColor: 'rgba(0,162,233, 1)'
@@ -696,6 +756,35 @@ var basePath = '<%= ResolveUrl("~/") %>';
             legend: {
                 show: false
             },
+            dataZoom: [
+                {
+                    type: 'slider',
+                    // start: 0,
+                    // end: 60
+                    maxValueSpan: 6,
+                    show: true,
+                    xAxisIndex: [0],
+                    bottom: 0, height: 10,
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    borderColor: 'none',
+                    brushSelect: false,
+                    textStyle: {
+                        color: 'rgba(0,0,0,0)'
+                    },
+                    selectedDataBackground: {
+                        areaStyle: {
+                            color: 'red',
+                            borderWidth: 0
+                        }
+                    },
+                    handleStyle: {  // 缩放手柄的样式
+                        color: "#0a1449"
+                    },
+                    moveHandleStyle: {
+                        color: '#0a1449'
+                    }
+                }
+            ],
             xAxis: {
                 axisTick: {
                     show: false
@@ -739,7 +828,7 @@ var basePath = '<%= ResolveUrl("~/") %>';
                 top: '15%',
                 left: '10',
                 right: '10',
-                bottom: '0%',
+                bottom: 10,
                 containLabel: true,
                 backgroundColor: 'rgba(0,162,233, 0.01)',
                 // borderColor: 'rgba(0,162,233, 1)'

SGGL/FineUIPro.Web/common/mainMenu_PDigData.aspx

@@ -316,6 +316,35 @@
             legend: {
                 show: false
             },
+            dataZoom: [
+                {
+                    type: 'slider',
+                    // start: 0,
+                    // end: 60
+                    maxValueSpan: 6,
+                    show: true,
+                    xAxisIndex: [0],
+                    bottom: 0, height: 10,
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    borderColor: 'none',
+                    brushSelect: false,
+                    textStyle: {
+                        color: 'rgba(0,0,0,0)'
+                    },
+                    selectedDataBackground: {
+                        areaStyle: {
+                            color: 'red',
+                            borderWidth: 0
+                        }
+                    },
+                    handleStyle: {  // 缩放手柄的样式
+                        color: "#0a1449"
+                    },
+                    moveHandleStyle: {
+                        color: '#0a1449'
+                    }
+                }
+            ],
             xAxis: {
                 axisTick: {
                     show: false
@@ -327,7 +356,8 @@
                 },
                 axisLabel: {
                     show: true,
-                    /*interval: 0,*/
+                    interval: 0,
+                    rotate: -15,
                     textStyle: {
                         color: 'rgba(255, 255, 255, 0.8)'
                     }
@@ -357,7 +387,7 @@
                 top: '15%',
                 left: '10',
                 right: '10',
-                bottom: '0%',
+                bottom: 30,
                 containLabel: true,
                 backgroundColor: 'rgba(0,162,233, 0.01)',
                 // borderColor: 'rgba(0,162,233, 1)'
@@ -445,6 +475,7 @@
                 },
                 axisLabel: {
                     show: true,
+                    rotate: -15,
                     interval: 0,
                     textStyle: {
                         color: 'rgba(255, 255, 255, 0.8)'
@@ -470,12 +501,41 @@
                     }
                 }
             },
+            dataZoom: [
+                {
+                    type: 'slider',
+                    // start: 0,
+                    // end: 60
+                    maxValueSpan: 6,
+                    show: true,
+                    xAxisIndex: [0],
+                    bottom: 0, height: 10,
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    borderColor: 'none',
+                    brushSelect: false,
+                    textStyle: {
+                        color: 'rgba(0,0,0,0)'
+                    },
+                    selectedDataBackground: {
+                        areaStyle: {
+                            color: 'red',
+                            borderWidth: 0
+                        }
+                    },
+                    handleStyle: {  // 缩放手柄的样式
+                        color: "#0a1449"
+                    },
+                    moveHandleStyle: {
+                        color: '#0a1449'
+                    }
+                }
+            ],
             series: series,
             grid: {
                 top: '25%',
                 left: '0%',
                 right: '0%',
-                bottom: '0%',
+                bottom: 40,
                 containLabel: true,
                 backgroundColor: 'rgba(0,162,233, 0.01)',                
                 // borderColor: 'rgba(0,162,233, 1)'

SGGL/FineUIPro.Web/common/mainMenu_PGJSX.aspx

@@ -340,6 +340,35 @@
                     fontSize: 12,
                 }
             },
+            dataZoom: [
+                {
+                    type: 'slider',
+                    // start: 0,
+                    // end: 60
+                    maxValueSpan: 6,
+                    show: true,
+                    xAxisIndex: [0],
+                    bottom: 0, height: 10,
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    borderColor: 'none',
+                    brushSelect: false,
+                    textStyle: {
+                        color: 'rgba(0,0,0,0)'
+                    },
+                    selectedDataBackground: {
+                        areaStyle: {
+                            color: 'red',
+                            borderWidth: 0
+                        }
+                    },
+                    handleStyle: {  // 缩放手柄的样式
+                        color: "#0a1449"
+                    },
+                    moveHandleStyle: {
+                        color: '#0a1449'
+                    }
+                }
+            ],
             xAxis: {
                 axisTick: {
                     show: false
@@ -355,6 +384,7 @@
                         color: 'rgba(0,0,0, 0.8)'
                     },
                     interval: 0,
+                    rotate: -15,
                     formatter: function (value) {
                         var ret = "";//拼接加\n返回的类目项  
                         var maxLength = num;//每项显示文字个数  
@@ -404,7 +434,7 @@
                 top: '20%',
                 left: '0%',
                 right: '0%',
-                bottom: '0%',
+                bottom: 40,
                 containLabel: true,
                 backgroundColor: 'rgba(0,162,233, 0.01)',
                 // borderColor: 'rgba(0,162,233, 1)'
@@ -489,6 +519,35 @@
                     fontSize: 12,
                 }
             },
+            dataZoom: [
+                {
+                    type: 'slider',
+                    // start: 0,
+                    // end: 60
+                    maxValueSpan: 6,
+                    show: true,
+                    xAxisIndex: [0],
+                    bottom: 0, height: 10,
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    borderColor: 'none',
+                    brushSelect: false,
+                    textStyle: {
+                        color: 'rgba(0,0,0,0)'
+                    },
+                    selectedDataBackground: {
+                        areaStyle: {
+                            color: 'red',
+                            borderWidth: 0
+                        }
+                    },
+                    handleStyle: {  // 缩放手柄的样式
+                        color: "#0a1449"
+                    },
+                    moveHandleStyle: {
+                        color: '#0a1449'
+                    }
+                }
+            ],
             xAxis: {
                 axisTick: {
                     show: false
@@ -504,6 +563,7 @@
                         color: 'rgba(0,0,0, 0.8)'
                     },
                     interval: 0,
+                    rotate: -15,
                     formatter: function (value) {
                         var ret = "";//拼接加\n返回的类目项  
                         var maxLength = num;//每项显示文字个数  
@@ -640,6 +700,35 @@
                     fontWeight: 700
                 }
             },
+            dataZoom: [
+                {
+                    type: 'slider',
+                    // start: 0,
+                    // end: 60
+                    maxValueSpan: 6,
+                    show: true,
+                    xAxisIndex: [0],
+                    bottom: 0, height: 10,
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    borderColor: 'none',
+                    brushSelect: false,
+                    textStyle: {
+                        color: 'rgba(0,0,0,0)'
+                    },
+                    selectedDataBackground: {
+                        areaStyle: {
+                            color: 'red',
+                            borderWidth: 0
+                        }
+                    },
+                    handleStyle: {  // 缩放手柄的样式
+                        color: "#0a1449"
+                    },
+                    moveHandleStyle: {
+                        color: '#0a1449'
+                    }
+                }
+            ],
             xAxis: {
                 axisTick: {
                     show: false
@@ -655,6 +744,7 @@
                         color: 'rgba(0,0,0, 0.8)'
                     },
                     interval: 0,
+                    rotate: -15, 
                     formatter: function (value) {
                         var ret = "";//拼接加\n返回的类目项  
                         var maxLength = 5;//每项显示文字个数  
@@ -703,7 +793,7 @@
                 top: '15%',
                 left: '0%',
                 right: '0%',
-                bottom: '0%',
+                bottom: 40,
                 containLabel: true,
                 backgroundColor: 'rgba(0,162,233, 0.01)',
                 // borderColor: 'rgba(0,162,233, 1)'
@@ -769,6 +859,35 @@
                     fontWeight: 700
                 }
             },
+            dataZoom: [
+                {
+                    type: 'slider',
+                    // start: 0,
+                    // end: 60
+                    maxValueSpan: 6,
+                    show: true,
+                    xAxisIndex: [0],
+                    bottom: 0, height: 10,
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    borderColor: 'none',
+                    brushSelect: false,
+                    textStyle: {
+                        color: 'rgba(0,0,0,0)'
+                    },
+                    selectedDataBackground: {
+                        areaStyle: {
+                            color: 'red',
+                            borderWidth: 0
+                        }
+                    },
+                    handleStyle: {  // 缩放手柄的样式
+                        color: "#0a1449"
+                    },
+                    moveHandleStyle: {
+                        color: '#0a1449'
+                    }
+                }
+            ],
             xAxis: {
                 axisTick: {
                     show: false
@@ -784,6 +903,7 @@
                         color: 'rgba(0,0,0, 0.8)'
                     },
                     interval: 0,
+                    rotate: -15,
                     formatter: function (value) {
                         var ret = "";//拼接加\n返回的类目项  
                         var maxLength = 5;//每项显示文字个数  
@@ -832,7 +952,7 @@
                 top: '15%',
                 left: '0%',
                 right: '0%',
-                bottom: '0%',
+                bottom: 40,
                 containLabel: true,
                 backgroundColor: 'rgba(0,162,233, 0.01)',
                 // borderColor: 'rgba(0,162,233, 1)'

SGGL/FineUIPro.Web/common/mainProject2.aspx

@@ -1732,7 +1732,7 @@
                 },
                 axisLabel: {
                     interval: 0,
-                    rotate: -20, // 如果数据较多时旋转标签以避免重叠
+                    rotate: -15, // 如果数据较多时旋转标签以避免重叠
                     margin: 8, // 设置标签与轴线之间的距离
                     // align: 'center'
                     textStyle: {
@@ -1744,6 +1744,35 @@
                 }
 
             },
+            dataZoom: [
+                {
+                    type: 'slider',
+                    // start: 0,
+                    // end: 60
+                    maxValueSpan: 6,
+                    show: true,
+                    xAxisIndex: [0],
+                    bottom: 0, height: 10,
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    borderColor: 'none',
+                    brushSelect: false,
+                    textStyle: {
+                        color: 'rgba(0,0,0,0)'
+                    },
+                    selectedDataBackground: {
+                        areaStyle: {
+                            color: 'red',
+                            borderWidth: 0
+                        }
+                    },
+                    handleStyle: {  // 缩放手柄的样式
+                        color: "#0a1449"
+                    },
+                    moveHandleStyle: {
+                        color: '#0a1449'
+                    }
+                }
+            ],
             yAxis: {
                 type: 'value',
                 axisLine: {
@@ -2585,6 +2614,8 @@
                     }
                 },
                 axisLabel: {
+                    interval: 0,
+                    rotate: -15,
                     show: true,
                     textStyle: {
                         color: 'rgba(255, 255, 255, 0.8)'
@@ -2593,11 +2624,40 @@
                 }
             },
             series: data,
+            dataZoom: [
+                {
+                    type: 'slider',
+                    // start: 0,
+                    // end: 60
+                    maxValueSpan: 6,
+                    show: true,
+                    xAxisIndex: [0],
+                    bottom: 0, height: 10,
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    borderColor: 'none',
+                    brushSelect: false,
+                    textStyle: {
+                        color: 'rgba(0,0,0,0)'
+                    },
+                    selectedDataBackground: {
+                        areaStyle: {
+                            color: 'red',
+                            borderWidth: 0
+                        }
+                    },
+                    handleStyle: {  // 缩放手柄的样式
+                        color: "#0a1449"
+                    },
+                    moveHandleStyle: {
+                        color: '#0a1449'
+                    }
+                }
+            ],
             grid: {
                 top: '15%',
                 left: '10',
                 right: '10',
-                bottom: '0%',
+                bottom: 40,
                 containLabel: true,
                 backgroundColor: 'rgba(0,162,233, 0.01)',
                 // borderColor: 'rgba(0,162,233, 1)'

SGGL/FineUIPro.Web/common/main_new.aspx

@@ -935,8 +935,8 @@
         let label = [<%=ProjectPersonMc%>]
         let opt = {
             grid: {
-                top: fontSize(30),
-                bottom: fontSize(40)
+                //top: fontSize(30),
+                //bottom: fontSize(40)
             },
             dataZoom: [
                 {
@@ -972,7 +972,7 @@
                 data: label,
                 axisLabel: {
                     interval: 0,//使x轴文字显示全
-                    rotate: -10,       // 标签倾斜的角度
+                    rotate: -15,       // 标签倾斜的角度
                     color: '#3FB0FF'
                 },
                 axisLine: {
@@ -2229,8 +2229,6 @@
         let opt = {
             grid: {
                 top: 30,
-                bottom: 40,
-
             },
             xAxis: {
                 type: 'category',
@@ -2242,7 +2240,7 @@
                 },
                 axisLabel: {
                     interval: 0,
-                    rotate: -16, // 如果数据较多时旋转标签以避免重叠
+                    rotate: -15, // 如果数据较多时旋转标签以避免重叠
                     margin: 8, // 设置标签与轴线之间的距离
                     // align: 'center'
                 },
@@ -2456,8 +2454,6 @@
         let opt = {
             grid: {
                 top: 60,
-                bottom: 40,
-
             },
             legend: {
                 top: 30,
@@ -2486,7 +2482,7 @@
                 },
                 axisLabel: {
                     interval: 0,
-                    rotate: -10, // 如果数据较多时旋转标签以避免重叠
+                    rotate: -15, // 如果数据较多时旋转标签以避免重叠
                     margin: 8, // 设置标签与轴线之间的距离
                     // align: 'center'
                 },

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

@@ -844,8 +844,8 @@ namespace FineUIPro.Web.common
 
                 if (ndtLists.Count > 0)
                 {
-                    //取每个单位、专业最新的一条数据
-                    var datalist = ndtLists.GroupBy(r => new { r.UnitId, r.ProfessionalName }).Select(g => g.OrderByDescending(r => r.CreateDate).First()).ToList();
+                    //取每个项目、单位、专业最新的一条数据
+                    var datalist = ndtLists.GroupBy(r => new { r.ProjectId, r.UnitId, r.ProfessionalName }).Select(g => g.OrderByDescending(r => r.CreateDate).First()).ToList();
                     foreach (var item in datalist)
                     {
                         if (item.TotalQuantity.HasValue)
@@ -854,7 +854,8 @@ namespace FineUIPro.Web.common
                             b += item.TotalQuantity.Value;
                         }
                     }
-                    result = Convert.ToDouble(Convert.ToDecimal(100.0) * b / a);
+                    //result = Convert.ToDouble(Convert.ToDecimal(100.0) * b / a);
+                    result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2));
                 }
                 //else
                 //{

SGGL/FineUIPro.Web/common/main_new0.aspx

@@ -696,8 +696,7 @@
                 data: [{ name: '<%=All%>', textStyle: { color: '#2F69D6' } }, { name: '<%=To_be_rectified%>', textStyle: { color: '#FFA602' } }]
             },
             grid: {
-                top: fontSize(60),
-                bottom: fontSize(40)
+                top: fontSize(60)
             },
             dataZoom: [
                 {
@@ -707,7 +706,7 @@
                     maxValueSpan: 6,
                     show: true,
                     xAxisIndex: [0],
-                    bottom: 25, height: 10,
+                    bottom: 0, height: 10,
                     backgroundColor: 'rgba(0,0,0,0)',
                     borderColor: 'none',
                     brushSelect: false,
@@ -754,7 +753,7 @@
                 },
                 axisLabel: {
                     interval: 0,      // 坐标轴刻度标签的显示间隔
-                    rotate: -10        // 标签倾斜的角度
+                    rotate: -15        // 标签倾斜的角度
                 }
             },
             yAxis: {

SGGL/FineUIPro.Web/common/main_new1.aspx

@@ -163,11 +163,13 @@
                             <div class="hj-box_label"><asp:Literal runat="server" Text="<%$ Resources:Lan,main_new1_HjData_WelderNum_Label%>"/></div>
                         </div>
                         <div class="y_column">
-                            <div class="hj-box_number"><%=GetTotalDineNum() %></div>
+                            <%--<div class="hj-box_number"><%=GetTotalDineNum() %></div>--%>
+                            <div class="hj-box_number"><%=WeldDine.Size %></div>
                             <div class="hj-box_label"><asp:Literal runat="server" Text="<%$ Resources:Lan,main_new1_HjData_TotalDineNum_Label%>"/></div>
                         </div>
                         <div class="y_column">
-                            <div class="hj-box_number" style="color: #12CDA2;"><%=GetCompleteDineNum() %></div>
+                            <%--<div class="hj-box_number" style="color: #12CDA2;"><%=GetCompleteDineNum() %></div>--%>
+                            <div class="hj-box_number" style="color: #12CDA2;"><%=WeldDine.DoneDin %></div>
                             <div class="hj-box_label"><asp:Literal runat="server" Text="<%$ Resources:Lan,main_new1_HjData_CompleteDineNum_Label%>"/></div>
                         </div>
                         <div class="y_column">

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

@@ -1,6 +1,7 @@
 using BLL;
 using FineUIPro.Web.BaseInfo;
 using FineUIPro.Web.DataShow;
+using Model;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
@@ -67,6 +68,45 @@ namespace FineUIPro.Web.common
                 getEarlyWarningCounts();
 
                 getCNEN();
+
+                //焊接达因数
+                GetWeldDineOutput();
+
+                //焊接数据
+                double result = 0;
+                Model.SGGLDB db = Funs.DB;
+                var ndtLists = (from x in db.ProcessControl_NondestructiveTest_New select x).ToList();
+                if (pids != null)
+                {
+                    ndtLists = ndtLists.Where(x => pids.Contains(x.ProjectId)).ToList();
+                }
+                decimal a = 0, b = 0;
+
+                if (ndtLists.Count > 0)
+                {
+                    //取每个项目、单位、专业最新的一条数据
+                    var datalist = ndtLists.GroupBy(r => new { r.ProjectId, r.UnitId, r.ProfessionalName }).Select(g => g.OrderByDescending(r => r.CreateDate).First()).ToList();
+                    foreach (var item in datalist)
+                    {
+                        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) * a / b);
+                    result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2));
+
+                }
+                if (b > 0)
+                {
+                    hjallNumber = b.ToString();
+                    hjfinishNumber = a.ToString();
+                    hjzgl = result.ToString() + "%";
+                }
+
+                /****** 焊接数据
+
                 //在建项目
                 var allProjects = ProjectService.GetAllProjectDropDownList();
                 //焊接数据
@@ -100,6 +140,8 @@ namespace FineUIPro.Web.common
                     hjfinishNumber = a.ToString();
                     hjzgl = result.ToString() + "%";
                 }
+
+                ********/
             }
         }
 
@@ -505,17 +547,93 @@ namespace FineUIPro.Web.common
             {
                 int result = (from x in Funs.DB.BS_Welder
                               where x.WED_IfOnGuard == true
-                              select x).Count();
+                              select x)
+                              .GroupBy(p => p.WED_WorkCode)
+                             .Select(g => g.First())
+                             .Count();
                 return result;
             }
             else
             {
                 int result = (from x in Funs.DB.BS_Welder
                               where x.WED_IfOnGuard == true && pids.Contains(x.ProjectId)
-                              select x).Count();
+                              select x)
+                              .GroupBy(p => p.WED_WorkCode)
+                             .Select(g => g.First())
+                             .Count();
                 return result;
             }
         }
+
+        protected WeldDineOutput WeldDine = new WeldDineOutput();
+        /// <summary>
+        /// 获取总达因数和完成达因数
+        /// </summary>
+        /// <returns></returns>
+        public WeldDineOutput GetWeldDineOutput()
+        {
+            var projectIds = new List<string>();
+            if (pids == null)
+            {
+                //加载所有在建项目的数据
+                projectIds = Funs.DB.Base_Project.Where(x => x.ProjectState == "1").Select(x => x.ProjectId).ToList();
+            }
+            else
+            {
+                projectIds = new List<string>(pids);
+            }
+
+            var result = new List<WeldDineOutput>();
+            var getD1 = from x in Funs.DB.HJGL_FL_TotalQuantity
+                        where projectIds.Contains(x.ProjectId)
+                        select x;
+            var proIds = getD1.Select(x => x.ProjectId).Distinct();
+            foreach (var pro in proIds)
+            {
+                double pTotalWeldQuantity = 0;
+                double pTotalCompleted = 0;
+                var proD1 = getD1.Where(x => x.ProjectId == pro);
+                foreach (var item in getD1)
+                {
+                    var dAll = !string.IsNullOrWhiteSpace(item.TotalWeldQuantity) ? Convert.ToDouble(item.TotalWeldQuantity) : 0;
+                    var dCompleted = !string.IsNullOrWhiteSpace(item.TotalCompleted) ? Convert.ToDouble(item.TotalCompleted) : 0;
+                    pTotalWeldQuantity += dAll;
+                    pTotalCompleted += dCompleted;
+                }
+                result.Add(new WeldDineOutput
+                {
+                    ProjectId = pro,
+                    Size = pTotalWeldQuantity,
+                    DoneDin = pTotalCompleted
+                });
+            }
+
+            var differenceProjectIds = projectIds.Except(proIds).ToList();
+            foreach (var pro in differenceProjectIds)
+            {
+                double pTotalWeldQuantity = 0;
+                double pTotalCompleted = 0;
+                var getD2 = (from x in Funs.DB.HJGL_FL_Data
+                             where x.ProjectId == pro
+                             orderby x.CompileDate descending
+                             select x).FirstOrDefault();
+                if (getD2 != null)
+                {
+                    pTotalWeldQuantity = !string.IsNullOrWhiteSpace(getD2.TotalWeldQuantity) ? Convert.ToDouble(getD2.TotalWeldQuantity) : 0;
+                    pTotalCompleted = !string.IsNullOrWhiteSpace(getD2.TotalCompleted) ? Convert.ToDouble(getD2.TotalCompleted) : 0;
+                }
+                result.Add(new WeldDineOutput
+                {
+                    ProjectId = pro,
+                    Size = pTotalWeldQuantity,
+                    DoneDin = pTotalCompleted
+                });
+            }
+            WeldDine.Size = Convert.ToInt32(result.Sum(x => x.Size));
+            WeldDine.DoneDin = Convert.ToInt32(result.Sum(x => x.DoneDin));
+            return WeldDine;
+        }
+
         /// <summary>
         /// 获取总达因数
         /// </summary>

SGGL/FineUIPro.Web/indexProject.aspx

@@ -358,9 +358,9 @@
                                     <div class="n-btn-r c-n-btn-r" onclick="DigitalSiteClick();" style="cursor: pointer">
                                         <asp:Literal runat="server" Text="<%$ Resources:Lan,VideoSurveillance %>" />
                                     </div>
-                                    <div class="n-btn-r c-n-btn-r" onclick="CommandDispatchClick();" style="cursor: pointer; width: 1.475rem; height: .305rem; line-height: .35rem;">
+                                    <%--<div class="n-btn-r c-n-btn-r" onclick="CommandDispatchClick();" style="cursor: pointer; width: 1.475rem; height: .305rem; line-height: .35rem;">
                                         <asp:Literal runat="server" Text="<%$ Resources:Lan,CommandDispatchCenter %>" />
-                                    </div>
+                                    </div>--%>
                                     <div class="n-btn-r c-n-btn-r" onclick="PDigDataClick();" style="cursor: pointer">
                                         <asp:Literal runat="server" Text="<%$ Resources:Lan,OnSiteAttendance %>" />
                                     </div>
@@ -537,10 +537,10 @@
         </f:Button>
        <%-- <f:Button runat="server" CssClass="bgbtn" Text="指挥调度中心" OnClick="btnCommandDispatch_Click" OnClientClick="openCommandDispatchCenter();"
             EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnCommandDispatch" Hidden="true">
-        </f:Button>--%>
+        </f:Button>
         <f:Button runat="server" CssClass="bgbtn" Text="指挥调度中心" OnClick="btnCommandDispatch_Click" OnClientClick="parent.removeActiveTab();"
             EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnCommandDispatch" Hidden="true">
-        </f:Button>
+        </f:Button>--%>
         <f:Button runat="server" CssClass="bgbtn" Text="现场考勤" OnClick="btnPDigData_Click" OnClientClick="parent.removeActiveTab();"
             EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnPDigData" Hidden="true">
         </f:Button>
@@ -582,7 +582,7 @@
         var btnTransferClientID = '<%= btnTransfer.ClientID %>';
         var btnPGJSXClientID = '<%= btnPGJSX.ClientID %>';
         var btnDigitalSiteClientID = '<%= btnDigitalSite.ClientID %>';
-        var btnCommandDispatchClientID = '<%= btnCommandDispatch.ClientID %>';
+       <%-- var btnCommandDispatchClientID = '<%= btnCommandDispatch.ClientID %>';--%>
         var btnPDigDataClientID = '<%= btnPDigData.ClientID %>';
         var btnOpinionClientID = '<%= btnOpinion.ClientID %>';
         var btnDocClientID = '<%= btnDoc.ClientID %>';
@@ -662,12 +662,12 @@
             var $item = $('.f-tabstrip-header')
             $item.attr('style', ";display:block !important;")
         }
-        function CommandDispatchClick() {
-            parent.removeActiveTab();
-            F(btnCommandDispatchClientID).click();
-            var $item = $('.f-tabstrip-header')
-            $item.attr('style', ";display:block !important;")
-        }
+        //function CommandDispatchClick() {
+        //    parent.removeActiveTab();
+        //    F(btnCommandDispatchClientID).click();
+        //    var $item = $('.f-tabstrip-header')
+        //    $item.attr('style', ";display:block !important;")
+        //}
         // 点击标题栏工具图标 - 查看源代码
         var videoURL ='<%=VideoURL %>'
 

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

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

SGGL/Model/APIItem/CNCEC/ActionWorkLedger.cs

@@ -40,5 +40,23 @@ namespace Model
             get;
             set;
         }
+
+        public int? KeyWorkNum
+        {
+            get;
+            set;
+        }
+
+        public int? KeyWorkOKNum
+        {
+            get;
+            set;
+        }
+
+        public string KeyWorkOKRate
+        {
+            get;
+            set;
+        }
     }
 }

SGGL/Model/ZHGL/DataSync/WelderOutput.cs

@@ -10,5 +10,6 @@ namespace Model
         public string  Id { get; set; }
         public string WEDCode { get; set; }
         public string WEDName { get; set; }
+        public string WEDWorkCode { get; set; }
     }
 }

SGGL/WebAPI/Controllers/IDP/IDPController.cs

@@ -0,0 +1,33 @@
+using BLL;
+using System;
+using System.Web.Http;
+
+namespace WebAPI.Controllers
+{
+    /// <summary>
+    /// 五环IDP平台
+    /// </summary>
+    public class IDPController : ApiController
+    {
+        /// <summary>
+        /// 每天夜间同步获取IDP系统项目开车数据
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public Model.ResponeData SynIDPPreRunData()
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                IDPDataService.GetIDPProjectMasterData();
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.ToString();
+            }
+            return responeData;
+        }
+
+    }
+}

SGGL/WebAPI/Filter/TestPermissionAttribute.cs

@@ -86,8 +86,10 @@ namespace WebAPI.Filter
         /// <summary>
         /// 
         /// </summary>
-        public static List<string> lists = new List<string> { "TowerCrane*saveTowerCraneRecord","PMP*SynPMPProjectData", "GJSX*OverdueWarningSendEmail", "User*postLoginOn", "get*token", "HazardRegister*getHazardRegisterTotalCount",
+        public static List<string> lists = new List<string> { "TowerCrane*saveTowerCraneRecord", "GJSX*OverdueWarningSendEmail", "User*postLoginOn", "get*token", "HazardRegister*getHazardRegisterTotalCount",
             "HazardRegister*getHazardRegisterByProjectIdStates",
+            "PMP*SynPMPProjectData",
+            "IDP*SynIDPPreRunData",
             "JGZL*getUserList",
             "JGZL*getProjedtList",
             "JGZL*getUnitWorkListByProjectId",

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

@@ -6,7 +6,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_PublishTargetUrl>G:\发布\五环WebApi</_PublishTargetUrl>
-    <History>True|2025-06-20T03:24:58.4099232Z||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;</History>
+    <History>True|2025-07-11T09:54:03.0298703Z||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;</History>
     <LastFailureDetails />
   </PropertyGroup>
   <ItemGroup>
@@ -86,22 +86,22 @@
       <publishTime>10/28/2024 14:02:50</publishTime>
     </File>
     <File Include="bin/App_global.asax.compiled">
-      <publishTime>06/20/2025 11:24:56</publishTime>
+      <publishTime>07/11/2025 17:54:01</publishTime>
     </File>
     <File Include="bin/App_global.asax.dll">
-      <publishTime>06/20/2025 11:24:56</publishTime>
+      <publishTime>07/11/2025 17:54:01</publishTime>
     </File>
     <File Include="bin/Aspose.Words.dll">
       <publishTime>12/06/2024 20:13:58</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>06/20/2025 11:24:35</publishTime>
+      <publishTime>07/11/2025 17:53:52</publishTime>
     </File>
     <File Include="bin/BLL.dll.config">
       <publishTime>12/26/2024 09:46:52</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>06/20/2025 11:24:35</publishTime>
+      <publishTime>07/11/2025 17:53:52</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
       <publishTime>12/18/2020 05:32:28</publishTime>
@@ -128,10 +128,10 @@
       <publishTime>07/25/2012 19:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>06/20/2025 11:24:28</publishTime>
+      <publishTime>07/11/2025 17:53:46</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>06/20/2025 11:24:28</publishTime>
+      <publishTime>07/11/2025 17:53:46</publishTime>
     </File>
     <File Include="bin/netstandard.dll">
       <publishTime>07/04/2024 14:13:01</publishTime>
@@ -389,13 +389,13 @@
       <publishTime>02/09/2013 00:42:28</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>06/20/2025 11:24:38</publishTime>
+      <publishTime>07/11/2025 17:53:53</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>06/20/2025 11:24:38</publishTime>
+      <publishTime>07/11/2025 17:53:53</publishTime>
     </File>
     <File Include="bin/WebAPI.xml">
-      <publishTime>06/20/2025 11:24:38</publishTime>
+      <publishTime>07/11/2025 17:53:53</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
       <publishTime>01/23/2014 21:57:34</publishTime>
@@ -479,7 +479,7 @@
       <publishTime>10/28/2024 14:02:50</publishTime>
     </File>
     <File Include="PrecompiledApp.config">
-      <publishTime>06/20/2025 11:24:39</publishTime>
+      <publishTime>07/11/2025 17:53:54</publishTime>
     </File>
     <File Include="Scripts/bootstrap.js">
       <publishTime>10/28/2024 14:02:50</publishTime>

SGGL/WebAPI/WebAPI.csproj

@@ -166,6 +166,7 @@
     <Compile Include="Controllers\HSSE\HSSELogController.cs" />
     <Compile Include="Controllers\HSSE\TestingController.cs" />
     <Compile Include="Controllers\HSSE\TowerCraneController.cs" />
+    <Compile Include="Controllers\IDP\IDPController.cs" />
     <Compile Include="Controllers\JGZL\JGZLController.cs" />
     <Compile Include="Controllers\Person\PersonCheckController.cs" />
     <Compile Include="Controllers\CQMS\CheckEquipmentController.cs" />