xiaju/SGGL_JT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

补丁

Browse Source
This commit is contained in:
geh
2026-03-24 17:47:53 +08:00
parent c38590add8
commit 03e585144c
5 changed files with 58 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SUBQHSE/BLL/API/HSSE/APIHazardRegisterService.cs
+40 -1
View File
@@ -129,7 +129,8 @@ namespace BLL
IsWx = "Y",
CCManIds = hazardRegister.CCManIds,
Requirements = hazardRegister.Requirements,
Risk_Level = hazardRegister.Risk_Level
Risk_Level = hazardRegister.Risk_Level,
PunishPerson = hazardRegister.PunishPerson,
};
var isUpdate = db.HSSE_Hazard_HazardRegister.FirstOrDefault(x => x.HazardRegisterId == newHazardRegister.HazardRegisterId);
if (isUpdate == null)
@@ -170,6 +171,44 @@ 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);
}
}
}
}
SUBQHSE/BLL/API/HSSE/APIMeetingService.cs
+6
View File
@@ -424,6 +424,12 @@ namespace BLL
}
menuId = Const.ProjectClassMeetingMenuId;
//班前会小程序新增推送到总包
var porject = BLL.ProjectService.GetProjectByProjectId(newClassMeeting.ProjectId);
if (!string.IsNullOrWhiteSpace(porject.SubjectUnit) && !string.IsNullOrWhiteSpace(porject.SubjectProject))
{//项目关联了总包单位项目，保存成功后自动推送至总包单位
APIMeetingSyncService.PushClassMeetingLists(newClassMeeting.ProjectId, newClassMeeting.ClassMeetingId);
}
}
else if (meeting.MeetingType == "W")
{