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

20240305 开车HSE管理

Browse Source
This commit is contained in:
毕文静
2024-03-05 09:52:53 +08:00
parent f227bbeba2
commit 8fec129c11
32 changed files with 2334 additions and 2283 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/BLL.csproj
+1
View File
@@ -166,6 +166,7 @@
<Compile Include="BaseInfo\SpecialEquipmentService.cs" />
<Compile Include="BaseInfo\SpecialSchemeTypeService.cs" />
<Compile Include="BaseInfo\SteelService.cs" />
<Compile Include="BaseInfo\TestRunLicenseTypeService.cs" />
<Compile Include="BaseInfo\TrainLevelService.cs" />
<Compile Include="BaseInfo\TrainTypeService.cs" />
<Compile Include="BaseInfo\TransferMajorService.cs" />
SGGL/BLL/BaseInfo/TestRunLicenseTypeService.cs
+98
View File
@@ -0,0 +1,98 @@
using System.Collections.Generic;
using System.Linq;
namespace BLL
{
/// <summary>
/// 作业类别及模板
/// </summary>
public class TestRunLicenseTypeService
{
/// <summary>
/// 根据主键获取作业类别及模板
/// </summary>
/// <param name="licenseTypeId"></param>
/// <returns></returns>
public static Model.Base_TestRunLicenseType GetLicenseTypeById(string licenseTypeId)
{
return Funs.DB.Base_TestRunLicenseType.FirstOrDefault(e => e.LicenseTypeId == licenseTypeId);
}
/// <summary>
/// 添加作业类别及模板
/// </summary>
/// <param name="testRunLicenseType"></param>
public static void AddTestRunLicenseType(Model.Base_TestRunLicenseType testRunLicenseType)
{
Model.Base_TestRunLicenseType newTestRunLicenseType = new Model.Base_TestRunLicenseType
{
LicenseTypeId = testRunLicenseType.LicenseTypeId,
LicenseTypeCode = testRunLicenseType.LicenseTypeCode,
LicenseTypeName = testRunLicenseType.LicenseTypeName,
Remark = testRunLicenseType.Remark,
TemplateUrl = testRunLicenseType.TemplateUrl
};
Funs.DB.Base_TestRunLicenseType.InsertOnSubmit(newTestRunLicenseType);
Funs.DB.SubmitChanges();
}
/// <summary>
/// 修改作业类别及模板
/// </summary>
/// <param name="testRunLicenseType"></param>
public static void UpdateTestRunLicenseType(Model.Base_TestRunLicenseType testRunLicenseType)
{
Model.Base_TestRunLicenseType newTestRunLicenseType = Funs.DB.Base_TestRunLicenseType.FirstOrDefault(e => e.LicenseTypeId == testRunLicenseType.LicenseTypeId);
if (newTestRunLicenseType != null)
{
newTestRunLicenseType.LicenseTypeCode = testRunLicenseType.LicenseTypeCode;
newTestRunLicenseType.LicenseTypeName = testRunLicenseType.LicenseTypeName;
newTestRunLicenseType.Remark = testRunLicenseType.Remark;
newTestRunLicenseType.TemplateUrl = testRunLicenseType.TemplateUrl;
Funs.DB.SubmitChanges();
}
}
/// <summary>
/// 根据主键删除作业类别及模板
/// </summary>
/// <param name="licenseTypeId"></param>
public static void DeleteTestRunLicenseTypeById(string licenseTypeId)
{
Model.Base_TestRunLicenseType newTestRunLicenseType = Funs.DB.Base_TestRunLicenseType.FirstOrDefault(e => e.LicenseTypeId == licenseTypeId);
if (newTestRunLicenseType!=null)
{
CommonService.DeleteAttachFileById(licenseTypeId);//删除附件
Funs.DB.Base_TestRunLicenseType.DeleteOnSubmit(newTestRunLicenseType);
Funs.DB.SubmitChanges();
}
}
/// <summary>
/// 获取作业类型下拉列表项
/// </summary>
/// <returns></returns>
public static List<Model.Base_TestRunLicenseType> GetTestRunLicenseTypeList()
{
return (from x in Funs.DB.Base_TestRunLicenseType orderby x.LicenseTypeCode select x).ToList();
}
/// <summary>
/// 作业类型下拉框
/// </summary>
/// <param name="dropName">下拉框名字</param>
/// <param name="projectId">项目id</param>
/// <param name="isShowPlease">是否显示请选择</param>
public static void InitLicenseTypeDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
{
dropName.DataValueField = "LicenseTypeId";
dropName.DataTextField = "LicenseTypeName";
dropName.DataSource = GetTestRunLicenseTypeList();
dropName.DataBind();
if (isShowPlease)
{
Funs.FineUIPleaseSelect(dropName);
}
}
}
}
SGGL/BLL/Common/Const.cs
+1
View File
@@ -5429,6 +5429,7 @@ namespace BLL
/// 项目完工总结
/// </summary>
public const string CompleteSummaryMenuId = "AA88BD56-E0B4-4B9C-9238-3F48EA59C50A";
#endregion
#region 进度管理
SGGL/BLL/TestRun/DriverHse/HseHazardService.cs
+4 -15
View File
@@ -26,14 +26,9 @@ namespace BLL
newHseHazard.HseHazardId = hseHazard.HseHazardId;
newHseHazard.ProjectId = hseHazard.ProjectId;
newHseHazard.Code = hseHazard.Code;
newHseHazard.UnitWorkId = hseHazard.UnitWorkId;
newHseHazard.WorkArea = hseHazard.WorkArea;
newHseHazard.UnitHead = hseHazard.UnitHead;
newHseHazard.Supervisor = hseHazard.Supervisor;
newHseHazard.Hazards = hseHazard.Hazards;
newHseHazard.Harm = hseHazard.Harm;
newHseHazard.PreventiveMeasures = hseHazard.PreventiveMeasures;
newHseHazard.Darificaiton = hseHazard.Darificaiton;
newHseHazard.IdentificationDate = hseHazard.IdentificationDate;
newHseHazard.ControlHeaderMan = hseHazard.ControlHeaderMan;
newHseHazard.AttachUrl = hseHazard.AttachUrl;
newHseHazard.Remark = hseHazard.Remark;
Funs.DB.DriverHse_HseHazard.InsertOnSubmit(newHseHazard);
@@ -49,16 +44,10 @@ namespace BLL
Model.DriverHse_HseHazard newHseHazard = Funs.DB.DriverHse_HseHazard.FirstOrDefault(e => e.HseHazardId == hseHazard.HseHazardId);
if (newHseHazard != null)
{
newHseHazard.ProjectId = hseHazard.ProjectId;
newHseHazard.Code = hseHazard.Code;
newHseHazard.UnitWorkId = hseHazard.UnitWorkId;
newHseHazard.WorkArea = hseHazard.WorkArea;
newHseHazard.UnitHead = hseHazard.UnitHead;
newHseHazard.Supervisor = hseHazard.Supervisor;
newHseHazard.Hazards = hseHazard.Hazards;
newHseHazard.Harm = hseHazard.Harm;
newHseHazard.PreventiveMeasures = hseHazard.PreventiveMeasures;
newHseHazard.Darificaiton = hseHazard.Darificaiton;
newHseHazard.IdentificationDate = hseHazard.IdentificationDate;
newHseHazard.ControlHeaderMan = hseHazard.ControlHeaderMan;
newHseHazard.AttachUrl = hseHazard.AttachUrl;
newHseHazard.Remark = hseHazard.Remark;
Funs.DB.SubmitChanges();
SGGL/BLL/TestRun/DriverHse/HseLicenseService.cs
+11 -23
View File
@@ -31,18 +31,12 @@ namespace BLL
newHseLicense.HseLicenseId = hseLicense.HseLicenseId;
newHseLicense.ProjectId = hseLicense.ProjectId;
newHseLicense.Code = hseLicense.Code;
newHseLicense.UnitWorkId = hseLicense.UnitWorkId;
newHseLicense.WorkArea = hseLicense.WorkArea;
newHseLicense.WorkContents = hseLicense.WorkContents;
newHseLicense.WorkDate = hseLicense.WorkDate;
newHseLicense.UnitHead = hseLicense.UnitHead;
newHseLicense.ApplyMan = hseLicense.ApplyMan;
newHseLicense.LicenseTypeId = hseLicense.LicenseTypeId;
newHseLicense.ApplyUnit = hseLicense.ApplyUnit;
newHseLicense.WorkTicket = hseLicense.WorkTicket;
newHseLicense.WorkTicketCode = hseLicense.WorkTicketCode;
newHseLicense.Detection = hseLicense.Detection;
newHseLicense.Guardian = hseLicense.Guardian;
newHseLicense.WorkEnd = hseLicense.WorkEnd;
newHseLicense.ApplyMan = hseLicense.ApplyMan;
newHseLicense.HeaderMan = hseLicense.HeaderMan;
newHseLicense.WorkAddress = hseLicense.WorkAddress;
newHseLicense.WorkContents = hseLicense.WorkContents;
newHseLicense.Remark = hseLicense.Remark;
Funs.DB.DriverHse_HseLicense.InsertOnSubmit(newHseLicense);
Funs.DB.SubmitChanges();
@@ -57,20 +51,13 @@ namespace BLL
Model.DriverHse_HseLicense newHseLicense = Funs.DB.DriverHse_HseLicense.FirstOrDefault(e => e.HseLicenseId == hseLicense.HseLicenseId);
if (newHseLicense != null)
{
newHseLicense.ProjectId = hseLicense.ProjectId;
newHseLicense.Code = hseLicense.Code;
newHseLicense.UnitWorkId = hseLicense.UnitWorkId;
newHseLicense.WorkArea = hseLicense.WorkArea;
newHseLicense.WorkContents = hseLicense.WorkContents;
newHseLicense.WorkDate = hseLicense.WorkDate;
newHseLicense.UnitHead = hseLicense.UnitHead;
newHseLicense.ApplyMan = hseLicense.ApplyMan;
//newHseLicense.LicenseTypeId = hseLicense.LicenseTypeId;
newHseLicense.ApplyUnit = hseLicense.ApplyUnit;
newHseLicense.WorkTicket = hseLicense.WorkTicket;
newHseLicense.WorkTicketCode = hseLicense.WorkTicketCode;
newHseLicense.Detection = hseLicense.Detection;
newHseLicense.Guardian = hseLicense.Guardian;
newHseLicense.WorkEnd = hseLicense.WorkEnd;
newHseLicense.ApplyMan = hseLicense.ApplyMan;
newHseLicense.HeaderMan = hseLicense.HeaderMan;
newHseLicense.WorkAddress = hseLicense.WorkAddress;
newHseLicense.WorkContents = hseLicense.WorkContents;
newHseLicense.Remark = hseLicense.Remark;
Funs.DB.SubmitChanges();
}
@@ -85,6 +72,7 @@ namespace BLL
Model.DriverHse_HseLicense newHseLicense = Funs.DB.DriverHse_HseLicense.FirstOrDefault(e => e.HseLicenseId == hseLicenseId);
if (newHseLicense != null)
{
CommonService.DeleteAttachFileById(hseLicenseId);//删除附件
Funs.DB.DriverHse_HseLicense.DeleteOnSubmit(newHseLicense);
Funs.DB.SubmitChanges();
}