lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交定制会内容

Browse Source
This commit is contained in:
高飞
2025-06-19 18:59:39 +08:00
parent 6be8d160e0
commit e1eb091f3b
150 changed files with 24036 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs
+19 -2
View File
@@ -381,8 +381,25 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
var hazardRegister = BLL.HSSE_Hazard_HazardRegisterService.GetHazardRegisterByHazardRegisterId(rowID);
if (hazardRegister.States == "1" || this.CurrUser.PersonId == BLL.Const.sysglyId) //待整改
{
BLL.LogService.AddSys_Log(this.CurrUser, hazardRegister.HazardCode, hazardRegister.HazardRegisterId, BLL.Const.HSSE_HiddenRectificationListMenuId, BLL.Const.BtnDelete);
BLL.HSSE_Hazard_HazardRegisterService.DeleteHazardRegisterByHazardRegisterId(rowID);
if (hazardRegister.IsUpdate == true) //已上传集团记录，需要先删除集团记录后才可以删除本地记录
{
var returndata = Project_HSSEData_HSSEService.DeleteProjectHazardRegisterData(rowID);
if (returndata.code == 1)
{
BLL.LogService.AddSys_Log(this.CurrUser, hazardRegister.HazardCode, hazardRegister.HazardRegisterId, BLL.Const.HSSE_HiddenRectificationListMenuId, BLL.Const.BtnDelete);
BLL.HSSE_Hazard_HazardRegisterService.DeleteHazardRegisterByHazardRegisterId(rowID);
}
else
{
Alert.ShowInTop("记录已上报集团，集团删除失败，无法删除本地数据！", MessageBoxIcon.Warning);
return;
}
}
else
{
BLL.LogService.AddSys_Log(this.CurrUser, hazardRegister.HazardCode, hazardRegister.HazardRegisterId, BLL.Const.HSSE_HiddenRectificationListMenuId, BLL.Const.BtnDelete);
BLL.HSSE_Hazard_HazardRegisterService.DeleteHazardRegisterByHazardRegisterId(rowID);
}
}
else
{
SGGL/FineUIPro.Web/HSSE/License/LicenseManager.aspx.cs
+20 -2
View File
@@ -243,8 +243,26 @@ namespace FineUIPro.Web.HSSE.License
var licenseManager = BLL.LicenseManagerService.GetLicenseManagerById(rowID);
if (licenseManager != null)
{
BLL.LogService.AddSys_Log(this.CurrUser, licenseManager.LicenseManagerCode, licenseManager.LicenseManagerId, BLL.Const.ProjectLicenseManagerMenuId, BLL.Const.BtnDelete);
BLL.LicenseManagerService.DeleteLicenseManagerById(rowID);
if (licenseManager.IsUpdate == true)
{
var returndata = Project_HSSEData_HSSEService.DeleteProjectLicenseData(rowID);
if (returndata.code == 1)
{
BLL.LogService.AddSys_Log(this.CurrUser, licenseManager.LicenseManagerCode, licenseManager.LicenseManagerId, BLL.Const.ProjectLicenseManagerMenuId, BLL.Const.BtnDelete);
BLL.LicenseManagerService.DeleteLicenseManagerById(rowID);
}
else
{
Alert.ShowInTop("记录已上报集团，集团删除失败，无法删除本地数据！", MessageBoxIcon.Warning);
return;
}
}
else
{
BLL.LogService.AddSys_Log(this.CurrUser, licenseManager.LicenseManagerCode, licenseManager.LicenseManagerId, BLL.Const.ProjectLicenseManagerMenuId, BLL.Const.BtnDelete);
BLL.LicenseManagerService.DeleteLicenseManagerById(rowID);
}
}
}
SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardList.aspx.cs
+19 -2
View File
@@ -203,8 +203,25 @@ namespace FineUIPro.Web.HSSE.Solution
var getV = BLL.LargerHazardService.GetLargerHazardByHazardId(rowID);
if (getV != null)
{
BLL.LogService.AddSys_Log(this.CurrUser, getV.HazardCode, getV.HazardId, BLL.Const.ProjectLargerHazardListMenuId, BLL.Const.BtnDelete);
BLL.LargerHazardService.DeleteLargerHazard(rowID);
if (getV.IsUpdate == true)
{
var returndata = Project_HSSEData_HSSEService.DeleteProjectLargeEngineeringData(rowID);
if (returndata.code == 1)
{
BLL.LogService.AddSys_Log(this.CurrUser, getV.HazardCode, getV.HazardId, BLL.Const.ProjectLargerHazardListMenuId, BLL.Const.BtnDelete);
BLL.LargerHazardService.DeleteLargerHazard(rowID);
}
else
{
Alert.ShowInTop("记录已上报集团，集团删除失败，无法删除本地数据！", MessageBoxIcon.Warning);
return;
}
}
else
{
BLL.LogService.AddSys_Log(this.CurrUser, getV.HazardCode, getV.HazardId, BLL.Const.ProjectLargerHazardListMenuId, BLL.Const.BtnDelete);
BLL.LargerHazardService.DeleteLargerHazard(rowID);
}
}
}
SGGL/FineUIPro.Web/HSSE/Technique/Rectify.aspx.cs
+15 -13
View File
@@ -1,15 +1,15 @@
namespace FineUIPro.Web.HSSE.Technique
{
using BLL;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Text;
using System.Web.UI;
using BLL;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Text;
using System.Web.UI;
namespace FineUIPro.Web.HSSE.Technique
{
public partial class Rectify : PageBase
{
#region 加载页面
@@ -38,9 +38,11 @@
string strSql = @"SELECT RectifyItem.RectifyItemId,RectifyItem.RectifyId,RectifyItem.HazardSourcePoint,(CASE WHEN LEN(RectifyItem.HazardSourcePoint) > 30 THEN LEFT(RectifyItem.HazardSourcePoint,30) + '...' ELSE RectifyItem.HazardSourcePoint END) AS ShortHazardSourcePoint, "
+ @" RectifyItem.RiskAnalysis,(CASE WHEN LEN(RectifyItem.RiskPrevention) > 30 THEN LEFT(RectifyItem.RiskPrevention,30) + '...' ELSE RectifyItem.RiskPrevention END) AS ShortRiskPrevention,RectifyItem.RiskPrevention, "
+ @" RectifyItem.SimilarRisk,(CASE WHEN LEN(RectifyItem.SimilarRisk) > 30 THEN LEFT(RectifyItem.SimilarRisk,30) + '...' ELSE RectifyItem.SimilarRisk END) AS ShortSimilarRisk,R.RectifyName,R.RectifyCode,RectifyItem.CompileMan,RectifyItem.CompileDate,"
+ @" RectifyItem.AuditMan,RectifyItem.AuditDate,RectifyItem.IsPass"
+ @" RectifyItem.AuditMan,RectifyItem.AuditDate,RectifyItem.IsPass,U.UserName AS CompileManName,UR.UserName AS AuditManName"
+ @" FROM dbo.Technique_RectifyItem AS RectifyItem"
+ @" LEFT JOIN dbo.Technique_Rectify AS R ON R.RectifyId=RectifyItem.RectifyId"
+ @" LEFT JOIN dbo.Sys_User AS U ON U.UserId=RectifyItem.CompileMan"
+ @" LEFT JOIN dbo.Sys_User AS UR ON U.UserId=RectifyItem.AuditMan"
+ @" WHERE RectifyItem.RectifyId=@RectifyId";
List<SqlParameter> listStr = new List<SqlParameter>
{
@@ -96,7 +98,7 @@
/// <param name="menuId"></param>
private void BoundTree(TreeNodeCollection nodes, string menuId)
{
var dt = BLL.RectifyService.GetRectifyBySupRectifyId(menuId);
var dt = BLL.RectifyService.GetRectifyBySupRectifyId(menuId, "0");
if (dt.Count() > 0)
{
TreeNode tn = null;
SGGL/FineUIPro.Web/HSSE/Technique/RectifyEdit.aspx.cs
+3 -2
View File
@@ -89,6 +89,7 @@ namespace FineUIPro.Web.HSSE.Technique
{
Model.Technique_Rectify rectify = new Model.Technique_Rectify
{
RectifyType = "0",//安全
RectifyCode = this.txtRectifyCode.Text.Trim(),
RectifyName = this.txtRectifyName.Text.Trim()
};
@@ -105,7 +106,7 @@ namespace FineUIPro.Web.HSSE.Technique
rectify.SupRectifyId = this.SupRectifyId;
rectify.RectifyId = SQLHelper.GetNewID(typeof(Model.Technique_Rectify));
BLL.RectifyService.AddRectify(rectify);
BLL.LogService.AddSys_Log(this.CurrUser, rectify.RectifyName, rectify.RectifyId, BLL.Const.RectifyMenuId, Const.BtnAdd);
}
else
@@ -117,7 +118,7 @@ namespace FineUIPro.Web.HSSE.Technique
}
rectify.RectifyId = this.RectifyId;
BLL.RectifyService.UpdateRectify(rectify);
BLL.LogService.AddSys_Log(this.CurrUser, rectify.RectifyName, rectify.RectifyId, BLL.Const.RectifyMenuId, Const.BtnModify);
}
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());