Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

SGGL/BLL/ProjectData/ProjectService.cs

@@ -125,8 +125,8 @@
                 Province = project.Province,
                 City = project.City,
                 EnglishRemark = project.EnglishRemark,
-                ProjectRealCode=project.ProjectRealCode,
+                ProjectRealCode = project.ProjectRealCode,
-                IsCNCECShow=project.IsCNCECShow,
+                IsCNCECShow = project.IsCNCECShow,
             };
             db.Base_Project.InsertOnSubmit(newProject);
             db.SubmitChanges();
@@ -231,6 +231,19 @@
             return list;
         }
 
+        /// <summary>
+        /// 获取施工中项目集合
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.Base_Project> GetCNCECShowProjectList()
+        {
+            var list = (from x in Funs.DB.Base_Project
+                        where x.IsCNCECShow == true
+                        orderby x.ProjectCode descending
+                        select x).ToList();
+            return list;
+        }
+
         /// <summary>
         /// 获取项目下拉选项
         /// </summary>
@@ -358,9 +371,9 @@
                 }
 
                 var pcount = (from x in db.Sys_Log
-                             where x.ProjectId != null && x.OperationTime > DateTime.Now.AddDays(-1)
+                              where x.ProjectId != null && x.OperationTime > DateTime.Now.AddDays(-1)
-                             group x by x.ProjectId into g
+                              group x by x.ProjectId into g
-                             select new { g.First().ProjectId, count = g.Count() }).Distinct();
+                              select new { g.First().ProjectId, count = g.Count() }).Distinct();
 
 
                 if (getProjects.Count() > 0)
@@ -522,8 +535,8 @@
             if (!string.IsNullOrEmpty(projectId))
             {
                 var getUnit = from x in Funs.DB.Project_ProjectUnit
-                                  where x.ProjectId == projectId && x.UnitType == unitType
+                              where x.ProjectId == projectId && x.UnitType == unitType
-                                  select x.UnitId;
+                              select x.UnitId;
                 if (getUnit.Count() > 0)
                 {
                     unitId = Funs.GetStringByArray(getUnit.ToArray());

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

@@ -321,7 +321,7 @@ namespace BLL
         }
         public static void StatisticalAllProjectData()
         {
-            var projectlist = ProjectService.GetProjectWorkList();
+            var projectlist = ProjectService.GetCNCECShowProjectList();
             foreach (var item in projectlist)
             {
                 StatisticalData(item.ProjectId, CQMSDateType.All);

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

@@ -204,7 +204,7 @@ namespace BLL
         /// </summary>
         public static void StatisticalAllProjectData()
         {
-            var projectlist = ProjectService.GetProjectWorkList();
+            var projectlist = ProjectService.GetCNCECShowProjectList();
             foreach (var item in projectlist)
             {
                 StatisticalData(item.ProjectId);

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

@@ -223,7 +223,7 @@ namespace BLL
         /// </summary>
         public static void StatisticalAllProjectData()
         {
-            var projectlist = ProjectService.GetProjectWorkList();
+            var projectlist = ProjectService.GetCNCECShowProjectList();
             foreach (var item in projectlist)
             {
                 StatisticalData(item.ProjectId, HJGLDateType.All);

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

@@ -371,7 +371,7 @@ namespace BLL
         /// </summary>
         public static void StatisticalAllProjectData()
         {
-            var projectlist = ProjectService.GetProjectWorkList();
+            var projectlist = ProjectService.GetCNCECShowProjectList();
             foreach (var item in projectlist) StatisticalData(item.ProjectId, HSSEDateType.All);
         }
 

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

@@ -227,7 +227,7 @@ namespace BLL
         {
             var db = Funs.DB;
 
-            var projectids = ProjectService.GetProjectWorkList().Select(x => x.ProjectId).ToList();
+            var projectids = ProjectService.GetCNCECShowProjectList().Select(x => x.ProjectId).ToList();
             var thisUnitId = string.Empty;
             var thisUnit = CommonService.GetIsThisUnit();
             if (thisUnit != null)

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

@@ -284,7 +284,7 @@ namespace BLL
         /// </summary>
         public static void StatisticalAllProjectData()
         {
-            var projectlist = ProjectService.GetProjectWorkList();
+            var projectlist = ProjectService.GetCNCECShowProjectList();
             foreach (var item in projectlist)
             {
                 StatisticalData(item.ProjectId, SYHSESDateType.All);