报表管理:职业健康危害因素清单
This commit is contained in:
@@ -1,10 +1,11 @@
|
||||
using System;
|
||||
using EmitMapper;
|
||||
using EmitMapper.MappingConfiguration;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Threading.Tasks;
|
||||
using EmitMapper;
|
||||
using EmitMapper.MappingConfiguration;
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
@@ -503,7 +504,8 @@ namespace BLL
|
||||
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
|
||||
{
|
||||
var getDataLists = (from x in db.Training_TestRecord
|
||||
join y in db.Training_TestPlan on x.TestPlanId equals y.TestPlanId
|
||||
join y in db.Training_TestPlan on x.TestPlanId equals y.TestPlanId into yGroup
|
||||
from y in yGroup.DefaultIfEmpty()
|
||||
where x.ProjectId == projectId && x.TestManId == personId && x.TestStartTime.HasValue
|
||||
orderby x.TestStartTime descending
|
||||
select new Model.TestRecordItem
|
||||
|
||||
@@ -847,6 +847,7 @@
|
||||
<Compile Include="PZHGL\InformationProject\WorkHandoverService.cs" />
|
||||
<Compile Include="PZHGL\ProjectData\ProjectMapService.cs" />
|
||||
<Compile Include="PZHGL\ProjectData\ProjectPageDataService.cs" />
|
||||
<Compile Include="ReportManage\HazardFactor\HazardFactorOccHealthService.cs" />
|
||||
<Compile Include="ReportManage\HazardFactor\HazardFactorSafetyService.cs" />
|
||||
<Compile Include="Service References\CNCECHSSEService\Reference.cs">
|
||||
<AutoGen>True</AutoGen>
|
||||
|
||||
@@ -27,7 +27,11 @@ namespace BLL
|
||||
/// 安全危害因素数据导入模板
|
||||
/// </summary>
|
||||
public const string HazardFactorSafetyDataInTemplateUrl = "File\\Excel\\DataIn\\安全危害因素数据导入模板.xlsx";
|
||||
|
||||
/// <summary>
|
||||
/// 职业健康危害因素数据导入模板
|
||||
/// </summary>
|
||||
public const string HazardFactorOccHealthDataInTemplateUrl = "File\\Excel\\DataIn\\职业健康危害因素数据导入模板.xlsx";
|
||||
|
||||
#endregion
|
||||
|
||||
/// <summary>
|
||||
@@ -3374,6 +3378,10 @@ namespace BLL
|
||||
/// 安全危害因素清单
|
||||
/// </summary>
|
||||
public const string ProjectHazardFactorSafetyMenuId = "8ABE259F-1C04-4DB4-B774-C8A4BD82E403";
|
||||
/// <summary>
|
||||
/// 职业健康危害因素清单
|
||||
/// </summary>
|
||||
public const string ProjectHazardFactorOccHealthMenuId = "78925136-1247-4E45-B538-8E91A332071A";
|
||||
|
||||
#endregion
|
||||
/// <summary>
|
||||
|
||||
@@ -0,0 +1,127 @@
|
||||
using Model;
|
||||
using System.Linq;
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
/// <summary>
|
||||
/// 职业健康危害因素
|
||||
/// </summary>
|
||||
public class HazardFactorOccHealthService
|
||||
{
|
||||
/// <summary>
|
||||
/// 根据ID获取职业健康危害因素
|
||||
/// </summary>
|
||||
/// <param name="Id"></param>
|
||||
/// <returns></returns>
|
||||
public static Model.HazardFactor_OccHealth GetHazardFactorOccHealthById(string Id)
|
||||
{
|
||||
return Funs.DB.HazardFactor_OccHealth.FirstOrDefault(e => e.ID == Id);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 增加职业健康危害因素
|
||||
/// </summary>
|
||||
/// <param name="model">职业健康危害因素实体</param>
|
||||
public static void AddHazardFactorOccHealth(Model.HazardFactor_OccHealth model)
|
||||
{
|
||||
Model.HazardFactor_OccHealth newModel = new Model.HazardFactor_OccHealth
|
||||
{
|
||||
ID = model.ID,
|
||||
ProjectId = model.ProjectId,
|
||||
Year = model.Year,
|
||||
Month = model.Month,
|
||||
State = model.State,
|
||||
CompileDate = model.CompileDate,
|
||||
CompileMan = model.CompileMan,
|
||||
CompileManName = model.CompileManName,
|
||||
};
|
||||
newModel.WorkPlace = model.WorkPlace;
|
||||
newModel.JobStep = model.JobStep;
|
||||
newModel.Hazard = model.Hazard;
|
||||
newModel.Consequence = model.Consequence;
|
||||
newModel.Illegality = model.Illegality;
|
||||
newModel.BaseRiskSeverity = model.BaseRiskSeverity;
|
||||
newModel.BaseRiskProbability = model.BaseRiskProbability;
|
||||
newModel.BaseRiskScore = model.BaseRiskScore;
|
||||
newModel.BaseRiskLevel = model.BaseRiskLevel;
|
||||
newModel.BaseRiskAcceptabity = model.BaseRiskAcceptabity;
|
||||
newModel.NetRiskControlMeasures = model.NetRiskControlMeasures;
|
||||
newModel.NetRiskSeverity = model.NetRiskSeverity;
|
||||
newModel.NetRiskProbability = model.NetRiskProbability;
|
||||
newModel.NetRiskScore = model.NetRiskScore;
|
||||
newModel.NetRiskLevel = model.NetRiskLevel;
|
||||
newModel.NetRiskAcceptabity = model.NetRiskAcceptabity;
|
||||
newModel.AdditionalControlMeasures = model.AdditionalControlMeasures;
|
||||
newModel.ResponsibleDepartment = model.ResponsibleDepartment;
|
||||
Funs.DB.HazardFactor_OccHealth.InsertOnSubmit(newModel);
|
||||
Funs.DB.SubmitChanges();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 修改职业健康危害因素
|
||||
/// </summary>
|
||||
/// <param name="model">职业健康危害因素实体</param>
|
||||
public static void UpdateHazardFactorOccHealth(Model.HazardFactor_OccHealth model)
|
||||
{
|
||||
Model.HazardFactor_OccHealth newModel = Funs.DB.HazardFactor_OccHealth.FirstOrDefault(e => e.ID == model.ID);
|
||||
if (newModel != null)
|
||||
{
|
||||
newModel.State = model.State;
|
||||
newModel.CompileDate = model.CompileDate;
|
||||
newModel.CompileMan = model.CompileMan;
|
||||
newModel.CompileManName = model.CompileManName;
|
||||
newModel.WorkPlace = model.WorkPlace;
|
||||
newModel.JobStep = model.JobStep;
|
||||
newModel.Hazard = model.Hazard;
|
||||
newModel.Consequence = model.Consequence;
|
||||
newModel.Illegality = model.Illegality;
|
||||
newModel.BaseRiskSeverity = model.BaseRiskSeverity;
|
||||
newModel.BaseRiskProbability = model.BaseRiskProbability;
|
||||
newModel.BaseRiskScore = model.BaseRiskScore;
|
||||
newModel.BaseRiskLevel = model.BaseRiskLevel;
|
||||
newModel.BaseRiskAcceptabity = model.BaseRiskAcceptabity;
|
||||
newModel.NetRiskControlMeasures = model.NetRiskControlMeasures;
|
||||
newModel.NetRiskSeverity = model.NetRiskSeverity;
|
||||
newModel.NetRiskProbability = model.NetRiskProbability;
|
||||
newModel.NetRiskScore = model.NetRiskScore;
|
||||
newModel.NetRiskLevel = model.NetRiskLevel;
|
||||
newModel.NetRiskAcceptabity = model.NetRiskAcceptabity;
|
||||
newModel.AdditionalControlMeasures = model.AdditionalControlMeasures;
|
||||
newModel.ResponsibleDepartment = model.ResponsibleDepartment;
|
||||
|
||||
Funs.DB.SubmitChanges();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据ID删除职业健康危害因素
|
||||
/// </summary>
|
||||
/// <param name="HazardID"></param>
|
||||
/// <param name="opUser"></param>
|
||||
public static void DeleteHazardFactorOccHealthById(string HazardID, Sys_User opUser)
|
||||
{
|
||||
var db = Funs.DB;
|
||||
Model.HazardFactor_OccHealth model = db.HazardFactor_OccHealth.FirstOrDefault(x => x.ID == HazardID);
|
||||
if (model != null)
|
||||
{
|
||||
db.HazardFactor_OccHealth.DeleteOnSubmit(model);
|
||||
db.SubmitChanges();
|
||||
|
||||
BLL.LogService.AddSys_Log(opUser, model.ID, model.ID, BLL.Const.ProjectHazardFactorOccHealthMenuId, BLL.Const.BtnDelete);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据报表项目,填报年月判断是否存在
|
||||
/// </summary>
|
||||
/// <param name="projectId">项目Id</param>
|
||||
/// <param name="year">year</param>
|
||||
/// <param name="month">month</param>
|
||||
/// <returns></returns>
|
||||
public static Model.HazardFactor_OccHealth GetHazardFactorOccHealthByProjectIdAndDate(string projectId, string year, string month)
|
||||
{
|
||||
return Funs.DB.HazardFactor_OccHealth.FirstOrDefault(e => e.ProjectId == projectId && e.Year == year && e.Month == month);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,10 +1,5 @@
|
||||
using Microsoft.Office.Interop.Word;
|
||||
using Model;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data.SqlClient;
|
||||
using Model;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user