班前会添加装置单元

SGGL/BLL/API/APIBaseInfoService.cs

@@ -87,6 +87,26 @@ namespace BLL
         }
         #endregion
 
+        #region 获取项目装置列表
+        public static List<Model.BaseInfoItem> getProjectInstallations(string projectId)
+        {
+            using(Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var list = (from x in db.Project_Installation
+                               where x.ProjectId == projectId
+                               select new Model.BaseInfoItem
+                               {
+                                   BaseInfoId = x.InstallationId,
+                                   BaseInfoCode = x.InstallationCode,
+                                   BaseInfoName = x.InstallationName
+                               }
+                               ).ToList();
+                return list;
+            }
+
+        }
+        #endregion
+
         #region 根据项目号获取项目信息
         /// <summary>
         /// 根据项目号获取项目信息

SGGL/BLL/API/HSSE/APIMeetingService.cs

@@ -47,6 +47,8 @@ namespace BLL
                                        MeetingHostManName = db.SitePerson_Person.First(y => y.PersonId == x.MeetingHostMan).PersonName,
                                        AttentPerson = x.AttentPerson,
                                        AttentPersonNum = x.AttentPersonNum ?? 0,
+                                       InstallationId = x.InstallationId,
+                                       InstallationName = x.InstallationName,
                                        CompileDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.CompileDate),
                                        CompileManId = x.CompileMan,
                                        MeetingHostManOther = x.MeetingHostManOther,
@@ -228,6 +230,8 @@ namespace BLL
                                        MeetingType = meetingType,
                                        MeetingHours = x.MeetingHours ?? 0,
                                        MeetingHostMan = x.MeetingHostMan,
+                                       InstallationId = x.InstallationId,
+                                       InstallationName = x.InstallationName,
                                        AttentPerson = x.AttentPerson,
                                        CompileDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.CompileDate),
                                        MeetingHostManOther=x.MeetingHostManOther,
@@ -400,8 +404,11 @@ namespace BLL
                     AttentPersonNum=meeting.AttentPersonNum,
                     MeetingHostManOther=meeting.MeetingHostManOther,
                     States = Const.State_2,
-                    ManagePersonNum = m_personum
-                };
+                    ManagePersonNum = m_personum,
+                    InstallationId = meeting.InstallationId,
+                    InstallationName = meeting.InstallationName,
+                }
+            ;
 
                 if (meeting.States != "1")
                 {