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

1

This commit is contained in:
夏菊 2026-03-24 17:43:52 +08:00
parent d36cec32ea
commit 2b9435744a
8 changed files with 126 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
SGGL/BLL/API/HSSE/APIHazardRegisterService.cs
View File

@ -30,7 +30,7 @@ namespace BLL
/// <param name="projectId"></param>
/// <param name="states"></param>
/// <returns></returns>
public static List<Model.HazardRegisterItem> getHazardRegisterByProjectIdStates(string projectId, string states, int type ,int pageIndex)
public static List<Model.HazardRegisterItem> getHazardRegisterByProjectIdStates(string projectId, string states, int type, int pageIndex)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
@ -82,7 +82,8 @@ namespace BLL
Requirements = hazardRegister.Requirements,
Risk_Level = hazardRegister.Risk_Level,
HiddenType= hazardRegister.HiddenType
PunishPerson = hazardRegister.PunishPerson,
HiddenType = hazardRegister.HiddenType
};
var RegisterTypesDt = db.HSSE_Hazard_HazardRegisterTypes.FirstOrDefault(x => x.RegisterTypesId == newHazardRegister.RegisterTypesId);
@ -91,7 +92,7 @@ namespace BLL
newHazardRegister.Type = 1; //常规巡检
}
else
{
{
newHazardRegister.Type = 0; //日常巡检
}
var isUpdate = db.HSSE_Hazard_HazardRegister.FirstOrDefault(x => x.HazardRegisterId == newHazardRegister.HazardRegisterId);
@ -103,7 +104,7 @@ namespace BLL
{
newHazardRegister.HazardRegisterId = SQLHelper.GetNewID();
}
db.HSSE_Hazard_HazardRegister.InsertOnSubmit(newHazardRegister);
db.HSSE_Hazard_HazardRegister.InsertOnSubmit(newHazardRegister);
}
else
{
@ -132,6 +133,43 @@ namespace BLL
else if (hazardRegister.States == Const.State_2)
{
APICommonService.SendSubscribeMessage(hazardRegister.CheckManId, "安全巡检待复查验收", hazardRegister.ResponsibilityManName, string.Format("{0:yyyy-MM-dd HH:mm:ss}", hazardRegister.RectificationTime));
//推送总包
var porject = BLL.ProjectService.GetProjectByProjectId(hazardRegister.ProjectId);
if (!string.IsNullOrWhiteSpace(porject.SubjectUnit) && !string.IsNullOrWhiteSpace(porject.SubjectProject))
{
var register = BLL.HSSE_Hazard_HazardRegisterService.GetHazardRegisterByHazardRegisterId(hazardRegister.HazardRegisterId);
if (register != null)
{
if (register.DataSource == "1")
{
//推送到总包
APIHazardRegisterSyncService.pushHazardRegisterLists(register.ProjectId, register.HazardRegisterId);
}
}
}
}
else if (hazardRegister.States == Const.State_3)
{
//闭环后通过的并且有处罚人的数据添加到奖罚管理中
if (!string.IsNullOrEmpty(hazardRegister.PunishPerson))
{
Model.Check_RewardAndPunish RewardAndPunish = new Model.Check_RewardAndPunish();
RewardAndPunish.RewardAndPunishID = SQLHelper.GetNewID(typeof(Model.Check_RewardAndPunish));
RewardAndPunish.ProjectId = hazardRegister.ProjectId;
RewardAndPunish.Type = 2;
RewardAndPunish.ResponseUnit = hazardRegister.ResponsibleUnit;
RewardAndPunish.Date = hazardRegister.CheckTime;
RewardAndPunish.Description = hazardRegister.RegisterDef;
RewardAndPunish.CreateMan = hazardRegister.CheckManId;
RewardAndPunish.RewardAndPunishCode = BLL.RewardAndPunishService.getCode("1", "CF");
RewardAndPunish.RewardAndPunishMan = hazardRegister.PunishPerson;
RewardAndPunish.TeamGroupId =
BLL.PersonService.GetPersonById(hazardRegister.PunishPerson).TeamGroupId;
RewardAndPunish.DataSource = "1";
RewardAndPunish.SysTemType = "1";
RewardAndPunish.HazardRegisterId = hazardRegister.HazardRegisterId;
BLL.RewardAndPunishService.AddRewardAndPunish(RewardAndPunish);
}
}
}
}
@ -177,7 +215,7 @@ namespace BLL
ResponsibilityManName = db.Sys_User.First(User => x.ResponsibleMan == User.UserId).UserName,
RectificationTime = x.RectificationTime,
Risk_Level = x.Risk_Level,
HiddenType=x.HiddenType
HiddenType = x.HiddenType
}).OrderBy(x => x.CheckTime).Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList();
return hazardRegisters;

7
SGGL/BLL/API/HSSE/APIMeetingService.cs
View File

@ -408,7 +408,12 @@ namespace BLL
{
CommonService.btnSaveData(meeting.ProjectId, Const.ProjectClassMeetingMenuId, newClassMeeting.ClassMeetingId, newClassMeeting.CompileMan, true, newClassMeeting.ClassMeetingName, "../Meeting/ClassMeetingView.aspx?ClassMeetingId={0}");
}
//班前会小程序新增推送到总包
var porject = BLL.ProjectService.GetProjectByProjectId(newClassMeeting.ProjectId);
if (!string.IsNullOrWhiteSpace(porject.SubjectUnit) && !string.IsNullOrWhiteSpace(porject.SubjectProject))
{//项目关联了总包单位项目，保存成功后自动推送至总包单位
APIMeetingSyncService.PushClassMeetingLists(newClassMeeting.ProjectId, newClassMeeting.ClassMeetingId);
}
menuId = Const.ProjectClassMeetingMenuId;
}
else if (meeting.MeetingType == "W")

27
SGGL/BLL/CQMS/Check/RewardAndPunishService.cs
View File

@ -120,7 +120,32 @@ namespace BLL
db.SubmitChanges();
}
}
/// <summary>
/// 获取最大编号
/// </summary>
/// <param name="SysTemType"></param>
/// <param name="type"></param>
/// <returns></returns>
public static string getCode(string SysTemType, string type)
{
var maxCode = Funs.DB.Check_RewardAndPunish
.Where(x => x.SysTemType == SysTemType && x.RewardAndPunishCode.Contains(type))
.Max(x => x.RewardAndPunishCode);
if (maxCode != null)
{
//取最后5 位
var code = maxCode.Substring(maxCode.Length - 5);
var codeNum = int.Parse(code);
codeNum++;
return $"{type}{codeNum:D5}";
}
else
{
return $"{type}00001";
}
}
}
}

44
SGGL/FineUIPro.Web/CQMS/Check/RewardAndPunishEdit.aspx.cs
View File

@ -55,7 +55,6 @@ namespace FineUIPro.Web.CQMS.Check
Model.Check_RewardAndPunish RewardAndPunish = BLL.RewardAndPunishService.GetRewardAndPunishById(RewardAndPunishID);
if (RewardAndPunish != null)
{
//this.CurrUser.LoginProjectId = RewardAndPunish.ProjectId;
this.drpRewardAndPunishType.SelectedValue = RewardAndPunish.RewardAndPunishType;
@ -169,7 +168,19 @@ namespace FineUIPro.Web.CQMS.Check
RewardAndPunish.Type = int.Parse(this.drpType.SelectedValue);
RewardAndPunish.ResponseUnit = this.drpResponseUnit.SelectedValue;
// RewardAndPunish.NoticeUnit = this.drpNoticeUnit.SelectedValue;
RewardAndPunish.Money = Decimal.Parse(this.txtMoney.Text);
if (!string.IsNullOrWhiteSpace(this.txtMoney.Text))
{
decimal moneyValue;
if (decimal.TryParse(this.txtMoney.Text.Trim(), out moneyValue))
{
RewardAndPunish.Money = moneyValue;
}
else
{
Alert.ShowInTop("金额必须为有效数字！", MessageBoxIcon.Warning);
return;
}
}
RewardAndPunish.Date = Convert.ToDateTime(this.dpDate.Text.Trim());
RewardAndPunish.Description = this.txtDescription.Text;
RewardAndPunish.CreateMan = this.CurrUser.UserId;
@ -231,17 +242,36 @@ namespace FineUIPro.Web.CQMS.Check
{
if (this.drpType.SelectedValue == "1")
{
this.txtRewardAndPunishCode.Text = BLL.SQLHelper.RunProcNewId("SpGetNewCode5",
"Check_RewardAndPunish", "RewardAndPunishCode", $"JL");
// this.txtRewardAndPunishCode.Text = BLL.SQLHelper.RunProcNewId("SpGetNewCode5",
// "Check_RewardAndPunish", "RewardAndPunishCode", $"JL");
this.txtRewardAndPunishCode.Text = BLL.RewardAndPunishService.getCode(SysTemType,"JL");
}
else
{
this.txtRewardAndPunishCode.Text = BLL.SQLHelper.RunProcNewId("SpGetNewCode5",
"Check_RewardAndPunish", "RewardAndPunishCode", $"CF");
// this.txtRewardAndPunishCode.Text = BLL.SQLHelper.RunProcNewId("SpGetNewCode5",
// "Check_RewardAndPunish", "RewardAndPunishCode", $"CF");
this.txtRewardAndPunishCode.Text = BLL.RewardAndPunishService.getCode(SysTemType,"CF");
}
drpRewardAndPunishType_Click(sender, e);
}
protected void getCode(string type)
{
var maxCode = Funs.DB.Check_RewardAndPunish
.Where(x => x.SysTemType == SysTemType && x.RewardAndPunishCode.Contains(type))
.Max(x => x.RewardAndPunishCode);
if (maxCode != null)
{
//取最后5 位
var code = maxCode.Substring(maxCode.Length - 5);
var codeNum = int.Parse(code);
codeNum++;
this.txtRewardAndPunishCode.Text = $"{type}{codeNum:D5}";
}
else
{
this.txtRewardAndPunishCode.Text = $"{type}00001";
}
}
protected void drpRewardAndPunishType_Click(object sender, EventArgs e)
{

5
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationConfirm.aspx.cs
View File

@ -185,9 +185,8 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
RewardAndPunish.ResponseUnit = register.ResponsibleUnit;
RewardAndPunish.Date = register.CheckTime;
RewardAndPunish.Description = register.RegisterDef;
RewardAndPunish.CreateMan = register.CheckManId;
RewardAndPunish.RewardAndPunishCode = BLL.SQLHelper.RunProcNewId("SpGetNewCode5",
"Check_RewardAndPunish", "RewardAndPunishCode", $"CF");
RewardAndPunish.CreateMan = register.CheckManId;
RewardAndPunish.RewardAndPunishCode = BLL.RewardAndPunishService.getCode("1", "CF");//接口获取的编号
RewardAndPunish.RewardAndPunishMan = register.PunishPerson;
RewardAndPunish.TeamGroupId = BLL.PersonService.GetPersonById(register.PunishPerson).TeamGroupId;
RewardAndPunish.DataSource = "1";

10
SGGL/Model/APIItem/HSSE/HazardRegisterItem.cs
View File

@ -368,7 +368,15 @@ namespace Model
get;
set;
}
/// <summary>
/// 惩罚人
/// </summary>
public string PunishPerson
{
get;
set;
}
/// <summary>
/// 隐患类型
/// </summary>

4
SGGL/WebAPI/Controllers/DataShare/HSSE/HazardRegisterSyncController.cs
View File

@ -14,13 +14,13 @@ namespace WebAPI.Controllers
/// 拉取项目安全检查数据
/// </summary>
/// <returns></returns>
public Model.ResponeData getHazardRegisterLists()
public Model.ResponeData getHazardRegisterLists(string projectId = "")
{
var responeData = new Model.ResponeData();
try
{
responeData.code = 1;
responeData.data = APIHazardRegisterSyncService.getHazardRegisterLists();
responeData.data = APIHazardRegisterSyncService.getHazardRegisterLists(projectId);
}
catch (Exception ex)
{

2
SGGL/WebAPI/WebAPI.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />