补丁

SUBQHSE/BLL/API/HSSE/APIHazardRegisterService.cs

@@ -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

@@ -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")
             {

SUBQHSE/FineUIPro.Web/HSSE/OccupationHealth/PhysicalExamination.aspx.cs

@@ -104,6 +104,15 @@ namespace FineUIPro.Web.HSSE.OccupationHealth
                 from teamGroup in teamGroups.DefaultIfEmpty()
                 where person.ProjectId  == this.ProjectId
                       && att.AttachFileId != null
+                      && (drpUnitId.SelectedValue == Const._Null || person.UnitId == drpUnitId.SelectedValue)
+                      && (string.IsNullOrEmpty(txtCardNo.Text) || person.CardNo.Contains(txtCardNo.Text.Trim()))
+                      && (string.IsNullOrEmpty(txtPersonName.Text) ||
+                          person.PersonName.Contains(txtPersonName.Text.Trim()))
+                      && (string.IsNullOrEmpty(txtWorkPostName.Text) ||
+                          post.WorkPostName.Contains(txtWorkPostName.Text.Trim()))
+                      && person.IsUsed == (drpIsUsedName.SelectedValue == "是" ? true : false)
+                      && project.ProjectState== BLL.Const.ProjectState_1
+                      && (project .IsDelete==null || project.IsDelete==false)
                 select new
                 {
                     person.ProjectId,

SUBQHSE/FineUIPro.Web/HSSE/QualityAudit/PersonQuality.aspx.cs

@@ -302,7 +302,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit
                 var personQuality = BLL.PersonQualityService.GetPersonQualityByPersonId(fileId);
                 if (personQuality != null)
                 {
-                    PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/PersonBaseInfo&menuId={1}&strParam=4&type=0", personQuality.PersonId, BLL.Const.PersonListMenuId)));
+                    PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/PersonBaseInfo&menuId={1}&strParam=4&type=-1", personQuality.PersonId, BLL.Const.PersonListMenuId)));
                     // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/PersonQualityAttachUrl&menuId={1}&type=-1", personQuality.PersonQualityId, BLL.Const.PersonQualityMenuId)));
                 }
             }

SUBQHSE/WebAPI/Controllers/DataShare/HSSE/HazardRegisterSyncController.cs

@@ -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)
             {