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

1、系统菜单调整；

Browse Source 
2、系统看板UI调整；
3、事故事件功能
4、其他
This commit is contained in:
夏菊
2025-12-10 15:58:02 +08:00
parent 3d00bb7a94
commit 6619f1e004
276 changed files with 131707 additions and 50045 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs
+280 -154
View File
@@ -2,6 +2,7 @@
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using FineUIPro;
using Model;
using Newtonsoft.Json;
@@ -10,7 +11,99 @@ namespace BLL
{
public static class HSSEData_HSSEService
{
public static CNPCDB Db = Funs.DB;
/// <summary>
/// 在建项目列表
/// </summary>
public static List<string> BeUnderConstructionList = BaseDataService.BeUnderConstructionList;
#region 安全数据统计
/// <summary>
/// 安全数据统计
/// </summary>
/// <returns></returns>
public static async Task<HSSEData> GetTodayHSSEData_HSSE()
{
var modelTask = StatisticalDataAsync();
var model = await modelTask;
HSSEData data = model;
return data;
}
/// <summary>
/// 统计数据(异步)
/// </summary>
/// <returns></returns>
public static async Task<HSSEData> StatisticalDataAsync()
{
var thisUnitId = string.Empty;
var thisUnit = CommonService.GetIsThisUnit();
if (thisUnit != null) { thisUnitId = thisUnit.UnitId; }
var baseUnit = UnitService.GetUnitByUnitId(thisUnitId);
Project_HSSEData_HiddenDangerDetailService.StatisticalAllProjectData();
var beUnderConstructionTask = GetBeUnderConstructionAsync();//在建项目
var shutdownTask = GetShutdownAsync();//停工项目
var joinConstructionPersonTask = GetJoinConstructionPersonAsync();//参建人数
await Task.WhenAll(beUnderConstructionTask, shutdownTask, joinConstructionPersonTask);
// 统一获取异步方法的返回值
var beUnderConstructionList = await beUnderConstructionTask;
var shutdownList = await shutdownTask;
var joinConstructionPersonList = await joinConstructionPersonTask;
// 构造结果对象
var table = new HSSEData_HSSE
{
UnitId = thisUnitId,
CollCropCode = baseUnit.CollCropCode,
UnitName = baseUnit.UnitName,
ReportDate = DateTime.Now.Date,
BeUnderConstructionNum = beUnderConstructionList.Count(),
ShutdownNum = shutdownList.Count(),
JoinConstructionPersonNum = joinConstructionPersonList.Count(),
};
#region 添加项目统计数据
Project_HSSEData_HSSEService.DeleteProject_HSSEData_HSSEByDate(DateTime.Now.Date);
foreach (var projectid in BeUnderConstructionList)
{
var projectHsseData = new Project_HSSEData_HSSE
{
Id = SQLHelper.GetNewID(),
ProjectId = projectid,
UnitId = thisUnitId,
CollCropCode = baseUnit.CollCropCode,
UnitName = baseUnit.UnitName,
ReportDate = DateTime.Now.Date,
};
Project_HSSEData_HSSEService.AddProject_HSSEData_HSSE(projectHsseData);
}
#endregion
if (IsReportByToday())
{
table.Id = GetTodayData().Id;
table.State = Const.CNCEC_State_1;
UpdateHSSEData_HSSE(table);
}
else
{
table.Id = SQLHelper.GetNewID();
table.State = Const.CNCEC_State_0;
AddHSSEData_HSSE(table);
}
var data = GetItemByHSSEData_HSSE(table, Project_HSSEData_HiddenDangerDetailService.GetTodayModel());
return data;
}
#endregion
public static void AddHSSEData_HSSE(HSSEData_HSSE newtable)
{
@@ -206,8 +299,7 @@ namespace BLL
item.TrainPersonNum = dataHsse.TrainPersonNum;
item.UnitId = dataHsse.UnitId;
item.UseEquipmentNum = dataHsse.UseEquipmentNum;
var hSseDataHiddens =
HSSEData_HiddenDangerDetailService.GetHSSEData_HiddenDangerDetailByDate(dataHsse.ReportDate);
var hSseDataHiddens = HSSEData_HiddenDangerDetailService.GetHSSEData_HiddenDangerDetailByDate(dataHsse.ReportDate);
if (hSseDataHiddens != null)
{
var list = hSseDataHiddens.Select(detail => new HSSEDataHiddenDangerDetailItem
@@ -227,8 +319,7 @@ namespace BLL
return data;
}
public static HSSEData GetItemByHSSEData_HSSE(HSSEData_HSSE dataHsse,
List<HSSEDataHiddenDangerDetailItem> hSseDataHiddens)
public static HSSEData GetItemByHSSEData_HSSE(HSSEData_HSSE dataHsse, List<HSSEDataHiddenDangerDetailItem> hSseDataHiddens)
{
var item = new HsseDataItem();
var data = new HSSEData();
@@ -330,19 +421,6 @@ namespace BLL
return data;
}
public static HSSEData GetTodayHSSEData_HSSE()
{
HSSEData data;
var q = (from x in Funs.DB.HSSEData_HSSE
where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date
select x).FirstOrDefault();
if (q != null && q.State == Const.CNCEC_State_S)
// data = GetItemByHSSEData_HSSE(q, Project_HSSEData_HiddenDangerDetailService.GetTodayModel()); ;
data = StatisticalData();
else
data = StatisticalData();
return data;
}
public static HSSEData_HSSE GetTodayData()
{
@@ -373,7 +451,7 @@ namespace BLL
}
/// <summary>
/// 判断当天是否已上报
/// 判断当天是否已上报
/// </summary>
/// <returns></returns>
public static bool IsReportByToday()
@@ -386,127 +464,6 @@ namespace BLL
return result;
}
public static ReturnData PushCncec(string id)
{
var baseurl = "/api/HSSEData/SaveHSSEData";
var item = GetItemById(id);
var str = JsonConvert.SerializeObject(item);
var responeData = ServerService.PushCNCEC(str, baseurl);
return responeData;
}
public static HSSEData StatisticalData()
{
var thisUnitId = string.Empty;
var thisUnit = CommonService.GetIsThisUnit();
if (thisUnit != null) thisUnitId = thisUnit.UnitId;
var baseUnit = UnitService.GetUnitByUnitId(thisUnitId);
Project_HSSEData_HSSEService.StatisticalAllProjectData();
Project_HSSEData_HiddenDangerDetailService.StatisticalAllProjectData();
var projectData = (from x in Funs.DB.Project_HSSEData_HSSE
where x.ReportDate < DateTime.Now.AddDays(1).Date && x.ReportDate >= DateTime.Now.Date
select x).ToList();
var totalEnergyConsumption = ChemicalReportItemService.GetLatstTimeTotalEnergyConsumption();
var incomeComprehensiveEnergyConsumption =
ChemicalReportItemService.GetLatstTimeIncomeComprehensiveEnergyConsumption();
var newWaterConsumption = ChemicalReportItemService.GetLatstTimeNewWaterConsumption();
var table = new HSSEData_HSSE
{
UnitId = thisUnitId,
CollCropCode = baseUnit.CollCropCode,
UnitName = baseUnit.UnitName,
ReportDate = DateTime.Now.Date,
BeUnderConstructionNum = projectData.Sum(x => x.BeUnderConstructionNum),
ShutdownNum = GetShutdownNum(),
JoinConstructionPersonNum = projectData.Sum(x => x.JoinConstructionPersonNum),
MajorProjectsUnderConstructionNum = projectData.Sum(x => x.MajorProjectsUnderConstructionNum),
TotalWorkingHour = projectData.Sum(x => x.TotalWorkingHour),
LostWorkingHour = projectData.Sum(x => x.LostWorkingHour),
SafeWorkingHour = projectData.Sum(x => x.SafeWorkingHour),
SafeTrainNum = projectData.Sum(x => x.SafeTrainNum),
SpecialTrainNum = projectData.Sum(x => x.SpecialTrainNum),
SpecialOperationTrainNum = projectData.Sum(x => x.SpecialOperationTrainNum),
TotalEnergyConsumption = totalEnergyConsumption,
IncomeComprehensiveEnergyConsumption = incomeComprehensiveEnergyConsumption,
NewWaterConsumption = newWaterConsumption,
HeadOfficeInspectorGeneralNum = GetHeadOfficeInspectorGeneralNum(),
HeadOfficeFullTimeNum = GetHeadOfficeFullTimeNum(),
BranchInspectorGeneralNum = GetBranchInspectorGeneralNum(),
BranchFullTimeNum = GetBranchFullTimeNum(),
ProjectInspectorGeneralNum = projectData.Sum(x => x.ProjectInspectorGeneralNum),
ProjectFullTimeNum = projectData.Sum(x => x.ProjectFullTimeNum),
ProjectSafetyMonitorNum = projectData.Sum(x => x.ProjectSafetyMonitorNum),
SafetyInjectionEngineer = projectData.Sum(x => x.SafetyInjectionEngineer),
CertificateANum = projectData.Sum(x => x.CertificateANum),
CertificateBNum = projectData.Sum(x => x.CertificateBNum),
CertificateCNum = projectData.Sum(x => x.CertificateCNum),
SafetyCommitteeMeetingNum = GetSafetyCommitteeMeetingNum(),
EnterpriseTopicsMeetingNum = GetEnterpriseTopicsMeetingNum(),
ProjectSafetyLeadingGroupMeetingNum = projectData.Sum(x => x.ProjectSafetyLeadingGroupMeetingNum),
ProjectSafetyMeetingNum = projectData.Sum(x => x.ProjectSafetyMeetingNum),
CompanyLeadShiftCheckNum = GetCompanyLeadShiftCheckNum(),
CompanyComprehensiveCheckNum = GetCompanyComprehensiveCheckNum(),
CompanySpecialCheckNum = GetCompanySpecialCheckNum(),
ProjectLeadShiftCheckNum = projectData.Sum(x => x.ProjectLeadShiftCheckNum),
ProjectSpecialCheckNum = projectData.Sum(x => x.ProjectSpecialCheckNum),
ProjectMajorCheckNum = projectData.Sum(x => x.ProjectMajorCheckNum),
NearMissNum = projectData.Sum(x => x.NearMissNum),
RecordableEventNum = projectData.Sum(x => x.RecordableEventNum),
GeneralAccidentNum = projectData.Sum(x => x.GeneralAccidentNum),
MajorAccidentNum = projectData.Sum(x => x.MajorAccidentNum),
SeriousAccidentNum = projectData.Sum(x => x.SeriousAccidentNum),
SpecialSeriousAccidentNum = projectData.Sum(x => x.SpecialSeriousAccidentNum),
CompanyComprehensivePlanNum = GetCompanyComprehensivePlanNum(),
CompanySpecialPlanNum = GetCompanySpecialPlanNum(),
CompanyOnSiteDisposalPlan = GetCompanyOnSiteDisposalPlan(),
CompanyDrillNum = GetCompanyDrillNum(),
ProjectComprehensivePlanNum = projectData.Sum(x => x.ProjectComprehensivePlanNum),
ProjectSpecialPlanNum = projectData.Sum(x => x.ProjectSpecialPlanNum),
ProjectOnSiteDisposalPlan = projectData.Sum(x => x.ProjectOnSiteDisposalPlan),
ProjectDrillNum = projectData.Sum(x => x.ProjectDrillNum),
CostExtract = projectData.Sum(x => x.CostExtract),
CostUse = projectData.Sum(x => x.CostUse),
UseEquipmentNum = projectData.Sum(x => x.UseEquipmentNum),
SpecialEquipmentNum = projectData.Sum(x => x.SpecialEquipmentNum),
LicensesNum = projectData.Sum(x => x.LicensesNum),
LicensesCloseNum = projectData.Sum(x => x.LicensesCloseNum),
GeneralClosedNum = projectData.Sum(x => x.GeneralClosedNum),
GeneralNotClosedNum = projectData.Sum(x => x.GeneralNotClosedNum),
MajorClosedNum = projectData.Sum(x => x.MajorClosedNum),
MajorNotClosedNum = projectData.Sum(x => x.MajorNotClosedNum),
GeneralRiskNum = projectData.Sum(x => x.GeneralRiskNum),
LowRiskNum = projectData.Sum(x => x.LowRiskNum),
MediumRiskNum = projectData.Sum(x => x.MediumRiskNum),
HighRiskNum = projectData.Sum(x => x.HighRiskNum),
CompletedNum = projectData.Sum(x => x.CompletedNum),
TrainPersonNum = projectData.Sum(x => x.TrainPersonNum),
ConstructionNum = projectData.Sum(x => x.ConstructionNum),
FinishedNum = projectData.Sum(x => x.FinishedNum),
SuperCompletedNum = projectData.Sum(x => x.SuperCompletedNum),
SuperTrainPersonNum = projectData.Sum(x => x.SuperTrainPersonNum),
SuperConstructionNum = projectData.Sum(x => x.SuperConstructionNum),
SuperFinishedNum = projectData.Sum(x => x.SuperFinishedNum),
CreateMan = Const.sysglyId,
CreateDate = DateTime.Now
};
if (IsReportByToday())
{
table.Id = GetTodayData().Id;
table.State = Const.CNCEC_State_1;
UpdateHSSEData_HSSE(table);
}
else
{
table.Id = SQLHelper.GetNewID();
table.State = Const.CNCEC_State_0;
AddHSSEData_HSSE(table);
}
var data = GetItemByHSSEData_HSSE(table, Project_HSSEData_HiddenDangerDetailService.GetTodayModel());
return data;
}
public static void UpdateHSSEData_HSSE(HSSEData_HSSE newtable)
{
@@ -598,6 +555,39 @@ namespace BLL
}
}
/// <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> GetBeUnderConstruction()
{
return BaseDataService.GetBeUnderConstruction();
}
/// <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> GetShutdown()
{
return BaseDataService.GetShutdown();
}
/// <summary>
/// 获取停工项目数
/// </summary>
@@ -611,7 +601,34 @@ namespace BLL
}
/// <summary>
/// 获取企业总部总监人数
/// 获取参建人数（异步）
/// </summary>
/// <returns></returns>
public static async Task<List<Model.BaseEntities>> GetJoinConstructionPersonAsync()
{
return await Task.Run(GetJoinConstructionPerson);
}
/// <summary>
/// 获取参建人数
/// </summary>
/// <returns></returns>
public static List<Model.BaseEntities> GetJoinConstructionPerson()
{
var result = (from x in Funs.DB.SitePerson_Person
where BeUnderConstructionList.Contains(x.ProjectId) && x.IsUsed == true
select new Model.BaseEntities
{
Id = x.PersonId,
ProjectId = x.ProjectId,
UnitId = x.UnitId
}).ToList();
return result;
}
/// <summary>
/// 获取企业总部总监人数
/// </summary>
/// <returns></returns>
public static int GetHeadOfficeInspectorGeneralNum()
@@ -626,7 +643,7 @@ namespace BLL
}
/// <summary>
/// 获取企业总部专职人数
/// 获取企业总部专职人数
/// </summary>
/// <returns></returns>
public static int GetHeadOfficeFullTimeNum()
@@ -642,7 +659,7 @@ namespace BLL
}
/// <summary>
/// 获取分支机构总监人数
/// 获取分支机构总监人数
/// </summary>
/// <returns></returns>
public static int GetBranchInspectorGeneralNum()
@@ -657,7 +674,7 @@ namespace BLL
}
/// <summary>
/// 获取分支机构专职人数
/// 获取分支机构专职人数
/// </summary>
/// <returns></returns>
public static int GetBranchFullTimeNum()
@@ -673,7 +690,7 @@ namespace BLL
}
/// <summary>
/// 获取企业安委会会议数
/// 获取企业安委会会议数
/// </summary>
/// <returns></returns>
public static int GetSafetyCommitteeMeetingNum()
@@ -685,7 +702,7 @@ namespace BLL
}
/// <summary>
/// 获取企业专题会议数
/// 获取企业专题会议数
/// </summary>
/// <returns></returns>
public static int GetEnterpriseTopicsMeetingNum()
@@ -697,7 +714,7 @@ namespace BLL
}
/// <summary>
/// 获取企业负责人带班检查次数
/// 获取企业负责人带班检查次数
/// </summary>
/// <returns></returns>
public static int GetCompanyLeadShiftCheckNum()
@@ -709,7 +726,7 @@ namespace BLL
}
/// <summary>
/// 获取企业综合检查次数
/// 获取企业综合检查次数
/// </summary>
/// <returns></returns>
public static int GetCompanyComprehensiveCheckNum()
@@ -721,7 +738,7 @@ namespace BLL
}
/// <summary>
/// 获取企业专项检查次数
/// 获取企业专项检查次数
/// </summary>
/// <returns></returns>
public static int GetCompanySpecialCheckNum()
@@ -733,7 +750,7 @@ namespace BLL
}
/// <summary>
/// 获取企业级综合预案数
/// 获取企业级综合预案数
/// </summary>
/// <returns></returns>
public static int GetCompanyComprehensivePlanNum()
@@ -746,7 +763,7 @@ namespace BLL
}
/// <summary>
/// 获取企业级专项预案数
/// 获取企业级专项预案数
/// </summary>
/// <returns></returns>
public static int GetCompanySpecialPlanNum()
@@ -759,7 +776,7 @@ namespace BLL
}
/// <summary>
/// 获取企业级现场处置预案
/// 获取企业级现场处置预案
/// </summary>
/// <returns></returns>
public static int GetCompanyOnSiteDisposalPlan()
@@ -772,7 +789,7 @@ namespace BLL
}
/// <summary>
/// 获取企业级演练次数
/// 获取企业级演练次数
/// </summary>
/// <returns></returns>
public static int GetCompanyDrillNum()
@@ -786,7 +803,7 @@ namespace BLL
#region 获取列表
/// <summary>
/// 记录数
/// 记录数
/// </summary>
public static int Count { get; set; }
@@ -900,5 +917,114 @@ namespace BLL
}
#endregion 获取列表
public static HSSEData_HSSE GetSubUnitCqmsDataByDate(List<string> beUnderConstructionList, DateTime? reportdate)
{
var result = new Model.HSSEData_HSSE();
if (reportdate == null)
{
return result;
}
var ProjectData = (from x in Funs.DB.Project_HSSEData_HSSE
where x.ReportDate == reportdate && beUnderConstructionList.Contains(x.ProjectId)
select x).ToList();
result = new HSSEData_HSSE
{
ReportDate = reportdate.Value.Date,
JoinConstructionPersonNum = ProjectData.Sum(x => x.JoinConstructionPersonNum),
TrainPersonNum = ProjectData.Sum(x => x.TrainPersonNum),
MajorProjectsUnderConstructionNum = ProjectData.Sum(x => x.MajorProjectsUnderConstructionNum),
TotalWorkingHour = ProjectData.Sum(x => x.TotalWorkingHour),
LostWorkingHour = ProjectData.Sum(x => x.LostWorkingHour),
SafeWorkingHour = ProjectData.Sum(x => x.SafeWorkingHour),
SafeTrainNum = ProjectData.Sum(x => x.SafeTrainNum),
SpecialTrainNum = ProjectData.Sum(x => x.SpecialTrainNum),
SpecialOperationTrainNum = ProjectData.Sum(x => x.SpecialOperationTrainNum),
//HseTechnicalNum = ProjectData.Sum(x => x.HseTechnicalNum),
//EnvironmentalTrainNum = ProjectData.Sum(x => x.EnvironmentalTrainNum),
TotalEnergyConsumption = ProjectData.Sum(x => x.TotalEnergyConsumption),
IncomeComprehensiveEnergyConsumption = ProjectData.Sum(x => x.IncomeComprehensiveEnergyConsumption),
NewWaterConsumption = ProjectData.Sum(x => x.NewWaterConsumption),
HeadOfficeInspectorGeneralNum = ProjectData.Sum(x => x.HeadOfficeInspectorGeneralNum),
HeadOfficeFullTimeNum = ProjectData.Sum(x => x.HeadOfficeFullTimeNum),
BranchInspectorGeneralNum = ProjectData.Sum(x => x.BranchInspectorGeneralNum),
BranchFullTimeNum = ProjectData.Sum(x => x.BranchFullTimeNum),
ProjectInspectorGeneralNum = ProjectData.Sum(x => x.ProjectInspectorGeneralNum),
ProjectFullTimeNum = ProjectData.Sum(x => x.ProjectFullTimeNum),
//ProjectSubFullTimeNum = ProjectData.Sum(x => x.ProjectSubFullTimeNum),
ProjectSafetyMonitorNum = ProjectData.Sum(x => x.ProjectSafetyMonitorNum),
SafetyInjectionEngineer = ProjectData.Sum(x => x.SafetyInjectionEngineer),
CertificateANum = ProjectData.Sum(x => x.CertificateANum),
CertificateBNum = ProjectData.Sum(x => x.CertificateBNum),
CertificateCNum = ProjectData.Sum(x => x.CertificateCNum),
//QualityPersonNum = ProjectData.Sum(x => x.QualityPersonNum),
SafetyCommitteeMeetingNum = ProjectData.Sum(x => x.SafetyCommitteeMeetingNum),
EnterpriseTopicsMeetingNum = ProjectData.Sum(x => x.EnterpriseTopicsMeetingNum),
ProjectSafetyLeadingGroupMeetingNum = ProjectData.Sum(x => x.ProjectSafetyLeadingGroupMeetingNum),
ProjectSafetyMeetingNum = ProjectData.Sum(x => x.ProjectSafetyMeetingNum),
CompanyLeadShiftCheckNum = ProjectData.Sum(x => x.CompanyLeadShiftCheckNum),
CompanyComprehensiveCheckNum = ProjectData.Sum(x => x.CompanyComprehensiveCheckNum),
CompanySpecialCheckNum = ProjectData.Sum(x => x.CompanySpecialCheckNum),
//BranchLeadShiftCheckNum = ProjectData.Sum(x => x.BranchLeadShiftCheckNum),
//BranchComprehensiveCheckNum = ProjectData.Sum(x => x.BranchComprehensiveCheckNum),
//BranchSpecialCheckNum = ProjectData.Sum(x => x.BranchSpecialCheckNum),
ProjectLeadShiftCheckNum = ProjectData.Sum(x => x.ProjectLeadShiftCheckNum),
ProjectSpecialCheckNum = ProjectData.Sum(x => x.ProjectSpecialCheckNum),
ProjectMajorCheckNum = ProjectData.Sum(x => x.ProjectMajorCheckNum),
NearMissNum = ProjectData.Sum(x => x.NearMissNum),
RecordableEventNum = ProjectData.Sum(x => x.RecordableEventNum),
GeneralAccidentNum = ProjectData.Sum(x => x.GeneralAccidentNum),
MajorAccidentNum = ProjectData.Sum(x => x.MajorAccidentNum),
SeriousAccidentNum = ProjectData.Sum(x => x.SeriousAccidentNum),
SpecialSeriousAccidentNum = ProjectData.Sum(x => x.SpecialSeriousAccidentNum),
CompanyComprehensivePlanNum = ProjectData.Sum(x => x.CompanyComprehensivePlanNum),
CompanySpecialPlanNum = ProjectData.Sum(x => x.CompanySpecialPlanNum),
CompanyOnSiteDisposalPlan = ProjectData.Sum(x => x.CompanyOnSiteDisposalPlan),
//BranchComprehensivePlanNum = ProjectData.Sum(x => x.BranchComprehensivePlanNum),
//BranchSpecialPlanNum = ProjectData.Sum(x => x.BranchSpecialPlanNum),
//BranchOnSiteDisposalPlan = ProjectData.Sum(x => x.BranchOnSiteDisposalPlan),
CompanyDrillNum = ProjectData.Sum(x => x.CompanyDrillNum),
//CompanyDrillPersonNum = ProjectData.Sum(x => x.CompanyDrillPersonNum),
//BranchDrillNum = ProjectData.Sum(x => x.BranchDrillNum),
//BranchDrillPersonNum = ProjectData.Sum(x => x.BranchDrillPersonNum),
ProjectComprehensivePlanNum = ProjectData.Sum(x => x.ProjectComprehensivePlanNum),
ProjectSpecialPlanNum = ProjectData.Sum(x => x.ProjectSpecialPlanNum),
ProjectOnSiteDisposalPlan = ProjectData.Sum(x => x.ProjectOnSiteDisposalPlan),
ProjectDrillNum = ProjectData.Sum(x => x.ProjectDrillNum),
//ProjectDrillPersonNum = ProjectData.Sum(x => x.ProjectDrillPersonNum),
CostExtract = ProjectData.Sum(x => x.CostExtract),
CostUse = ProjectData.Sum(x => x.CostUse),
UseEquipmentNum = ProjectData.Sum(x => x.UseEquipmentNum),
SpecialEquipmentNum = ProjectData.Sum(x => x.SpecialEquipmentNum),
LicensesNum = ProjectData.Sum(x => x.LicensesNum),
LicensesCloseNum = ProjectData.Sum(x => x.LicensesCloseNum),
GeneralClosedNum = ProjectData.Sum(x => x.GeneralClosedNum),
GeneralNotClosedNum = ProjectData.Sum(x => x.GeneralNotClosedNum),
MajorClosedNum = ProjectData.Sum(x => x.MajorClosedNum),
MajorNotClosedNum = ProjectData.Sum(x => x.MajorNotClosedNum),
LowRiskNum = ProjectData.Sum(x => x.LowRiskNum),
GeneralRiskNum = ProjectData.Sum(x => x.GeneralRiskNum),
MediumRiskNum = ProjectData.Sum(x => x.MediumRiskNum),
HighRiskNum = ProjectData.Sum(x => x.HighRiskNum),
CompletedNum = ProjectData.Sum(x => x.CompletedNum),
//OperativesNum = ProjectData.Sum(x => x.OperativesNum),
ConstructionNum = ProjectData.Sum(x => x.ConstructionNum),
FinishedNum = ProjectData.Sum(x => x.FinishedNum),
//ArgumentNum = ProjectData.Sum(x => x.ArgumentNum),
SuperCompletedNum = ProjectData.Sum(x => x.SuperCompletedNum),
SuperTrainPersonNum = ProjectData.Sum(x => x.SuperTrainPersonNum),
//SuperOperativesNum = ProjectData.Sum(x => x.SuperOperativesNum),
SuperConstructionNum = ProjectData.Sum(x => x.SuperConstructionNum),
SuperFinishedNum = ProjectData.Sum(x => x.SuperFinishedNum),
//SuperArgumentNum = ProjectData.Sum(x => x.SuperArgumentNum),
CreateMan = Const.sysglyId,
CreateDate = DateTime.Now
};
return result;
}
}
}
SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs
+18 -6
View File
@@ -100,7 +100,6 @@ namespace BLL
DangerousProject
}
public static CNPCDB db = Funs.DB;
/// <summary>
/// 新增实体
@@ -218,7 +217,7 @@ namespace BLL
/// <returns></returns>
public static Project_HSSEData_HSSE GetProject_HSSEData_HSSEById(string Id)
{
return db.Project_HSSEData_HSSE.FirstOrDefault(x => x.Id == Id);
return Funs.DB.Project_HSSEData_HSSE.FirstOrDefault(x => x.Id == Id);
}
public static List<Project_HSSEData_HSSE> GetProject_HSSEData_HSSEByProjectid(string Projectid)
@@ -232,6 +231,19 @@ namespace BLL
}
}
public static void DeleteProject_HSSEData_HSSEByDate(DateTime? reportDate)
{
using (var db = new CNPCDB(Funs.ConnString))
{
var table = db.Project_HSSEData_HSSE.Where(x => x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0);
if (table != null)
{
db.Project_HSSEData_HSSE.DeleteAllOnSubmit(table);
db.SubmitChanges();
}
}
}
public static void UpdateProject_HSSEData_HSSE(Project_HSSEData_HSSE newtable)
{
using (var db = new CNPCDB(Funs.ConnString))
@@ -503,7 +515,7 @@ namespace BLL
table.GeneralClosedNum = GetGeneralClosedNum(projectid);
table.GeneralNotClosedNum = GetGeneralNotClosedNum(projectid);
table.MajorClosedNum = GetMajorClosedNum(projectid);
table.MajorNotClosedNum = GetMajorNotClosedNum(projectid);
table.MajorNotClosedNum = GetMajorNotClosedNum(projectid);
}
if (hSseDateType == HSSEDateType.SecurityRisk || hSseDateType == HSSEDateType.All)
@@ -1271,7 +1283,7 @@ namespace BLL
&& x.ApplyDate > Const.DtmarkTime
select x).Count() +
(from x in db.License_LicenseManager
where x.ProjectId == projectid && x.IsHighRisk == true && x.CompileDate> Const.DtmarkTime
where x.ProjectId == projectid && x.IsHighRisk == true && x.CompileDate > Const.DtmarkTime
select x).Count();
return result;
}
@@ -1286,7 +1298,7 @@ namespace BLL
using (var db = new Model.CNPCDB(Funs.ConnString))
{
var result = (from x in db.License_FireWork
where x.ProjectId == projectid && x.States== Const.State_3
where x.ProjectId == projectid && x.States == Const.State_3
&& x.ApplyDate > Const.DtmarkTime
select x).Count() +
(from x in db.License_HeightWork
@@ -1552,7 +1564,7 @@ namespace BLL
public static List<Project_HSSEData_HSSE> GetProject_HSSEData_HSSEByModle(Project_HSSEData_HSSE table)
{
var q = from x in db.Project_HSSEData_HSSE
var q = from x in Funs.DB.Project_HSSEData_HSSE
where
(string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
(string.IsNullOrEmpty(table.ProjectId) || x.Id.Contains(table.ProjectId)) &&