添加周例会删除功能

.vs/SGGL_HBAZ/v17/DocumentLayout.json

@@ -0,0 +1,153 @@
+{
+  "Version": 1,
+  "WorkspaceRootPath": "E:\\COMPANYPROJECT\\\u6CB3\u5317\u5B89\u88C5\\SGGL_HBAZ\\",
+  "Documents": [],
+  "DocumentGroupContainers": [
+    {
+      "Orientation": 0,
+      "VerticalTabListWidth": 256,
+      "DocumentGroups": [
+        {
+          "DockedWidth": 203,
+          "SelectedChildIndex": -1,
+          "Children": [
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{3ae79031-e1bc-11d0-8f78-00a0c9110057}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:129:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:130:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{1c64b9c2-e352-428e-a56d-0ace190b99a6}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{e506b91c-c606-466a-90a9-123d1d1e12b3}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:132:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:133:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:134:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:1:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:129:0:{13b12e3e-c1b4-4539-9371-4fe9a0d523fc}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:2:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:3:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:129:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:131:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{1a46fd64-28d5-434c-8eb3-17a02d419b53}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{5726b0e3-1012-5233-81f9-d1fad48e7a56}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{eefa5220-e298-11d0-8f78-00a0c9110057}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:131:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:141:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:142:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:143:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:144:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:145:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:140:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:137:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:139:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:138:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
+            }
+          ]
+        },
+        {
+          "DockedWidth": 183,
+          "SelectedChildIndex": -1,
+          "Children": [
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{d78612c7-9962-4b83-95d9-268046dad23a}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{34e76e81-ee4a-11d0-ae2e-00a0c90fffc3}"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

ReleasePackerALL2022.bat

@@ -53,7 +53,7 @@ IF errorlevel 1 goto delReleasePackError
 
 @echo ÉèÖÃ.net¿ØÖÆ̨»·¾³
 @echo.
-@call "%VS150%"
+@call "%VS2022%"
 IF errorlevel 1 goto netEnvironmentError
 
 

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();
             }
         }
@@ -105,5 +106,24 @@ namespace BLL
                 db.SubmitChanges();
             }
         }
+
+        /// <summary>
+        /// 根据主键删除周例会
+        /// </summary>
+        /// <param name="weekMeetingId"></param>
+        public static void DeleteWeekMeetingById(string weekMeetingId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.Meeting_WeekMeeting weekMeeting = db.Meeting_WeekMeeting.FirstOrDefault(e => e.WeekMeetingId == weekMeetingId);
+            if (weekMeeting != null)
+            {
+                BLL.CodeRecordsService.DeleteCodeRecordsByDataId(weekMeetingId);
+                BLL.CommonService.DeleteAttachFileById(weekMeetingId);
+                ////删除审核流程表
+                BLL.CommonService.DeleteFlowOperateByID(weekMeetingId);
+                db.Meeting_WeekMeeting.DeleteOnSubmit(weekMeeting);
+                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

@@ -97,13 +97,22 @@ namespace WebAPI.Controllers
         #endregion
 
         #region 根据ID删除会议
+        // type C
         [HttpDelete]
-        public Model.ResponeData DeleteMeeting(string meetingId)
+        public Model.ResponeData DeleteMeeting(string meetingId, string type)
         {
             var responeData = new Model.ResponeData();
             try
             {
-                BLL.ClassMeetingService.DeleteClassMeetingById(meetingId);
+                if(type == "C")
+                {
+
+                    BLL.ClassMeetingService.DeleteClassMeetingById(meetingId);
+                }
+                if(type == "W")
+                {
+                    BLL.ClassMeetingService.DeleteWeekMeetingById(meetingId);
+                }
             }
             catch (Exception ex)
             {
@@ -185,7 +194,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  STRING_AGG(mc.[Declare], '。') WITHIN GROUP (ORDER BY mc.ClassMeetingDate DESC)  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) 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));