页面修改

Edu.Module.Course/OrderModule.cs

@@ -1178,6 +1178,38 @@ namespace Edu.Module.Course
                     item.RectorRemarkList = remarkList.Where(x => x.OrderId == item.OrderId && x.Type == 3).ToList();
                     item.DirectorRemarkList = remarkList.Where(x => x.OrderId == item.OrderId && x.Type == 4).ToList();
                     item.GuestList = guestList.Where(x => x.OrderId == item.OrderId).ToList();
+                    if (item.GuestList != null && item.GuestList.Count > 0)
+                    {
+                        foreach (var subItem in item.GuestList)
+                        {
+                            var contractModel = clist.Where(x => x.OrderId == item.OrderId && x.GuestId == subItem.Id)?.FirstOrDefault();
+                            subItem.ContractId = contractModel?.Id ?? 0;
+                            subItem.ContractNo = contractModel?.ContractNo ?? "";
+                            subItem.ContractStatus = contractModel?.Status ?? -1;
+                            string ContractStatusStr = "";
+                            if (subItem.ContractStatus == 0)
+                            {
+                                ContractStatusStr = "草稿";
+                            }
+                            else if (subItem.ContractStatus == 1)
+                            {
+                                ContractStatusStr = "提交审核";
+                            }
+                            else if (subItem.ContractStatus == 2)
+                            {
+                                ContractStatusStr = "审核通过";
+                            }
+                            else if (subItem.ContractStatus == 3)
+                            {
+                                ContractStatusStr = "驳回";
+                            }
+                            else if (subItem.ContractStatus == 4)
+                            {
+                                ContractStatusStr = "取消";
+                            }
+                            subItem.ContractStatusStr = ContractStatusStr;
+                        }
+                    }
                     item.ContractList = clist.Where(x => x.OrderId == item.OrderId).ToList();
                     var ZList = item.GuestList.Where(x => !item.ContractList.Select(z => z.GuestId).Contains(x.Id)).ToList();
                     if (ZList.Any() && item.ContractList.Any())

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -263,6 +263,8 @@ namespace Edu.WebApi.Controllers.Course
                             z.GuestName,
                             z.GuestState,
                             z.GuestStateStr,
+                            z.ContractNo,
+                            z.ContractId,
                         }),
                         ContractList = x.ContractList.Select(z => new
                         {
@@ -1419,7 +1421,7 @@ namespace Edu.WebApi.Controllers.Course
                         z.StudentName,
                         z.ContractNo,
                         z.GuestId,
-                        z.Status
+                        z.Status,
                     })
                 })
             };