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

1、车辆交易安全管理，现场车辆管理：补充批量退场和导入功能；

Browse Source 
2、危大工程方案调整
3、企业安全检查调整
4、安全活动调整
This commit is contained in:
夏菊
2026-03-16 14:38:56 +08:00
parent 2c1f892dec
commit 13364fcbf7
69 changed files with 4291 additions and 746 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/BLL.csproj
+1
View File
@@ -132,6 +132,7 @@
<Compile Include="API\HSSE\APITrainingPlanService.cs" />
<Compile Include="API\HSSE\APITrainingTaskService.cs" />
<Compile Include="API\HSSE\APITrainRecordService.cs" />
<Compile Include="BaseInfo\ActivityTypeService.cs" />
<Compile Include="BaseInfo\QualificationService.cs" />
<Compile Include="BaseInfo\ReceivingDocTypeService.cs" />
<Compile Include="BaseInfo\SuperviseCheckTypeService.cs" />
SGGL/BLL/BaseInfo/ActivityTypeService.cs
+96
View File
@@ -0,0 +1,96 @@
using System.Collections.Generic;
using System.Linq;
namespace BLL
{
/// <summary>
/// 活动类型
/// </summary>
public static class ActivityTypeService
{
/// <summary>
/// 根据主键获取活动类型
/// </summary>
/// <param name="ActivityTypeId"></param>
/// <returns></returns>
public static Model.Base_ActivityType GetActivityTypeById(string ActivityTypeId)
{
return Funs.DB.Base_ActivityType.FirstOrDefault(e => e.ActivityTypeId == ActivityTypeId);
}
/// <summary>
/// 添加活动类型
/// </summary>
/// <param name="ActivityType"></param>
public static void AddActivityType(Model.Base_ActivityType ActivityType)
{
Model.Base_ActivityType newActivityType = new Model.Base_ActivityType
{
ActivityTypeId = ActivityType.ActivityTypeId,
ActivityTypeCode = ActivityType.ActivityTypeCode,
ActivityTypeName = ActivityType.ActivityTypeName,
Remark = ActivityType.Remark
};
Funs.DB.Base_ActivityType.InsertOnSubmit(newActivityType);
Funs.DB.SubmitChanges();
}
/// <summary>
/// 修改活动类型
/// </summary>
/// <param name="ActivityType"></param>
public static void UpdateActivityType(Model.Base_ActivityType ActivityType)
{
Model.Base_ActivityType newActivityType = Funs.DB.Base_ActivityType.FirstOrDefault(e => e.ActivityTypeId == ActivityType.ActivityTypeId);
if (newActivityType != null)
{
newActivityType.ActivityTypeCode = ActivityType.ActivityTypeCode;
newActivityType.ActivityTypeName = ActivityType.ActivityTypeName;
newActivityType.Remark = ActivityType.Remark;
Funs.DB.SubmitChanges();
}
}
/// <summary>
/// 根据主键删除活动类型
/// </summary>
/// <param name="ActivityTypeId"></param>
public static void DeleteActivityTypeById(string ActivityTypeId)
{
Model.Base_ActivityType ActivityType = Funs.DB.Base_ActivityType.FirstOrDefault(e => e.ActivityTypeId == ActivityTypeId);
if (ActivityType != null)
{
Funs.DB.Base_ActivityType.DeleteOnSubmit(ActivityType);
Funs.DB.SubmitChanges();
}
}
/// <summary>
///获取活动类型下拉选择项
/// </summary>
/// <returns></returns>
public static List<Model.Base_ActivityType> GetActivityTypeList()
{
return (from x in Funs.DB.Base_ActivityType orderby x.ActivityTypeCode select x).ToList();
}
#region 活动类型下拉框
/// <summary>
/// 活动类型下拉框
/// </summary>
/// <param name="dropName">下拉框名字</param>
/// <param name="isShowPlease">是否显示请选择</param>
public static void InitActivityTypeDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
{
dropName.DataValueField = "ActivityTypeId";
dropName.DataTextField = "ActivityTypeName";
dropName.DataSource = GetActivityTypeList();
dropName.DataBind();
if (isShowPlease)
{
Funs.FineUIPleaseSelect(dropName);
}
}
#endregion
}
}
SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs
+2
View File
@@ -225,6 +225,7 @@ namespace BLL
States = majorPlanApproval.States,
TrainPersonNum = majorPlanApproval.TrainPersonNum,
OperativesNum = majorPlanApproval.OperativesNum,
ApprovalState = "2",
IsSuperLargerHazard = majorPlanApproval.SchemeType == "超危大工程" ? true : false,
};
@@ -252,6 +253,7 @@ namespace BLL
newLargerHazard.States = majorPlanApproval.States;
newLargerHazard.TrainPersonNum = majorPlanApproval.TrainPersonNum;
newLargerHazard.OperativesNum = majorPlanApproval.OperativesNum;
newLargerHazard.ApprovalState = "2";
newLargerHazard.IsSuperLargerHazard = majorPlanApproval.SchemeType == "超危大工程" ? true : false;
db.SubmitChanges();
}
SGGL/BLL/Common/Const.cs
+14
View File
@@ -1130,6 +1130,10 @@ namespace BLL
/// 移交专业
/// </summary>
public const string TransferMajorMenuId = "D0850615-BF32-4CFA-84CA-EEA261676EA8";
/// <summary>
/// 活动类型
/// </summary>
public const string ActivityTypeMenuId = "79116536-BE80-4323-A46F-10222601D5B5";
#endregion
#region 质量基础信息
@@ -3197,6 +3201,11 @@ namespace BLL
/// 专项检查明细导入模板
/// </summary>
public const string CheckSpecialDetailTemplateUrl = "File\\Excel\\DataIn\\专项检查明细导入模板.xls";
/// <summary>
/// 企业大检查明细导入模板
/// </summary>
public const string UnitHazardRegisterDetailTemplateUrl = "File\\Excel\\DataIn\\企业大检查明细导入模板.xls";
/// <summary>
/// 综合检查导入模板
/// </summary>
@@ -3457,6 +3466,11 @@ namespace BLL
/// 资料收发文登记记录导入模板原始虚拟路径
/// </summary>
public const string CQMS_DataReceivingDocTempUrl = "File\\Excel\\DataIn\\资料收发文登记记录导入模板.xls";
/// <summary>
/// 现场车辆管理导入模板
/// </summary>
public const string CarManagerTemplateUrl = "File\\Excel\\DataIn\\现场车辆管理导入模板.xls";
/// <summary>
/// 培训记录导入模板原始虚拟路径
SGGL/BLL/HSSE/Administrative/CarManagerService.cs
+4 -2
View File
@@ -40,7 +40,8 @@ namespace BLL
Remark = carManager.Remark,
CompileMan = carManager.CompileMan,
CompileDate = carManager.CompileDate,
States = carManager.States
States = carManager.States,
InOutState = carManager.InOutState,
};
Funs.DB.Administrative_CarManager.InsertOnSubmit(newCarManager);
Funs.DB.SubmitChanges();
@@ -66,7 +67,8 @@ namespace BLL
newCarManager.Remark = carManager.Remark;
newCarManager.CompileMan = carManager.CompileMan;
newCarManager.CompileDate = carManager.CompileDate;
newCarManager.States = carManager.States;
newCarManager.States = carManager.States;
newCarManager.InOutState = carManager.InOutState;
Funs.DB.SubmitChanges();
}
}
SGGL/BLL/HSSE/InformationProject/PromotionalActivitiesService.cs
+3 -1
View File
@@ -64,7 +64,8 @@ namespace BLL
AttachUrl = promotionalActivities.AttachUrl,
CompileMan = promotionalActivities.CompileMan,
CompileDate = System.DateTime.Now,
States = promotionalActivities.States
States = promotionalActivities.States,
ActivityTypeId = promotionalActivities.ActivityTypeId
};
Funs.DB.InformationProject_PromotionalActivities.InsertOnSubmit(newPromotionalActivities);
Funs.DB.SubmitChanges();
@@ -93,6 +94,7 @@ namespace BLL
newPromotionalActivities.CompileMan = promotionalActivities.CompileMan;
newPromotionalActivities.CompileDate = promotionalActivities.CompileDate;
newPromotionalActivities.States = promotionalActivities.States;
newPromotionalActivities.ActivityTypeId = promotionalActivities.ActivityTypeId;
Funs.DB.SubmitChanges();
}
}
SGGL/BLL/HSSE/Solution/LargerHazardService.cs
+4 -2
View File
@@ -45,7 +45,8 @@ namespace BLL
TrainPersonNum = largerHazard.TrainPersonNum,
IsSuperLargerHazard = largerHazard.IsSuperLargerHazard,
Descriptions = largerHazard.Descriptions,
OperativesNum = largerHazard.OperativesNum
OperativesNum = largerHazard.OperativesNum,
ApprovalState = largerHazard.ApprovalState,
};
db.Solution_LargerHazard.InsertOnSubmit(newLargerHazard);
@@ -88,7 +89,8 @@ namespace BLL
newLargerHazard.IsSuperLargerHazard = largerHazard.IsSuperLargerHazard;
newLargerHazard.Descriptions = largerHazard.Descriptions;
newLargerHazard.IsUpdate = null;
newLargerHazard.OperativesNum = largerHazard.OperativesNum;
newLargerHazard.OperativesNum = largerHazard.OperativesNum;
newLargerHazard.ApprovalState = largerHazard.ApprovalState;
db.SubmitChanges();
//判断是否有数据 有数据则更新 没有数据则添加
var majorPlanApproval = BLL.MajorPlanApprovalService.GetMajorPlanApprovalById(largerHazard.HazardId);
SGGL/BLL/SysManage/UserService.cs
+34
View File
@@ -1519,6 +1519,40 @@ namespace BLL
}
}
/// <summary>
/// 根据单位Id获取用户下拉选项【单位本部在职人员】
/// </summary>
/// <returns></returns>
public static List<Model.Sys_User> GetIsOfficeUserListByUnitId(string unitId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
List<Model.Sys_User> list = new List<Model.Sys_User>();
list = (from x in db.Sys_User
where x.UnitId == unitId && x.IsOffice == true && x.IsPost == true
orderby x.UserName
select x).ToList();
return list;
}
}
/// <summary>
/// 用户下拉框
/// </summary>
/// <param name="dropName">下拉框名字</param>
/// <param name="isShowPlease">是否显示请选择</param>
public static void InitIsOfficeUserUnitIdDropDownList(FineUIPro.DropDownList dropName, string unitId, bool isShowPlease)
{
dropName.DataValueField = "UserId";
dropName.DataTextField = "UserName";
dropName.DataSource = BLL.UserService.GetIsOfficeUserListByUnitId(unitId);
dropName.DataBind();
if (isShowPlease)
{
Funs.FineUIPleaseSelect(dropName);
}
}
/// <summary>
/// 用户下拉框
/// </summary>
SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs
+65 -5
View File
@@ -122,6 +122,12 @@ namespace BLL
SuperConstructionNum = newtable.SuperConstructionNum,
SuperFinishedNum = newtable.SuperFinishedNum,
SuperArgumentNum = newtable.SuperArgumentNum,
AwaitApprovalNum = newtable.AwaitApprovalNum,
PendingApprovalNum = newtable.PendingApprovalNum,
CompletedApprovalNum = newtable.CompletedApprovalNum,
SuperAwaitApprovalNum = newtable.SuperAwaitApprovalNum,
SuperPendingApprovalNum = newtable.SuperPendingApprovalNum,
SuperCompletedApprovalNum = newtable.SuperCompletedApprovalNum,
State = newtable.State,
CreateDate = newtable.CreateDate,
CreateMan = newtable.CreateMan
@@ -250,6 +256,12 @@ namespace BLL
item.SuperTrainPersonNum = dataHsse.SuperTrainPersonNum;
item.SuperOperativesNum = dataHsse.SuperOperativesNum;
item.SuperArgumentNum = dataHsse.SuperArgumentNum;
item.AwaitApprovalNum = dataHsse.AwaitApprovalNum;
item.PendingApprovalNum = dataHsse.PendingApprovalNum;
item.CompletedApprovalNum = dataHsse.CompletedApprovalNum;
item.SuperAwaitApprovalNum = dataHsse.SuperAwaitApprovalNum;
item.SuperPendingApprovalNum = dataHsse.SuperPendingApprovalNum;
item.SuperCompletedApprovalNum = dataHsse.SuperCompletedApprovalNum;
item.TotalEnergyConsumption = dataHsse.TotalEnergyConsumption;
item.TotalWorkingHour = dataHsse.TotalWorkingHour;
item.TrainPersonNum = dataHsse.TrainPersonNum;
@@ -375,6 +387,12 @@ namespace BLL
item.SuperArgumentNum = dataHsse.SuperArgumentNum;
item.SuperTrainPersonNum = dataHsse.SuperTrainPersonNum;
item.SuperOperativesNum = dataHsse.SuperOperativesNum;
item.AwaitApprovalNum = dataHsse.AwaitApprovalNum;
item.PendingApprovalNum = dataHsse.PendingApprovalNum;
item.CompletedApprovalNum = dataHsse.CompletedApprovalNum;
item.SuperAwaitApprovalNum = dataHsse.SuperAwaitApprovalNum;
item.SuperPendingApprovalNum = dataHsse.SuperPendingApprovalNum;
item.SuperCompletedApprovalNum = dataHsse.SuperCompletedApprovalNum;
item.TotalEnergyConsumption = dataHsse.TotalEnergyConsumption;
item.TotalWorkingHour = dataHsse.TotalWorkingHour;
item.TrainPersonNum = dataHsse.TrainPersonNum;
@@ -551,6 +569,12 @@ namespace BLL
SuperTrainPersonNum = projectData.Sum(x => x.SuperTrainPersonNum),
SuperConstructionNum = projectData.Sum(x => x.SuperConstructionNum),
SuperFinishedNum = projectData.Sum(x => x.SuperFinishedNum),
AwaitApprovalNum = projectData.Sum(x => x.AwaitApprovalNum),
PendingApprovalNum = projectData.Sum(x => x.PendingApprovalNum),
CompletedApprovalNum = projectData.Sum(x => x.CompletedApprovalNum),
SuperAwaitApprovalNum = projectData.Sum(x => x.SuperAwaitApprovalNum),
SuperPendingApprovalNum = projectData.Sum(x => x.SuperPendingApprovalNum),
SuperCompletedApprovalNum = projectData.Sum(x => x.SuperCompletedApprovalNum),
CreateMan = Const.sysglyId,
CreateDate = DateTime.Now
};
@@ -640,7 +664,7 @@ namespace BLL
var licensesTask = HSSEData_HSSEService.GetLicensesAsync();
var licensesCloseTask = HSSEData_HSSEService.GetLicensesCloseAsync();
var generalHiddenRectificationOutputsTask = HSSEData_HSSEService.GetGeneralHiddenRectificationOutputsAsync();
var largerHiddenRectificationOutputsTask = HSSEData_HSSEService.GetLargerHiddenRectificationOutputsAsync();
var largerHiddenRectificationOutputsTask = HSSEData_HSSEService.GetLargerHiddenRectificationOutputsAsync();
var majorHiddenRectificationOutputsTask = HSSEData_HSSEService.GetMajorHiddenRectificationOutputsAsync();
// 等待所有异步方法执行完成
@@ -880,7 +904,13 @@ namespace BLL
SuperOperativesNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperOperativesNum),
SuperConstructionNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperConstructionNum),
SuperFinishedNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperFinishedNum),
SuperArgumentNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperArgumentNum)
SuperArgumentNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperArgumentNum),
AwaitApprovalNum = largeEngineeringOutputsTask.Result.Sum(x => x.AwaitApprovalNum),
PendingApprovalNum = largeEngineeringOutputsTask.Result.Sum(x => x.PendingApprovalNum),
CompletedApprovalNum = largeEngineeringOutputsTask.Result.Sum(x => x.CompletedApprovalNum),
SuperAwaitApprovalNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperAwaitApprovalNum),
SuperPendingApprovalNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperPendingApprovalNum),
SuperCompletedApprovalNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperCompletedApprovalNum),
};
#region 添加项目统计数据
@@ -936,7 +966,13 @@ namespace BLL
SuperOperativesNum = g.Sum(x => x.SuperOperativesNum),
SuperConstructionNum = g.Sum(x => x.SuperConstructionNum),
SuperFinishedNum = g.Sum(x => x.SuperFinishedNum),
SuperArgumentNum = g.Sum(x => x.SuperArgumentNum)
SuperArgumentNum = g.Sum(x => x.SuperArgumentNum),
AwaitApprovalNum = g.Sum(x => x.AwaitApprovalNum),
PendingApprovalNum = g.Sum(x => x.PendingApprovalNum),
CompletedApprovalNum = g.Sum(x => x.CompletedApprovalNum),
SuperAwaitApprovalNum = g.Sum(x => x.SuperAwaitApprovalNum),
SuperPendingApprovalNum = g.Sum(x => x.SuperPendingApprovalNum),
SuperCompletedApprovalNum = g.Sum(x => x.SuperCompletedApprovalNum),
}
);
foreach (var projectid in BeUnderConstructionList)
@@ -1041,7 +1077,13 @@ namespace BLL
SuperOperativesNum = largeEngineeringOutputs?.SuperOperativesNum ?? 0,
SuperConstructionNum = largeEngineeringOutputs?.SuperConstructionNum ?? 0,
SuperFinishedNum = largeEngineeringOutputs?.SuperFinishedNum ?? 0,
SuperArgumentNum = largeEngineeringOutputs?.SuperArgumentNum ?? 0
SuperArgumentNum = largeEngineeringOutputs?.SuperArgumentNum ?? 0,
AwaitApprovalNum = largeEngineeringOutputs?.AwaitApprovalNum ?? 0,
PendingApprovalNum = largeEngineeringOutputs?.PendingApprovalNum ?? 0,
CompletedApprovalNum = largeEngineeringOutputs?.CompletedApprovalNum ?? 0,
SuperAwaitApprovalNum = largeEngineeringOutputs?.SuperAwaitApprovalNum ?? 0,
SuperPendingApprovalNum = largeEngineeringOutputs?.SuperPendingApprovalNum ?? 0,
SuperCompletedApprovalNum = largeEngineeringOutputs?.SuperCompletedApprovalNum ?? 0,
};
Project_HSSEData_HSSEService.AddProject_HSSEData_HSSE(projectHsseData);
}
@@ -1167,7 +1209,13 @@ namespace BLL
table.SuperOperativesNum = newtable.SuperOperativesNum;
table.SuperConstructionNum = newtable.SuperConstructionNum;
table.SuperFinishedNum = newtable.SuperFinishedNum;
table.SuperArgumentNum = newtable.SuperArgumentNum;
table.SuperArgumentNum = newtable.SuperArgumentNum;
table.AwaitApprovalNum = newtable.AwaitApprovalNum;
table.PendingApprovalNum = newtable.PendingApprovalNum;
table.CompletedApprovalNum = newtable.CompletedApprovalNum;
table.SuperAwaitApprovalNum = newtable.SuperAwaitApprovalNum;
table.SuperPendingApprovalNum = newtable.SuperPendingApprovalNum;
table.SuperCompletedApprovalNum = newtable.SuperCompletedApprovalNum;
table.State = newtable.State;
table.CreateMan = newtable.CreateMan;
table.CreateDate = newtable.CreateDate;
@@ -4136,6 +4184,12 @@ namespace BLL
SuperConstructionNum = gg.Count(x => x.States == "2" && x.IsSuperLargerHazard == true),
SuperFinishedNum = gg.Count(x => x.States == "3" && x.IsSuperLargerHazard == true),
SuperArgumentNum = gg.Count(x => x.IsArgument == true && x.IsSuperLargerHazard == true),
AwaitApprovalNum = gg.Count(x => x.ApprovalState == "0" && x.IsSuperLargerHazard == false),
PendingApprovalNum = gg.Count(x => x.ApprovalState == "1" && x.IsSuperLargerHazard == false),
CompletedApprovalNum = gg.Count(x => x.ApprovalState == "2" && x.IsSuperLargerHazard == false),
SuperAwaitApprovalNum = gg.Count(x => x.ApprovalState == "0" && x.IsSuperLargerHazard == true),
SuperPendingApprovalNum = gg.Count(x => x.ApprovalState == "1" && x.IsSuperLargerHazard == true),
SuperCompletedApprovalNum = gg.Count(x => x.ApprovalState == "2" && x.IsSuperLargerHazard == true),
}).ToList();
return query;
}
@@ -4376,6 +4430,12 @@ namespace BLL
x.SuperConstructionNum,
x.SuperFinishedNum,
x.SuperArgumentNum,
x.AwaitApprovalNum,
x.PendingApprovalNum,
x.CompletedApprovalNum,
x.SuperAwaitApprovalNum,
x.SuperPendingApprovalNum,
x.SuperCompletedApprovalNum,
x.State,
x.CreateDate,
x.CreateMan
SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs
+134 -4
View File
@@ -207,7 +207,13 @@ namespace BLL
SuperOperativesNum = newtable.SuperOperativesNum,
SuperConstructionNum = newtable.SuperConstructionNum,
SuperFinishedNum = newtable.SuperFinishedNum,
SuperArgumentNum = newtable.SuperArgumentNum
SuperArgumentNum = newtable.SuperArgumentNum,
AwaitApprovalNum = newtable.AwaitApprovalNum,
PendingApprovalNum = newtable.PendingApprovalNum,
CompletedApprovalNum = newtable.CompletedApprovalNum,
SuperAwaitApprovalNum = newtable.SuperAwaitApprovalNum,
SuperPendingApprovalNum = newtable.SuperPendingApprovalNum,
SuperCompletedApprovalNum = newtable.SuperCompletedApprovalNum,
};
db.Project_HSSEData_HSSE.InsertOnSubmit(table);
db.SubmitChanges();
@@ -347,7 +353,15 @@ namespace BLL
table.SuperTrainPersonNum = newtable.SuperTrainPersonNum;
table.SuperOperativesNum = newtable.SuperOperativesNum;
table.SuperConstructionNum = newtable.SuperConstructionNum;
table.SuperFinishedNum = newtable.SuperFinishedNum;
table.SuperFinishedNum = newtable.SuperFinishedNum;
table.ArgumentNum = newtable.ArgumentNum;
table.SuperArgumentNum = newtable.SuperArgumentNum;
table.AwaitApprovalNum = newtable.AwaitApprovalNum;
table.PendingApprovalNum = newtable.PendingApprovalNum;
table.CompletedApprovalNum = newtable.CompletedApprovalNum;
table.SuperAwaitApprovalNum = newtable.SuperAwaitApprovalNum;
table.SuperPendingApprovalNum = newtable.SuperPendingApprovalNum;
table.SuperCompletedApprovalNum = newtable.SuperCompletedApprovalNum;
db.SubmitChanges();
}
}
@@ -623,7 +637,15 @@ namespace BLL
table.SuperTrainPersonNum = GetSuperTrainPersonNum(projectid);
table.SuperOperativesNum = GetSuperOperativesNum(projectid);
table.SuperConstructionNum = GetSuperConstructionNum(projectid);
table.SuperFinishedNum = GetSuperFinishedNum(projectid);
table.SuperFinishedNum = GetSuperFinishedNum(projectid);
table.ArgumentNum = GetArgumentNum(projectid);
table.SuperArgumentNum = GetSuperArgumentNum(projectid);
table.AwaitApprovalNum = GetAwaitApprovalNum(projectid);
table.PendingApprovalNum = GetPendingApprovalNum(projectid);
table.CompletedApprovalNum = GetCompletedApprovalNum(projectid);
table.SuperAwaitApprovalNum = GetSuperAwaitApprovalNum(projectid);
table.SuperPendingApprovalNum = GetSuperPendingApprovalNum(projectid);
table.SuperCompletedApprovalNum = GetSuperCompletedApprovalNum(projectid);
}
if (IsReportByToday(projectid))
@@ -1589,6 +1611,106 @@ namespace BLL
return result;
}
/// <summary>
/// 获取危大工程论证个数
/// </summary>
/// <returns></returns>
public static int GetArgumentNum(string projectid)
{
var result = (from x in Funs.DB.Solution_LargerHazard
where x.ProjectId == projectid && x.IsArgument == true && x.IsSuperLargerHazard == false &&
x.RecordTime > Const.DtmarkTime
select x).Count();
return result;
}
/// <summary>
/// 获取超危大工程论证个数
/// </summary>
/// <returns></returns>
public static int GetSuperArgumentNum(string projectid)
{
var result = (from x in Funs.DB.Solution_LargerHazard
where x.ProjectId == projectid && x.IsArgument == true && x.IsSuperLargerHazard == true &&
x.RecordTime > Const.DtmarkTime
select x).Count();
return result;
}
/// <summary>
/// 获取危大工程待审核个数
/// </summary>
/// <returns></returns>
public static int GetAwaitApprovalNum(string projectid)
{
var result = (from x in Funs.DB.Solution_LargerHazard
where x.ProjectId == projectid && x.ApprovalState == "0" && x.IsSuperLargerHazard == false && x.RecordTime > Const.DtmarkTime
select x).Count();
return result;
}
/// <summary>
/// 获取超危大工程待审核个数
/// </summary>
/// <returns></returns>
public static int GetSuperAwaitApprovalNum(string projectid)
{
var result = (from x in Funs.DB.Solution_LargerHazard
where x.ProjectId == projectid && x.ApprovalState == "0" && x.IsSuperLargerHazard == true && x.RecordTime > Const.DtmarkTime
select x).Count();
return result;
}
/// <summary>
/// 获取危大工程审核中个数
/// </summary>
/// <returns></returns>
public static int GetPendingApprovalNum(string projectid)
{
var result = (from x in Funs.DB.Solution_LargerHazard
where x.ProjectId == projectid && x.ApprovalState == "1" && x.IsSuperLargerHazard == false && x.RecordTime > Const.DtmarkTime
select x).Count();
return result;
}
/// <summary>
/// 获取超危大工程审核中个数
/// </summary>
/// <returns></returns>
public static int GetSuperPendingApprovalNum(string projectid)
{
var result = (from x in Funs.DB.Solution_LargerHazard
where x.ProjectId == projectid && x.ApprovalState == "1" && x.IsSuperLargerHazard == true && x.RecordTime > Const.DtmarkTime
select x).Count();
return result;
}
/// <summary>
/// 获取危大工程已完成个数
/// </summary>
/// <returns></returns>
public static int GetCompletedApprovalNum(string projectid)
{
var result = (from x in Funs.DB.Solution_LargerHazard
where x.ProjectId == projectid && x.ApprovalState == "2" && x.IsSuperLargerHazard == false && x.RecordTime > Const.DtmarkTime
select x).Count();
return result;
}
/// <summary>
/// 获取超危大工程已完成个数
/// </summary>
/// <returns></returns>
public static int GetSuperCompletedApprovalNum(string projectid)
{
var result = (from x in Funs.DB.Solution_LargerHazard
where x.ProjectId == projectid && x.ApprovalState == "2" && x.IsSuperLargerHazard == true && x.RecordTime > Const.DtmarkTime
select x).Count();
return result;
}
/// <summary>
/// 获取超危大工程审批完成数
/// </summary>
@@ -1765,7 +1887,15 @@ namespace BLL
x.SuperCompletedNum,
x.SuperTrainPersonNum,
x.SuperConstructionNum,
x.SuperFinishedNum
x.SuperFinishedNum,
x.ArgumentNum,
x.SuperArgumentNum,
x.AwaitApprovalNum,
x.PendingApprovalNum,
x.CompletedApprovalNum,
x.SuperAwaitApprovalNum,
x.SuperPendingApprovalNum,
x.SuperCompletedApprovalNum,
};
}