页面修改

Edu.Common/Enum/Sale/SaleStateEnum.cs

 using Edu.Common.Plugin;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace Edu.Common.Enum.Sale
 {
@@ -33,5 +30,11 @@ namespace Edu.Common.Enum.Sale
         /// </summary>
         [EnumField("审核失败")]
         Fail = 4,
+
+        /// <summary>
+        /// 下架
+        /// </summary>
+        [EnumField("下架")]
+        OffShelf = 5,
     }
 }

Edu.Model/ViewModel/Course/RB_Order_Guest_ViewModel.cs

@@ -45,5 +45,28 @@ namespace Edu.Model.ViewModel.Course
                 return str;
             }
         }
+
+        /// <summary>
+        /// 合同主键编号
+        /// </summary>
+        public int ContractId { get; set; }
+
+        /// <summary>
+        /// 合同编号
+        /// </summary>
+        public string ContractNo { get; set; }
+
+        /// <summary>
+        /// 合同状态
+        /// </summary>
+        public int ContractStatus { get; set; }
+
+        /// <summary>
+        /// 合同状态字符串
+        /// </summary>
+        public string ContractStatusStr
+        {
+            get;set;
+        }
     }
 }
\ No newline at end of file

Edu.Module.Course/OrderModule.cs

@@ -1560,19 +1560,36 @@ 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();
-                    var ZList = item.GuestList.Where(x => !item.ContractList.Select(z => z.GuestId).Contains(x.Id)).ToList();
-                    if (ZList.Any() && item.ContractList.Any())
+                    if (item.GuestList != null && item.GuestList.Count > 0)
                     {
-                        foreach (var qitem in ZList)
+                        foreach (var subItem in item.GuestList)
                         {
-                            item.ContractList.Add(new RB_Education_Contract_ViewModel()
+                            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)
                             {
-                                Id = 0,
-                                StudentName = qitem.GuestName,
-                                ContractNo = "",
-                                GuestId = qitem.Id,
-                                Status = 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;
                         }
                     }
                 }

Edu.Module.StudyAbroad/StudyAbroadModule.cs

@@ -265,11 +265,14 @@ namespace Edu.Module.StudyAbroad
             Dictionary<string, object> fileds = new Dictionary<string, object>()
             {
                 { nameof(RB_StudyAbroad_ViewModel.SaleState),SaleState},
-                { nameof(RB_StudyAbroad_ViewModel.DirectorAuditTime),null},
-                { nameof(RB_StudyAbroad_ViewModel.DirectorId),Common.Config.StudyAbroadDirectorId},
-                { nameof(RB_StudyAbroad_ViewModel.DirectorOpinion),""},
-                { nameof(RB_StudyAbroad_ViewModel.DirectorStatus),0},
             };
+            if (SaleState == 2)
+            {
+                fileds.Add(nameof(RB_StudyAbroad_ViewModel.DirectorAuditTime), null);
+                fileds.Add(nameof(RB_StudyAbroad_ViewModel.DirectorId), Common.Config.StudyAbroadDirectorId);
+                fileds.Add(nameof(RB_StudyAbroad_ViewModel.DirectorOpinion), "");
+                fileds.Add(nameof(RB_StudyAbroad_ViewModel.DirectorStatus), 0);
+            }
             bool flag = studyAbroadRepository.Update(fileds, new WhereHelper(nameof(RB_StudyAbroad_ViewModel.Id), Id));
             return flag;
         }

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -1014,7 +1014,11 @@ namespace Edu.WebApi.Controllers.Course
                     {
                         z.Id,
                         z.GuestName,
-                        z.GuestState
+                        z.GuestState,
+                        z.ContractId,
+                        z.ContractNo,
+                        z.ContractStatus,
+                        z.ContractStatusStr,
                     }),
                     ContractList = x?.ContractList.Select(z => new {
                         z.Id,