1、系统菜单调整；

2、系统看板UI调整；
3、事故事件功能
4、其他

SGGL/BLL/Accident/AccidentWarningService.cs

@@ -0,0 +1,99 @@
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace BLL
+{
+    /// <summary>
+    /// 事故警示
+    /// </summary>
+    public static class AccidentWarningService
+    {
+
+        /// <summary>
+        /// 根据主键获取事故警示
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        public static Model.Accident_Warning GetAccidentWarningById(string Id)
+        {
+            return Funs.DB.Accident_Warning.FirstOrDefault(e => e.Id == Id);
+        }
+
+        /// <summary>
+        /// 获取历年今日发生的事故
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.Accident_Warning> GetYearsTodayList()
+        {
+            string monthDay = DateTime.Now.ToString("MM-dd");
+            var list = (from x in Funs.DB.Accident_Warning where x.AccidentMonthDay == monthDay orderby x.AccidentDate descending select x).ToList();
+            //var list = (from x in Funs.DB.Accident_Warning  orderby x.AccidentDate descending select x).ToList();
+            return list;
+        }
+
+        /// <summary>
+        /// 添加事故警示
+        /// </summary>
+        /// <param name="model"></param>
+        public static void AddAccidentWarning(Model.Accident_Warning model)
+        {
+            Model.CNPCDB db = Funs.DB;
+            Model.Accident_Warning newModel = new Model.Accident_Warning
+            {
+                Id = model.Id,
+                Code = model.Code,
+                Title = model.Title,
+                Content = model.Content,
+                Address = model.Address,
+                ResponsibleUnit = model.ResponsibleUnit,
+                AccidentDate = model.AccidentDate,
+                AccidentMonthDay = model.AccidentMonthDay,
+                Remarks = model.Remarks,
+                CreateTime = model.CreateTime,
+                CompileMan = model.CompileMan,
+                CompileManName = model.CompileManName
+            };
+            db.Accident_Warning.InsertOnSubmit(newModel);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 修改事故警示
+        /// </summary>
+        /// <param name="model"></param>
+        public static void UpdateAccidentWarning(Model.Accident_Warning model)
+        {
+            Model.CNPCDB db = Funs.DB;
+            Model.Accident_Warning newModel = db.Accident_Warning.FirstOrDefault(e => e.Id == model.Id);
+            if (newModel != null)
+            {
+                newModel.Title = model.Title;
+                newModel.Content = model.Content;
+                newModel.Address = model.Address;
+                newModel.ResponsibleUnit = model.ResponsibleUnit;
+                newModel.AccidentDate = model.AccidentDate;
+                newModel.AccidentMonthDay = model.AccidentMonthDay;
+                newModel.Remarks = model.Remarks;
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 根据主键删除事故警示
+        /// </summary>
+        /// <param name="Id"></param>
+        public static void DeleteAccidentWarningById(string Id)
+        {
+            Model.CNPCDB db = Funs.DB;
+            Model.Accident_Warning model = db.Accident_Warning.FirstOrDefault(e => e.Id == Id);
+            if (model != null)
+            {
+                CommonService.DeleteAttachFileById(Id);//删除附件              
+                db.Accident_Warning.DeleteOnSubmit(model);
+                db.SubmitChanges();
+            }
+        }
+    }
+}

SGGL/BLL/BLL.csproj

@@ -157,6 +157,7 @@
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
+    <Reference Include="System.Runtime.Caching" />
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
@@ -199,6 +200,7 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Accident\AccidentWarningService.cs" />
     <Compile Include="API\APIBaseInfoService.cs" />
     <Compile Include="API\APICommonService.cs" />
     <Compile Include="API\APIGetHttpService.cs" />
@@ -299,6 +301,7 @@
     <Compile Include="Common\Captcha.cs" />
     <Compile Include="Common\CodeRecordsService.cs" />
     <Compile Include="Common\CommonService.cs" />
+    <Compile Include="Common\CacheHelper.cs" />
     <Compile Include="Common\Enums.cs" />
     <Compile Include="Common\CreateQRCodeService.cs" />
     <Compile Include="Common\FastReportService.cs" />
@@ -310,6 +313,7 @@
     <Compile Include="Common\Redis\ICache.cs" />
     <Compile Include="Common\Redis\Redis.cs" />
     <Compile Include="Common\Redis\RedisHelper.cs" />
+    <Compile Include="Common\DateHelper.cs" />
     <Compile Include="Common\UploadFileService.cs" />
     <Compile Include="Common\UpLoadImageService.cs" />
     <Compile Include="Common\UserShowColumnsService.cs" />
@@ -517,6 +521,8 @@
     <Compile Include="HJGL\WeldingManage\WeldJointService.cs" />
     <Compile Include="HJGL\WeldingManage\WeldReportService.cs" />
     <Compile Include="HJGL\WeldingReport\NDTReportService.cs" />
+    <Compile Include="Home\BaseDataService.cs" />
+    <Compile Include="Home\MainSevice.cs" />
     <Compile Include="HotHardManage\HotHardManageEditService.cs" />
     <Compile Include="HotProessManage\HotProessManageEditService.cs" />
     <Compile Include="HSSE\Accident\AccidentHandleService.cs" />

SGGL/BLL/Common/CacheHelper.cs

@@ -0,0 +1,102 @@
+using System;
+using System.Runtime.Caching;
+
+namespace BLL
+{
+    public class CacheHelper
+    {
+        private static readonly ObjectCache Cache = MemoryCache.Default;
+
+        /// <summary>
+        /// 添加缓存项
+        /// </summary>
+        /// <param name="key">缓存键</param>
+        /// <param name="value">缓存值</param>
+        /// <param name="absoluteExpiration">绝对过期时间</param>
+        public static void Add(string key, object value, DateTimeOffset absoluteExpiration)
+        {
+            if (string.IsNullOrEmpty(key))
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            Cache.Set(key, value, absoluteExpiration);
+        }
+
+        /// <summary>
+        /// 获取缓存项（泛型）
+        /// </summary>
+        /// <typeparam name="T">返回类型</typeparam>
+        /// <param name="key">缓存键</param>
+        /// <returns>缓存值</returns>
+        public static T Get<T>(string key)
+        {
+            if (string.IsNullOrEmpty(key))
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            object value = Cache[key];
+            if (value is T tValue)
+            {
+                return tValue;
+            }
+            return default(T);
+        }
+
+        /// <summary>
+        /// 获取缓存项
+        /// </summary>
+        /// <param name="key">缓存键</param>
+        /// <returns>缓存值</returns>
+        public static object Get(string key)
+        {
+            if (string.IsNullOrEmpty(key))
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            return Cache[key];
+        }
+
+        /// <summary>
+        /// 移除缓存项
+        /// </summary>
+        /// <param name="key">缓存键</param>
+        public static void Remove(string key)
+        {
+            if (string.IsNullOrEmpty(key))
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            Cache.Remove(key);
+        }
+
+        /// <summary>
+        /// 清空所有缓存
+        /// </summary>
+        public static void Clear()
+        {
+            foreach (var item in Cache)
+            {
+                Cache.Remove(item.Key);
+            }
+        }
+
+        /// <summary>
+        /// 检查缓存项是否存在
+        /// </summary>
+        /// <param name="key">缓存键</param>
+        /// <returns>是否存在</returns>
+        public static bool Exists(string key)
+        {
+            if (string.IsNullOrEmpty(key))
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            return Cache.Contains(key);
+        }
+    }
+}

SGGL/BLL/Common/CommonService.cs

@@ -132,6 +132,32 @@ namespace BLL
         }
         #endregion
 
+        /// <summary>
+        ///根据userid获取当前人的单位类型（0总公司，1分公司，2其他）
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public static int GetUnitTypeByUserId(string userId)
+        {
+            int result = 0;
+            var user = UserService.GetUserByUserId(userId);
+
+
+            if ((userId == Const.hfnbdId || userId == Const.sysglyId) || (!string.IsNullOrEmpty(user.UnitId) && user.UnitId == CommonService.GetThisUnitId()))//公司级别
+            {
+                result = 0;
+            }
+            else if (!string.IsNullOrEmpty(user.UnitId) && UnitService.GetUnitByUnitId(user.UnitId).IsBranch == true && user.IsOffice == true) //子公司级数据
+            {
+                result = 1;
+            }
+            else //外来账户
+            {
+                result = 2;
+            }
+            return result;
+        }
+
         #region 根据登陆id菜单id判断是否有权限
         /// <summary>
         /// 根据登陆id菜单id判断是否有权限

SGGL/BLL/Common/Const.cs

@@ -2527,6 +2527,15 @@ namespace BLL
         public const string ProjectEmergencyProcessMenuId = "A5D0287B-2410-4DB1-8BD4-E0534EBAE308";
         #endregion
 
+        #region 事故警示
+
+        /// <summary>
+        /// 事故警示
+        /// </summary>
+        public const string AccidentWarningMenuId = "05B1C636-75F0-4F58-ABBF-B79604E2F11C";
+
+        #endregion
+
         #region 施工方案/方案审查
         /// <summary>
         /// 施工方案及审查
@@ -6334,9 +6343,24 @@ namespace BLL
         /// 实业数据
         /// </summary>
         public const string SYHSEData_SYHSEMenuId = "64EE5EC2-F725-4656-9110-5AF83C18FB6C";
+
+        #endregion
+
+        #region 定时任务
+
+        /// <summary>
+        /// 接口设置
+        /// </summary>
         public const string InterFaceSetMenuId = "FFD221D7-AE05-447F-8727-80058A04F401";
+        /// <summary>
+        /// 任务清单
+        /// </summary>
         public const string InterFaceTaskMenuId = "FFD221D7-AE05-447F-8727-80058A04F402";
+        /// <summary>
+        /// 请求日志
+        /// </summary>
         public const string IFLogListMenuId = "FFD221D7-AE05-447F-8727-80058A04F404";
+
         #endregion
 
         #region 数据同步状态

SGGL/BLL/Common/DateHelper.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Data;
+using System.Linq;
+
+namespace BLL
+{
+    /// <summary>
+    /// 时间操作辅助类
+    /// </summary>
+    public class DateHelper
+    {
+        /// <summary>
+        /// 计算两个日期之间相差多少天
+        /// </summary>
+        /// <param name="date1">先</param>
+        /// <param name="date2">后</param>
+        /// <returns></returns>
+        public static int DaysDifference(DateTime date1, DateTime date2)
+        {
+            int result = 0;
+            // 计算两个日期之间的天数差
+            TimeSpan difference = date2.Subtract(date1);
+            result = Math.Abs(difference.Days); //使用绝对值获取正数差值
+            return result;
+        }
+    }
+}

SGGL/BLL/Home/BaseDataService.cs

@@ -0,0 +1,197 @@
+using Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Caching;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+    public static class BaseDataService
+    {
+        public static List<string> BeUnderConstructionList = GetBeUnderConstruction().Select(p => p.ProjectId).ToList();
+        public static Dictionary<string, string> BeUnderConstructionDic = GetBeUnderConstruction().ToDictionary(p => p.ProjectId, p => p.UnitId);
+
+        /// <summary>
+        /// 获取在建项目数
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.ProjectOutput> GetBeUnderConstruction()
+        {
+            var cacheKey = "BeUnderConstructionProjects";
+            if (CacheHelper.Exists(cacheKey))
+            {
+                return CacheHelper.Get<List<Model.ProjectOutput>>(cacheKey);
+            }
+            // 如果缓存中不存在数据，则执行查询并存储结果到缓存
+            var projectInfos = from project in Funs.DB.Base_Project
+                               join unit in Funs.DB.Base_Unit on project.UnitId equals unit.UnitId into unitJoin
+                               from unit in unitJoin.DefaultIfEmpty()
+                               join projectType in Funs.DB.Base_ProjectType on project.ProjectType equals projectType.ProjectTypeId into projectTypeJoin
+                               from projectType in projectTypeJoin.DefaultIfEmpty()
+                               join sysConst in Funs.DB.Sys_Const on new { ProjectState2 = project.ProjectState2, GroupId = BLL.ConstValue.GroupId_ProjectState }
+                               equals new { ProjectState2 = sysConst.ConstValue, GroupId = sysConst.GroupId } into sysConstJoin
+                               from sysConst in sysConstJoin.DefaultIfEmpty()
+                               where (project.ProjectAttribute == "GONGCHENG" || project.ProjectAttribute == null) &&
+                                     (project.IsDelete == null || project.IsDelete == false) &&
+                                     project.ProjectState == "1"
+                               select new ProjectOutput
+                               {
+                                   ProjectId = project.ProjectId,
+                                   ProjectCode = project.ProjectCode,
+                                   ProjectName = project.ProjectName,
+                                   UnitId = project.UnitId,
+                                   UnitName = unit.UnitName,
+                                   StartDate = project.StartDate,
+                                   EndDate = project.EndDate,
+                                   ProjectAddress = project.ProjectAddress,
+                                   ShortName = project.ShortName,
+                                   ConstructionMoney = project.ConstructionMoney,
+                                   ProjectStateName = project.ProjectState == BLL.Const.ProjectState_2 ? "暂停中" :
+                                                      (project.ProjectState == BLL.Const.ProjectState_3 ? "已完工" : "施工中"),
+                                   ProjectState = project.ProjectState,
+                                   ProjectAttributeName = project.ProjectAttribute == "GONGCHENG" ? "工程" :
+                                                         (project.ProjectAttribute == "SHIYE" ? "实业" : ""),
+                                   ProjectMoney = project.ProjectMoney,
+                                   DayCount = DateTime.Now.Subtract(project.StartDate.Value).Days,
+                                   ProjectTypeName = projectType.ProjectTypeName,
+                                   ProjectStateName2 = sysConst.ConstText
+                               };
+
+            var result = projectInfos.ToList();
+            CacheHelper.Add(cacheKey, result, DateTimeOffset.Now.AddHours(2));
+            return result;
+        }        /// <summary>
+                 /// 获取在建项目数(异步)
+                 /// </summary>
+                 /// <returns></returns>
+        public static async Task<List<Model.ProjectOutput>> GetBeUnderConstructionAsync()
+        {
+            return await Task.Run(GetBeUnderConstruction);
+        }
+
+        /// <summary>
+        /// 获取停工项目数
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.ProjectOutput> GetShutdown()
+        {
+            var projectInfos = from project in Funs.DB.Base_Project
+                               join unit in Funs.DB.Base_Unit on project.UnitId equals unit.UnitId into unitJoin
+                               from unit in unitJoin.DefaultIfEmpty()
+                               join projectType in Funs.DB.Base_ProjectType on project.ProjectType equals projectType.ProjectTypeId into projectTypeJoin
+                               from projectType in projectTypeJoin.DefaultIfEmpty()
+                               join sysConst in Funs.DB.Sys_Const on new { ProjectState2 = project.ProjectState2, GroupId = BLL.ConstValue.GroupId_ProjectState } equals new { ProjectState2 = sysConst.ConstValue, GroupId = sysConst.GroupId } into sysConstJoin
+                               from sysConst in sysConstJoin.DefaultIfEmpty()
+                               where (project.ProjectAttribute == "GONGCHENG" || project.ProjectAttribute == null) && (project.IsDelete == null || project.IsDelete == false) && project.ProjectState == "2"
+                               select new ProjectOutput
+                               {
+                                   ProjectId = project.ProjectId,
+                                   ProjectCode = project.ProjectCode,
+                                   ProjectName = project.ProjectName,
+                                   UnitId = project.UnitId,
+                                   UnitName = unit.UnitName,
+                                   StartDate = project.StartDate,
+                                   EndDate = project.EndDate,
+                                   ProjectAddress = project.ProjectAddress,
+                                   ShortName = project.ShortName,
+                                   ConstructionMoney = project.ConstructionMoney,
+                                   ProjectStateName = project.ProjectState == BLL.Const.ProjectState_2 ? "暂停中" : (project.ProjectState == BLL.Const.ProjectState_3 ? "已完工" : "施工中"),
+                                   ProjectState = project.ProjectState,
+                                   ProjectAttributeName = project.ProjectAttribute == "GONGCHENG" ? "工程" : (project.ProjectAttribute == "SHIYE" ? "实业" : ""),
+                                   ProjectMoney = project.ProjectMoney,
+                                   DayCount = DateTime.Now.Subtract(project.StartDate.Value).Days,
+                                   ProjectTypeName = projectType.ProjectTypeName,
+                                   ProjectStateName2 = sysConst.ConstText
+                               };
+            var result = projectInfos.ToList();
+            return result;
+        }
+
+        /// <summary>
+        /// 获取停工项目数(异步)
+        /// </summary>
+        /// <returns></returns>
+        public static async Task<List<Model.ProjectOutput>> GetShutdownAsync()
+        {
+            return await Task.Run(GetShutdown);
+        }
+
+        /// <summary>
+        /// 获取完工项目数
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.ProjectOutput> GetCompletedProject()
+        {
+            var projectInfos = from project in Funs.DB.Base_Project
+                               join unit in Funs.DB.Base_Unit on project.UnitId equals unit.UnitId into unitJoin
+                               from unit in unitJoin.DefaultIfEmpty()
+                               join projectType in Funs.DB.Base_ProjectType on project.ProjectType equals projectType.ProjectTypeId into projectTypeJoin
+                               from projectType in projectTypeJoin.DefaultIfEmpty()
+                               join sysConst in Funs.DB.Sys_Const on new { ProjectState2 = project.ProjectState2, GroupId = BLL.ConstValue.GroupId_ProjectState } equals new { ProjectState2 = sysConst.ConstValue, GroupId = sysConst.GroupId } into sysConstJoin
+                               from sysConst in sysConstJoin.DefaultIfEmpty()
+                               where (project.ProjectAttribute == "GONGCHENG" || project.ProjectAttribute == null) && (project.IsDelete == null || project.IsDelete == false) && project.ProjectState == "3"
+                               select new ProjectOutput
+                               {
+                                   ProjectId = project.ProjectId,
+                                   ProjectCode = project.ProjectCode,
+                                   ProjectName = project.ProjectName,
+                                   UnitId = project.UnitId,
+                                   UnitName = unit.UnitName,
+                                   StartDate = project.StartDate,
+                                   EndDate = project.EndDate,
+                                   ProjectAddress = project.ProjectAddress,
+                                   ShortName = project.ShortName,
+                                   ConstructionMoney = project.ConstructionMoney,
+                                   ProjectStateName = project.ProjectState == BLL.Const.ProjectState_2 ? "暂停中" : (project.ProjectState == BLL.Const.ProjectState_3 ? "已完工" : "施工中"),
+                                   ProjectState = project.ProjectState,
+                                   ProjectAttributeName = project.ProjectAttribute == "GONGCHENG" ? "工程" : (project.ProjectAttribute == "SHIYE" ? "实业" : ""),
+                                   ProjectMoney = project.ProjectMoney,
+                                   DayCount = DateTime.Now.Subtract(project.StartDate.Value).Days,
+                                   ProjectTypeName = projectType.ProjectTypeName,
+                                   ProjectStateName2 = sysConst.ConstText
+                               };
+            var result = projectInfos.ToList();
+            return result;
+        }
+
+        /// <summary>
+        /// 获取所有项目数
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.ProjectOutput> GetALLProject()
+        {
+            var projectInfos = from project in Funs.DB.Base_Project
+                               join unit in Funs.DB.Base_Unit on project.UnitId equals unit.UnitId into unitJoin
+                               from unit in unitJoin.DefaultIfEmpty()
+                               join projectType in Funs.DB.Base_ProjectType on project.ProjectType equals projectType.ProjectTypeId into projectTypeJoin
+                               from projectType in projectTypeJoin.DefaultIfEmpty()
+                               join sysConst in Funs.DB.Sys_Const on new { ProjectState2 = project.ProjectState2, GroupId = BLL.ConstValue.GroupId_ProjectState } equals new { ProjectState2 = sysConst.ConstValue, GroupId = sysConst.GroupId } into sysConstJoin
+                               from sysConst in sysConstJoin.DefaultIfEmpty()
+                               where (project.ProjectAttribute == "GONGCHENG" || project.ProjectAttribute == null) && (project.IsDelete == null || project.IsDelete == false)
+                               select new ProjectOutput
+                               {
+                                   ProjectId = project.ProjectId,
+                                   ProjectCode = project.ProjectCode,
+                                   ProjectName = project.ProjectName,
+                                   UnitId = project.UnitId,
+                                   UnitName = unit.UnitName,
+                                   StartDate = project.StartDate,
+                                   EndDate = project.EndDate,
+                                   ProjectAddress = project.ProjectAddress,
+                                   ShortName = project.ShortName,
+                                   ConstructionMoney = project.ConstructionMoney,
+                                   ProjectStateName = project.ProjectState == BLL.Const.ProjectState_2 ? "暂停中" : (project.ProjectState == BLL.Const.ProjectState_3 ? "已完工" : "施工中"),
+                                   ProjectState = project.ProjectState,
+                                   ProjectAttributeName = project.ProjectAttribute == "GONGCHENG" ? "工程" : (project.ProjectAttribute == "SHIYE" ? "实业" : ""),
+                                   ProjectMoney = project.ProjectMoney,
+                                   DayCount = DateTime.Now.Subtract(project.StartDate.Value).Days,
+                                   ProjectTypeName = projectType.ProjectTypeName,
+                                   ProjectStateName2 = sysConst.ConstText
+                               };
+            var result = projectInfos.ToList();
+            return result;
+        }
+    }
+}

SGGL/BLL/Home/MainSevice.cs

@@ -0,0 +1,95 @@
+using Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+namespace BLL
+{
+    public class MainSevice
+    {
+        /// <summary>
+        /// 在建项目集合
+        /// </summary>
+        private List<string> _beUnderConstructionList;
+        private HSSEData_HSSE _hsseData;
+        private CQMSData_CQMS _cqmsData;
+        private HJGLData_HJGL _hjglData;
+        private string _unitId;
+        private int _unitType;
+
+
+        public MainSevice(string userid)
+        {
+            var userModel = UserService.GetUserByUserId(userid);
+            int unitType = CommonService.GetUnitTypeByUserId(userid);
+            var projectList = BaseDataService.GetBeUnderConstruction();
+            _unitId = userModel.UnitId;
+            _unitType = unitType;
+            if (unitType == 0)
+            {
+                _beUnderConstructionList = projectList.Select(x => x.ProjectId).ToList();
+                _unitId = CommonService.GetThisUnitId();
+            }
+            else if (unitType == 1)
+            {
+                _beUnderConstructionList = projectList.Where(x => x.UnitId == userModel.UnitId).Select(x => x.ProjectId).ToList();
+            }
+            else if (unitType == 2)
+            {
+                _beUnderConstructionList = new List<string>() { "0" };
+            }
+        }
+        public MainSevice(string userid, string projectId)
+        {
+            var userModel = UserService.GetUserByUserId(userid);
+            int unitType = 3;
+            _unitId = userModel.UnitId ?? "";
+            _unitType = unitType;
+            _beUnderConstructionList = new List<string>() { projectId };
+        }
+
+        /// <summary>
+        /// 获取安全数据（项目统计数据直接取的统计表）
+        /// </summary>
+        /// <returns></returns>
+        public async Task<HSSEData_HSSE> GetHsseData()
+        {
+            HSSEData_HSSE result = new HSSEData_HSSE();
+            var getHseData = Funs.DB.HSSEData_HSSE.OrderByDescending(x => x.ReportDate).FirstOrDefault();
+
+            switch (_unitType)
+            {
+                case 0: //企业级
+                    result = getHseData;
+                    break;
+                case 1: //分公司级别
+                    result = HSSEData_HSSEService.GetSubUnitCqmsDataByDate(_beUnderConstructionList, getHseData.ReportDate);
+
+                    ////涉及到企业级别的统计直接取值
+                    //var BeUnderConstructionDic = BaseDataService.BeUnderConstructionDic;
+                    //result.BeUnderConstructionNum = BeUnderConstructionDic.Count(x => x.Value == _unitId);
+                    //result.ShutdownNum = BaseDataService.GetShutdown().Count(x => x.UnitId == _unitId);
+
+                    var beUnderConstructionTask = HSSEData_HSSEService.GetBeUnderConstructionAsync();//在建项目
+                    var shutdownTask = HSSEData_HSSEService.GetShutdownAsync();//停工项目
+                    // 统一获取异步方法的返回值
+                    var beUnderConstructionList = await beUnderConstructionTask;
+                    var shutdownList = await shutdownTask;
+                    result.BeUnderConstructionNum = beUnderConstructionList.Count(x => x.UnitId == _unitId);
+                    result.ShutdownNum = shutdownList.Count(x => x.UnitId == _unitId);
+
+                    break;
+                case 3: //项目级别
+                    var projectHsseData = Funs.DB.Project_HSSEData_HSSE.OrderByDescending(x => x.ReportDate).FirstOrDefault(x => x.ProjectId == _beUnderConstructionList.FirstOrDefault());
+                    if (projectHsseData != null)
+                    {
+                        result = HSSEData_HSSEService.GetSubUnitCqmsDataByDate(_beUnderConstructionList, projectHsseData.ReportDate);
+                    }
+                    break;
+            }
+            return result;
+        }
+
+
+    }
+}

SGGL/BLL/ProjectData/ProjectService.cs

@@ -383,6 +383,81 @@
                 return null;
             }
         }
+        public static List<Model.Base_Project> GetUnEndProjectByUserIdDropDownList(string userId, string needProjectId, string ProjectAttribute, string projectState, string projectName = null)
+        {
+            IQueryable<Model.Base_Project> projects = null;
+            if (userId == Const.sysglyId || userId == Const.hfnbdId || userId == Const.sedinId)
+            {
+                projects = from x in Funs.DB.Base_Project
+                           where x.ProjectAttribute.Contains(ProjectAttribute) && (x.IsDelete == null || x.IsDelete == false)
+                           select x;
+            }
+            else
+            {
+                var getUser = UserService.GetUserByUserId(userId);
+                if (getUser != null)
+                {
+                    var thisUnitId = CommonService.GetThisUnitId();
+                    var getUnit = UnitService.GetUnitByUnitId(getUser.UnitId);
+                    ///// 获取角色类型
+                    //var getRoleP = Funs.DB.Sys_RolePower.FirstOrDefault(x => x.RoleId == getUser.RoleId && x.IsOffice == true);
+                    if (getUser.IsOffice == true)
+                    {
+                        if (getUser.UnitId == thisUnitId)
+                        {
+                            projects = from x in Funs.DB.Base_Project
+                                       where x.ProjectAttribute.Contains(ProjectAttribute) && (x.IsDelete == null || x.IsDelete == false)
+                                       select x;
+                        }
+                        else if (getUnit != null && getUnit.IsBranch == true)
+                        {
+                            projects = from x in Funs.DB.Base_Project
+                                       where x.ProjectAttribute.Contains(ProjectAttribute) && (x.IsDelete == null || x.IsDelete == false) && x.UnitId == getUnit.UnitId
+                                       select x;
+                        }
+                        else
+                        {
+                            projects = from x in Funs.DB.Base_Project
+                                       join y in Funs.DB.Project_ProjectUser on x.ProjectId equals y.ProjectId
+                                       where x.ProjectAttribute.Contains(ProjectAttribute) && (x.UnitId == getUser.UnitId || y.UserId == userId)
+                                        && (x.IsDelete == null || x.IsDelete == false)
+                                       select x;
+                        }
+                    }
+                    else
+                    {
+                        projects = from x in Funs.DB.Base_Project
+                                   join y in Funs.DB.Project_ProjectUser on x.ProjectId equals y.ProjectId
+                                   where y.UserId == userId && x.ProjectAttribute.Contains(ProjectAttribute)
+                                   && (x.IsDelete == null || x.IsDelete == false)
+                                   select x;
+                    }
+                }
+                else
+                {
+                    return null;
+                }
+            }
+            if (projectState != "0")
+            {
+                if (projectState == "1")
+                {
+                    projects = from x in projects where x.ProjectState == projectState || x.ProjectState == null select x;
+                }
+                else
+                {
+                    projects = from x in projects where x.ProjectState == projectState select x;
+                }
+            }
+
+            if (!string.IsNullOrEmpty(projectName))
+            {
+                projects = from x in projects where x.ProjectName.Contains(projectName) select x;
+            }
+            return (from x in projects
+                    join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
+                    select x).Distinct().ToList();
+        }
 
         #region 项目表下拉框
         /// <summary>

SGGL/BLL/SysManage/UnitService.cs

@@ -414,7 +414,36 @@ namespace BLL
             return code;
         }
 
+        /// <summary>
+        /// 获取当前单位下分公司拉选项
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.Base_Unit> GetMainAndSubUnitList()
+        {
+            //return (from x in Funs.DB.Base_Unit where x.IsThisUnit == true || x.IsBranch == true orderby x.IsThisUnit descending select x).ToList();
+            return (from x in Funs.DB.Base_Unit where x.IsBranch == true  select x).ToList();
+        }
+
         #region 单位表下拉框
+
+        /// <summary>
+        /// 获取分公司表下拉框
+        /// </summary>
+        /// <param name="dropName"></param>
+        /// <param name="isShowPlease"></param>
+        public static void InitBranchUnitDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
+        {
+            dropName.DataValueField = "UnitId";
+            dropName.DataTextField = "UnitName";
+            dropName.DataSource = BLL.UnitService.GetMainAndSubUnitList();
+            dropName.DataBind();
+            if (isShowPlease)
+            {
+                Funs.FineUIPleaseSelect(dropName);
+            }
+        }
+
+
         /// <summary>
         ///  单位表下拉框
         /// </summary>

SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs

@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using FineUIPro;
 using Model;
 using Newtonsoft.Json;
@@ -10,7 +11,99 @@ namespace BLL
 {
     public static class HSSEData_HSSEService
     {
-        public static CNPCDB Db = Funs.DB;
+        /// <summary>
+        /// 在建项目列表
+        /// </summary>
+        public static List<string> BeUnderConstructionList = BaseDataService.BeUnderConstructionList;
+
+        #region 安全数据统计
+
+        /// <summary>
+        /// 安全数据统计
+        /// </summary>
+        /// <returns></returns>
+        public static async Task<HSSEData> GetTodayHSSEData_HSSE()
+        {
+            var modelTask = StatisticalDataAsync();
+            var model = await modelTask;
+            HSSEData data = model;
+            return data;
+        }
+
+        /// <summary>
+        /// 统计数据(异步)
+        /// </summary>
+        /// <returns></returns>
+        public static async Task<HSSEData> StatisticalDataAsync()
+        {
+            var thisUnitId = string.Empty;
+            var thisUnit = CommonService.GetIsThisUnit();
+            if (thisUnit != null) { thisUnitId = thisUnit.UnitId; }
+            var baseUnit = UnitService.GetUnitByUnitId(thisUnitId);
+            Project_HSSEData_HiddenDangerDetailService.StatisticalAllProjectData();
+
+            var beUnderConstructionTask = GetBeUnderConstructionAsync();//在建项目
+            var shutdownTask = GetShutdownAsync();//停工项目
+            var joinConstructionPersonTask = GetJoinConstructionPersonAsync();//参建人数
+
+            await Task.WhenAll(beUnderConstructionTask, shutdownTask, joinConstructionPersonTask);
+            // 统一获取异步方法的返回值
+            var beUnderConstructionList = await beUnderConstructionTask;
+            var shutdownList = await shutdownTask;
+            var joinConstructionPersonList = await joinConstructionPersonTask;
+
+            // 构造结果对象
+            var table = new HSSEData_HSSE
+            {
+                UnitId = thisUnitId,
+                CollCropCode = baseUnit.CollCropCode,
+                UnitName = baseUnit.UnitName,
+                ReportDate = DateTime.Now.Date,
+
+                BeUnderConstructionNum = beUnderConstructionList.Count(),
+                ShutdownNum = shutdownList.Count(),
+                JoinConstructionPersonNum = joinConstructionPersonList.Count(),
+            };
+
+            #region 添加项目统计数据
+
+            Project_HSSEData_HSSEService.DeleteProject_HSSEData_HSSEByDate(DateTime.Now.Date);
+
+            foreach (var projectid in BeUnderConstructionList)
+            {
+                var projectHsseData = new Project_HSSEData_HSSE
+                {
+                    Id = SQLHelper.GetNewID(),
+                    ProjectId = projectid,
+                    UnitId = thisUnitId,
+                    CollCropCode = baseUnit.CollCropCode,
+                    UnitName = baseUnit.UnitName,
+                    ReportDate = DateTime.Now.Date,
+                };
+                Project_HSSEData_HSSEService.AddProject_HSSEData_HSSE(projectHsseData);
+            }
+
+            #endregion
+
+            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;
+        }
+
+        #endregion
+
 
         public static void AddHSSEData_HSSE(HSSEData_HSSE newtable)
         {
@@ -206,8 +299,7 @@ namespace BLL
                 item.TrainPersonNum = dataHsse.TrainPersonNum;
                 item.UnitId = dataHsse.UnitId;
                 item.UseEquipmentNum = dataHsse.UseEquipmentNum;
-                var hSseDataHiddens =
-                    HSSEData_HiddenDangerDetailService.GetHSSEData_HiddenDangerDetailByDate(dataHsse.ReportDate);
+                var hSseDataHiddens = HSSEData_HiddenDangerDetailService.GetHSSEData_HiddenDangerDetailByDate(dataHsse.ReportDate);
                 if (hSseDataHiddens != null)
                 {
                     var list = hSseDataHiddens.Select(detail => new HSSEDataHiddenDangerDetailItem
@@ -227,8 +319,7 @@ namespace BLL
             return data;
         }
 
-        public static HSSEData GetItemByHSSEData_HSSE(HSSEData_HSSE dataHsse,
-            List<HSSEDataHiddenDangerDetailItem> hSseDataHiddens)
+        public static HSSEData GetItemByHSSEData_HSSE(HSSEData_HSSE dataHsse, List<HSSEDataHiddenDangerDetailItem> hSseDataHiddens)
         {
             var item = new HsseDataItem();
             var data = new HSSEData();
@@ -330,19 +421,6 @@ namespace BLL
             return data;
         }
 
-        public static HSSEData GetTodayHSSEData_HSSE()
-        {
-            HSSEData data;
-            var q = (from x in Funs.DB.HSSEData_HSSE
-                     where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date
-                     select x).FirstOrDefault();
-            if (q != null && q.State == Const.CNCEC_State_S)
-                // data = GetItemByHSSEData_HSSE(q, Project_HSSEData_HiddenDangerDetailService.GetTodayModel()); ;
-                data = StatisticalData();
-            else
-                data = StatisticalData();
-            return data;
-        }
 
         public static HSSEData_HSSE GetTodayData()
         {
@@ -373,7 +451,7 @@ namespace BLL
         }
 
         /// <summary>
-        ///     判断当天是否已上报
+        /// 判断当天是否已上报
         /// </summary>
         /// <returns></returns>
         public static bool IsReportByToday()
@@ -386,127 +464,6 @@ namespace BLL
             return result;
         }
 
-        public static ReturnData PushCncec(string id)
-        {
-            var baseurl = "/api/HSSEData/SaveHSSEData";
-            var item = GetItemById(id);
-            var str = JsonConvert.SerializeObject(item);
-            var responeData = ServerService.PushCNCEC(str, baseurl);
-            return responeData;
-        }
-
-        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_HSSEService.StatisticalAllProjectData();
-            Project_HSSEData_HiddenDangerDetailService.StatisticalAllProjectData();
-
-            var projectData = (from x in Funs.DB.Project_HSSEData_HSSE
-                               where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date
-                               select x).ToList();
-            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 = projectData.Sum(x => x.BeUnderConstructionNum),
-                ShutdownNum = GetShutdownNum(),
-                JoinConstructionPersonNum = projectData.Sum(x => x.JoinConstructionPersonNum),
-                MajorProjectsUnderConstructionNum = projectData.Sum(x => x.MajorProjectsUnderConstructionNum),
-                TotalWorkingHour = projectData.Sum(x => x.TotalWorkingHour),
-                LostWorkingHour = projectData.Sum(x => x.LostWorkingHour),
-                SafeWorkingHour = projectData.Sum(x => x.SafeWorkingHour),
-                SafeTrainNum = projectData.Sum(x => x.SafeTrainNum),
-                SpecialTrainNum = projectData.Sum(x => x.SpecialTrainNum),
-                SpecialOperationTrainNum = projectData.Sum(x => x.SpecialOperationTrainNum),
-                TotalEnergyConsumption = totalEnergyConsumption,
-                IncomeComprehensiveEnergyConsumption = incomeComprehensiveEnergyConsumption,
-                NewWaterConsumption = newWaterConsumption,
-                HeadOfficeInspectorGeneralNum = GetHeadOfficeInspectorGeneralNum(),
-                HeadOfficeFullTimeNum = GetHeadOfficeFullTimeNum(),
-                BranchInspectorGeneralNum = GetBranchInspectorGeneralNum(),
-                BranchFullTimeNum = GetBranchFullTimeNum(),
-                ProjectInspectorGeneralNum = projectData.Sum(x => x.ProjectInspectorGeneralNum),
-                ProjectFullTimeNum = projectData.Sum(x => x.ProjectFullTimeNum),
-                ProjectSafetyMonitorNum = projectData.Sum(x => x.ProjectSafetyMonitorNum),
-                SafetyInjectionEngineer = projectData.Sum(x => x.SafetyInjectionEngineer),
-                CertificateANum = projectData.Sum(x => x.CertificateANum),
-                CertificateBNum = projectData.Sum(x => x.CertificateBNum),
-                CertificateCNum = projectData.Sum(x => x.CertificateCNum),
-                SafetyCommitteeMeetingNum = GetSafetyCommitteeMeetingNum(),
-                EnterpriseTopicsMeetingNum = GetEnterpriseTopicsMeetingNum(),
-                ProjectSafetyLeadingGroupMeetingNum = projectData.Sum(x => x.ProjectSafetyLeadingGroupMeetingNum),
-                ProjectSafetyMeetingNum = projectData.Sum(x => x.ProjectSafetyMeetingNum),
-                CompanyLeadShiftCheckNum = GetCompanyLeadShiftCheckNum(),
-                CompanyComprehensiveCheckNum = GetCompanyComprehensiveCheckNum(),
-                CompanySpecialCheckNum = GetCompanySpecialCheckNum(),
-                ProjectLeadShiftCheckNum = projectData.Sum(x => x.ProjectLeadShiftCheckNum),
-                ProjectSpecialCheckNum = projectData.Sum(x => x.ProjectSpecialCheckNum),
-                ProjectMajorCheckNum = projectData.Sum(x => x.ProjectMajorCheckNum),
-                NearMissNum = projectData.Sum(x => x.NearMissNum),
-                RecordableEventNum = projectData.Sum(x => x.RecordableEventNum),
-                GeneralAccidentNum = projectData.Sum(x => x.GeneralAccidentNum),
-                MajorAccidentNum = projectData.Sum(x => x.MajorAccidentNum),
-                SeriousAccidentNum = projectData.Sum(x => x.SeriousAccidentNum),
-                SpecialSeriousAccidentNum = projectData.Sum(x => x.SpecialSeriousAccidentNum),
-                CompanyComprehensivePlanNum = GetCompanyComprehensivePlanNum(),
-                CompanySpecialPlanNum = GetCompanySpecialPlanNum(),
-                CompanyOnSiteDisposalPlan = GetCompanyOnSiteDisposalPlan(),
-                CompanyDrillNum = GetCompanyDrillNum(),
-                ProjectComprehensivePlanNum = projectData.Sum(x => x.ProjectComprehensivePlanNum),
-                ProjectSpecialPlanNum = projectData.Sum(x => x.ProjectSpecialPlanNum),
-                ProjectOnSiteDisposalPlan = projectData.Sum(x => x.ProjectOnSiteDisposalPlan),
-                ProjectDrillNum = projectData.Sum(x => x.ProjectDrillNum),
-                CostExtract = projectData.Sum(x => x.CostExtract),
-                CostUse = projectData.Sum(x => x.CostUse),
-                UseEquipmentNum = projectData.Sum(x => x.UseEquipmentNum),
-                SpecialEquipmentNum = projectData.Sum(x => x.SpecialEquipmentNum),
-                LicensesNum = projectData.Sum(x => x.LicensesNum),
-                LicensesCloseNum = projectData.Sum(x => x.LicensesCloseNum),
-                GeneralClosedNum = projectData.Sum(x => x.GeneralClosedNum),
-                GeneralNotClosedNum = projectData.Sum(x => x.GeneralNotClosedNum),
-                MajorClosedNum = projectData.Sum(x => x.MajorClosedNum),
-                MajorNotClosedNum = projectData.Sum(x => x.MajorNotClosedNum),
-                GeneralRiskNum = projectData.Sum(x => x.GeneralRiskNum),
-                LowRiskNum = projectData.Sum(x => x.LowRiskNum),
-                MediumRiskNum = projectData.Sum(x => x.MediumRiskNum),
-                HighRiskNum = projectData.Sum(x => x.HighRiskNum),
-                CompletedNum = projectData.Sum(x => x.CompletedNum),
-                TrainPersonNum = projectData.Sum(x => x.TrainPersonNum),
-                ConstructionNum = projectData.Sum(x => x.ConstructionNum),
-                FinishedNum = projectData.Sum(x => x.FinishedNum),
-                SuperCompletedNum = projectData.Sum(x => x.SuperCompletedNum),
-                SuperTrainPersonNum = projectData.Sum(x => x.SuperTrainPersonNum),
-                SuperConstructionNum = projectData.Sum(x => x.SuperConstructionNum),
-                SuperFinishedNum = projectData.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;
-        }
 
         public static void UpdateHSSEData_HSSE(HSSEData_HSSE newtable)
         {
@@ -598,6 +555,39 @@ namespace BLL
             }
         }
 
+        /// <summary>
+        /// 获取在建项目数(异步)
+        /// </summary>
+        /// <returns></returns>
+        public static async Task<List<Model.ProjectOutput>> GetBeUnderConstructionAsync()
+        {
+            return await Task.Run(GetBeUnderConstruction);
+        }
+        /// <summary>
+        /// 获取在建项目数
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.ProjectOutput> GetBeUnderConstruction()
+        {
+            return BaseDataService.GetBeUnderConstruction();
+        }
+
+        /// <summary>
+        /// 获取停工项目数(异步)
+        /// </summary>
+        /// <returns></returns>
+        public static async Task<List<Model.ProjectOutput>> GetShutdownAsync()
+        {
+            return await Task.Run(GetShutdown);
+        }
+        /// <summary>
+        /// 获取停工项目数
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.ProjectOutput> GetShutdown()
+        {
+            return BaseDataService.GetShutdown();
+        }
         /// <summary>
         /// 获取停工项目数
         /// </summary>
@@ -611,7 +601,34 @@ namespace BLL
         }
 
         /// <summary>
-        ///     获取企业总部总监人数
+        /// 获取参建人数（异步）
+        /// </summary>
+        /// <returns></returns>
+        public static async Task<List<Model.BaseEntities>> GetJoinConstructionPersonAsync()
+        {
+            return await Task.Run(GetJoinConstructionPerson);
+        }
+        /// <summary>
+        /// 获取参建人数
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.BaseEntities> GetJoinConstructionPerson()
+        {
+            var result = (from x in Funs.DB.SitePerson_Person
+                          where BeUnderConstructionList.Contains(x.ProjectId) && x.IsUsed == true
+                          select new Model.BaseEntities
+                          {
+                              Id = x.PersonId,
+                              ProjectId = x.ProjectId,
+                              UnitId = x.UnitId
+                          }).ToList();
+            return result;
+        }
+
+
+
+        /// <summary>
+        /// 获取企业总部总监人数
         /// </summary>
         /// <returns></returns>
         public static int GetHeadOfficeInspectorGeneralNum()
@@ -626,7 +643,7 @@ namespace BLL
         }
 
         /// <summary>
-        ///     获取企业总部专职人数
+        /// 获取企业总部专职人数
         /// </summary>
         /// <returns></returns>
         public static int GetHeadOfficeFullTimeNum()
@@ -642,7 +659,7 @@ namespace BLL
         }
 
         /// <summary>
-        ///     获取分支机构总监人数
+        /// 获取分支机构总监人数
         /// </summary>
         /// <returns></returns>
         public static int GetBranchInspectorGeneralNum()
@@ -657,7 +674,7 @@ namespace BLL
         }
 
         /// <summary>
-        ///     获取分支机构专职人数
+        /// 获取分支机构专职人数
         /// </summary>
         /// <returns></returns>
         public static int GetBranchFullTimeNum()
@@ -673,7 +690,7 @@ namespace BLL
         }
 
         /// <summary>
-        ///     获取企业安委会会议数
+        /// 获取企业安委会会议数
         /// </summary>
         /// <returns></returns>
         public static int GetSafetyCommitteeMeetingNum()
@@ -685,7 +702,7 @@ namespace BLL
         }
 
         /// <summary>
-        ///     获取企业专题会议数
+        /// 获取企业专题会议数
         /// </summary>
         /// <returns></returns>
         public static int GetEnterpriseTopicsMeetingNum()
@@ -697,7 +714,7 @@ namespace BLL
         }
 
         /// <summary>
-        ///     获取企业负责人带班检查次数
+        /// 获取企业负责人带班检查次数
         /// </summary>
         /// <returns></returns>
         public static int GetCompanyLeadShiftCheckNum()
@@ -709,7 +726,7 @@ namespace BLL
         }
 
         /// <summary>
-        ///     获取企业综合检查次数
+        /// 获取企业综合检查次数
         /// </summary>
         /// <returns></returns>
         public static int GetCompanyComprehensiveCheckNum()
@@ -721,7 +738,7 @@ namespace BLL
         }
 
         /// <summary>
-        ///     获取企业专项检查次数
+        /// 获取企业专项检查次数
         /// </summary>
         /// <returns></returns>
         public static int GetCompanySpecialCheckNum()
@@ -733,7 +750,7 @@ namespace BLL
         }
 
         /// <summary>
-        ///     获取企业级综合预案数
+        /// 获取企业级综合预案数
         /// </summary>
         /// <returns></returns>
         public static int GetCompanyComprehensivePlanNum()
@@ -746,7 +763,7 @@ namespace BLL
         }
 
         /// <summary>
-        ///     获取企业级专项预案数
+        /// 获取企业级专项预案数
         /// </summary>
         /// <returns></returns>
         public static int GetCompanySpecialPlanNum()
@@ -759,7 +776,7 @@ namespace BLL
         }
 
         /// <summary>
-        ///     获取企业级现场处置预案
+        /// 获取企业级现场处置预案
         /// </summary>
         /// <returns></returns>
         public static int GetCompanyOnSiteDisposalPlan()
@@ -772,7 +789,7 @@ namespace BLL
         }
 
         /// <summary>
-        ///     获取企业级演练次数
+        /// 获取企业级演练次数
         /// </summary>
         /// <returns></returns>
         public static int GetCompanyDrillNum()
@@ -786,7 +803,7 @@ namespace BLL
         #region 获取列表
 
         /// <summary>
-        ///     记录数
+        /// 记录数
         /// </summary>
         public static int Count { get; set; }
 
@@ -900,5 +917,114 @@ namespace BLL
         }
 
         #endregion 获取列表
+
+
+        public static HSSEData_HSSE GetSubUnitCqmsDataByDate(List<string> beUnderConstructionList, DateTime? reportdate)
+        {
+            var result = new Model.HSSEData_HSSE();
+            if (reportdate == null)
+            {
+                return result;
+            }
+            var ProjectData = (from x in Funs.DB.Project_HSSEData_HSSE
+                               where x.ReportDate == reportdate && beUnderConstructionList.Contains(x.ProjectId)
+                               select x).ToList();
+            result = new HSSEData_HSSE
+            {
+                ReportDate = reportdate.Value.Date,
+                JoinConstructionPersonNum = ProjectData.Sum(x => x.JoinConstructionPersonNum),
+
+
+                TrainPersonNum = ProjectData.Sum(x => x.TrainPersonNum),
+                MajorProjectsUnderConstructionNum = ProjectData.Sum(x => x.MajorProjectsUnderConstructionNum),
+                TotalWorkingHour = ProjectData.Sum(x => x.TotalWorkingHour),
+                LostWorkingHour = ProjectData.Sum(x => x.LostWorkingHour),
+                SafeWorkingHour = ProjectData.Sum(x => x.SafeWorkingHour),
+                SafeTrainNum = ProjectData.Sum(x => x.SafeTrainNum),
+                SpecialTrainNum = ProjectData.Sum(x => x.SpecialTrainNum),
+                SpecialOperationTrainNum = ProjectData.Sum(x => x.SpecialOperationTrainNum),
+                //HseTechnicalNum = ProjectData.Sum(x => x.HseTechnicalNum),
+                //EnvironmentalTrainNum = ProjectData.Sum(x => x.EnvironmentalTrainNum),
+                TotalEnergyConsumption = ProjectData.Sum(x => x.TotalEnergyConsumption),
+                IncomeComprehensiveEnergyConsumption = ProjectData.Sum(x => x.IncomeComprehensiveEnergyConsumption),
+                NewWaterConsumption = ProjectData.Sum(x => x.NewWaterConsumption),
+                HeadOfficeInspectorGeneralNum = ProjectData.Sum(x => x.HeadOfficeInspectorGeneralNum),
+                HeadOfficeFullTimeNum = ProjectData.Sum(x => x.HeadOfficeFullTimeNum),
+                BranchInspectorGeneralNum = ProjectData.Sum(x => x.BranchInspectorGeneralNum),
+                BranchFullTimeNum = ProjectData.Sum(x => x.BranchFullTimeNum),
+                ProjectInspectorGeneralNum = ProjectData.Sum(x => x.ProjectInspectorGeneralNum),
+                ProjectFullTimeNum = ProjectData.Sum(x => x.ProjectFullTimeNum),
+                //ProjectSubFullTimeNum = ProjectData.Sum(x => x.ProjectSubFullTimeNum),
+                ProjectSafetyMonitorNum = ProjectData.Sum(x => x.ProjectSafetyMonitorNum),
+                SafetyInjectionEngineer = ProjectData.Sum(x => x.SafetyInjectionEngineer),
+                CertificateANum = ProjectData.Sum(x => x.CertificateANum),
+                CertificateBNum = ProjectData.Sum(x => x.CertificateBNum),
+                CertificateCNum = ProjectData.Sum(x => x.CertificateCNum),
+                //QualityPersonNum = ProjectData.Sum(x => x.QualityPersonNum),
+                SafetyCommitteeMeetingNum = ProjectData.Sum(x => x.SafetyCommitteeMeetingNum),
+                EnterpriseTopicsMeetingNum = ProjectData.Sum(x => x.EnterpriseTopicsMeetingNum),
+                ProjectSafetyLeadingGroupMeetingNum = ProjectData.Sum(x => x.ProjectSafetyLeadingGroupMeetingNum),
+                ProjectSafetyMeetingNum = ProjectData.Sum(x => x.ProjectSafetyMeetingNum),
+                CompanyLeadShiftCheckNum = ProjectData.Sum(x => x.CompanyLeadShiftCheckNum),
+                CompanyComprehensiveCheckNum = ProjectData.Sum(x => x.CompanyComprehensiveCheckNum),
+                CompanySpecialCheckNum = ProjectData.Sum(x => x.CompanySpecialCheckNum),
+                //BranchLeadShiftCheckNum = ProjectData.Sum(x => x.BranchLeadShiftCheckNum),
+                //BranchComprehensiveCheckNum = ProjectData.Sum(x => x.BranchComprehensiveCheckNum),
+                //BranchSpecialCheckNum = ProjectData.Sum(x => x.BranchSpecialCheckNum),
+                ProjectLeadShiftCheckNum = ProjectData.Sum(x => x.ProjectLeadShiftCheckNum),
+                ProjectSpecialCheckNum = ProjectData.Sum(x => x.ProjectSpecialCheckNum),
+                ProjectMajorCheckNum = ProjectData.Sum(x => x.ProjectMajorCheckNum),
+                NearMissNum = ProjectData.Sum(x => x.NearMissNum),
+                RecordableEventNum = ProjectData.Sum(x => x.RecordableEventNum),
+                GeneralAccidentNum = ProjectData.Sum(x => x.GeneralAccidentNum),
+                MajorAccidentNum = ProjectData.Sum(x => x.MajorAccidentNum),
+                SeriousAccidentNum = ProjectData.Sum(x => x.SeriousAccidentNum),
+                SpecialSeriousAccidentNum = ProjectData.Sum(x => x.SpecialSeriousAccidentNum),
+                CompanyComprehensivePlanNum = ProjectData.Sum(x => x.CompanyComprehensivePlanNum),
+                CompanySpecialPlanNum = ProjectData.Sum(x => x.CompanySpecialPlanNum),
+                CompanyOnSiteDisposalPlan = ProjectData.Sum(x => x.CompanyOnSiteDisposalPlan),
+                //BranchComprehensivePlanNum = ProjectData.Sum(x => x.BranchComprehensivePlanNum),
+                //BranchSpecialPlanNum = ProjectData.Sum(x => x.BranchSpecialPlanNum),
+                //BranchOnSiteDisposalPlan = ProjectData.Sum(x => x.BranchOnSiteDisposalPlan),
+                CompanyDrillNum = ProjectData.Sum(x => x.CompanyDrillNum),
+                //CompanyDrillPersonNum = ProjectData.Sum(x => x.CompanyDrillPersonNum),
+                //BranchDrillNum = ProjectData.Sum(x => x.BranchDrillNum),
+                //BranchDrillPersonNum = ProjectData.Sum(x => x.BranchDrillPersonNum),
+                ProjectComprehensivePlanNum = ProjectData.Sum(x => x.ProjectComprehensivePlanNum),
+                ProjectSpecialPlanNum = ProjectData.Sum(x => x.ProjectSpecialPlanNum),
+                ProjectOnSiteDisposalPlan = ProjectData.Sum(x => x.ProjectOnSiteDisposalPlan),
+                ProjectDrillNum = ProjectData.Sum(x => x.ProjectDrillNum),
+                //ProjectDrillPersonNum = ProjectData.Sum(x => x.ProjectDrillPersonNum),
+                CostExtract = ProjectData.Sum(x => x.CostExtract),
+                CostUse = ProjectData.Sum(x => x.CostUse),
+                UseEquipmentNum = ProjectData.Sum(x => x.UseEquipmentNum),
+                SpecialEquipmentNum = ProjectData.Sum(x => x.SpecialEquipmentNum),
+                LicensesNum = ProjectData.Sum(x => x.LicensesNum),
+                LicensesCloseNum = ProjectData.Sum(x => x.LicensesCloseNum),
+                GeneralClosedNum = ProjectData.Sum(x => x.GeneralClosedNum),
+                GeneralNotClosedNum = ProjectData.Sum(x => x.GeneralNotClosedNum),
+                MajorClosedNum = ProjectData.Sum(x => x.MajorClosedNum),
+                MajorNotClosedNum = ProjectData.Sum(x => x.MajorNotClosedNum),
+                LowRiskNum = ProjectData.Sum(x => x.LowRiskNum),
+                GeneralRiskNum = ProjectData.Sum(x => x.GeneralRiskNum),
+                MediumRiskNum = ProjectData.Sum(x => x.MediumRiskNum),
+                HighRiskNum = ProjectData.Sum(x => x.HighRiskNum),
+                CompletedNum = ProjectData.Sum(x => x.CompletedNum),
+                //OperativesNum = ProjectData.Sum(x => x.OperativesNum),
+                ConstructionNum = ProjectData.Sum(x => x.ConstructionNum),
+                FinishedNum = ProjectData.Sum(x => x.FinishedNum),
+                //ArgumentNum = ProjectData.Sum(x => x.ArgumentNum),
+                SuperCompletedNum = ProjectData.Sum(x => x.SuperCompletedNum),
+                SuperTrainPersonNum = ProjectData.Sum(x => x.SuperTrainPersonNum),
+                //SuperOperativesNum = ProjectData.Sum(x => x.SuperOperativesNum),
+                SuperConstructionNum = ProjectData.Sum(x => x.SuperConstructionNum),
+                SuperFinishedNum = ProjectData.Sum(x => x.SuperFinishedNum),
+                //SuperArgumentNum = ProjectData.Sum(x => x.SuperArgumentNum),
+                CreateMan = Const.sysglyId,
+                CreateDate = DateTime.Now
+            };
+            return result;
+        }
+
     }
 }

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

@@ -100,7 +100,6 @@ namespace BLL
             DangerousProject
         }
 
-        public static CNPCDB db = Funs.DB;
 
         /// <summary>
         ///     新增实体
@@ -218,7 +217,7 @@ namespace BLL
         /// <returns></returns>
         public static Project_HSSEData_HSSE GetProject_HSSEData_HSSEById(string Id)
         {
-            return db.Project_HSSEData_HSSE.FirstOrDefault(x => x.Id == Id);
+            return Funs.DB.Project_HSSEData_HSSE.FirstOrDefault(x => x.Id == Id);
         }
 
         public static List<Project_HSSEData_HSSE> GetProject_HSSEData_HSSEByProjectid(string Projectid)
@@ -232,6 +231,19 @@ namespace BLL
             }
         }
 
+        public static void DeleteProject_HSSEData_HSSEByDate(DateTime? reportDate)
+        {
+            using (var db = new CNPCDB(Funs.ConnString))
+            {
+                var table = db.Project_HSSEData_HSSE.Where(x => x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0);
+                if (table != null)
+                {
+                    db.Project_HSSEData_HSSE.DeleteAllOnSubmit(table);
+                    db.SubmitChanges();
+                }
+            }
+        }
+
         public static void UpdateProject_HSSEData_HSSE(Project_HSSEData_HSSE newtable)
         {
             using (var db = new CNPCDB(Funs.ConnString))
@@ -503,7 +515,7 @@ namespace BLL
                 table.GeneralClosedNum = GetGeneralClosedNum(projectid);
                 table.GeneralNotClosedNum = GetGeneralNotClosedNum(projectid);
                 table.MajorClosedNum = GetMajorClosedNum(projectid);
-                table.MajorNotClosedNum = GetMajorNotClosedNum(projectid); 
+                table.MajorNotClosedNum = GetMajorNotClosedNum(projectid);
             }
 
             if (hSseDateType == HSSEDateType.SecurityRisk || hSseDateType == HSSEDateType.All)
@@ -1271,7 +1283,7 @@ namespace BLL
                                                         && x.ApplyDate > Const.DtmarkTime
                                                         select x).Count() +
                                                                (from x in db.License_LicenseManager
-                                                                where x.ProjectId == projectid && x.IsHighRisk == true && x.CompileDate> Const.DtmarkTime
+                                                                where x.ProjectId == projectid && x.IsHighRisk == true && x.CompileDate > Const.DtmarkTime
                                                                 select x).Count();
                 return result;
             }
@@ -1286,7 +1298,7 @@ namespace BLL
             using (var db = new Model.CNPCDB(Funs.ConnString))
             {
                 var result = (from x in db.License_FireWork
-                              where x.ProjectId == projectid && x.States== Const.State_3
+                              where x.ProjectId == projectid && x.States == Const.State_3
                               && x.ApplyDate > Const.DtmarkTime
                               select x).Count() +
                           (from x in db.License_HeightWork
@@ -1552,7 +1564,7 @@ namespace BLL
 
         public static List<Project_HSSEData_HSSE> GetProject_HSSEData_HSSEByModle(Project_HSSEData_HSSE table)
         {
-            var q = from x in db.Project_HSSEData_HSSE
+            var q = from x in Funs.DB.Project_HSSEData_HSSE
                     where
                         (string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
                         (string.IsNullOrEmpty(table.ProjectId) || x.Id.Contains(table.ProjectId)) &&