增加施工工程师
This commit is contained in:
		
							parent
							
								
									9b8821bf3a
								
							
						
					
					
						commit
						66d458026e
					
				| 
						 | 
					@ -6120,5 +6120,10 @@ namespace BLL
 | 
				
			||||||
        /// 中央企业安全生产管理评价工作调度台账上报
 | 
					        /// 中央企业安全生产管理评价工作调度台账上报
 | 
				
			||||||
        /// </summary>
 | 
					        /// </summary>
 | 
				
			||||||
        public const string ReportType_12 = "12";
 | 
					        public const string ReportType_12 = "12";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        /// <summary>
 | 
				
			||||||
 | 
					        /// 施工工程师(总包)
 | 
				
			||||||
 | 
					        /// </summary>
 | 
				
			||||||
 | 
					        public const string SGEngineer = "F7302DA3-B522-43F9-98CC-6317622A884E";
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					@ -1543,7 +1543,8 @@ namespace FineUIPro.Web.CQMS.Solution
 | 
				
			||||||
                                on x.UnitId equals y.UnitId
 | 
					                                on x.UnitId equals y.UnitId
 | 
				
			||||||
                            join p in Funs.DB.Project_ProjectUser
 | 
					                            join p in Funs.DB.Project_ProjectUser
 | 
				
			||||||
                                on x.UserId equals p.UserId
 | 
					                                on x.UserId equals p.UserId
 | 
				
			||||||
                            where (p.RoleId.Contains(Const.ZBCNEngineer)|| p.RoleId.Contains(Const.HSSEEngineer))
 | 
					                            where (p.RoleId.Contains(Const.ZBCNEngineer)|| p.RoleId.Contains(Const.HSSEEngineer)
 | 
				
			||||||
 | 
					                                   || p.RoleId.Contains(Const.SGEngineer))
 | 
				
			||||||
                                  && y.UnitType == Const.ProjectUnitType_1 && p.ProjectId == CurrUser.LoginProjectId &&
 | 
					                                  && y.UnitType == Const.ProjectUnitType_1 && p.ProjectId == CurrUser.LoginProjectId &&
 | 
				
			||||||
                                  y.ProjectId == CurrUser.LoginProjectId
 | 
					                                  y.ProjectId == CurrUser.LoginProjectId
 | 
				
			||||||
                            select x);
 | 
					                            select x);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue