From a4bd12e3681f1e029650a4214682c48992027374 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Wed, 10 Jan 2024 11:22:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
SGGL/BLL/ProjectData/ProjectService.cs | 31 +++++++++++++------
.../Project_CQMSDataService.cs | 2 +-
.../Project_HJGLData_DefectService.cs | 2 +-
.../Project_HJGLData_HJGLService.cs | 2 +-
.../Project_HSSEData_HSSEService.cs | 2 +-
...ject_HSSEData_HiddenDangerDetailService.cs | 2 +-
.../Project_SYHSEData_SYHSEService.cs | 2 +-
7 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/SGGL/BLL/ProjectData/ProjectService.cs b/SGGL/BLL/ProjectData/ProjectService.cs
index 7239b9f4..6f2cb1d5 100644
--- a/SGGL/BLL/ProjectData/ProjectService.cs
+++ b/SGGL/BLL/ProjectData/ProjectService.cs
@@ -125,8 +125,8 @@
Province = project.Province,
City = project.City,
EnglishRemark = project.EnglishRemark,
- ProjectRealCode=project.ProjectRealCode,
- IsCNCECShow=project.IsCNCECShow,
+ ProjectRealCode = project.ProjectRealCode,
+ IsCNCECShow = project.IsCNCECShow,
};
db.Base_Project.InsertOnSubmit(newProject);
db.SubmitChanges();
@@ -231,6 +231,19 @@
return list;
}
+ ///
+ /// 获取施工中项目集合
+ ///
+ ///
+ public static List GetCNCECShowProjectList()
+ {
+ var list = (from x in Funs.DB.Base_Project
+ where x.IsCNCECShow == true
+ orderby x.ProjectCode descending
+ select x).ToList();
+ return list;
+ }
+
///
/// 获取项目下拉选项
///
@@ -346,7 +359,7 @@
//List roleidList = Funs.GetStrListByStr(getUser.RoleIds, ',');
///// 获取角色类型
//var getRoleP = db.Sys_RolePower.FirstOrDefault(x => roleidList.Contains(x.RoleId) && x.IsOffice == false);
- if (getUser.IsOffice != true)
+ if (getUser.IsOffice != true)
{
var getProjectIdList = db.SitePerson_Person.Where(x => x.PersonId == userId && x.RoleIds != null).Select(x => x.ProjectId);
if (getProjectIdList.Count() > 0)
@@ -358,9 +371,9 @@
}
var pcount = (from x in db.Sys_Log
- where x.ProjectId != null && x.OperationTime > DateTime.Now.AddDays(-1)
- group x by x.ProjectId into g
- select new { g.First().ProjectId, count = g.Count() }).Distinct();
+ where x.ProjectId != null && x.OperationTime > DateTime.Now.AddDays(-1)
+ group x by x.ProjectId into g
+ select new { g.First().ProjectId, count = g.Count() }).Distinct();
if (getProjects.Count() > 0)
@@ -375,7 +388,7 @@
else
{
return null;
- }
+ }
}
}
@@ -522,8 +535,8 @@
if (!string.IsNullOrEmpty(projectId))
{
var getUnit = from x in Funs.DB.Project_ProjectUnit
- where x.ProjectId == projectId && x.UnitType == unitType
- select x.UnitId;
+ where x.ProjectId == projectId && x.UnitType == unitType
+ select x.UnitId;
if (getUnit.Count() > 0)
{
unitId = Funs.GetStringByArray(getUnit.ToArray());
diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs
index 1dba3c70..32b4ef3a 100644
--- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs
+++ b/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);
diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_DefectService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_DefectService.cs
index 22430e30..991485c3 100644
--- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_DefectService.cs
+++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_DefectService.cs
@@ -204,7 +204,7 @@ namespace BLL
///
public static void StatisticalAllProjectData()
{
- var projectlist = ProjectService.GetProjectWorkList();
+ var projectlist = ProjectService.GetCNCECShowProjectList();
foreach (var item in projectlist)
{
StatisticalData(item.ProjectId);
diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLService.cs
index 885a8ca3..138313e1 100644
--- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLService.cs
+++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLService.cs
@@ -223,7 +223,7 @@ namespace BLL
///
public static void StatisticalAllProjectData()
{
- var projectlist = ProjectService.GetProjectWorkList();
+ var projectlist = ProjectService.GetCNCECShowProjectList();
foreach (var item in projectlist)
{
StatisticalData(item.ProjectId, HJGLDateType.All);
diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs
index 71ffc420..ee27a6ef 100644
--- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs
+++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs
@@ -371,7 +371,7 @@ namespace BLL
///
public static void StatisticalAllProjectData()
{
- var projectlist = ProjectService.GetProjectWorkList();
+ var projectlist = ProjectService.GetCNCECShowProjectList();
foreach (var item in projectlist) StatisticalData(item.ProjectId, HSSEDateType.All);
}
diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HiddenDangerDetailService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HiddenDangerDetailService.cs
index eb2e941b..96e7afa2 100644
--- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HiddenDangerDetailService.cs
+++ b/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)
diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_SYHSEData_SYHSEService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_SYHSEData_SYHSEService.cs
index 8753500e..543892ba 100644
--- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_SYHSEData_SYHSEService.cs
+++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_SYHSEData_SYHSEService.cs
@@ -284,7 +284,7 @@ namespace BLL
///
public static void StatisticalAllProjectData()
{
- var projectlist = ProjectService.GetProjectWorkList();
+ var projectlist = ProjectService.GetCNCECShowProjectList();
foreach (var item in projectlist)
{
StatisticalData(item.ProjectId, SYHSESDateType.All);