五环二期集团数据对接

SGGL/BLL/API/CQMS/QualityAssuranceService.cs

@@ -1072,5 +1072,76 @@ namespace BLL
             return list;
         }
         #endregion
+
+        #region 特设质保体系
+
+        /// <summary>
+        /// 根据主键获取特设质保体系
+        /// </summary>
+        /// <param name="qualityAssuranceId"></param>
+        /// <returns></returns>
+        public static Model.Comprehensive_QualityAssurance GetQualityAssuranceById(string qualityAssuranceId)
+        {
+            return Funs.DB.Comprehensive_QualityAssurance.FirstOrDefault(e => e.QualityAssuranceId == qualityAssuranceId);
+        }
+
+        /// <summary>
+        /// 添加特设质保体系
+        /// </summary>
+        /// <param name="qualityAssurance"></param>
+        public static void AddQualityAssurance(Model.Comprehensive_QualityAssurance qualityAssurance)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.Comprehensive_QualityAssurance newAssurance = new Model.Comprehensive_QualityAssurance
+            {
+                QualityAssuranceId = qualityAssurance.QualityAssuranceId,
+                ProjectId = qualityAssurance.ProjectId,
+                QualityAssuranceCode = qualityAssurance.QualityAssuranceCode,
+                QualityAssuranceName = qualityAssurance.QualityAssuranceName,
+                QualityAssuranceType = qualityAssurance.QualityAssuranceType,
+                ContentTexts = qualityAssurance.ContentTexts,
+                CompileMan = qualityAssurance.CompileMan,
+                CompileDate = qualityAssurance.CompileDate,
+            };
+            db.Comprehensive_QualityAssurance.InsertOnSubmit(newAssurance);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 修改特设质保体系
+        /// </summary>
+        /// <param name="qualityAssurance"></param>
+        public static void UpdateQualityAssurance(Model.Comprehensive_QualityAssurance qualityAssurance)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.Comprehensive_QualityAssurance newAssurance = db.Comprehensive_QualityAssurance.FirstOrDefault(e => e.QualityAssuranceId == qualityAssurance.QualityAssuranceId);
+            if (newAssurance != null)
+            {
+                newAssurance.QualityAssuranceCode = qualityAssurance.QualityAssuranceCode;
+                newAssurance.QualityAssuranceName = qualityAssurance.QualityAssuranceName;
+                newAssurance.QualityAssuranceType = qualityAssurance.QualityAssuranceType;
+                newAssurance.ContentTexts = qualityAssurance.ContentTexts;
+                newAssurance.CompileMan = qualityAssurance.CompileMan;
+                newAssurance.CompileDate = qualityAssurance.CompileDate;
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 根据主键删除特设质保体系
+        /// </summary>
+        /// <param name="qualityAssuranceId"></param>
+        public static void DeleteQualityAssuranceById(string qualityAssuranceId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.Comprehensive_QualityAssurance qualityAssurance = db.Comprehensive_QualityAssurance.FirstOrDefault(e => e.QualityAssuranceId == qualityAssuranceId);
+            if (qualityAssurance != null)
+            {
+                db.Comprehensive_QualityAssurance.DeleteOnSubmit(qualityAssurance);
+                db.SubmitChanges();
+            }
+        }
+
+        #endregion
     }
 }

SGGL/BLL/BLL.csproj

@@ -132,6 +132,7 @@
     <Compile Include="API\HSSE\APITrainingPlanService.cs" />
     <Compile Include="API\HSSE\APITrainingTaskService.cs" />
     <Compile Include="API\HSSE\APITrainRecordService.cs" />
+    <Compile Include="BaseInfo\SuperviseCheckTypeService.cs" />
     <Compile Include="BaseInfo\AccidentTypeService.cs" />
     <Compile Include="BaseInfo\BaseFactoryService.cs" />
     <Compile Include="BaseInfo\CertificateService.cs" />
@@ -282,6 +283,7 @@
     <Compile Include="CQMS\ProcessControl\NondestructiveTestNewService.cs" />
     <Compile Include="CQMS\ProcessControl\NondestructiveTestService.cs" />
     <Compile Include="CQMS\ProcessControl\TestPackageManagementService.cs" />
+    <Compile Include="CQMS\QualityActivity\QCManage\QCManage_QCGroupRegistrationService.cs" />
     <Compile Include="CQMS\QualityPlanning\ConExperienceSummaryService.cs" />
     <Compile Include="CQMS\QualityPlanning\ProjectQualityPlanService.cs" />
     <Compile Include="CQMS\QualityPlanning\QualityManagementSysService.cs" />
@@ -822,6 +824,7 @@
     <Compile Include="WebService\CNCECHSSEWebService.cs" />
     <Compile Include="WebService\CNCECHSSEMonitorService.cs" />
     <Compile Include="ZHGL\DataStatistics\DataStatisticsService.cs" />
+    <Compile Include="ZHGL\DataSync\BaseDataService.cs" />
     <Compile Include="ZHGL\DataSync\CQMSDataService.cs" />
     <Compile Include="ZHGL\DataSync\Hazard_RealTimeDeviceService.cs" />
     <Compile Include="ZHGL\DataSync\HJGLData_DefectService.cs" />

SGGL/BLL/BaseInfo/SuperviseCheckTypeService.cs

@@ -0,0 +1,107 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+    /// <summary>
+    /// 企业大检查类别         
+    /// </summary>
+    public class SuperviseCheckTypeService
+    {
+        /// <summary>
+        /// 根据主键获取检查类别
+        /// </summary>
+        /// <param name="checkTypeId"></param>
+        /// <returns></returns>
+        public static Model.Base_SuperviseCheckType GetCheckTypeById(string checkTypeId)
+        {
+            return Funs.DB.Base_SuperviseCheckType.FirstOrDefault(e => e.CheckTypeId == checkTypeId);
+        }
+
+        /// <summary>
+        /// 添加检查类别
+        /// </summary>
+        /// <param name="checkType"></param>
+        public static void AddCheckType(Model.Base_SuperviseCheckType checkType)
+        {
+            Model.Base_SuperviseCheckType newCheckType = new Model.Base_SuperviseCheckType
+            {
+                CheckTypeId = checkType.CheckTypeId,
+                CheckTypeCode = checkType.CheckTypeCode,
+                CheckTypeName = checkType.CheckTypeName,
+                CheckMainType = checkType.CheckMainType,
+                Remark = checkType.Remark
+            };
+            Funs.DB.Base_SuperviseCheckType.InsertOnSubmit(newCheckType);
+            Funs.DB.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 修改检查类别
+        /// </summary>
+        /// <param name="checkType"></param>
+        public static void UpdateCheckType(Model.Base_SuperviseCheckType checkType)
+        {
+            Model.Base_SuperviseCheckType newCheckType = Funs.DB.Base_SuperviseCheckType.FirstOrDefault(e => e.CheckTypeId == checkType.CheckTypeId);
+            if (newCheckType != null)
+            {
+                newCheckType.CheckTypeCode = checkType.CheckTypeCode;
+                newCheckType.CheckTypeName = checkType.CheckTypeName;
+                newCheckType.CheckMainType = checkType.CheckMainType;
+                newCheckType.Remark = checkType.Remark;
+                Funs.DB.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 根据主键删除检查类别
+        /// </summary>
+        /// <param name="checkTypeId"></param>
+        public static void DeleteCheckTypeById(string checkTypeId)
+        {
+            Model.Base_SuperviseCheckType newCheckType = Funs.DB.Base_SuperviseCheckType.FirstOrDefault(e => e.CheckTypeId == checkTypeId);
+            if (newCheckType != null)
+            {
+                Funs.DB.Base_SuperviseCheckType.DeleteOnSubmit(newCheckType);
+                Funs.DB.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 获取检查类别下拉列表项
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.Base_SuperviseCheckType> GetCheckTypeListByMainType(string mainType)
+        {
+            if (!string.IsNullOrWhiteSpace(mainType))
+            {
+                return (from x in Funs.DB.Base_SuperviseCheckType where x.CheckMainType == mainType orderby x.CheckTypeCode select x).ToList();
+            }
+            else
+            {
+                return (from x in Funs.DB.Base_SuperviseCheckType orderby x.CheckTypeCode select x).ToList();
+            }
+        }
+
+        /// <summary>
+        /// 检查类别下拉框
+        /// </summary>
+        /// <param name="dropName">下拉框名字</param>
+        /// <param name="mainType">检查大类</param>
+        /// <param name="isShowPlease">是否显示请选择</param>
+        public static void InitCheckTypeDropDownListByMainType(FineUIPro.DropDownList dropName, string mainType, bool isShowPlease)
+        {
+            dropName.DataValueField = "CheckTypeCode";
+            dropName.DataTextField = "CheckTypeName";
+            dropName.DataSource = GetCheckTypeListByMainType(mainType);
+            dropName.DataBind();
+            if (isShowPlease)
+            {
+                Funs.FineUIPleaseSelect(dropName);
+            }
+        }
+    }
+}

SGGL/BLL/CQMS/QualityActivity/QCManage/QCManage_QCGroupRegistrationService.cs

@@ -0,0 +1,85 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Web.UI.WebControls;
+
+namespace BLL
+{
+    public class QCManage_QCGroupRegistrationService
+    {
+        /// <summary>
+        /// 获取QC管理-QC小组注册信息
+        /// </summary>
+        /// <param name="UnitWorkId"></param>
+        /// <returns></returns>
+        public static Model.QCManage_QCGroupRegistration GetQCGroupRegistrationByQCGroupRegistrationId(string QCGroupRegistrationId)
+        {
+            return Funs.DB.QCManage_QCGroupRegistration.FirstOrDefault(e => e.QCGroupRegistrationId == QCGroupRegistrationId);
+        }
+        /// <summary>
+        /// 添加QC管理-QC小组注册信息
+        /// </summary>
+        /// <param name="WPQ"></param>
+        public static void AddQCGroupRegistration(Model.QCManage_QCGroupRegistration QCGroupRegistration)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.QCManage_QCGroupRegistration newQCGroupRegistration = new Model.QCManage_QCGroupRegistration();
+            newQCGroupRegistration.QCGroupRegistrationId = QCGroupRegistration.QCGroupRegistrationId;
+            newQCGroupRegistration.ProjectId = QCGroupRegistration.ProjectId;
+            newQCGroupRegistration.Code = QCGroupRegistration.Code;
+            newQCGroupRegistration.Name = QCGroupRegistration.Name;
+            newQCGroupRegistration.CompileMan = QCGroupRegistration.CompileMan;
+            newQCGroupRegistration.CompileDate = QCGroupRegistration.CompileDate;
+            newQCGroupRegistration.UnitId = QCGroupRegistration.UnitId;
+            newQCGroupRegistration.Subjects = QCGroupRegistration.Subjects;
+            newQCGroupRegistration.Process = QCGroupRegistration.Process;
+            newQCGroupRegistration.Achievement = QCGroupRegistration.Achievement;
+            newQCGroupRegistration.AwardName = QCGroupRegistration.AwardName;
+            newQCGroupRegistration.AwardLevel = QCGroupRegistration.AwardLevel;
+            newQCGroupRegistration.AwardType = QCGroupRegistration.AwardType;
+            newQCGroupRegistration.AwardingUnit = QCGroupRegistration.AwardingUnit;
+            db.QCManage_QCGroupRegistration.InsertOnSubmit(newQCGroupRegistration);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 修改QC管理-QC小组注册信息
+        /// </summary>
+        /// <param name="WPQ"></param>
+        public static void UpdateQCGroupRegistration(Model.QCManage_QCGroupRegistration QCGroupRegistration)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.QCManage_QCGroupRegistration newQCGroupRegistration = db.QCManage_QCGroupRegistration.FirstOrDefault(e => e.QCGroupRegistrationId == QCGroupRegistration.QCGroupRegistrationId);
+            if (newQCGroupRegistration != null)
+            {
+                newQCGroupRegistration.Code = QCGroupRegistration.Code;
+                newQCGroupRegistration.Name = QCGroupRegistration.Name;
+                newQCGroupRegistration.CompileMan = QCGroupRegistration.CompileMan;
+                newQCGroupRegistration.CompileDate = QCGroupRegistration.CompileDate;
+                newQCGroupRegistration.UnitId = QCGroupRegistration.UnitId;
+                newQCGroupRegistration.Subjects = QCGroupRegistration.Subjects;
+                newQCGroupRegistration.Process = QCGroupRegistration.Process;
+                newQCGroupRegistration.Achievement = QCGroupRegistration.Achievement;
+                newQCGroupRegistration.AwardName = QCGroupRegistration.AwardName;
+                newQCGroupRegistration.AwardLevel = QCGroupRegistration.AwardLevel;
+                newQCGroupRegistration.AwardType = QCGroupRegistration.AwardType;
+                newQCGroupRegistration.AwardingUnit = QCGroupRegistration.AwardingUnit;
+                newQCGroupRegistration.IsUpdate = null;
+                db.SubmitChanges();
+            }
+        }
+        /// <summary>
+        /// 根据主键删除QC管理-QC小组注册信息
+        /// </summary>
+        /// <param name="checkerId"></param>
+        public static void DeleteQCGroupRegistrationById(string QCGroupRegistrationId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.QCManage_QCGroupRegistration QCGroupRegistration = db.QCManage_QCGroupRegistration.FirstOrDefault(e => e.QCGroupRegistrationId == QCGroupRegistrationId);
+            if (QCGroupRegistration != null)
+            {
+                db.QCManage_QCGroupRegistration.DeleteOnSubmit(QCGroupRegistration);
+                db.SubmitChanges();
+            }
+        }
+    }
+}

SGGL/BLL/Common/AttachFileService.cs

@@ -545,5 +545,65 @@ namespace BLL
             }
             return result;
         }
+
+
+        /// <summary>
+        /// 获取附件数据流类 多附件的情况
+        /// </summary>
+        /// <param name="attachUrl">附件路径</param>
+        /// <returns></returns>
+        public static List<byte[]> GetMoreFileStructByAttachUrl(string attachUrl)
+        {
+            List<byte[]> fileContext = new List<byte[]>();
+            try
+            {
+                if (!String.IsNullOrEmpty(attachUrl))
+                {
+                    string physicalpath = ConfigurationManager.AppSettings["localRoot"];
+                    string filePath = string.Empty;
+                    string[] strs = attachUrl.Trim().Split(',');
+                    foreach (var item in strs)
+                    {
+                        //HttpContext.Current.Request.PhysicalApplicationPath;    
+                        filePath = physicalpath + item;
+                        if (File.Exists(filePath))
+                        {
+                            fileContext.Add(fileConvertByte(item));
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                string a = ex.Message;
+            }
+            return fileContext;
+        }
+
+        #region 附件转换二进制数据(用于保存数据库)
+        /// <summary>
+        /// 附件转换二进制数据(用于保存数据库)
+        /// </summary>
+        /// <param name="filePath">附件路径</param>
+        /// <returns>二进制</returns>
+        public static byte[] fileConvertByte(string filePath)
+        {
+            string physicalpath = (ConfigurationManager.AppSettings["localRoot"] + "\\" + filePath).Replace("\\\\", "\\");
+            byte[] bytContent = null;
+            System.IO.FileStream fs = null;
+            System.IO.BinaryReader br = null;
+            try
+            {
+                fs = new FileStream(physicalpath, System.IO.FileMode.Open);
+            }
+            catch
+            {
+            }
+            br = new BinaryReader((Stream)fs);
+            bytContent = br.ReadBytes((Int32)fs.Length);
+            fs.Dispose();
+            return bytContent;
+        }
+        #endregion
     }
 }

SGGL/BLL/Common/CommonService.cs

@@ -131,7 +131,24 @@ namespace BLL
             }
         }
         #endregion
-        
+
+        #region 根据项目id获取项目总包单位Id
+        /// <summary>
+        /// 得到本单位Id
+        /// </summary>
+        /// <returns></returns>
+        public static string GetMainProjectUnitId(string projectId)
+        {
+            string unitId = string.Empty;
+            var projectUnit = Funs.DB.Project_ProjectUnit.FirstOrDefault(e => e.ProjectId == projectId && e.UnitType == BLL.Const.ProjectUnitType_1);
+            if (projectUnit != null)
+            {
+                unitId = projectUnit.UnitId;
+            }
+            return unitId;
+        }
+        #endregion
+
         #region 根据登陆id菜单id判断是否有权限
         /// <summary>
         /// 根据登陆id菜单id判断是否有权限

SGGL/BLL/Common/Const.cs

@@ -1256,6 +1256,10 @@ namespace BLL
         /// </summary>
         public const string RectifyMenuId = "2D86AD87-4108-428C-BA3D-F81FB85511FE";
         /// <summary>
+        /// 质量隐患
+        /// </summary>
+        public const string CQMSRectifyMenuId = "D72BB321-11A8-485B-BAC7-367C7FCA7FBA";
+        /// <summary>
         /// 检查项
         /// </summary>
         public const string TechniqueCheckItemSetMenuId = "9C26BF2A-091D-4AC3-8678-334DE4E1CED7";
@@ -1714,6 +1718,33 @@ namespace BLL
         public const string PersonPlanMenuId = "0E46F8F2-69DB-4F54-BCA0-1F3CBE57DA10";
         #endregion
 
+        #region 质量QC管理
+        /// <summary>
+        /// QC小组注册
+        /// </summary>
+        public const string ProjectQCGroupRegistrationListMenuId = "8B1DFB6D-B48C-4FAB-821F-25AD582DBFAB";
+
+        ///// <summary>
+        ///// 课题注册
+        ///// </summary>
+        //public const string ProjectProjectRegistrationListMenuId = "B15BA270-D315-41C0-8383-4BC3BAA77DA7";
+
+        ///// <summary>
+        ///// PDCA过程
+        ///// </summary>
+        //public const string ProjectPDCAProcessListMenuId = "3439948C-126C-421B-894A-B87B01C3C3C5";
+
+        ///// <summary>
+        ///// 成果
+        ///// </summary>
+        //public const string ProjectAchievementListMenuId = "E95D09BF-A7CB-4870-A51F-2C291EFDFF0B";
+
+        ///// <summary>
+        ///// 成果评审及推进
+        ///// </summary>
+        //public const string ProjectResultsReviewListMenuId = "948B5C35-0171-4A1E-B9BA-E6007675BB81";
+        #endregion
+
         #region 项目菜单
 
         #region 安全体系
@@ -3809,6 +3840,20 @@ namespace BLL
         public const string WeekReportNewMenuId = "51ee983f-085e-4f02-b819-cab049d9cc27";
 
         #region  质量管理
+
+        #region 综合管理
+        ///// <summary>
+        ///// 组织机构
+        ///// </summary>
+        //public const string CQMS_OrganizationalMenuId = "0B84F67A-BD4D-49C0-82B6-005F1409924E";
+
+        /// <summary>
+        /// 特设质保体系
+        /// </summary>
+        public const string CQMS_QualityAssuranceMenuId = "2C49EC5E-BF6F-4C44-BA02-9BD183CF68C6";
+        #endregion
+
+
         #region 基础设置
         /// <summary>
         /// 项目环境设置

SGGL/BLL/DropListService.cs

@@ -282,5 +282,17 @@
             ".zip", ".rar", ".7z" // 压缩包文件类型
         };
 
+
+        public static ListItem[] drpQualityAssuranceTypeList()
+        {
+            ListItem[] list = new ListItem[6];
+            list[0] = new ListItem("压力管道安装", "压力管道安装");
+            list[1] = new ListItem("压力容器制造", "压力容器制造");
+            list[2] = new ListItem("压力容器安装", "压力容器安装");
+            list[3] = new ListItem("锅炉安装", "锅炉安装");
+            list[4] = new ListItem("起重机械安装", "起重机械安装");
+            list[5] = new ListItem("电梯安装", "电梯安装");
+            return list;
+        }
     }
 }

SGGL/BLL/HSSE/Technique/RectifyService.cs

@@ -26,10 +26,11 @@ namespace BLL
         /// 根据上一节点id获取安全隐患
         /// </summary>
         /// <param name="supRectifyId"></param>
+        /// <param name="type"></param>
         /// <returns></returns>
-        public static List<Model.Technique_Rectify> GetRectifyBySupRectifyId(string supRectifyId)
+        public static List<Model.Technique_Rectify> GetRectifyBySupRectifyId(string supRectifyId, string type)
         {
-            return (from x in Funs.DB.Technique_Rectify where x.SupRectifyId == supRectifyId select x).ToList();
+            return (from x in Funs.DB.Technique_Rectify where x.SupRectifyId == supRectifyId && x.RectifyType == type select x).ToList();
         }
 
         /// <summary>
@@ -42,6 +43,7 @@ namespace BLL
             Model.Technique_Rectify newRectify = new Model.Technique_Rectify
             {
                 RectifyId = rectify.RectifyId,
+                RectifyType = rectify.RectifyType,
                 RectifyCode = rectify.RectifyCode,
                 RectifyName = rectify.RectifyName,
                 SupRectifyId = rectify.SupRectifyId,
@@ -62,6 +64,7 @@ namespace BLL
             Model.Technique_Rectify newRectify = db.Technique_Rectify.FirstOrDefault(e => e.RectifyId == rectify.RectifyId);
             if (newRectify != null)
             {
+                newRectify.RectifyType = rectify.RectifyType;
                 newRectify.RectifyCode = rectify.RectifyCode;
                 newRectify.RectifyName = rectify.RectifyName;
                 newRectify.SupRectifyId = rectify.SupRectifyId;
@@ -111,7 +114,7 @@ namespace BLL
                 }
                 else
                 {
-                    var supItemSetCount = BLL.RectifyService.GetRectifyBySupRectifyId(rectifyId);
+                    var supItemSetCount = BLL.RectifyService.GetRectifyBySupRectifyId(rectifyId, rectify.RectifyType);
                     if (supItemSetCount.Count() > 0)
                     {
                         isDelete = false;
@@ -120,7 +123,15 @@ namespace BLL
             }
             return isDelete;
         }
+        public static List<Model.Technique_Rectify> GetRectifyList()
+        {
+            var q = from x in Funs.DB.Technique_Rectify
+                    where x.SupRectifyId == "0"
+                    select x;
+            return q.ToList();
 
+
+        }
         public static void InitRectifyDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease, string itemText)
         {
             dropName.DataValueField = "RectifyName";
@@ -132,13 +143,5 @@ namespace BLL
                 Funs.FineUIPleaseSelect(dropName, itemText);
             }
         }
-
-        public static List<Model.Technique_Rectify> GetRectifyList()
-        {
-            var q = from x in Funs.DB.Technique_Rectify
-                    where x.SupRectifyId == "0"
-                    select x;
-            return q.ToList();
-        }
     }
 }

SGGL/BLL/SysManage/UnitService.cs

@@ -395,6 +395,33 @@ namespace BLL
             }
         }
 
+        /// <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>
+        /// <returns></returns>
+        public static List<Model.Base_Unit> GetMainAndSubUnitList()
+        {
+            return (from x in Funs.DB.Base_Unit where x.UnitId == CommonService.GetThisUnitId() || x.IsBranch == true  select x).ToList();//orderby x.IsThisUnit descending
+        }
+
         /// <summary>
         ///  单位表下拉框
         /// </summary>
@@ -657,6 +684,27 @@ namespace BLL
                 Funs.FineUIPleaseSelect(dropName);
             }
         }
+        public static void InitAllUnitDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
+        {
+            dropName.DataValueField = "UnitId";
+            dropName.DataTextField = "UnitName";
+            dropName.DataSource = GetAllUnitList();
+            dropName.DataBind();
+            if (isShowPlease)
+            {
+                Funs.FineUIPleaseSelect(dropName);
+            }
+        }
+
+        /// <summary>
+        /// 获取所有单位名称下拉选择项
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.Base_Unit> GetAllUnitList()
+        {
+            var q = (from x in Funs.DB.Base_Unit orderby x.UnitCode select x).ToList();
+            return q;
+        }
 
         /// <summary>
         /// 字符串转化-》单位名称转化为对应的单位ID

SGGL/BLL/ZHGL/DataSync/BaseDataService.cs

@@ -0,0 +1,180 @@
+using Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+    public static class BaseDataService
+    {
+        public static List<string> BeUnderConstructionList = GetBeUnderConstruction().Select(p => p.ProjectId).ToList();
+
+        /// <summary>
+        ///     获取在建项目数
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.ProjectOutput> GetBeUnderConstruction()
+        {
+            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();
+            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/ZHGL/DataSync/CQMSDataService.cs

@@ -12,7 +12,8 @@ namespace BLL
     public static class CQMSDataService
     {
         public static SGGLDB db = Funs.DB;
-        public static List<string> BeUnderConstructionList = ProjectService.GetProjectWorkList().Where(x => (x.ProjectAttribute == "GONGCHENG" || x.ProjectAttribute == null)).Select(x => x.ProjectId).ToList();
+        //public static List<string> BeUnderConstructionList = ProjectService.GetProjectWorkList().Where(x => (x.ProjectAttribute == "GONGCHENG" || x.ProjectAttribute == null)).Select(x => x.ProjectId).ToList();
+        public static List<string> BeUnderConstructionList = BaseDataService.BeUnderConstructionList;
 
         #region 获取列表
 
@@ -109,11 +110,15 @@ namespace BLL
                     ReportDate = newtable.ReportDate,
                     TrainPersonNum = newtable.TrainPersonNum,
                     TechnicalDisclosePersonNum = newtable.TechnicalDisclosePersonNum,
+                    ComprehensiveConTechnologyDisclosureNum = newtable.ComprehensiveConTechnologyDisclosureNum,
+                    ComprehensiveConTechnologyDisclosurePersonNum = newtable.ComprehensiveConTechnologyDisclosurePersonNum,
+                    ComprehensiveReviewDrawingsNum = newtable.ComprehensiveReviewDrawingsNum,
                     UseNum = newtable.UseNum,
                     OKNum = newtable.OKNum,
                     CompanyPersonNum = newtable.CompanyPersonNum,
                     BranchPersonNum = newtable.BranchPersonNum,
                     ProjectPersonNum = newtable.ProjectPersonNum,
+                    ProjectSubPersonNum = newtable.ProjectSubPersonNum,
                     ProblemNum = newtable.ProblemNum,
                     ProblemCompletedNum = newtable.ProblemCompletedNum,
                     ProblemNotCompletedNum = newtable.ProblemNotCompletedNum,
@@ -155,6 +160,8 @@ namespace BLL
                     SubProjectAcceptOKNum = newtable.SubProjectAcceptOKNum,
                     SubdivisionalWorksAcceptNum = newtable.SubdivisionalWorksAcceptNum,
                     SubdivisionalWorksAcceptOKNum = newtable.SubdivisionalWorksAcceptOKNum,
+                    InspectionMachineNum = newtable.InspectionMachineNum,
+                    InspectionMachineQualifiedNum = newtable.InspectionMachineQualifiedNum,
                     State = newtable.State,
                     CreateDate = newtable.CreateDate,
                     CreateMan = newtable.CreateMan
@@ -178,14 +185,24 @@ namespace BLL
                     table.ReportDate = newtable.ReportDate;
                     table.TrainPersonNum = newtable.TrainPersonNum;
                     table.TechnicalDisclosePersonNum = newtable.TechnicalDisclosePersonNum;
+                    table.ComprehensiveConTechnologyDisclosureNum = newtable.ComprehensiveConTechnologyDisclosureNum;
+                    table.ComprehensiveConTechnologyDisclosurePersonNum = newtable.ComprehensiveConTechnologyDisclosurePersonNum;
+                    table.ComprehensiveReviewDrawingsNum = newtable.ComprehensiveReviewDrawingsNum;
                     table.UseNum = newtable.UseNum;
                     table.OKNum = newtable.OKNum;
                     table.CompanyPersonNum = newtable.CompanyPersonNum;
                     table.BranchPersonNum = newtable.BranchPersonNum;
                     table.ProjectPersonNum = newtable.ProjectPersonNum;
+                    table.ProjectSubPersonNum = newtable.ProjectSubPersonNum;
                     table.ProblemNum = newtable.ProblemNum;
                     table.ProblemCompletedNum = newtable.ProblemCompletedNum;
                     table.ProblemNotCompletedNum = newtable.ProblemNotCompletedNum;
+                    table.UnitCheckNum = newtable.UnitCheckNum;
+                    table.UnitCheckClosedNum = newtable.UnitCheckClosedNum;
+                    table.UnitCheckNotClosedNum = newtable.UnitCheckNotClosedNum;
+                    table.BranchCheckNum = newtable.BranchCheckNum;
+                    table.BranchCheckClosedNum = newtable.BranchCheckClosedNum;
+                    table.BranchCheckNotClosedNum = newtable.BranchCheckNotClosedNum;
                     table.SNum = newtable.SNum;
                     table.ANum = newtable.ANum;
                     table.BNum = newtable.BNum;
@@ -224,6 +241,8 @@ namespace BLL
                     table.SubProjectAcceptOKNum = newtable.SubProjectAcceptOKNum;
                     table.SubdivisionalWorksAcceptNum = newtable.SubdivisionalWorksAcceptNum;
                     table.SubdivisionalWorksAcceptOKNum = newtable.SubdivisionalWorksAcceptOKNum;
+                    table.InspectionMachineNum = newtable.InspectionMachineNum;
+                    table.InspectionMachineQualifiedNum = newtable.InspectionMachineQualifiedNum;
                     table.State = newtable.State;
                     table.CreateMan = newtable.CreateMan;
                     table.CreateDate = newtable.CreateDate;
@@ -367,6 +386,9 @@ namespace BLL
                 ReportDate = DateTime.Now.Date,
                 TrainPersonNum = ProjectData.Sum(x => x.TrainPersonNum),
                 TechnicalDisclosePersonNum = ProjectData.Sum(x => x.TechnicalDisclosePersonNum),
+                ComprehensiveConTechnologyDisclosureNum = ProjectData.Sum(x => x.ComprehensiveConTechnologyDisclosureNum),
+                ComprehensiveConTechnologyDisclosurePersonNum = ProjectData.Sum(x => x.ComprehensiveConTechnologyDisclosurePersonNum),
+                ComprehensiveReviewDrawingsNum = ProjectData.Sum(x => x.ComprehensiveReviewDrawingsNum),
                 UseNum = ProjectData.Sum(x => x.UseNum),
                 OKNum = ProjectData.Sum(x => x.OKNum),
                 CompanyPersonNum = GetCompanyPersonNum(),
@@ -394,6 +416,9 @@ namespace BLL
                 SubProjectNum = ProjectData.Sum(x => x.SubProjectNum),
                 SubdivisionalWorksNum = ProjectData.Sum(x => x.SubdivisionalWorksNum),
                 InspectionLotNum = ProjectData.Sum(x => x.InspectionLotNum),
+                InspectionMachineNum = ProjectData.Sum(x => x.InspectionMachineNum),
+                InspectionMachineQualifiedNum = ProjectData.Sum(x => x.InspectionMachineQualifiedNum),
+                SpecialEquipmentQualityAssuranceSystemNum = ProjectData.Sum(x => x.SpecialEquipmentQualityAssuranceSystemNum),
                 CreateMan = Const.sysglyId,
                 CreateDate = DateTime.Now
             };
@@ -543,11 +568,15 @@ namespace BLL
             var branchPersonNumTask = CQMSDataService.GetBranchPersonNumAsync(); //获取分支机构人数
             var projectPersonNumTask = CQMSDataService.GetProjectPersonNumAsync(); //获取项目专职人数
             var trainPersonNumTask = CQMSDataService.GetTrainPersonNumAsync(); //获取质量培训人次数
-            var technicalDisclosePersonTask = CQMSDataService.GetTechnicalDisclosePersonNumAsync(); //获取技术交底人次数
+            var technicalDisclosePersonTask = CQMSDataService.GetTechnicalDisclosePersonNumAsync(); //获取设计交底人次数
+            var qualityAssuranceNumTask = CQMSDataService.GetQualityAssuranceNumAsync(); //获取特设质保体系数量
+            var comprehensiveConTechnologyDisclosureTask = CQMSDataService.GetComprehensiveConTechnologyDisclosureAsync(); //获取施工技术交底
+            var comprehensiveReviewDrawingsTask = CQMSDataService.GetComprehensiveReviewDrawingsAsync(); //获取图纸会审
 
-            var inspectionEquipmentTask = CQMSDataService.GetComprehensive_InspectionEquipmentAsync(); //获取设备报验
+            var inspectionEquipmentTask = CQMSDataService.GetComprehensive_InspectionEquipmentAsync(); //获取设备材料报验
             var inspectionPersonTask = CQMSDataService.GetComprehensive_InspectionPersonAsync(); //获取人员报验
             var inspectionMachineTask = CQMSDataService.GetComprehensive_InspectionMachineAsync(); //获取机具报验
+            var inspectionMachineEquipmentTask = CQMSDataService.GetComprehensive_InspectionMachineEquipmentAsync(); //获取设备报验报检
             var useNumTask = CQMSDataService.GetUseNumAsync(); //获取在用计量器具数
             var okNumTask = CQMSDataService.GetOkNumAsync(); //获取校准合格数
 
@@ -557,7 +586,10 @@ namespace BLL
             var subdivisionalWorksNuTask = CQMSDataService.GetSubdivisionalWorksNumAsync(); //获取分项工程个数
             var inspectionLotNumTask = CQMSDataService.GetInspectionLotNumAsync(); //获取检验批个数
             var constructSolutionTask = CQMSDataService.GetConstructSolutionAsync(); //施工方案数量
+            var comprehensiveMajorPlanTask = CQMSDataService.GetComprehensive_MajorPlanApprovalAsync(); //危大工程、超危大工程施工方案数量
             var cqmsProblemTask = CQMSDataService.GetCQMSProblemAsync(); //获取企业级、项目级质量问题
+            var cqmsBranchMajorCheckTask = CQMSDataService.GetBranchMajorCheckAsync(); //获取分支机构质量大检查次数
+            var cqmsCompanyMajorCheckTask = CQMSDataService.GetCompanyMajorCheckAsync(); //获取企业质量大检查次数
 
             //质量验收数据
             var keyProcessNumTask = CQMSDataService.GetKeyProcessNumAsync(); //获取关键工序验收数
@@ -580,14 +612,16 @@ namespace BLL
             await Task.WhenAll(
                 companyPersonNumTask, branchPersonNumTask, projectPersonNumTask,
                 trainPersonNumTask, technicalDisclosePersonTask,
+                comprehensiveConTechnologyDisclosureTask, comprehensiveReviewDrawingsTask,
                 inspectionEquipmentTask, inspectionPersonTask, inspectionMachineTask,
                 useNumTask, okNumTask,
                 singleProjectNumTask, unitProjectNumTask, subProjectNuTask, subdivisionalWorksNuTask, inspectionLotNumTask,
-                constructSolutionTask,
-                cqmsProblemTask,
+                constructSolutionTask, comprehensiveMajorPlanTask,
+                cqmsProblemTask, cqmsBranchMajorCheckTask, cqmsCompanyMajorCheckTask,
                 keyProcessNumTask, keyProcessOKNumTask, specialProcessNumTask, specialProcessOKNumTask, concealedWorksNumTask, concealedWorksOKNumTask,
                 unitProjectAcceptNumTask, unitProjectAcceptOKNumTask, subProjectAcceptNumTask, subProjectAcceptOKNumTask, subdivisionalWorksAcceptNumTask, subdivisionalWorksAcceptOKNumTask,
-                materialInRecheckNumTask, materialInRecheckOKNumTask
+                materialInRecheckNumTask, materialInRecheckOKNumTask, inspectionMachineEquipmentTask,
+                qualityAssuranceNumTask
             );
 
             // 统一获取异步方法的返回值
@@ -596,10 +630,13 @@ namespace BLL
             var projectPersonNumList = await projectPersonNumTask;
             var trainPersonNumList = await trainPersonNumTask;
             var technicalDisclosePersonList = await technicalDisclosePersonTask;
+            var comprehensiveConTechnologyDisclosureList = await comprehensiveConTechnologyDisclosureTask;
+            var comprehensiveReviewDrawingsList = await comprehensiveReviewDrawingsTask;
 
             var inspectionEquipmentList = await inspectionEquipmentTask;
             var inspectionPersonList = await inspectionPersonTask;
             var inspectionMachineList = await inspectionMachineTask;
+            var inspectionMachineEquipmentList = await inspectionMachineEquipmentTask;
             var useNum = await useNumTask;
             var okNum = await okNumTask;
             var singleProjectNum = await singleProjectNumTask;
@@ -609,7 +646,10 @@ namespace BLL
             var inspectionLotNum = await inspectionLotNumTask;
 
             var constructSolutionList = await constructSolutionTask;
+            var comprehensiveMajorPlanList = await comprehensiveMajorPlanTask;            
             var cqmsProblemList = await cqmsProblemTask;
+            var cqmsBranchMajorCheckList = await cqmsBranchMajorCheckTask;
+            var cqmsCompanyMajorCheckList = await cqmsCompanyMajorCheckTask;
 
             var keyProcessNum = await keyProcessNumTask;
             var keyProcessOKNum = await keyProcessOKNumTask;
@@ -626,6 +666,7 @@ namespace BLL
             var subdivisionalWorksAcceptOKNum = await subdivisionalWorksAcceptOKNumTask;
             var materialInRecheckNum = await materialInRecheckNumTask;
             var materialInRecheckOKNum = await materialInRecheckOKNumTask;
+            var qualityAssuranceNum = await qualityAssuranceNumTask;
 
             // 构造结果对象
             var table = new CQMSData_CQMS
@@ -636,17 +677,25 @@ namespace BLL
                 ReportDate = DateTime.Now.Date,
                 CompanyPersonNum = companyPersonNum,//
                 BranchPersonNum = branchPersonNum,//
-                ProjectPersonNum = projectPersonNumList.Count(),
+                ProjectPersonNum = projectPersonNumList.Count(x => x.IsOffice == true),
+                ProjectSubPersonNum = projectPersonNumList.Count(x => x.IsOffice == false),
                 TrainPersonNum = trainPersonNumList.Count(),
                 TechnicalDisclosePersonNum = technicalDisclosePersonList.Sum(x => x.TrainPersonNum),
+                ComprehensiveConTechnologyDisclosureNum = comprehensiveConTechnologyDisclosureList.Count(),
+                ComprehensiveConTechnologyDisclosurePersonNum = comprehensiveConTechnologyDisclosureList.Sum(x => x.TrainPersonNum),
+                ComprehensiveReviewDrawingsNum = comprehensiveReviewDrawingsList.Count(),
+
                 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(),
                 MachineInspectionNum = inspectionMachineList.Count(),
                 MachineInspectionQualifiedNum = inspectionMachineList.Where(x => x.IsCheckOK.HasValue && x.IsCheckOK == true).Count(),
-                MaterialInspectionNum = 0,
-                MaterialInspectionQualifiedNum = 0,
+                InspectionMachineNum = inspectionMachineEquipmentList.Count(),
+                InspectionMachineQualifiedNum = inspectionMachineEquipmentList.Where(x => x.IsCheckOK.HasValue && x.IsCheckOK == true).Count(),
+
+                MaterialInspectionNum = inspectionEquipmentList.Count(),
+                MaterialInspectionQualifiedNum = inspectionEquipmentList.Where(x => x.SamplingResult == "1").Count(),
                 UseNum = useNum.Count(),
                 OKNum = okNum.Count(),
                 SingleProjectNum = singleProjectNum.Count(),
@@ -656,14 +705,20 @@ namespace BLL
                 InspectionLotNum = inspectionLotNum.Sum(x => x.Sum),
 
                 ConstructSolutionNum = constructSolutionList.Count(),
-                ConstructSolutionProjectApproveNum = constructSolutionList.Where(x => x.State == "1").Count(),
-                ConstructSolutionUnitApproveNum = 0,//
-                SpecialEquipmentQualityAssuranceSystemNum = 0,//
+                ConstructSolutionProjectApproveNum = constructSolutionList.Where(x => x.ApprovalDate.HasValue).Count(),
+                ConstructSolutionUnitApproveNum = comprehensiveMajorPlanList.Count(),//
+                SpecialEquipmentQualityAssuranceSystemNum = qualityAssuranceNum.Count(),
                 DesignDetailsNum = technicalDisclosePersonList.Sum(x => x.TrainPersonNum),
 
                 ProblemNum = cqmsProblemList.Count(),
                 ProblemCompletedNum = cqmsProblemList.Where(x => x.State == "7").Count(),
                 ProblemNotCompletedNum = cqmsProblemList.Where(x => x.State != "7").Count(),
+                BranchCheckNum = cqmsBranchMajorCheckList.Count(),
+                BranchCheckClosedNum = cqmsBranchMajorCheckList.Count(),
+                BranchCheckNotClosedNum = 0,
+                UnitCheckNum = cqmsCompanyMajorCheckList.Count(),
+                UnitCheckClosedNum = cqmsCompanyMajorCheckList.Count(),
+                UnitCheckNotClosedNum = 0,
 
                 KeyProcessNum = keyProcessNum.Count(),
                 KeyProcessOKNum = keyProcessOKNum.Count(),
@@ -678,7 +733,8 @@ namespace BLL
                 SubdivisionalWorksAcceptNum = subdivisionalWorksAcceptNum.Count(),
                 SubdivisionalWorksAcceptOKNum = subdivisionalWorksAcceptOKNum.Count(),
                 MaterialInRecheckNum = materialInRecheckNum.Count(),
-                MaterialInRecheckOKNum = materialInRecheckOKNum.Count()
+                MaterialInRecheckOKNum = materialInRecheckOKNum.Count(),
+
             };
             #region 添加项目统计数据
 
@@ -695,17 +751,21 @@ namespace BLL
                     ReportDate = DateTime.Now.Date,
                     CompanyPersonNum = companyPersonNum,//
                     BranchPersonNum = branchPersonNum,//
-                    ProjectPersonNum = projectPersonNumList.Count(x => x.ProjectId == projectid),
+                    ProjectPersonNum = projectPersonNumList.Count(x => x.ProjectId == projectid && x.IsOffice == true),
+                    ProjectSubPersonNum = projectPersonNumList.Count(x => x.ProjectId == projectid && x.IsOffice == false),
                     TrainPersonNum = trainPersonNumList.Count(x => x.ProjectId == projectid),
                     TechnicalDisclosePersonNum = technicalDisclosePersonList.Where(x => x.ProjectId == projectid).Sum(x => x.TrainPersonNum),
+                    ComprehensiveConTechnologyDisclosureNum = comprehensiveConTechnologyDisclosureList.Count(x => x.ProjectId == projectid),
+                    ComprehensiveConTechnologyDisclosurePersonNum = comprehensiveConTechnologyDisclosureList.Where(x => x.ProjectId == projectid).Sum(x => x.TrainPersonNum),
+                    ComprehensiveReviewDrawingsNum = comprehensiveReviewDrawingsList.Count(x => x.ProjectId == projectid),
                     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(),
                     MachineInspectionNum = inspectionMachineList.Count(x => x.ProjectId == projectid),
                     MachineInspectionQualifiedNum = inspectionMachineList.Where(x => x.IsCheckOK.HasValue && x.IsCheckOK == true && x.ProjectId == projectid).Count(),
-                    MaterialInspectionNum = 0,
-                    MaterialInspectionQualifiedNum = 0,
+                    MaterialInspectionNum = inspectionEquipmentList.Count(x => x.ProjectId == projectid),
+                    MaterialInspectionQualifiedNum = inspectionEquipmentList.Where(x => x.SamplingResult == "1" && x.ProjectId == projectid).Count(),
                     UseNum = useNum.Count(x => x.ProjectId == projectid),
                     OKNum = okNum.Count(x => x.ProjectId == projectid),
                     SingleProjectNum = singleProjectNum.Count(x => x.ProjectId == projectid),
@@ -715,9 +775,9 @@ namespace BLL
                     InspectionLotNum = inspectionLotNum.Where(x => x.ProjectId == projectid).Sum(x => x.Sum),
 
                     ConstructSolutionNum = constructSolutionList.Count(x => x.ProjectId == projectid),
-                    ConstructSolutionProjectApproveNum = constructSolutionList.Where(x => x.State == "1" && x.ProjectId == projectid).Count(),
-                    ConstructSolutionUnitApproveNum = 0,//
-                    SpecialEquipmentQualityAssuranceSystemNum = 0,//
+                    ConstructSolutionProjectApproveNum = constructSolutionList.Where(x => x.ApprovalDate.HasValue && x.ProjectId == projectid).Count(),
+                    ConstructSolutionUnitApproveNum = comprehensiveMajorPlanList.Count(x => x.ProjectId == projectid),
+                    SpecialEquipmentQualityAssuranceSystemNum = qualityAssuranceNum.Count(x => x.ProjectId == projectid),
                     DesignDetailsNum = technicalDisclosePersonList.Where(x => x.ProjectId == projectid).Sum(x => x.TrainPersonNum),
 
                     ProblemNum = cqmsProblemList.Count(x => x.ProjectId == projectid),
@@ -737,7 +797,10 @@ namespace BLL
                     SubdivisionalWorksAcceptNum = subdivisionalWorksAcceptNum.Count(x => x.ProjectId == projectid),
                     SubdivisionalWorksAcceptOKNum = subdivisionalWorksAcceptOKNum.Count(x => x.ProjectId == projectid),
                     MaterialInRecheckNum = materialInRecheckNum.Count(x => x.ProjectId == projectid),
-                    MaterialInRecheckOKNum = materialInRecheckOKNum.Count(x => x.ProjectId == projectid)
+                    MaterialInRecheckOKNum = materialInRecheckOKNum.Count(x => x.ProjectId == projectid),
+                    InspectionMachineNum = inspectionMachineEquipmentList.Count(x => x.ProjectId == projectid),
+                    InspectionMachineQualifiedNum = inspectionMachineEquipmentList.Where(x => x.IsCheckOK.HasValue && x.IsCheckOK == true && x.ProjectId == projectid).Count(),
+
                 };
                 Project_CQMSDataService.AddProject_CQMSData_CQMS(projectCqmsData);
             }
@@ -762,7 +825,6 @@ namespace BLL
             return data;
 
         }
-
         public static CQMSData GetDataByCQMSData_CQMS(CQMSData_CQMS table)
         {
             var data = new CQMSData();
@@ -773,15 +835,25 @@ namespace BLL
             item.CollCropCode = table.CollCropCode;
             item.TrainPersonNum = table.TrainPersonNum;
             item.TechnicalDisclosePersonNum = table.TechnicalDisclosePersonNum;
+            item.ComprehensiveConTechnologyDisclosureNum = table.ComprehensiveConTechnologyDisclosureNum;
+            item.ComprehensiveConTechnologyDisclosurePersonNum = table.ComprehensiveConTechnologyDisclosurePersonNum;
+            item.ComprehensiveReviewDrawingsNum = table.ComprehensiveReviewDrawingsNum;
             item.UseNum = table.UseNum;
             item.OKNum = table.OKNum;
             item.CompanyPersonNum = table.CompanyPersonNum;
             item.BranchPersonNum = table.BranchPersonNum;
             item.ProjectPersonNum = table.ProjectPersonNum;
+            item.ProjectSubPersonNum = table.ProjectSubPersonNum;
             item.ProblemNum = table.ProblemNum;
             item.ProblemCompletedNum = table.ProblemCompletedNum;
             item.ProblemNotCompletedNum = table.ProblemNotCompletedNum;
             item.ProblemRate = "";
+            item.UnitCheckNum = table.UnitCheckNum;
+            item.UnitCheckClosedNum = table.UnitCheckClosedNum;
+            item.UnitCheckNotClosedNum = table.UnitCheckNotClosedNum;
+            item.BranchCheckNum = table.BranchCheckNum;
+            item.BranchCheckClosedNum = table.BranchCheckClosedNum;
+            item.BranchCheckNotClosedNum = table.BranchCheckNotClosedNum;
             item.SNum = table.SNum;
             item.ANum = table.ANum;
             item.BNum = table.BNum;
@@ -825,6 +897,8 @@ namespace BLL
             item.SubProjectAcceptOKNum = table.SubProjectAcceptOKNum;
             item.SubdivisionalWorksAcceptNum = table.SubdivisionalWorksAcceptNum;
             item.SubdivisionalWorksAcceptOKNum = table.SubdivisionalWorksAcceptOKNum;
+            item.InspectionMachineNum = table.InspectionMachineNum;
+            item.InspectionMachineQualifiedNum = table.InspectionMachineQualifiedNum;
             var cqmsDataItems = new List<CqmsDataItem>();
             cqmsDataItems.Add(item);
             data.CQMSDataItems = cqmsDataItems;
@@ -887,6 +961,7 @@ namespace BLL
         /// <returns></returns>
         public static IEnumerable<Model.OfSafetySupervisorsOutput> GetProjectPersonNum()
         {
+            string ThisUnitId = CommonService.GetThisUnitId();
             var result = (from x in Funs.DB.SitePerson_Person
                           join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
                           join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into pGroup
@@ -898,13 +973,15 @@ namespace BLL
                           {
                               ProjectId = x.ProjectId,
                               ProjectName = p.ProjectName,
+                              ProjectFromUnitId = p.UnitId,
                               UnitId = u.UnitId,
                               UnitName = u.UnitName,
                               Name = x.PersonName,
                               Sex = x.Sex == null ? "" : (x.Sex == "1" ? "男" : "女"),
                               IdentityCard = x.IdentityCard,
                               WorkPostName = y.WorkPostName == null ? "" : y.WorkPostName,
-                              Phone = x.Telephone
+                              Phone = x.Telephone,
+                              IsOffice = u.UnitId == null ? false : (u.UnitId == ThisUnitId || u.IsBranch == true ? true : false)
                           }).ToList();
             result = result
                 .GroupBy(x => x.IdentityCard)
@@ -1005,6 +1082,69 @@ namespace BLL
             return await Task.Run(GetTechnicalDisclosePerson);
         }
 
+
+        /// <summary>
+        /// 获取施工技术交底
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.EduTrainOutput> GetComprehensiveConTechnologyDisclosure()
+        {
+            var result = (from x in Funs.DB.Comprehensive_ConTechnologyDisclosure
+                          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.CompileDate > Const.DtmarkTime
+                          select new Model.EduTrainOutput()
+                          {
+                              ProjectId = x.ProjectId,
+                              ProjectName = p.ProjectName,
+                              UnitName = "",
+                              Id = x.ConTechnologyDisclosureId,
+                              TrainTitle = "",
+                              TrainStartDate = null,
+                              TrainEndDate = null,
+                              TrainPersonNum = x.DisclosurePersonNum ?? 0,
+                          }).ToList();
+            return result;
+        }
+
+        /// <summary>
+        /// 获取施工技术交底(异步)
+        /// </summary>
+        /// <returns></returns>
+        public static async Task<List<EduTrainOutput>> GetComprehensiveConTechnologyDisclosureAsync()
+        {
+            return await Task.Run(GetComprehensiveConTechnologyDisclosure);
+        }
+
+        /// <summary>
+        /// 获取图纸会审
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.EduTrainOutput> GetComprehensiveReviewDrawings()
+        {
+            var result = (from x in Funs.DB.Comprehensive_ReviewDrawings
+                          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.CreateDate > Const.DtmarkTime
+                          select new Model.EduTrainOutput()
+                          {
+                              ProjectId = x.ProjectId,
+                              ProjectName = p.ProjectName,
+                              UnitName = "",
+                              Id = x.Id
+                          }).ToList();
+            return result;
+        }
+
+        /// <summary>
+        /// 获取图纸会审(异步)
+        /// </summary>
+        /// <returns></returns>
+        public static async Task<List<EduTrainOutput>> GetComprehensiveReviewDrawingsAsync()
+        {
+            return await Task.Run(GetComprehensiveReviewDrawings);
+        }
+
         /// <summary>
         /// 获取设备报验
         /// </summary>
@@ -1068,6 +1208,27 @@ namespace BLL
             return await Task.Run(GetComprehensive_InspectionMachine);
         }
 
+        /// <summary>
+        /// 获取设备报验
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.Comprehensive_InspectionMachine> GetComprehensive_InspectionMachineEquipment()
+        {
+            var result = (from x in Funs.DB.Comprehensive_InspectionMachine
+                          where BeUnderConstructionList.Contains(x.ProjectId) && x.CompileDate > Const.DtmarkTime//x.SType == "设备" && 
+                          select x).ToList();
+            return result;
+        }
+
+        /// <summary>
+        /// 获取设备报验(异步)
+        /// </summary>
+        /// <returns></returns>
+        public static async Task<List<Comprehensive_InspectionMachine>> GetComprehensive_InspectionMachineEquipmentAsync()
+        {
+            return await Task.Run(GetComprehensive_InspectionMachineEquipment);
+        }
+
         /// <summary>
         /// 获取在用计量器具数
         /// </summary>
@@ -1223,25 +1384,63 @@ namespace BLL
 
 
         /// <summary>
-        /// 施工方案数量
+        /// 危大（超危大）工程施工方案数量
         /// </summary>
         /// <returns></returns>
-        public static List<Solution_CQMSConstructSolution> GetConstructSolution()
+        public static List<Comprehensive_MajorPlanApproval> GetComprehensive_MajorPlanApproval()
         {
-            var result = (from x in Funs.DB.Solution_CQMSConstructSolution
+            var result = (from x in Funs.DB.Comprehensive_MajorPlanApproval
+                          where BeUnderConstructionList.Contains(x.ProjectId)
+                          select x).ToList();
+            return result;
+        }
+        /// <summary>
+        /// 危大（超危大）工程施工方案数量(异步)
+        /// </summary>
+        /// <returns></returns>
+        public static async Task<List<Comprehensive_MajorPlanApproval>> GetComprehensive_MajorPlanApprovalAsync()
+        {
+            return await Task.Run(GetComprehensive_MajorPlanApproval);
+        }
+        /// <summary>
+        /// 施工方案数量
+        /// </summary>
+        /// <returns></returns>
+        public static List<Comprehensive_GeneralPlanApproval> GetConstructSolution()
+        {
+            var result = (from x in Funs.DB.Comprehensive_GeneralPlanApproval
                           where BeUnderConstructionList.Contains(x.ProjectId)
                           select x).ToList();
             return result;
         }
-
         /// <summary>
         /// 施工方案数量(异步)
         /// </summary>
         /// <returns></returns>
-        public static async Task<List<Solution_CQMSConstructSolution>> GetConstructSolutionAsync()
+        public static async Task<List<Comprehensive_GeneralPlanApproval>> GetConstructSolutionAsync()
         {
             return await Task.Run(GetConstructSolution);
         }
+        ///// <summary>
+        ///// 施工方案数量
+        ///// </summary>
+        ///// <returns></returns>
+        //public static List<Solution_CQMSConstructSolution> GetConstructSolution()
+        //{
+        //    var result = (from x in Funs.DB.Solution_CQMSConstructSolution
+        //                  where BeUnderConstructionList.Contains(x.ProjectId)
+        //                  select x).ToList();
+        //    return result;
+        //}
+
+        ///// <summary>
+        ///// 施工方案数量(异步)
+        ///// </summary>
+        ///// <returns></returns>
+        //public static async Task<List<Solution_CQMSConstructSolution>> GetConstructSolutionAsync()
+        //{
+        //    return await Task.Run(GetConstructSolution);
+        //}
 
         /// <summary>
         /// 获取质量问题
@@ -1726,5 +1925,110 @@ namespace BLL
         }
         #endregion
 
+
+
+        /// <summary>
+        /// 特设质保体系数量
+        /// </summary>
+        /// <returns></returns>
+        public static List<Comprehensive_QualityAssurance> GetQualityAssuranceNum()
+        {
+            var result = (from x in Funs.DB.Comprehensive_QualityAssurance
+                          where BeUnderConstructionList.Contains(x.ProjectId)
+                          select x).ToList();
+            return result;
+        }
+        /// <summary>
+        /// 特设质保体系数量(异步)
+        /// </summary>
+        /// <returns></returns>
+        public static async Task<List<Comprehensive_QualityAssurance>> GetQualityAssuranceNumAsync()
+        {
+            return await Task.Run(GetQualityAssuranceNum);
+        }
+
+        #region 质量监督大检查数据
+
+        #region 企业级-本单位
+
+        /// <summary>
+        ///     获取企业质量大检查次数
+        /// </summary>
+        /// <returns></returns>
+        public static List<CheckOutput> GetCompanyMajorCheck()
+        {
+            var result = (from x in Funs.DB.Supervise_SuperviseCheckReport
+                          join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into pGroup
+                          from p in pGroup.DefaultIfEmpty()
+                          join u in Funs.DB.Base_Unit on x.UnitId equals u.UnitId into uGroup
+                          from u in uGroup.DefaultIfEmpty()
+                          join cu in Funs.DB.Base_Unit on x.CheckUnitId equals cu.UnitId into cuGroup
+                          from cu in cuGroup.DefaultIfEmpty()
+                          where cu.UnitId == CommonService.GetThisUnitId() && x.CheckMainType == "1" && x.CheckDate > Const.DtmarkTime //&& x.CheckType == "1"
+                          select new Model.CheckOutput()
+                          {
+                              ProjectId = x.ProjectId,
+                              ProjectName = p.ProjectName,
+                              UnitId = x.UnitId,
+                              UnitName = u.UnitName,
+                              Id = x.SuperviseCheckReportId,
+                              CheckTeam = x.CheckTeam,
+                              CheckDate = x.CheckDate,
+                          });
+            return result.ToList();
+        }
+        /// <summary>
+        ///     获取企业质量大检查次数（异步）
+        /// </summary>
+        /// <returns></returns>
+        public static async Task<List<CheckOutput>> GetCompanyMajorCheckAsync()
+        {
+            return await Task.Run(GetCompanyMajorCheck);
+        }
+
+        #endregion
+
+        #region 分支机构
+
+        /// <summary>
+        ///     获取分支机构质量大检查次数
+        /// </summary>
+        /// <returns></returns>
+        public static List<CheckOutput> GetBranchMajorCheck()
+        {
+            var result = (from x in Funs.DB.Supervise_SuperviseCheckReport
+                          join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into pGroup
+                          from p in pGroup.DefaultIfEmpty()
+                          join u in Funs.DB.Base_Unit on x.UnitId equals u.UnitId into uGroup
+                          from u in uGroup.DefaultIfEmpty()
+                          join cu in Funs.DB.Base_Unit on x.CheckUnitId equals cu.UnitId into cuGroup
+                          from cu in cuGroup.DefaultIfEmpty()
+                          where cu.IsBranch == true && x.CheckMainType == "1" && x.CheckDate > Const.DtmarkTime//&& x.CheckType == "1"
+                          select new Model.CheckOutput()
+                          {
+                              ProjectId = x.ProjectId,
+                              ProjectName = p.ProjectName,
+                              UnitId = x.UnitId,
+                              UnitName = u.UnitName,
+                              Id = x.SuperviseCheckReportId,
+                              CheckTeam = x.CheckTeam,
+                              CheckDate = x.CheckDate,
+                          });
+            return result.ToList();
+        }
+        /// <summary>
+        ///     获取分支机构质量大检查次数（异步）
+        /// </summary>
+        /// <returns></returns>
+        public static async Task<List<CheckOutput>> GetBranchMajorCheckAsync()
+        {
+            return await Task.Run(GetBranchMajorCheck);
+        }
+
+
+        #endregion
+
+        #endregion
+
     }
 }

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

@@ -61,6 +61,10 @@ namespace BLL
             /// </summary>
             SpecialEquipmentAndDesignDetails,
             /// <summary>
+            /// 设备报验报检
+            /// </summary>
+            InspectionMachineEquipment,
+            /// <summary>
             /// 全部数据
             /// </summary>
             All
@@ -181,11 +185,15 @@ namespace BLL
                     ReportDate = newtable.ReportDate,
                     TrainPersonNum = newtable.TrainPersonNum,
                     TechnicalDisclosePersonNum = newtable.TechnicalDisclosePersonNum,
+                    ComprehensiveReviewDrawingsNum = newtable.ComprehensiveReviewDrawingsNum,
+                    ComprehensiveConTechnologyDisclosureNum = newtable.ComprehensiveConTechnologyDisclosureNum,
+                    ComprehensiveConTechnologyDisclosurePersonNum = newtable.ComprehensiveConTechnologyDisclosurePersonNum,
                     UseNum = newtable.UseNum,
                     OKNum = newtable.OKNum,
                     CompanyPersonNum = newtable.CompanyPersonNum,
                     BranchPersonNum = newtable.BranchPersonNum,
                     ProjectPersonNum = newtable.ProjectPersonNum,
+                    ProjectSubPersonNum = newtable.ProjectSubPersonNum,
                     ProblemNum = newtable.ProblemNum,
                     ProblemCompletedNum = newtable.ProblemCompletedNum,
                     ProblemNotCompletedNum = newtable.ProblemNotCompletedNum,
@@ -226,7 +234,9 @@ namespace BLL
                     SubProjectAcceptNum = newtable.SubProjectAcceptNum,
                     SubProjectAcceptOKNum = newtable.SubProjectAcceptOKNum,
                     SubdivisionalWorksAcceptNum = newtable.SubdivisionalWorksAcceptNum,
-                    SubdivisionalWorksAcceptOKNum = newtable.SubdivisionalWorksAcceptOKNum
+                    SubdivisionalWorksAcceptOKNum = newtable.SubdivisionalWorksAcceptOKNum,
+                    InspectionMachineNum = newtable.InspectionMachineNum,
+                    InspectionMachineQualifiedNum = newtable.InspectionMachineQualifiedNum,
                 };
                 db.Project_CQMSData_CQMS.InsertOnSubmit(table);
                 db.SubmitChanges();
@@ -252,11 +262,15 @@ namespace BLL
                     table.ReportDate = newtable.ReportDate;
                     table.TrainPersonNum = newtable.TrainPersonNum;
                     table.TechnicalDisclosePersonNum = newtable.TechnicalDisclosePersonNum;
+                    table.ComprehensiveConTechnologyDisclosureNum = newtable.ComprehensiveConTechnologyDisclosureNum;
+                    table.ComprehensiveConTechnologyDisclosurePersonNum = newtable.ComprehensiveConTechnologyDisclosurePersonNum;
+                    table.ComprehensiveReviewDrawingsNum = newtable.ComprehensiveReviewDrawingsNum;
                     table.UseNum = newtable.UseNum;
                     table.OKNum = newtable.OKNum;
                     table.CompanyPersonNum = newtable.CompanyPersonNum;
                     table.BranchPersonNum = newtable.BranchPersonNum;
                     table.ProjectPersonNum = newtable.ProjectPersonNum;
+                    table.ProjectSubPersonNum = newtable.ProjectSubPersonNum;
                     table.ProblemNum = newtable.ProblemNum;
                     table.ProblemCompletedNum = newtable.ProblemCompletedNum;
                     table.ProblemNotCompletedNum = newtable.ProblemNotCompletedNum;
@@ -298,6 +312,8 @@ namespace BLL
                     table.SubProjectAcceptOKNum = newtable.SubProjectAcceptOKNum;
                     table.SubdivisionalWorksAcceptNum = newtable.SubdivisionalWorksAcceptNum;
                     table.SubdivisionalWorksAcceptOKNum = newtable.SubdivisionalWorksAcceptOKNum;
+                    table.InspectionMachineNum = newtable.InspectionMachineNum;
+                    table.InspectionMachineQualifiedNum = newtable.InspectionMachineQualifiedNum;
                     db.SubmitChanges();
                 }
             }
@@ -495,6 +511,17 @@ namespace BLL
             {
                 table.SpecialEquipmentQualityAssuranceSystemNum = GetSpecialEquipmentQualityAssuranceSystemNum(projectid);
                 table.DesignDetailsNum = GetTechnicalDisclosePersonNum(projectid);
+                table.ComprehensiveConTechnologyDisclosureNum = GetComprehensiveConTechnologyDisclosureNum(projectid);
+                table.ComprehensiveConTechnologyDisclosurePersonNum = GetComprehensiveConTechnologyDisclosurePersonNum(projectid);
+                table.ComprehensiveReviewDrawingsNum = GetComprehensiveReviewDrawings(projectid);
+            }
+            if (cQMSDateType == CQMSDateType.InspectionMachineEquipment || cQMSDateType == CQMSDateType.All)
+            {
+                //table.InspectionMachineNum = GetInspectionMachineEquipmentNum(projectid);
+                //table.InspectionMachineQualifiedNum = GetInspectionMachineEquipmentQualifiedNum(projectid);
+
+                table.InspectionMachineNum = GetComprehensiveInspectionEquipmentNum(projectid);
+                table.InspectionMachineQualifiedNum = GetComprehensiveInspectionEquipmentOKNum(projectid);
             }
 
             if (IsReportByToday(projectid))
@@ -519,7 +546,7 @@ namespace BLL
             return result;
         }
         /// <summary>
-        /// 获取技术交底人次数
+        /// 获取设计交底人次数
         /// </summary>
         /// <returns></returns>
         public static int GetTechnicalDisclosePersonNum(string projectid)
@@ -531,6 +558,40 @@ namespace BLL
             return q;
         }
         /// <summary>
+        /// 获取施工技术交底数
+        /// </summary>
+        /// <returns></returns>
+        public static int GetComprehensiveConTechnologyDisclosureNum(string projectid)
+        {
+            var result = (from x in Funs.DB.Comprehensive_ConTechnologyDisclosure
+                          where x.ProjectId == projectid && x.CompileDate > Const.DtmarkTime
+                          select x).ToList().Count();
+            return result;
+        }
+        /// <summary>
+        /// 获取施工技术交底人数
+        /// </summary>
+        /// <returns></returns>
+        public static int GetComprehensiveConTechnologyDisclosurePersonNum(string projectid)
+        {
+            var result = (from x in Funs.DB.Comprehensive_ConTechnologyDisclosure
+                          where x.ProjectId == projectid && x.CompileDate > Const.DtmarkTime
+                          select x.DisclosurePersonNum).ToList().Sum(x => x.Value);
+            var q = Funs.GetNewIntOrZero(result.ToString());
+            return q;
+        }
+        /// <summary>
+        /// 获取图纸会审
+        /// </summary>
+        /// <returns></returns>
+        public static int GetComprehensiveReviewDrawings(string projectid)
+        {
+            var result = (from x in Funs.DB.Comprehensive_ReviewDrawings
+                          where x.ProjectId == projectid && x.CreateDate > Const.DtmarkTime
+                          select x).ToList().Count();
+            return result;
+        }
+        /// <summary>
         /// 获取在用计量器具数
         /// </summary>
         /// <returns></returns>
@@ -876,7 +937,7 @@ namespace BLL
         public static int GetComprehensiveInspectionEquipmentNum(string projectid)
         {
             int result = (from x in Funs.DB.Comprehensive_InspectionEquipment
-                          where x.ProjectId == projectid && x.CompileDate > Const.DtmarkTime
+                          where x.ProjectId == projectid && x.EquipmentOrMatail == "设备" && x.CompileDate > Const.DtmarkTime
                           select x).Count();
             return result;
         }
@@ -888,7 +949,7 @@ namespace BLL
         public static int GetComprehensiveInspectionEquipmentOKNum(string projectid)
         {
             int result = (from x in Funs.DB.Comprehensive_InspectionEquipment
-                          where x.ProjectId == projectid && x.SamplingResult == "1" && x.CompileDate > Const.DtmarkTime
+                          where x.ProjectId == projectid && x.EquipmentOrMatail == "设备" && x.SamplingResult == "1" && x.CompileDate > Const.DtmarkTime
                           select x).Count();
             return result;
         }
@@ -949,7 +1010,9 @@ namespace BLL
         /// <returns></returns>
         public static int GetComprehensiveInspectionMaterialNum(string projectid)
         {
-            var result = 0;
+            int result = (from x in Funs.DB.Comprehensive_InspectionEquipment
+                          where x.ProjectId == projectid && x.EquipmentOrMatail == "材料" && x.CompileDate > Const.DtmarkTime
+                          select x).Count();
             return result;
         }
 
@@ -959,7 +1022,9 @@ namespace BLL
         /// <returns></returns>
         public static int GetComprehensiveInspectionMaterialOKNum(string projectid)
         {
-            var result = 0;
+            int result = (from x in Funs.DB.Comprehensive_InspectionEquipment
+                          where x.ProjectId == projectid && x.EquipmentOrMatail == "材料" && x.SamplingResult == "1" && x.CompileDate > Const.DtmarkTime
+                          select x).Count();
             return result;
         }
 
@@ -1040,5 +1105,348 @@ namespace BLL
         }
 
         #endregion
+
+        #region 推送项目质量巡检数据
+
+        /// <summary>
+        /// 推送项目质量巡检数据
+        /// </summary>
+        /// <returns></returns>
+        public static ReturnData PushProjectHazardRegisterData()
+        {
+            var thisUnit = CommonService.GetIsThisUnit();
+            Model.SGGLDB db = Funs.DB;
+            var items = (from x in db.View_Hazard_HazardRegister
+                         where x.IsUpdate == null || x.IsUpdate == false
+                         select new Model.Hazard_HazardRegisterItem
+                         {
+                             HazardRegisterId = x.HazardRegisterId,
+                             SourceUnitId = thisUnit.UnitId,
+                             RegisterDate = x.RegisterDate,
+                             RegisterDef = x.RegisterDef,
+                             Rectification = x.Rectification,
+                             WorkAreaName = x.WorkAreaName,
+                             ResponsibilityUnitName = x.ResponsibilityUnitName,
+                             ResponsibilityUnitCollCropCode = x.ResponsibilityUnitCollCropCode,
+                             Risk_Level = x.Risk_Level,
+                             ProjectId = x.ProjectId,
+                             ProjectName = x.ProjectName,
+                             States = x.States,
+                             StatesStr = x.StatesStr,
+                             ResponsibilityManName = x.ResponsibilityManName,
+                             CheckManName = x.CheckManName,
+                             CheckTime = x.CheckTime,
+                             RectificationPeriod = x.RectificationPeriod,
+                             ImageUrl = x.ImageUrl,
+                             ImageUrlFileContext = AttachFileService.GetMoreFileStructByAttachUrl(x.ImageUrl),
+                             RectificationImageUrl = x.RectificationImageUrl,
+                             RectificationImageUrlFileContext = AttachFileService.GetMoreFileStructByAttachUrl(x.RectificationImageUrl),
+                             RectificationTime = x.RectificationTime,
+                             ConfirmManName = x.ConfirmManName,
+                             ConfirmDate = x.ConfirmDate,
+                             HandleIdea = x.HandleIdea,
+                             CutPayment = x.CutPayment,
+                             CheckCycle = x.CheckCycle,
+                             RegisterTypesName = x.RegisterTypesName,
+                             Requirements = x.Requirements
+                         }).ToList();
+            Model.ReturnData responeData = new Model.ReturnData();
+            if (items.Count() > 0)
+            {
+
+                var newItem = new { CollCropCode = thisUnit.CollCropCode, Items = items };
+                var str = JsonConvert.SerializeObject(newItem);
+                var baseurl = "/api/HSSEData/SaveProjectHazardRegisterData";
+                responeData = ServerService.PushCNCEC(str, baseurl);
+                if (responeData.code == 1)
+                {
+                    var list = from x in db.HSSE_Hazard_HazardRegister
+                               where x.IsUpdate == null || x.IsUpdate == false
+                               select x;
+                    foreach (var item in list)
+                    {
+                        item.IsUpdate = true;
+                    }
+                    db.SubmitChanges();
+                }
+            }
+            else
+            {
+                responeData.code = 0;
+                responeData.message = "当前没有项目质量巡检数据";
+            }
+            return responeData;
+        }
+
+        #endregion
+
+
+        #region 推送项目质量隐患数据
+
+        /// <summary>
+        /// 推送项目质量隐患数据
+        /// </summary>
+        /// <returns></returns>
+        public static ReturnData PushProjectQualityProblemData(int pushNum)
+        {
+            var thisUnit = CommonService.GetIsThisUnit();
+            Model.SGGLDB db = Funs.DB;
+            var items = (from x in db.Check_CheckControl
+                         join unit in db.Base_Unit on x.UnitId equals unit.UnitId into unitJ
+                         from unit in unitJ.DefaultIfEmpty()
+                         join cNProfessional in db.Base_CNProfessional on x.CNProfessionalCode equals cNProfessional.CNProfessionalId into cNProfessionalJ
+                         from cNProfessional in cNProfessionalJ.DefaultIfEmpty()
+                         join unitWork in db.WBS_UnitWork on x.UnitWorkId equals unitWork.UnitWorkId into unitWorkJ
+                         from unitWork in unitWorkJ.DefaultIfEmpty()
+                         join QualityQuestionType in db.Base_QualityQuestionType on x.QuestionType equals QualityQuestionType.QualityQuestionTypeId
+                         where (x.IsUpdate == null || x.IsUpdate == false) && x.CheckDate > BLL.Const.DtmarkTime
+                         select new Model.QualityProblemItem
+                         {
+                             Id = x.CheckControlCode,
+                             SourceUnitId = thisUnit.UnitId,
+                             ProjectId = x.ProjectId,
+                             CollCropCode = thisUnit.CollCropCode,
+                             DataDate = x.CheckDate,
+                             CheckDate = x.CheckDate,
+                             UnitWorkName = unitWork.UnitWorkName + (unitWork.ProjectType == "1" ? "(建筑)" : "(安装)"),
+                             UnitName = unit.UnitName,
+                             ProfessionalName = cNProfessional.ProfessionalName,
+                             QuestionType = QualityQuestionType.QualityQuestionType,
+                             ImageUrl = AttachFileService.getFileUrl(x.CheckControlCode.ToString()),
+                             RectificationImageUrl = AttachFileService.getFileUrl(x.CheckControlCode.ToString() + "r"),
+                             CheckSite = x.CheckSite,
+                             States = x.State,
+                             StatesStr = x.State == "5" || x.State == "6" ? "未确认" :
+                                 x.State == "7" ? "已闭环" :
+                                 Convert.ToDateTime(x.LimitDate).AddDays(1) < DateTime.Now ? "超期未整改" : "未整改",
+                         }).Take(pushNum).ToList();
+            Model.ReturnData responeData = new Model.ReturnData();
+            if (items.Count() > 0)
+            {
+
+                var newItem = new { CollCropCode = thisUnit.CollCropCode, Items = items };
+                var str = JsonConvert.SerializeObject(newItem);
+                var baseurl = "/api/CQMSData/SaveProjectQualityProblemData";
+                responeData = ServerService.PushCNCEC(str, baseurl);
+                if (responeData.code == 1)
+                {
+                    foreach (var item in items)
+                    {
+                        var data = db.Check_CheckControl.FirstOrDefault(x =>
+                            x.CheckControlCode == item.Id && (x.IsUpdate == null || x.IsUpdate == false));
+                        data.IsUpdate = true;
+                        db.SubmitChanges();
+                    }
+
+                }
+            }
+            else
+            {
+                responeData.code = 0;
+                responeData.message = "当前没有项目质量隐患数据";
+            }
+            return responeData;
+        }
+
+        #endregion
+
+        #region 删除项目质量隐患数据
+
+        /// <summary>
+        /// 删除项目质量隐患数据
+        /// </summary>
+        /// <returns></returns>
+        public static ReturnData DeleteProjectQualityProblemData(string Id)
+        {
+            Model.ReturnData responeData = new Model.ReturnData();
+            try
+            {
+                var thisUnit = CommonService.GetIsThisUnit();
+                Model.SGGLDB db = Funs.DB;
+                var items = (from x in db.Check_CheckControl
+                             join unit in db.Base_Unit on x.UnitId equals unit.UnitId into unitJ
+                             from unit in unitJ.DefaultIfEmpty()
+                             join cNProfessional in db.Base_CNProfessional on x.CNProfessionalCode equals cNProfessional.CNProfessionalId into cNProfessionalJ
+                             from cNProfessional in cNProfessionalJ.DefaultIfEmpty()
+                             join unitWork in db.WBS_UnitWork on x.UnitWorkId equals unitWork.UnitWorkId into unitWorkJ
+                             from unitWork in unitWorkJ.DefaultIfEmpty()
+                             join QualityQuestionType in db.Base_QualityQuestionType on x.QuestionType equals QualityQuestionType.QualityQuestionTypeId
+                             where x.CheckControlCode == Id
+                             select new Model.QualityProblemItem
+                             {
+                                 Id = x.CheckControlCode,
+                                 SourceUnitId = thisUnit.UnitId,
+                                 ProjectId = x.ProjectId,
+                                 CollCropCode = thisUnit.CollCropCode,
+                                 DataDate = x.CheckDate,
+                                 CheckDate = x.CheckDate,
+                                 UnitWorkName = unitWork.UnitWorkName + (unitWork.ProjectType == "1" ? "(建筑)" : "(安装)"),
+                                 UnitName = unit.UnitName,
+                                 ProfessionalName = cNProfessional.ProfessionalName,
+                                 QuestionType = QualityQuestionType.QualityQuestionType,
+                                 ImageUrl = AttachFileService.getFileUrl(x.CheckControlCode.ToString()),
+                                 RectificationImageUrl = AttachFileService.getFileUrl(x.CheckControlCode.ToString() + "r"),
+                                 CheckSite = x.CheckSite,
+                                 States = x.State,
+                                 StatesStr = x.State == "5" || x.State == "6" ? "未确认" :
+                                     x.State == "7" ? "已闭环" :
+                                     Convert.ToDateTime(x.LimitDate).AddDays(1) < DateTime.Now ? "超期未整改" : "未整改",
+                             }).ToList();
+
+                if (items.Count() > 0)
+                {
+                    var newItem = new { CollCropCode = thisUnit.CollCropCode, Items = items };
+                    var str = JsonConvert.SerializeObject(newItem);
+                    var baseurl = "/api/CQMSData/DeleteProjectQualityProblemData";
+                    responeData = ServerService.PushCNCEC(str, baseurl);
+                }
+                else
+                {
+                    responeData.code = 0;
+                    responeData.message = "集团数据删除失败";
+                }
+            }
+            catch (Exception)
+            {
+                responeData.code = 0;
+                responeData.message = "集团数据删除失败";
+            }
+            return responeData;
+        }
+
+        #endregion
+
+
+        #region 推送质量QC活动注册数据
+
+        /// <summary>
+        /// 推送质量QC活动注册数据
+        /// </summary>
+        /// <returns></returns>
+        public static ReturnData PushQCRegistrationData(int pushNum)
+        {
+            var thisUnit = CommonService.GetIsThisUnit();
+            Model.SGGLDB db = Funs.DB;
+            var items = (from x in db.QCManage_QCGroupRegistration
+                         join unit in db.Base_Unit on x.UnitId equals unit.UnitId into unitJ
+                         from u in unitJ.DefaultIfEmpty()
+                         join s in db.Sys_User on x.CompileMan equals s.UserId into userJ
+                         from s in userJ.DefaultIfEmpty()
+                         where (x.IsUpdate == null || x.IsUpdate == false) && x.CompileDate > BLL.Const.DtmarkTime
+                         select new Model.QCRegistrationItem
+                         {
+                             Id = x.QCGroupRegistrationId,
+                             SourceUnitId = thisUnit.UnitId,
+                             ProjectId = x.ProjectId,
+                             CollCropCode = thisUnit.CollCropCode,
+                             DataDate = x.CompileDate,
+                             AttachFile = AttachFileService.getFileUrl(x.QCGroupRegistrationId.ToString()),
+                             Code = x.Code,
+                             Name = x.Name,
+                             CompileManName = s.UserName,
+                             CompileDate = x.CompileDate,
+                             UnitName = u.UnitName,
+                             UnitCollCropCode = Funs.DB.Base_Unit.FirstOrDefault(e => e.UnitId == x.UnitId).CollCropCode,
+                             Subjects = x.Subjects,
+                             Process = x.Process,
+                             Achievement = x.Achievement,
+                             AwardName = x.AwardName,
+                             AwardType = x.AwardType,
+                             AwardLevel = x.AwardLevel,
+                             AwardingUnit = x.AwardingUnit,
+                         }).Take(pushNum).ToList();
+            Model.ReturnData responeData = new Model.ReturnData();
+            if (items.Count() > 0)
+            {
+                var newItem = new { CollCropCode = thisUnit.CollCropCode, Items = items };
+                var str = JsonConvert.SerializeObject(newItem);
+                var baseurl = "/api/CQMSData/SaveQCRegistrationData";
+                responeData = ServerService.PushCNCEC(str, baseurl);
+                if (responeData.code == 1)
+                {
+                    foreach (var item in items)
+                    {
+                        var data = db.QCManage_QCGroupRegistration.FirstOrDefault(x =>
+                            x.QCGroupRegistrationId == item.Id && (x.IsUpdate == null || x.IsUpdate == false));
+                        data.IsUpdate = true;
+                        db.SubmitChanges();
+                    }
+
+                }
+            }
+            else
+            {
+                responeData.code = 0;
+                responeData.message = "当前没有质量QC活动注册数据";
+            }
+            return responeData;
+        }
+
+        #endregion
+
+        #region 删除质量QC活动注册数据
+
+        /// <summary>
+        /// 删除质量QC活动注册数据
+        /// </summary>
+        /// <returns></returns>
+        public static ReturnData DeleteQCRegistrationData(string Id)
+        {
+            Model.ReturnData responeData = new Model.ReturnData();
+            try
+            {
+                var thisUnit = CommonService.GetIsThisUnit();
+                Model.SGGLDB db = Funs.DB;
+                var items = (from x in db.QCManage_QCGroupRegistration
+                             join unit in db.Base_Unit on x.UnitId equals unit.UnitId into unitJ
+                             from u in unitJ.DefaultIfEmpty()
+                             join s in db.Sys_User on x.CompileMan equals s.UserId into userJ
+                             from s in userJ.DefaultIfEmpty()
+                             where x.QCGroupRegistrationId == Id
+                             select new Model.QCRegistrationItem
+                             {
+                                 Id = x.QCGroupRegistrationId,
+                                 SourceUnitId = thisUnit.UnitId,
+                                 ProjectId = x.ProjectId,
+                                 CollCropCode = thisUnit.CollCropCode,
+                                 DataDate = x.CompileDate,
+                                 AttachFile = AttachFileService.getFileUrl(x.QCGroupRegistrationId.ToString()),
+                                 Code = x.Code,
+                                 Name = x.Name,
+                                 CompileManName = s.UserName,
+                                 CompileDate = x.CompileDate,
+                                 UnitName = u.UnitName,
+                                 UnitCollCropCode = Funs.DB.Base_Unit.FirstOrDefault(e => e.UnitId == x.UnitId).CollCropCode,
+                                 Subjects = x.Subjects,
+                                 Process = x.Process,
+                                 Achievement = x.Achievement,
+                                 AwardName = x.AwardName,
+                                 AwardLevel = x.AwardLevel,
+                                 AwardingUnit = x.AwardingUnit,
+                             }).ToList();
+
+                if (items.Count() > 0)
+                {
+                    var newItem = new { CollCropCode = thisUnit.CollCropCode, Items = items };
+                    var str = JsonConvert.SerializeObject(newItem);
+                    var baseurl = "/api/CQMSData/DeleteQCRegistrationData";
+                    responeData = ServerService.PushCNCEC(str, baseurl);
+                }
+                else
+                {
+                    responeData.code = 0;
+                    responeData.message = "集团数据删除失败";
+                }
+            }
+            catch (Exception)
+            {
+                responeData.code = 0;
+                responeData.message = "集团数据删除失败";
+            }
+            return responeData;
+        }
+
+        #endregion
+
     }
 }

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

@@ -139,11 +139,13 @@ namespace BLL
                     BranchFullTimeNum = newtable.BranchFullTimeNum,
                     ProjectInspectorGeneralNum = newtable.ProjectInspectorGeneralNum,
                     ProjectFullTimeNum = newtable.ProjectFullTimeNum,
+                    ProjectSubFullTimeNum = newtable.ProjectSubFullTimeNum,
                     ProjectSafetyMonitorNum = newtable.ProjectSafetyMonitorNum,
                     SafetyInjectionEngineer = newtable.SafetyInjectionEngineer,
                     CertificateANum = newtable.CertificateANum,
                     CertificateBNum = newtable.CertificateBNum,
                     CertificateCNum = newtable.CertificateCNum,
+                    QualityPersonNum = newtable.QualityPersonNum,
                     SafetyCommitteeMeetingNum = newtable.SafetyCommitteeMeetingNum,
                     EnterpriseTopicsMeetingNum = newtable.EnterpriseTopicsMeetingNum,
                     ProjectSafetyLeadingGroupMeetingNum = newtable.ProjectSafetyLeadingGroupMeetingNum,
@@ -151,6 +153,9 @@ namespace BLL
                     CompanyLeadShiftCheckNum = newtable.CompanyLeadShiftCheckNum,
                     CompanyComprehensiveCheckNum = newtable.CompanyComprehensiveCheckNum,
                     CompanySpecialCheckNum = newtable.CompanySpecialCheckNum,
+                    BranchLeadShiftCheckNum = newtable.BranchLeadShiftCheckNum,
+                    BranchComprehensiveCheckNum = newtable.BranchComprehensiveCheckNum,
+                    BranchSpecialCheckNum = newtable.BranchSpecialCheckNum,
                     ProjectLeadShiftCheckNum = newtable.ProjectLeadShiftCheckNum,
                     ProjectSpecialCheckNum = newtable.ProjectSpecialCheckNum,
                     ProjectMajorCheckNum = newtable.ProjectMajorCheckNum,
@@ -163,8 +168,13 @@ namespace BLL
                     CompanyComprehensivePlanNum = newtable.CompanyComprehensivePlanNum,
                     CompanySpecialPlanNum = newtable.CompanySpecialPlanNum,
                     CompanyOnSiteDisposalPlan = newtable.CompanyOnSiteDisposalPlan,
+                    BranchComprehensivePlanNum = newtable.BranchComprehensivePlanNum,
+                    BranchSpecialPlanNum = newtable.BranchSpecialPlanNum,
+                    BranchOnSiteDisposalPlan = newtable.BranchOnSiteDisposalPlan,
                     CompanyDrillNum = newtable.CompanyDrillNum,
                     CompanyDrillPersonNum = newtable.CompanyDrillPersonNum,
+                    BranchDrillNum = newtable.BranchDrillNum,
+                    BranchDrillPersonNum = newtable.BranchDrillPersonNum,
                     ProjectComprehensivePlanNum = newtable.ProjectComprehensivePlanNum,
                     ProjectSpecialPlanNum = newtable.ProjectSpecialPlanNum,
                     ProjectOnSiteDisposalPlan = newtable.ProjectOnSiteDisposalPlan,
@@ -186,11 +196,13 @@ namespace BLL
                     HighRiskNum = newtable.HighRiskNum,
                     CompletedNum = newtable.CompletedNum,
                     TrainPersonNum = newtable.TrainPersonNum,
+                    OperativesNum = newtable.OperativesNum,
                     ConstructionNum = newtable.ConstructionNum,
                     FinishedNum = newtable.FinishedNum,
                     ArgumentNum = newtable.ArgumentNum,
                     SuperCompletedNum = newtable.SuperCompletedNum,
                     SuperTrainPersonNum = newtable.SuperTrainPersonNum,
+                    SuperOperativesNum = newtable.SuperOperativesNum,
                     SuperConstructionNum = newtable.SuperConstructionNum,
                     SuperFinishedNum = newtable.SuperFinishedNum,
                     SuperArgumentNum = newtable.SuperArgumentNum
@@ -200,6 +212,7 @@ namespace BLL
             }
         }
 
+
         /// <summary>
         ///     删除实体
         /// </summary>
@@ -270,11 +283,13 @@ namespace BLL
                     table.BranchFullTimeNum = newtable.BranchFullTimeNum;
                     table.ProjectInspectorGeneralNum = newtable.ProjectInspectorGeneralNum;
                     table.ProjectFullTimeNum = newtable.ProjectFullTimeNum;
+                    table.ProjectSubFullTimeNum = newtable.ProjectSubFullTimeNum;
                     table.ProjectSafetyMonitorNum = newtable.ProjectSafetyMonitorNum;
                     table.SafetyInjectionEngineer = newtable.SafetyInjectionEngineer;
                     table.CertificateANum = newtable.CertificateANum;
                     table.CertificateBNum = newtable.CertificateBNum;
                     table.CertificateCNum = newtable.CertificateCNum;
+                    table.QualityPersonNum = newtable.QualityPersonNum;
                     table.SafetyCommitteeMeetingNum = newtable.SafetyCommitteeMeetingNum;
                     table.EnterpriseTopicsMeetingNum = newtable.EnterpriseTopicsMeetingNum;
                     table.ProjectSafetyLeadingGroupMeetingNum = newtable.ProjectSafetyLeadingGroupMeetingNum;
@@ -294,7 +309,13 @@ namespace BLL
                     table.CompanyComprehensivePlanNum = newtable.CompanyComprehensivePlanNum;
                     table.CompanySpecialPlanNum = newtable.CompanySpecialPlanNum;
                     table.CompanyOnSiteDisposalPlan = newtable.CompanyOnSiteDisposalPlan;
+                    table.BranchComprehensivePlanNum = newtable.BranchComprehensivePlanNum;
+                    table.BranchSpecialPlanNum = newtable.BranchSpecialPlanNum;
+                    table.BranchOnSiteDisposalPlan = newtable.BranchOnSiteDisposalPlan;
                     table.CompanyDrillNum = newtable.CompanyDrillNum;
+                    table.CompanyDrillPersonNum = newtable.CompanyDrillPersonNum;
+                    table.BranchDrillNum = newtable.BranchDrillNum;
+                    table.BranchDrillPersonNum = newtable.BranchDrillPersonNum;
                     table.ProjectComprehensivePlanNum = newtable.ProjectComprehensivePlanNum;
                     table.ProjectSpecialPlanNum = newtable.ProjectSpecialPlanNum;
                     table.ProjectOnSiteDisposalPlan = newtable.ProjectOnSiteDisposalPlan;
@@ -315,10 +336,12 @@ namespace BLL
                     table.HighRiskNum = newtable.HighRiskNum;
                     table.CompletedNum = newtable.CompletedNum;
                     table.TrainPersonNum = newtable.TrainPersonNum;
+                    table.OperativesNum = newtable.OperativesNum;
                     table.ConstructionNum = newtable.ConstructionNum;
                     table.FinishedNum = newtable.FinishedNum;
                     table.SuperCompletedNum = newtable.SuperCompletedNum;
                     table.SuperTrainPersonNum = newtable.SuperTrainPersonNum;
+                    table.SuperOperativesNum = newtable.SuperOperativesNum;
                     table.SuperConstructionNum = newtable.SuperConstructionNum;
                     table.SuperFinishedNum = newtable.SuperFinishedNum;
                     db.SubmitChanges();
@@ -457,6 +480,7 @@ namespace BLL
                 table.CertificateANum = GetCertificateANum(projectid);
                 table.CertificateBNum = GetCertificateBNum(projectid);
                 table.CertificateCNum = GetCertificateCNum(projectid);
+                table.QualityPersonNum = GetQualityPersonNum(projectid);
             }
 
             if (hSseDateType == HSSEDateType.SafetyMeeting || hSseDateType == HSSEDateType.All)
@@ -492,11 +516,18 @@ namespace BLL
                 table.CompanyComprehensivePlanNum = GetCompanyComprehensivePlanNum(projectid);
                 table.CompanySpecialPlanNum = GetCompanySpecialPlanNum(projectid);
                 table.CompanyOnSiteDisposalPlan = GetCompanyOnSiteDisposalPlan(projectid);
+                table.BranchComprehensivePlanNum = GetBranchComprehensivePlanNum(projectid);
+                table.BranchSpecialPlanNum = GetBranchSpecialPlanNum(projectid);
+                table.BranchOnSiteDisposalPlan = GetBranchOnSiteDisposalPlan(projectid);
                 table.CompanyDrillNum = GetCompanyDrillNum(projectid);
+                table.CompanyDrillPersonNum = GetCompanyDrillPersonNum(projectid);
+                table.BranchDrillNum = GetBranchDrillNum(projectid);
+                table.BranchDrillPersonNum = GetBranchDrillPersonNum(projectid);
                 table.ProjectComprehensivePlanNum = GetProjectComprehensivePlanNum(projectid);
                 table.ProjectSpecialPlanNum = GetProjectSpecialPlanNum(projectid);
                 table.ProjectOnSiteDisposalPlan = GetProjectOnSiteDisposalPlan(projectid);
                 table.ProjectDrillNum = GetProjectDrillNum(projectid);
+                table.ProjectDrillNum = GetProjectDrillNum(projectid);
             }
 
             if (hSseDateType == HSSEDateType.SecurityCost || hSseDateType == HSSEDateType.All)
@@ -579,10 +610,12 @@ namespace BLL
             {
                 table.CompletedNum = GetCompletedNum(projectid);
                 table.TrainPersonNum = GetTrainPersonNum(projectid);
+                table.OperativesNum = GetOperativesNum(projectid);
                 table.ConstructionNum = GetConstructionNum(projectid);
                 table.FinishedNum = GetFinishedNum(projectid);
                 table.SuperCompletedNum = GetSuperCompletedNum(projectid);
                 table.SuperTrainPersonNum = GetSuperTrainPersonNum(projectid);
+                table.SuperOperativesNum = GetSuperOperativesNum(projectid);
                 table.SuperConstructionNum = GetSuperConstructionNum(projectid);
                 table.SuperFinishedNum = GetSuperFinishedNum(projectid);
             }
@@ -903,6 +936,20 @@ namespace BLL
             return result;
         }
 
+        /// <summary>
+        ///     获取在岗特种作业人员数量
+        /// </summary>
+        /// <returns></returns>
+        public static int GetQualityPersonNum(string projectid)
+        {
+            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)
+                          select x).Count();
+            return result;
+        }
+
         /// <summary>
         ///     获取企业安委会会议数
         /// </summary>
@@ -1120,6 +1167,35 @@ namespace BLL
             var result = 0;
             return result;
         }
+        /// <summary>
+        ///     获取分支机构综合预案数
+        /// </summary>
+        /// <returns></returns>
+        public static int GetBranchComprehensivePlanNum(string projectid)
+        {
+            var result = 0;
+            return result;
+        }
+
+        /// <summary>
+        ///     获取分支机构专项预案数
+        /// </summary>
+        /// <returns></returns>
+        public static int GetBranchSpecialPlanNum(string projectid)
+        {
+            var result = 0;
+            return result;
+        }
+        /// <summary>
+        ///     获取分支机构现场处置预案
+        /// </summary>
+        /// <returns></returns>
+        public static int GetBranchOnSiteDisposalPlan(string projectid)
+        {
+            var result = 0;
+            return result;
+        }
+
 
         /// <summary>
         ///     获取企业级演练次数
@@ -1130,6 +1206,33 @@ namespace BLL
             var result = 0;
             return result;
         }
+        /// <summary>
+        ///     获取企业级演练人次数
+        /// </summary>
+        /// <returns></returns>
+        public static int GetCompanyDrillPersonNum(string projectid)
+        {
+            var result = 0;
+            return result;
+        }
+        /// <summary>
+        ///     获取分支机构演练次数
+        /// </summary>
+        /// <returns></returns>
+        public static int GetBranchDrillNum(string projectid)
+        {
+            var result = 0;
+            return result;
+        }
+        /// <summary>
+        ///     获取分支机构演练人次数
+        /// </summary>
+        /// <returns></returns>
+        public static int GetBranchDrillPersonNum(string projectid)
+        {
+            var result = 0;
+            return result;
+        }
 
         /// <summary>
         ///     获取项目级综合预案
@@ -1393,6 +1496,17 @@ namespace BLL
                           select x).ToList().Sum(x => x.TrainPersonNum ?? 0);
             return result;
         }
+        /// <summary>
+        ///     获取危大工程作业人次数
+        /// </summary>
+        /// <returns></returns>
+        public static int GetOperativesNum(string projectid)
+        {
+            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);
+            return result;
+        }
 
         /// <summary>
         ///     获取危大工程施工个数
@@ -1445,6 +1559,18 @@ namespace BLL
                  select x.TrainPersonNum).ToList().Sum(x => x.Value);
             return result;
         }
+        /// <summary>
+        ///     获取超危大工程作业人员数
+        /// </summary>
+        /// <returns></returns>
+        public static int GetSuperOperativesNum(string projectid)
+        {
+            var result =
+                (from x in Funs.DB.Solution_LargerHazard
+                 where x.ProjectId == projectid && x.IsSuperLargerHazard == true && x.RecordTime > Const.DtmarkTime
+                 select x.OperativesNum).ToList().Sum(x => x.Value);
+            return result;
+        }
 
         /// <summary>
         ///     获取超危大工程施工个数
@@ -1588,6 +1714,167 @@ namespace BLL
 
         #endregion
 
+        #region 转换字符串
+
+        /// <summary>
+        /// 转换工作阶段
+        /// </summary>
+        /// <param name="workStage"></param>
+        /// <returns></returns>
+        public static string ConvertWorkStage(object workStage)
+        {
+            if (workStage != null)
+            {
+                string workStages = string.Empty;
+                string[] strList = workStage.ToString().Split(',');
+                foreach (string str in strList)
+                {
+                    Model.Base_WorkStage c = BLL.WorkStageService.GetWorkStageById(str);
+                    if (c != null)
+                    {
+                        workStages += c.WorkStageName + ",";
+                    }
+                }
+
+                if (!string.IsNullOrEmpty(workStages))
+                {
+                    workStages = workStages.Substring(0, workStages.LastIndexOf(","));
+                }
+
+                return workStages;
+            }
+
+            return "";
+        }
+
+        /// <summary>
+        /// 获取危险源编号
+        /// </summary>
+        /// <param name="WorkStage"></param>
+        /// <returns></returns>
+        public static string ConvertHazardCode(object HazardId)
+        {
+            string hazardCode = string.Empty;
+            if (HazardId != null)
+            {
+                Model.Technique_HazardList hazardList = BLL.HazardListService.GetHazardListById(HazardId.ToString());
+                if (hazardList != null)
+                {
+                    hazardCode = hazardList.HazardCode;
+                }
+            }
+
+            return hazardCode;
+        }
+
+        /// <summary>
+        /// 获取危险源类别
+        /// </summary>
+        /// <param name="hazardListTypeId"></param>
+        /// <returns></returns>
+        public static string ConvertSupHazardListTypeId(object hazardListTypeId)
+        {
+            if (hazardListTypeId != null)
+            {
+                Model.Technique_HazardListType hazardListType =
+                    BLL.HazardListTypeService.GetHazardListTypeById(hazardListTypeId.ToString());
+                if (hazardListType != null)
+                {
+                    var hazard = BLL.HazardListTypeService.GetHazardListTypeById(hazardListType.SupHazardListTypeId);
+                    if (hazard != null)
+                    {
+                        return hazard.HazardListTypeName;
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// 获取危险源项
+        /// </summary>
+        /// <param name="hazardListTypeId"></param>
+        /// <returns></returns>
+        public static string ConvertHazardListTypeId(object hazardListTypeId)
+        {
+            if (hazardListTypeId != null)
+            {
+                Model.Technique_HazardListType hazardListType =
+                    BLL.HazardListTypeService.GetHazardListTypeById(hazardListTypeId.ToString());
+                if (hazardListType != null)
+                {
+                    return hazardListType.HazardListTypeName;
+                }
+            }
+
+            return null;
+        }
+
+        #endregion
+
+        #region 推送安全作业许可业务明细数据
+
+        /// <summary>
+        /// 推送安全作业许可业务明细数据
+        /// </summary>
+        /// <returns></returns>
+        public static ReturnData PushProjectLicenseData(int pushNum)
+        {
+            var thisUnit = CommonService.GetIsThisUnit();
+            Model.SGGLDB db = Funs.DB;
+            var items = (from x in db.View_License_LicenseManager
+                         where (x.IsUpdate == null || x.IsUpdate == false) && x.CompileDate > BLL.Const.DtmarkTime
+                         select new Model.ProjectLicenseItem
+                         {
+                             Id = x.LicenseManagerId,
+                             SourceUnitId = thisUnit.UnitId,
+                             ProjectId = x.ProjectId,
+                             CollCropCode = thisUnit.CollCropCode,
+                             DataDate = x.CompileDate,
+                             AttachFile = AttachFileService.getFileUrl(x.LicenseManagerId.ToString()),
+                             LicenseManagerCode = x.LicenseManagerCode,
+                             UnitId = x.UnitId,
+                             UnitName = x.UnitName,
+                             LicenseTypeName = x.LicenseTypeName,
+                             UnitTypeName = x.UnitTypeName,
+                             IsHighRisk = x.IsHighRisk,
+                             WorkAreaName = x.WorkAreaName,
+                             CompileDate = x.CompileDate,
+                             StartDate = x.StartDate,
+                             EndDate = x.EndDate,
+                             WorkStatesStr = x.WorkStatesStr,
+
+                         }).Take(pushNum).ToList();
+            Model.ReturnData responeData = new Model.ReturnData();
+            if (items.Count() > 0)
+            {
+                var newItem = new { CollCropCode = thisUnit.CollCropCode, Items = items };
+                var str = JsonConvert.SerializeObject(newItem);
+                var baseurl = "/api/HSSEData/SaveProjectLicenseData";
+                responeData = ServerService.PushCNCEC(str, baseurl);
+                if (responeData.code == 1)
+                {
+                    foreach (var item in items)
+                    {
+                        var data = db.License_LicenseManager.FirstOrDefault(x =>
+                            x.LicenseManagerId == item.Id && (x.IsUpdate == null || x.IsUpdate == false));
+                        data.IsUpdate = true;
+                        db.SubmitChanges();
+                    }
+                }
+            }
+            else
+            {
+                responeData.code = 0;
+                responeData.message = "当前没有项目安全作业许可业务明细数据";
+            }
+
+            return responeData;
+        }
+
+        #endregion
+
         #region 推送项目安全隐患风险数据
 
         /// <summary>
@@ -1620,5 +1907,489 @@ namespace BLL
         }
 
         #endregion
+
+        #region 推送项目安全隐患数据
+
+        /// <summary>
+        /// 推送项目安全隐患数据
+        /// </summary>
+        /// <returns></returns>
+        public static ReturnData PushProjectHazardRegisterData(int pushNum)
+        {
+            var thisUnit = CommonService.GetIsThisUnit();
+            Model.SGGLDB db = Funs.DB;
+            var items = (from x in db.View_Hazard_HazardRegister
+                         where (x.IsUpdate == null || x.IsUpdate == false) && x.CheckTime > BLL.Const.DtmarkTime
+                                                                           && x.ProblemTypes == "1"
+                                                                           && x.ProjectState == "1"
+                                                                           // && x.IsBranch.Value == true
+                                                                           && (x.IsDelete == null || x.IsDelete == false)
+                         select new Model.Hazard_HazardRegisterItem
+                         {
+                             HazardRegisterId = x.HazardRegisterId,
+                             SourceUnitId = thisUnit.UnitId,
+                             RegisterDate = x.RegisterDate,
+                             RegisterDef = x.RegisterDef,
+                             Rectification = x.Rectification,
+                             WorkAreaName = x.WorkAreaName,
+                             ResponsibilityUnitName = x.ResponsibilityUnitName,
+                             ResponsibilityUnitCollCropCode = x.ResponsibilityUnitCollCropCode,
+                             Risk_Level = x.Risk_Level,
+                             ProjectId = x.ProjectId,
+                             ProjectName = x.ProjectName,
+                             States = x.States,
+                             StatesStr = x.StatesStr,
+                             ResponsibilityManName = x.ResponsibilityManName,
+                             CheckManName = x.CheckManName,
+                             CheckTime = x.CheckTime,
+                             RectificationPeriod = x.RectificationPeriod,
+                             ImageUrl = x.ImageUrl,
+                             // ImageUrlFileContext = AttachFileService.GetMoreFileStructByAttachUrl(x.ImageUrl),
+                             RectificationImageUrl = x.RectificationImageUrl,
+                             // RectificationImageUrlFileContext = AttachFileService.GetMoreFileStructByAttachUrl(x.RectificationImageUrl),
+                             RectificationTime = x.RectificationTime,
+                             ConfirmManName = x.ConfirmManName,
+                             ConfirmDate = x.ConfirmDate,
+                             HandleIdea = x.HandleIdea,
+                             CutPayment = x.CutPayment,
+                             CheckCycle = x.CheckCycle,
+                             RegisterTypesName = x.RegisterTypesName,
+                             Requirements = x.Requirements
+                         }).Take(pushNum).ToList();
+            Model.ReturnData responeData = new Model.ReturnData();
+            if (items.Count() > 0)
+            {
+
+                var newItem = new { CollCropCode = thisUnit.CollCropCode, Items = items };
+                var str = JsonConvert.SerializeObject(newItem);
+                var baseurl = "/api/HSSEData/SaveProjectHazardRegisterData";
+                responeData = ServerService.PushCNCEC(str, baseurl);
+                if (responeData.code == 1)
+                {
+                    foreach (var item in items)
+                    {
+                        var data = db.HSSE_Hazard_HazardRegister.FirstOrDefault(x =>
+                            x.HazardRegisterId == item.HazardRegisterId && (x.IsUpdate == null || x.IsUpdate == false));
+                        data.IsUpdate = true;
+                        db.SubmitChanges();
+                    }
+                    // var list = from x in db.HSSE_Hazard_HazardRegister
+                    //            where x.IsUpdate == null || x.IsUpdate == false
+                    //            select x;
+                    // foreach (var item in list)
+                    // {
+                    //     item.IsUpdate = true;
+                    // }
+                    // db.SubmitChanges();
+                }
+            }
+            else
+            {
+                responeData.code = 0;
+                responeData.message = "当前没有项目安全隐患数据";
+            }
+            return responeData;
+        }
+
+        #endregion
+
+        #region 推送安全风险数据
+
+        /// <summary>
+        /// 推送安全风险数据
+        /// </summary>
+        /// <returns></returns>
+        public static ReturnData PushProjectSecurityRiskData(int pushNum)
+        {
+            var thisUnit = CommonService.GetIsThisUnit();
+            Model.SGGLDB db = Funs.DB;
+            var items = (from x in db.Hazard_HazardSelectedItem
+                         join List in db.Hazard_HazardList on x.HazardListId equals List.HazardListId into ListJ
+                         from list in ListJ.DefaultIfEmpty()
+                         join Level in db.Base_RiskLevel on x.HazardLevel equals Level.RiskLevelId into LevelJ
+                         from level in LevelJ.DefaultIfEmpty()
+                         where (x.IsUpdate == null || x.IsUpdate == false) && level.RiskLevelName != "" && list.States == BLL.Const.State_2
+                         select new Model.ProjectSecurityRiskItem
+                         {
+                             Id = x.HazardSelectedItemId,
+                             SourceUnitId = thisUnit.UnitId,
+                             ProjectId = x.ProjectId,
+                             CollCropCode = thisUnit.CollCropCode,
+                             DataDate = x.CheckStartDate,
+                             // AttachFile = AttachFileService.getFileUrl(x.HazardListId.ToString()),
+                             WorkAreaName = list.WorkAreaName,
+                             WorkStageName = ConvertWorkStage(x.WorkStage),
+                             SupHazardListType = ConvertSupHazardListTypeId(x.HazardListTypeId),
+                             HazardListType = ConvertHazardListTypeId(x.HazardListTypeId),
+                             Hazard = ConvertHazardCode(x.HazardId),
+                             HazardItems = x.HazardItems,
+                             DefectsType = x.DefectsType,
+                             MayLeadAccidents = x.MayLeadAccidents,
+                             HelperMethod = x.HelperMethod,
+                             HazardJudge_L = x.HazardJudge_L,
+                             HazardJudge_E = x.HazardJudge_E,
+                             HazardJudge_C = x.HazardJudge_C,
+                             HazardJudge_D = x.HazardJudge_D,
+                             RiskLevelName = level.RiskLevelName,
+                             RiskLevel = level.RiskLevel,
+                             ControlMeasures = x.ControlMeasures,
+                         }).Take(pushNum).ToList();
+            Model.ReturnData responeData = new Model.ReturnData();
+            if (items.Count() > 0)
+            {
+                var newItem = new { CollCropCode = thisUnit.CollCropCode, Items = items };
+                var str = JsonConvert.SerializeObject(newItem);
+                var baseurl = "/api/HSSEData/SaveProjectSecurityRiskData";
+                responeData = ServerService.PushCNCEC(str, baseurl);
+                if (responeData.code == 1)
+                {
+                    foreach (var item in items)
+                    {
+                        var data = db.Hazard_HazardSelectedItem.FirstOrDefault(x =>
+                            x.HazardSelectedItemId == item.Id && (x.IsUpdate == null || x.IsUpdate == false));
+                        data.IsUpdate = true;
+                        db.SubmitChanges();
+                    }
+                }
+            }
+            else
+            {
+                responeData.code = 0;
+                responeData.message = "当前没有项目安全风险数据";
+            }
+
+            return responeData;
+        }
+
+        #endregion
+
+        #region 推送危大工程业务明细数据
+
+        /// <summary>
+        /// 推送危大工程业务明细数据
+        /// </summary>
+        /// <returns></returns>
+        public static ReturnData PushProjectLargeEngineeringData(int pushNum)
+        {
+            var thisUnit = CommonService.GetIsThisUnit();
+            Model.SGGLDB db = Funs.DB;
+            var items = (from x in db.Solution_LargerHazard
+                         where (x.IsUpdate == null || x.IsUpdate == false) && x.RecordTime > BLL.Const.DtmarkTime
+                         select new Model.LargeEngineeringItem
+                         {
+                             Id = x.HazardId,
+                             SourceUnitId = thisUnit.UnitId,
+                             ProjectId = x.ProjectId,
+                             CollCropCode = thisUnit.CollCropCode,
+                             DataDate = x.RecordTime,
+                             AttachFile = AttachFileService.getFileUrl(x.HazardId.ToString()),
+                             //HazardName = x.HazardName,
+                             TypeName = db.Sys_Const.FirstOrDefault(y =>
+                                 y.ConstValue == x.HazardType && y.GroupId == ConstValue.Group_LargerHazardType).ConstText,
+                             IsSuperLargerHazard = x.IsSuperLargerHazard,
+                             IsArgument = x.IsArgument,
+                             Address = x.Address,
+                             Descriptions = x.Descriptions,
+                             TrainPersonNum = x.TrainPersonNum,
+                             RecordTime = x.RecordTime,
+                             ExpectedTime = x.ExpectedTime,
+                             States = x.States,
+                             StatesStr = x.States == "0" ? "已取消" :
+                                 x.States == "1" ? "未开始" :
+                                 x.States == "2" ? "作业中" :
+                                 x.States == "3" ? "已完工" : "",
+                         }).Take(pushNum).ToList();
+            Model.ReturnData responeData = new Model.ReturnData();
+            if (items.Count() > 0)
+            {
+                var newItem = new { CollCropCode = thisUnit.CollCropCode, Items = items };
+                var str = JsonConvert.SerializeObject(newItem);
+                var baseurl = "/api/HSSEData/SaveProjectLargeEngineeringData";
+                responeData = ServerService.PushCNCEC(str, baseurl);
+                if (responeData.code == 1)
+                {
+                    foreach (var item in items)
+                    {
+                        var data = db.Solution_LargerHazard.FirstOrDefault(x =>
+                            x.HazardId == item.Id && (x.IsUpdate == null || x.IsUpdate == false));
+                        data.IsUpdate = true;
+                        db.SubmitChanges();
+                    }
+                }
+            }
+            else
+            {
+                responeData.code = 0;
+                responeData.message = "当前没有项目危大工程业务明细数据";
+            }
+
+            return responeData;
+        }
+
+        #endregion
+
+        #region 删除安全作业许可业务明细数据
+
+        /// <summary>
+        /// 删除安全作业许可业务明细数据
+        /// </summary>
+        /// <returns></returns>
+        public static ReturnData DeleteProjectLicenseData(string Id)
+        {
+            Model.ReturnData responeData = new Model.ReturnData();
+            try
+            {
+                var thisUnit = CommonService.GetIsThisUnit();
+                Model.SGGLDB db = Funs.DB;
+                var items = (from x in db.View_License_LicenseManager
+                             where x.LicenseManagerId == Id
+                             select new Model.ProjectLicenseItem
+                             {
+                                 Id = x.LicenseManagerId,
+                                 SourceUnitId = thisUnit.UnitId,
+                                 ProjectId = x.ProjectId,
+                                 CollCropCode = thisUnit.CollCropCode,
+                                 DataDate = x.CompileDate,
+                                 AttachFile = AttachFileService.getFileUrl(x.LicenseManagerId.ToString()),
+                                 LicenseManagerCode = x.LicenseManagerCode,
+                                 UnitId = x.UnitId,
+                                 UnitName = x.UnitName,
+                                 LicenseTypeName = x.LicenseTypeName,
+                                 UnitTypeName = x.UnitTypeName,
+                                 IsHighRisk = x.IsHighRisk,
+                                 WorkAreaName = x.WorkAreaName,
+                                 CompileDate = x.CompileDate,
+                                 StartDate = x.StartDate,
+                                 EndDate = x.EndDate,
+                                 WorkStatesStr = x.WorkStatesStr,
+
+                             }).ToList();
+
+                if (items.Count() > 0)
+                {
+                    var newItem = new { CollCropCode = thisUnit.CollCropCode, Items = items };
+                    var str = JsonConvert.SerializeObject(newItem);
+                    var baseurl = "/api/HSSEData/DeleteProjectLicenseData";
+                    responeData = ServerService.PushCNCEC(str, baseurl);
+                }
+                else
+                {
+                    responeData.code = 0;
+                    responeData.message = "集团数据删除失败";
+                }
+            }
+            catch (Exception)
+            {
+                responeData.code = 0;
+                responeData.message = "集团数据删除失败";
+            }
+            return responeData;
+        }
+
+        #endregion
+
+        #region 删除项目安全隐患数据
+
+        /// <summary>
+        /// 删除项目安全隐患数据
+        /// </summary>
+        /// <returns></returns>
+        public static ReturnData DeleteProjectHazardRegisterData(string hazardRegisterId)
+        {
+            Model.ReturnData responeData = new Model.ReturnData();
+            try
+            {
+                var thisUnit = CommonService.GetIsThisUnit();
+                Model.SGGLDB db = Funs.DB;
+                var items = (from x in db.View_Hazard_HazardRegister
+                             where x.HazardRegisterId == hazardRegisterId
+                             select new Model.Hazard_HazardRegisterItem
+                             {
+                                 HazardRegisterId = x.HazardRegisterId,
+                                 SourceUnitId = thisUnit.UnitId,
+                                 RegisterDate = x.RegisterDate,
+                                 RegisterDef = x.RegisterDef,
+                                 Rectification = x.Rectification,
+                                 WorkAreaName = x.WorkAreaName,
+                                 ResponsibilityUnitName = x.ResponsibilityUnitName,
+                                 ResponsibilityUnitCollCropCode = x.ResponsibilityUnitCollCropCode,
+                                 Risk_Level = x.Risk_Level,
+                                 ProjectId = x.ProjectId,
+                                 ProjectName = x.ProjectName,
+                                 States = x.States,
+                                 StatesStr = x.StatesStr,
+                                 ResponsibilityManName = x.ResponsibilityManName,
+                                 CheckManName = x.CheckManName,
+                                 CheckTime = x.CheckTime,
+                                 RectificationPeriod = x.RectificationPeriod,
+                                 ImageUrl = x.ImageUrl,
+                                 ImageUrlFileContext = AttachFileService.GetMoreFileStructByAttachUrl(x.ImageUrl),
+                                 RectificationImageUrl = x.RectificationImageUrl,
+                                 RectificationImageUrlFileContext = AttachFileService.GetMoreFileStructByAttachUrl(x.RectificationImageUrl),
+                                 RectificationTime = x.RectificationTime,
+                                 ConfirmManName = x.ConfirmManName,
+                                 ConfirmDate = x.ConfirmDate,
+                                 HandleIdea = x.HandleIdea,
+                                 CutPayment = x.CutPayment,
+                                 CheckCycle = x.CheckCycle,
+                                 RegisterTypesName = x.RegisterTypesName,
+                                 Requirements = x.Requirements
+                             }).ToList();
+
+                if (items.Count() > 0)
+                {
+                    var newItem = new { CollCropCode = thisUnit.CollCropCode, Items = items };
+                    var str = JsonConvert.SerializeObject(newItem);
+                    var baseurl = "/api/HSSEData/DeleteProjectHazardRegisterData";
+                    responeData = ServerService.PushCNCEC(str, baseurl);
+                }
+                else
+                {
+                    responeData.code = 0;
+                    responeData.message = "集团数据删除失败";
+                }
+            }
+            catch (Exception)
+            {
+                responeData.code = 0;
+                responeData.message = "集团数据删除失败";
+            }
+            return responeData;
+        }
+
+        #endregion
+
+        #region 删除危大工程业务明细数据
+
+        /// <summary>
+        /// 删除危大工程业务明细数据
+        /// </summary>
+        /// <returns></returns>
+        public static ReturnData DeleteProjectLargeEngineeringData(string Id)
+        {
+            Model.ReturnData responeData = new Model.ReturnData();
+            try
+            {
+                var thisUnit = CommonService.GetIsThisUnit();
+                Model.SGGLDB db = Funs.DB;
+                var items = (from x in db.Solution_LargerHazard
+                             where x.HazardId == Id
+                             select new Model.LargeEngineeringItem
+                             {
+                                 Id = x.HazardId,
+                                 SourceUnitId = thisUnit.UnitId,
+                                 ProjectId = x.ProjectId,
+                                 CollCropCode = thisUnit.CollCropCode,
+                                 DataDate = x.RecordTime,
+                                 AttachFile = AttachFileService.getFileUrl(x.HazardId.ToString()),
+                                 //HazardName = x.HazardName,
+                                 TypeName = db.Sys_Const.FirstOrDefault(y =>
+                                     y.ConstValue == x.HazardType && y.GroupId == ConstValue.Group_LargerHazardType).ConstText,
+                                 IsSuperLargerHazard = x.IsSuperLargerHazard,
+                                 IsArgument = x.IsArgument,
+                                 Address = x.Address,
+                                 Descriptions = x.Descriptions,
+                                 TrainPersonNum = x.TrainPersonNum,
+                                 OperativesNum = x.OperativesNum,
+                                 RecordTime = x.RecordTime,
+                                 ExpectedTime = x.ExpectedTime,
+                                 States = x.States,
+                                 StatesStr = x.States == "0" ? "已取消" :
+                                     x.States == "1" ? "未开始" :
+                                     x.States == "2" ? "作业中" :
+                                     x.States == "3" ? "已完工" : "",
+                             }).ToList();
+
+                if (items.Count() > 0)
+                {
+                    var newItem = new { CollCropCode = thisUnit.CollCropCode, Items = items };
+                    var str = JsonConvert.SerializeObject(newItem);
+                    var baseurl = "/api/HSSEData/DeleteProjectLargeEngineeringData";
+                    responeData = ServerService.PushCNCEC(str, baseurl);
+                }
+                else
+                {
+                    responeData.code = 0;
+                    responeData.message = "集团数据删除失败";
+                }
+            }
+            catch (Exception)
+            {
+                responeData.code = 0;
+                responeData.message = "集团数据删除失败";
+            }
+            return responeData;
+        }
+
+        #endregion
+
+        #region 删除安全风险数据
+
+        /// <summary>
+        /// 删除安全风险数据
+        /// </summary>
+        /// <returns></returns>
+        public static ReturnData DeleteProjectSecurityRiskData(string Id)
+        {
+            Model.ReturnData responeData = new Model.ReturnData();
+            try
+            {
+                var thisUnit = CommonService.GetIsThisUnit();
+                Model.SGGLDB db = Funs.DB;
+                var items = (from x in db.Hazard_HazardSelectedItem
+                             join List in db.Hazard_HazardList on x.HazardListId equals List.HazardListId into ListJ
+                             from list in ListJ.DefaultIfEmpty()
+                             join Level in db.Base_RiskLevel on x.HazardLevel equals Level.RiskLevelId into LevelJ
+                             from level in LevelJ.DefaultIfEmpty()
+                             where x.HazardSelectedItemId == Id
+                             select new Model.ProjectSecurityRiskItem
+                             {
+                                 Id = x.HazardSelectedItemId,
+                                 SourceUnitId = thisUnit.UnitId,
+                                 ProjectId = x.ProjectId,
+                                 CollCropCode = thisUnit.CollCropCode,
+                                 DataDate = x.CheckStartDate,
+                                 // AttachFile = AttachFileService.getFileUrl(x.HazardListId.ToString()),
+                                 WorkAreaName = list.WorkAreaName,
+                                 WorkStageName = ConvertWorkStage(x.WorkStage),
+                                 SupHazardListType = ConvertSupHazardListTypeId(x.HazardListTypeId),
+                                 HazardListType = ConvertHazardListTypeId(x.HazardListTypeId),
+                                 Hazard = ConvertHazardCode(x.HazardId),
+                                 HazardItems = x.HazardItems,
+                                 DefectsType = x.DefectsType,
+                                 MayLeadAccidents = x.MayLeadAccidents,
+                                 HelperMethod = x.HelperMethod,
+                                 HazardJudge_L = x.HazardJudge_L,
+                                 HazardJudge_E = x.HazardJudge_E,
+                                 HazardJudge_C = x.HazardJudge_C,
+                                 HazardJudge_D = x.HazardJudge_D,
+                                 RiskLevelName = level.RiskLevelName,
+                                 RiskLevel = level.RiskLevel,
+                                 ControlMeasures = x.ControlMeasures,
+                             }).ToList();
+
+                if (items.Count() > 0)
+                {
+                    var newItem = new { CollCropCode = thisUnit.CollCropCode, Items = items };
+                    var str = JsonConvert.SerializeObject(newItem);
+                    var baseurl = "/api/HSSEData/DeleteProjectSecurityRiskData";
+                    responeData = ServerService.PushCNCEC(str, baseurl);
+                }
+                else
+                {
+                    responeData.code = 0;
+                    responeData.message = "集团数据删除失败";
+                }
+            }
+            catch (Exception)
+            {
+                responeData.code = 0;
+                responeData.message = "集团数据删除失败";
+            }
+            return responeData;
+        }
+
+        #endregion
+
     }
 }

SGGL/BLL/ZHGL/Supervise/SuperviseCheckReportService.cs

@@ -35,8 +35,10 @@ namespace BLL
                 ProjectId = superviseCheckReport.ProjectId,
                 UnitId = superviseCheckReport.UnitId,
                 CheckTeam = superviseCheckReport.CheckTeam,
-                CheckType = superviseCheckReport.CheckType,
                 EvaluationResult = superviseCheckReport.EvaluationResult,
+                CheckUnitId = superviseCheckReport.CheckUnitId,
+                CheckMainType = superviseCheckReport.CheckMainType,
+                CheckType = superviseCheckReport.CheckType,
                 AttachUrl = superviseCheckReport.AttachUrl,
                 IsIssued = superviseCheckReport.IsIssued
             };
@@ -58,10 +60,13 @@ namespace BLL
                 newSuperviseCheckReport.ProjectId = superviseCheckReport.ProjectId;
                 newSuperviseCheckReport.UnitId = superviseCheckReport.UnitId;
                 newSuperviseCheckReport.CheckTeam = superviseCheckReport.CheckTeam;
-                newSuperviseCheckReport.CheckType = superviseCheckReport.CheckType;
                 newSuperviseCheckReport.EvaluationResult = superviseCheckReport.EvaluationResult;
+                newSuperviseCheckReport.CheckUnitId = superviseCheckReport.CheckUnitId;
+                newSuperviseCheckReport.CheckMainType = superviseCheckReport.CheckMainType;
+                newSuperviseCheckReport.CheckType = superviseCheckReport.CheckType;
                 newSuperviseCheckReport.AttachUrl = superviseCheckReport.AttachUrl;
                 newSuperviseCheckReport.IsIssued = superviseCheckReport.IsIssued;
+                newSuperviseCheckReport.IsUpdate = null;
                 Funs.DB.SubmitChanges();
             }
         }