班前会议添加情况说明

SGGL/BLL/API/HSSE/APIMeetingService.cs

@@ -239,6 +239,7 @@ namespace BLL
                                        CompileManName = db.Sys_User.First(u => u.UserId == x.CompileMan).UserName,
                                        AttentPersonNum = x.AttentPersonNum ?? 0,
                                        AttachUrl = db.AttachFile.First(z => z.ToKeyId == x.ClassMeetingId).AttachUrl.Replace('\\', '/'),
+                                       Declare = x.Declare
                                    }).Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList();
                 }
                 else if (meetingType == "W")
@@ -407,6 +408,7 @@ namespace BLL
                     ManagePersonNum = m_personum,
                     InstallationId = meeting.InstallationId,
                     InstallationName = meeting.InstallationName,
+                    Declare = meeting.Declare
                 }
             ;
 

SGGL/BLL/HSSE/Meeting/ClassMeetingService.cs

@@ -47,7 +47,8 @@ namespace BLL
                 MeetingHostManOther=classMeeting.MeetingHostManOther,
                 ManagePersonNum = classMeeting.ManagePersonNum,
                 InstallationId = classMeeting.InstallationId,
-                InstallationName = classMeeting.InstallationName
+                InstallationName = classMeeting.InstallationName,
+                Declare = classMeeting.Declare
             };
             db.Meeting_ClassMeeting.InsertOnSubmit(newClassMeeting);
             db.SubmitChanges();
@@ -81,7 +82,7 @@ namespace BLL
                 newClassMeeting.AttentPerson = classMeeting.AttentPerson;
                 newClassMeeting.AttentPersonNum = classMeeting.AttentPersonNum;
                 newClassMeeting.MeetingHostManOther = classMeeting.MeetingHostManOther;
-
+                newClassMeeting.Declare = classMeeting.Declare;
                 db.SubmitChanges();
             }
         }

SGGL/Model/APIItem/HSSE/MeetingItem.cs

@@ -163,6 +163,14 @@ namespace Model
             set;
         }
         /// <summary>
+        /// 情况说明
+        /// </summary>
+        public string Declare
+        {
+            get;
+            set;
+        }
+        /// <summary>
         /// 参会人数
         /// </summary>
         public int AttentPersonNum

SGGL/Model/Model.cs

@@ -299232,6 +299232,8 @@ namespace Model
 		
 		private string _InstallationName;
 		
+		private string _Declare;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntityRef<Base_Unit> _Base_Unit;
@@ -299284,6 +299286,8 @@ namespace Model
     partial void OnInstallationIdChanged();
     partial void OnInstallationNameChanging(string value);
     partial void OnInstallationNameChanged();
+    partial void OnDeclareChanging(string value);
+    partial void OnDeclareChanged();
     #endregion
 		
 		public Meeting_ClassMeeting()
@@ -299711,6 +299715,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Declare", DbType="NVarChar(500)")]
+		public string Declare
+		{
+			get
+			{
+				return this._Declare;
+			}
+			set
+			{
+				if ((this._Declare != value))
+				{
+					this.OnDeclareChanging(value);
+					this.SendPropertyChanging();
+					this._Declare = value;
+					this.SendPropertyChanged("Declare");
+					this.OnDeclareChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Meeting_ClassMeeting_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{

SGGL/WebAPI/Controllers/HSSE/MeetingController.cs

@@ -185,7 +185,7 @@ namespace WebAPI.Controllers
                 using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
                 {
 
-                    string sql = "SELECT p.ProjectId as projectId, p.ProjectName as projectName,(SELECT count(*) FROM [dbo].[Project_ProjectUser] as pu LEFT JOIN [dbo].[Sys_User] as u on u.UserId = pu.UserId WHERE pu.ProjectId = p.ProjectId) as manager,(SELECT SUM(AttentPersonNum) as cpunt FROM [dbo].[Meeting_ClassMeeting] as mc WHERE mc.ProjectId = p.ProjectId AND Year(ClassMeetingDate) = @year AND Month(ClassMeetingDate) = @month AND Day(ClassMeetingDate) = @day) as personCount FROM [dbo].[Base_Project] as p where p.ProjectState = @projectState;";
+                    string sql = "SELECT p.ProjectId as projectId, p.ProjectName as projectName,(SELECT count(*) FROM [dbo].[Project_ProjectUser] as pu LEFT JOIN [dbo].[Sys_User] as u on u.UserId = pu.UserId WHERE pu.ProjectId = p.ProjectId) as manager,(SELECT SUM(AttentPersonNum) as cpunt FROM [dbo].[Meeting_ClassMeeting] as mc WHERE mc.ProjectId = p.ProjectId AND Year(ClassMeetingDate) = @year AND Month(ClassMeetingDate) = @month AND Day(ClassMeetingDate) = @day) as personCount, (SELECT TOP 1 [Declare]  FROM [dbo].[Meeting_ClassMeeting] as mc WHERE mc.ProjectId = p.ProjectId AND Year(ClassMeetingDate) = @year AND Month(ClassMeetingDate) = @month AND Day(ClassMeetingDate) = @day AND [Declare] IS NOT NULL ORDER BY ClassMeetingDate DESC) AS [Declare] FROM [dbo].[Base_Project] as p where p.ProjectState = @projectState;";
                     DateTime mdate = Funs.GetNewDateTimeOrNow(meetingDate);
                     List<SqlParameter> listStr = new List<SqlParameter>();
                     listStr.Add(new SqlParameter("@year", mdate.Year));