lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
李鹏飞 2024-01-10 19:41:22 +08:00
parent 396611a39d 2ba7371b6e
commit 835b75114e
7 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
SGGL/BLL/ProjectData/ProjectService.cs
View File

@ -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;
}
/// <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>
@ -346,7 +359,7 @@
//List<string> 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());

2
SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs
View File

@ -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);

2
SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_DefectService.cs
View File

@ -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);

2
SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLService.cs
View File

@ -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);

2
SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs
View File

@ -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);
}

2
SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HiddenDangerDetailService.cs
View File

@ -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)

2
SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_SYHSEData_SYHSEService.cs
View File

@ -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);