diff --git a/SGGL/BLL/HSSE/Meeting/ClassMeetingService.cs b/SGGL/BLL/HSSE/Meeting/ClassMeetingService.cs
index 48202f4..66e3b9a 100644
--- a/SGGL/BLL/HSSE/Meeting/ClassMeetingService.cs
+++ b/SGGL/BLL/HSSE/Meeting/ClassMeetingService.cs
@@ -106,5 +106,24 @@ namespace BLL
db.SubmitChanges();
}
}
+
+ ///
+ /// 根据主键删除周例会
+ ///
+ ///
+ 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();
+ }
+ }
}
}
diff --git a/SGGL/WebAPI/Controllers/HSSE/MeetingController.cs b/SGGL/WebAPI/Controllers/HSSE/MeetingController.cs
index 5ef628c..f717563 100644
--- a/SGGL/WebAPI/Controllers/HSSE/MeetingController.cs
+++ b/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)
{