diff --git a/SGGL/BLL/API/APIUserService.cs b/SGGL/BLL/API/APIUserService.cs index 678b5e66..0b559085 100644 --- a/SGGL/BLL/API/APIUserService.cs +++ b/SGGL/BLL/API/APIUserService.cs @@ -73,7 +73,7 @@ namespace BLL join y in db.Project_ProjectUser on x.UserId equals y.UserId where y.ProjectId == projectId && (x.UnitId == unitId || unitId == null) && (roleIds == null || roleList.Contains(y.RoleId)) && (strParam == null || x.UserName.Contains(strParam)) - && y.IsPost ==true + && y.IsPost == true select new Model.UserItem { UserId = x.UserId, @@ -285,7 +285,7 @@ namespace BLL { var getDataLists = (from x in db.Sys_User join y in db.Project_ProjectUser on x.UserId equals y.UserId - where y.ProjectId == projectId + where y.ProjectId == projectId select new Model.UserItem { UserId = x.UserId, @@ -330,5 +330,79 @@ namespace BLL return getDataList.OrderBy(x => x.UnitName).ThenBy(x => x.UserName).ToList(); } } + + + //HSSE副经理 + public static string HSSEEngineerf = "e2166a63-23ae-41de-9fbd-63ead785c033"; + //分包商HSE经理 + public static string FbsGcs = "b01b5d82-c0d9-44fc-b3b9-fca91da34d28"; + //分包商HSE工程师 + public static string FbsHseGcs = "9d12f8fa-56a3-4db4-849e-e85e1c21a769"; + /// + /// 根据受检单位项目id获取参加检查人员(项目HSE经理、HSE工程师、 HSSE副经理、受检单位的分包商HSE经理、分包商HSE工程师) + /// + /// + /// + /// + public static List getCheckUserByProjectIdAndUnitid(string projectId, string unitid) + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + //当前项目的项目HSE经理、HSE工程师、 HSSE副经理 + var getlist1 =(from x in db.Sys_User + join y in db.Project_ProjectUser on x.UserId equals y.UserId + where y.ProjectId==projectId && + (y.RoleId.Contains(Const.HSSEManager) || y.RoleId.Contains(Const.HSSEEngineer) + || y.RoleId.Contains(HSSEEngineerf) + ) + select new Model.UserItem + { + UserId = x.UserId, + Account = x.Account, + UserCode = x.UserCode, + Password = x.Password, + UserName = x.UserName, + RoleId = y.RoleId, + RoleName = RoleService.getRoleNamesRoleIds(y.RoleId), + UnitId = y.UnitId, + UnitName = db.Base_Unit.First(z => z.UnitId == y.UnitId).UnitName, + LoginProjectId = y.ProjectId, + LoginProjectName = db.Base_Project.First(z => z.ProjectId == y.ProjectId).ProjectName, + IdentityCard = x.IdentityCard, + Email = x.Email, + Telephone = x.Telephone, + IsOffice = x.IsOffice, + SignatureUrl = x.SignatureUrl.Replace('\\', '/'), + }).ToList(); + //受检单位的分包商HSE经理、分包商HSE工程师 + var getlist2 =(from x in db.Sys_User + join y in db.Project_ProjectUser on x.UserId equals y.UserId + where y.ProjectId == projectId && y.UnitId == unitid && + (y.RoleId.Contains(FbsGcs) || y.RoleId.Contains(FbsHseGcs) + ) + select new Model.UserItem + { + UserId = x.UserId, + Account = x.Account, + UserCode = x.UserCode, + Password = x.Password, + UserName = x.UserName, + RoleId = y.RoleId, + RoleName = RoleService.getRoleNamesRoleIds(y.RoleId), + UnitId = y.UnitId, + UnitName = db.Base_Unit.First(z => z.UnitId == y.UnitId).UnitName, + LoginProjectId = y.ProjectId, + LoginProjectName = db.Base_Project.First(z => z.ProjectId == y.ProjectId).ProjectName, + IdentityCard = x.IdentityCard, + Email = x.Email, + Telephone = x.Telephone, + IsOffice = x.IsOffice, + SignatureUrl = x.SignatureUrl.Replace('\\', '/'), + }).ToList(); + var getlist = getlist1.Union(getlist2).ToList(); + return getlist; + + } + } } } diff --git a/SGGL/BLL/API/HSSE/APICheckSpecialService.cs b/SGGL/BLL/API/HSSE/APICheckSpecialService.cs index 3c15b020..bf053967 100644 --- a/SGGL/BLL/API/HSSE/APICheckSpecialService.cs +++ b/SGGL/BLL/API/HSSE/APICheckSpecialService.cs @@ -56,7 +56,8 @@ namespace BLL ResponsibleMan = x.ResponsibleMan, ReceiveMan = x.ReceiveMan, - ReceiveManName = UserService.getUserNamesUserIds(x.ReceiveMan) + ReceiveManName = UserService.getUserNamesUserIds(x.ReceiveMan), + AttachUrl2= APIUpLoadFileService.getFileUrl(x.CheckSpecialId+"zgh", null), }; return getInfo.FirstOrDefault(); @@ -98,8 +99,8 @@ namespace BLL ResponsibleMan = x.ResponsibleMan, ReceiveMan = x.ReceiveMan, - ReceiveManName = UserService.getUserNamesUserIds(x.ReceiveMan) - + ReceiveManName = UserService.getUserNamesUserIds(x.ReceiveMan), + AttachUrl2 = APIUpLoadFileService.getFileUrl(x.CheckSpecialId + "zgh", null), }; return getInfo.FirstOrDefault(); } @@ -232,7 +233,7 @@ namespace BLL //// 删除专项检查明细项 Check_CheckSpecialDetailService.DeleteCheckSpecialDetails(newCheckSpecial.CheckSpecialId); } - ////保存附件 + ////保存附件(提交前附件) if (!string.IsNullOrEmpty(newItem.AttachUrl1)) { UploadFileService.SaveAttachUrl(UploadFileService.GetSourceByAttachUrl(newItem.AttachUrl1, 10, null), newItem.AttachUrl1, Const.ProjectCheckSpecialMenuId, newCheckSpecial.CheckSpecialId); @@ -242,6 +243,16 @@ namespace BLL CommonService.DeleteAttachFileById(Const.ProjectCheckSpecialMenuId, newCheckSpecial.CheckSpecialId); } + ////保存附件(整改后附件) + if (!string.IsNullOrEmpty(newItem.AttachUrl2)) + { + UploadFileService.SaveAttachUrl(UploadFileService.GetSourceByAttachUrl(newItem.AttachUrl2, 10, null), newItem.AttachUrl2, Const.ProjectCheckSpecialMenuId, newCheckSpecial.CheckSpecialId+"zgh"); + } + else + { + CommonService.DeleteAttachFileById(Const.ProjectCheckSpecialMenuId, newCheckSpecial.CheckSpecialId + "zgh"); + } + ///// 新增检查项 if (newItem.CheckSpecialDetailItems != null && newItem.CheckSpecialDetailItems.Count() > 0) { diff --git a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecial.aspx b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecial.aspx index 5a70c33f..f3ee4869 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecial.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecial.aspx @@ -51,7 +51,7 @@ - + diff --git a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecial.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecial.aspx.cs index 9b77dffb..e1148b87 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecial.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecial.aspx.cs @@ -60,7 +60,7 @@ namespace FineUIPro.Web.HSSE.Check { string strSql = @"SELECT CheckSpecial.CheckSpecialId,CodeRecords.Code AS CheckSpecialCode," + @" CheckItemSet.CheckItemName,CheckSpecial.CheckTime,(CASE WHEN CheckSpecial.CheckType ='1' THEN '联合检查' ELSE '专项检查' END) AS CheckTypeName" - + @" ,(CASE WHEN CheckSpecial.States='2' THEN '待确认' WHEN CheckSpecial.States='3' THEN '已确认' WHEN CheckSpecial.States='1' THEN '待整改' ELSE '待提交' END) AS StatesName" + + @" ,(CASE WHEN CheckSpecial.States='2' THEN '待确认' WHEN CheckSpecial.States='3' THEN '已关闭' WHEN CheckSpecial.States='1' THEN '待整改' ELSE '待提交' END) AS StatesName" + @" FROM Check_CheckSpecial AS CheckSpecial " + @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON CheckSpecial.CheckSpecialId=CodeRecords.DataId " + @" LEFT JOIN Technique_CheckItemSet AS CheckItemSet ON CheckItemSet.CheckItemSetId = CheckSpecial.CheckItemSetId where 1=1"; diff --git a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx index 08a475e7..23fe916b 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx @@ -100,9 +100,14 @@ - + + + + diff --git a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx.cs index ae8ccfb0..37a68c6a 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx.cs @@ -90,6 +90,19 @@ namespace FineUIPro.Web.HSSE.Check PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/CheckSpecial&menuId={1}&type=-1", this.CheckSpecialId, BLL.Const.ProjectCheckSpecialMenuId))); } } + + /// + /// 上传附件 + /// + /// + /// + protected void btnAttachUrl_Click2(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(this.CheckSpecialId)) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/CheckSpecial&menuId={1}&type=-1", this.CheckSpecialId+"zgh", BLL.Const.ProjectCheckSpecialMenuId))); + } + } #endregion /// diff --git a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx.designer.cs index e9ca0ba9..045c02e0 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx.designer.cs @@ -158,6 +158,15 @@ namespace FineUIPro.Web.HSSE.Check /// protected global::FineUIPro.Button btnAttachUrl; + /// + /// btnAttachUrl2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttachUrl2; + /// /// ToolbarFill1 控件。 /// diff --git a/SGGL/Model/APIItem/HSSE/CheckSpecialItem.cs b/SGGL/Model/APIItem/HSSE/CheckSpecialItem.cs index 0bcae846..2481813b 100644 --- a/SGGL/Model/APIItem/HSSE/CheckSpecialItem.cs +++ b/SGGL/Model/APIItem/HSSE/CheckSpecialItem.cs @@ -246,5 +246,14 @@ namespace Model public string ReceiveMan { get; set; } public string ReceiveManName { get; set; } + + /// + /// 整改后附件 + /// + public string AttachUrl2 + { + get; + set; + } } } diff --git a/SGGL/WebAPI/Controllers/UserController.cs b/SGGL/WebAPI/Controllers/UserController.cs index acf1b14f..25dc8ab2 100644 --- a/SGGL/WebAPI/Controllers/UserController.cs +++ b/SGGL/WebAPI/Controllers/UserController.cs @@ -455,5 +455,27 @@ namespace WebAPI.Controllers return responeData; } #endregion + + #region 根据受检单位项目id获取参加检查人员 + /// + /// 根据受检单位项目id获取参加检查人员(项目HSE经理、HSE工程师、 HSSE副经理、受检单位的分包商HSE经理、分包商HSE工程师) + /// + /// + /// + /// + public Model.ResponeData getCheckUserByProjectIdAndUnitid(string projectId,string unitid) { + var responeData = new Model.ResponeData(); + try + { + responeData.data = APIUserService.getCheckUserByProjectIdAndUnitid(projectId, unitid); + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + } + return responeData; + } + #endregion } }