页面修改

Edu.Model/ViewModel/Course/RB_Order_ViewModel.cs

@@ -89,6 +89,12 @@ namespace Edu.Model.ViewModel.Course
         /// 合同列表
         /// </summary>
         public List<RB_Education_Contract_ViewModel> ContractList { get; set; }
+
+        /// <summary>
+        /// 合同状态(1-正常)
+        /// </summary>
+        public int ContractStatus { get; set; }
+
         /// <summary>
         /// 报名开始时间
         /// </summary>

Edu.Module.Course/OrderModule.cs

@@ -1692,8 +1692,11 @@ namespace Edu.Module.Course
                     item.DirectorRemarkList = remarkList.Where(x => x.OrderId == item.OrderId && x.Type == 4).ToList();
                     item.GuestList = guestList.Where(x => x.OrderId == item.OrderId).ToList();
                     item.ContractList = clist.Where(x => x.OrderId == item.OrderId).ToList();
+                    item.ContractStatus = 0;
+
                     if (item.GuestList != null && item.GuestList.Count > 0)
                     {
+                        int guestContractCount = 0;
                         foreach (var subItem in item.GuestList)
                         {
                             var contractModel = clist.Where(x => x.OrderId == item.OrderId && x.GuestId == subItem.Id)?.FirstOrDefault();
@@ -1712,6 +1715,7 @@ namespace Edu.Module.Course
                             else if (subItem.ContractStatus == 2)
                             {
                                 ContractStatusStr = "审核通过";
+                                guestContractCount++;
                             }
                             else if (subItem.ContractStatus == 3)
                             {
@@ -1723,6 +1727,10 @@ namespace Edu.Module.Course
                             }
                             subItem.ContractStatusStr = ContractStatusStr;
                         }
+                        if (guestContractCount == item.GuestList.Count)
+                        {
+                            item.ContractStatus = 1;
+                        }
                     }
                 }
             }

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -38,9 +38,19 @@ namespace Edu.WebApi.Controllers.Course
         {
             var userInfo = base.UserInfo;
             var pageModel = JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
-            var dmodel = JsonHelper.DeserializeObject<RB_Class_ViewModel>(RequestParm.Msg.ToString());
+            var dmodel = new RB_Class_ViewModel()
+            {
+                School_Id = base.ParmJObj.GetInt("School_Id"),
+                ClassName = base.ParmJObj.GetStringValue("ClassName"),
+                StartTime = base.ParmJObj.GetStringValue("StartTime"),
+                EndTime = base.ParmJObj.GetStringValue("EndTime"),
+                Teacher_Id = base.ParmJObj.GetInt("Teacher_Id"),
+                CouseId = base.ParmJObj.GetInt("CouseId"),
+                Q_CanApply = base.ParmJObj.GetInt("Q_CanApply"),
+                JoinStartTime = base.ParmJObj.GetStringValue("JoinStartTime"),
+                JoinEndTime = base.ParmJObj.GetStringValue("JoinEndTime")
+            };
             dmodel.Group_Id = userInfo.Group_Id;
-
             var list = orderModule.GetClassPruductList(pageModel.PageIndex, pageModel.PageSize, out long count, dmodel);
             pageModel.Count = Convert.ToInt32(count);
             pageModel.PageData = list.Select(x => new
@@ -1061,6 +1071,7 @@ namespace Edu.WebApi.Controllers.Course
                         z.ContractStatus,
                         z.ContractStatusStr,
                     }),
+                    x.ContractStatus,
                     ContractList = x?.ContractList.Select(z => new {
                         z.Id,
                         z.StudentName,
@@ -1325,7 +1336,8 @@ namespace Edu.WebApi.Controllers.Course
                         z.Id,
                         z.GuestName,
                         z.GuestState
-                    })
+                    }),
+                    ContractStatus=1,//留学就业订单还没有合同(默认1)
                 })
             };
             return ApiResult.Success("", pageModel);