页面修改

Edu.Model/ViewModel/Duty/RB_Duty_Content_ViewModel.cs

@@ -20,5 +20,10 @@ namespace Edu.Model.ViewModel.Duty
         /// 值班计划编号【查询使用】
         /// </summary>
         public string QPlanIds { get; set; }
+
+        /// <summary>
+        /// 是否可以修改和删除(1-可修改可删除)
+        /// </summary>
+        public int IsOperate { get; set; }
     }
 }

Edu.Module.Duty/DutyPlanModule.cs

@@ -137,10 +137,14 @@ namespace Edu.Module.Duty
                                 subItem.DutyItemList = new List<RB_Duty_Item_ViewModel>();
                                 foreach (var dItem in dutyContentList.Where(qitem => qitem.PlanId == item.Id && qitem.PlanShift == subItem.Shift))
                                 {
-                                    subItem.DutyItemList.Add(new RB_Duty_Item_ViewModel
+                                    var dutyItem = dutyItemList?.Where(qitem =>qitem.Shifts.Contains(subItem.Shift.ToString()) && qitem.Id == dItem.ItemId && qitem.ItemSchools.Contains(item.School_Id.ToString()))?.FirstOrDefault();
+                                    if (dutyItem != null)
                                     {
-                                        ItemName = dutyItemList.Where(qitem => qitem.Id == dItem.ItemId)?.FirstOrDefault()?.ItemName ?? ""
-                                    }); 
+                                        subItem.DutyItemList.Add(new RB_Duty_Item_ViewModel
+                                        {
+                                            ItemName = dutyItem?.ItemName??""
+                                        });
+                                    }
                                 }
                             }
                             else
@@ -578,13 +582,61 @@ namespace Edu.Module.Duty
                         pList.Add(pObj);
                     }
                 }
-                
-              
+
                 result.Add("WorkList", pList);
                 //突发事项列表
-                result.Add("EmergenciesList", contentList?.Where(qitem => qitem.PlanType == 3)?.ToList() ?? new List<RB_Duty_Content_ViewModel>());
+                List<object> EmergenciesList = new List<object>();
+                foreach (var item in model.PlanDetails)
+                {
+                    if (item.Id != currentModel.Id)
+                    {
+                        var tempEmergenciesList = contentList?.Where(qitem => qitem.PlanType == 3 && qitem.PlanId == item.PlanId && qitem.PlanShift == item.Shift)?.ToList() ?? new List<RB_Duty_Content_ViewModel>();
+                        if (tempEmergenciesList != null && tempEmergenciesList.Count > 0)
+                        {
+                            tempEmergenciesList.ForEach(item => item.IsOperate = 0);
+                            EmergenciesList.AddRange(tempEmergenciesList);
+                        }
+                    }
+                    else
+                    {
+                        var tempEmergenciesList = contentList?.Where(qitem => qitem.PlanType == 3 && qitem.PlanId == item.PlanId && qitem.PlanShift == item.Shift)?.ToList() ?? new List<RB_Duty_Content_ViewModel>();
+                        if (tempEmergenciesList != null && tempEmergenciesList.Count > 0)
+                        {
+                            tempEmergenciesList.ForEach(item => item.IsOperate = 1);
+                            EmergenciesList.AddRange(tempEmergenciesList);
+                        }
+                    }
+                }
+                result.Add("EmergenciesList", EmergenciesList);
+
                 //交接事项
-                result.Add("HandoverList", contentList?.Where(qitem => qitem.PlanType == 2)?.ToList() ?? new List<RB_Duty_Content_ViewModel>());
+                List<object> HandoverList = new List<object>();
+                foreach (var item in model.PlanDetails)
+                {
+                    if ( item.Id != currentModel.Id)
+                    {
+                        if (item.Status == 2)
+                        {
+                            var tempHandOverList = contentList?.Where(qitem => qitem.PlanType == 2 && qitem.PlanId == item.PlanId && qitem.PlanShift == item.Shift)?.ToList() ?? new List<RB_Duty_Content_ViewModel>();
+                            if (tempHandOverList != null && tempHandOverList.Count > 0)
+                            {
+                                tempHandOverList.ForEach(item => item.IsOperate = 0);
+                                HandoverList.AddRange(tempHandOverList);
+                            }
+                        }
+                    }
+                    else
+                    {
+                        var tempHandOverList = contentList?.Where(qitem => qitem.PlanType == 2 && qitem.PlanId == item.PlanId && qitem.PlanShift == item.Shift)?.ToList() ?? new List<RB_Duty_Content_ViewModel>();
+                        if (tempHandOverList != null && tempHandOverList.Count > 0)
+                        {
+                            tempHandOverList.ForEach(item => item.IsOperate = 1);
+                            HandoverList.AddRange(tempHandOverList);
+                        }
+                    }
+                }
+                
+                result.Add("HandoverList", HandoverList);
                 result.Add("ReciveMan", nextModel?.DutyManName ?? "");
                 result.Add("GiveMan", previousModel?.DutyManName ?? "");