lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

看板图表样式；人员报验补充查询条件；

Browse Source
This commit is contained in:
夏菊
2025-07-01 14:07:38 +08:00
parent 94eea2512d
commit 037888ef1f
24 changed files with 707 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs
+20 -4
View File
@@ -3,6 +3,7 @@ using System.Collections;
using System.Collections.Generic;
using System.Linq;
using FineUIPro;
using Microsoft.SqlServer.Dts.Runtime;
using Model;
using Newtonsoft.Json;
@@ -455,7 +456,7 @@ namespace BLL
if (hSseDateType == HSSEDateType.EducationAndTraining || hSseDateType == HSSEDateType.All)
{
table.SafeTrainNum = GetSafeTrainNum(projectid);
table.SafeTrainNum = GetSafeTrainNum(projectid) + GetBoShengSafeTrain(projectid);
table.SpecialTrainNum = GetSpecialTrainNum(projectid);
table.SpecialOperationTrainNum = GetSpecialOperationTrainNum(projectid);
}
@@ -748,6 +749,21 @@ namespace BLL
return result;
}
/// <summary>
/// 获取三级安全教育培训数——博晟培训
/// </summary>
/// <returns></returns>
public static int GetBoShengSafeTrain(string projectid)
{
var result = (from x in Funs.DB.Bo_Sheng_Train
join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into pGroup
from p in pGroup.DefaultIfEmpty()
where x.ProjectId == projectid && (x.TrainType == "入场（厂）培训" || x.TrainType == "入厂（场）级培训")
&& (x.DeleteTag == "False" || x.DeleteTag == null) && x.TrainStartDate > Const.DtmarkTime
select x.PersonCount ?? 0).ToList().Sum();
return result;
}
/// <summary>
/// 获取专项培训数
/// </summary>
@@ -945,7 +961,7 @@ namespace BLL
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
where x.ProjectId == projectid && m.PostType == Const.PostType_2 && x.IsUsed == true
select x).Count();
return result;
}
@@ -1319,7 +1335,7 @@ namespace BLL
public static int GetUseEquipmentNum(string projectid)
{
var result = (from x in Funs.DB.QualityAudit_EquipmentQuality
where x.ProjectId == projectid
where x.ProjectId == projectid
select x).Count() +
(from x in Funs.DB.QualityAudit_GeneralEquipmentQuality
where x.ProjectId == projectid
@@ -1343,7 +1359,7 @@ namespace BLL
public static int GetSpecialEquipmentNum(string projectid)
{
var result = (from x in Funs.DB.QualityAudit_EquipmentQuality
where x.ProjectId == projectid
where x.ProjectId == projectid
select x).Count();
//var result = (from x in Funs.DB.InApproveManager_EquipmentInItem
// join y in Funs.DB.InApproveManager_EquipmentIn on x.EquipmentInId equals y.EquipmentInId