From 3e80782deb767656a37609b53bd1f426b343a5b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?old=E6=98=93?= <156663459@qq.com>
Date: Tue, 25 Jun 2024 17:47:33 +0800
Subject: [PATCH] ferast

---
 New_College.Api/Controllers/Front/PcVolunteerController.cs | 5 +++--
 New_College.Api/New_College.Model.xml                      | 5 +++++
 New_College.Model/Models/T_TbSNeedDataInfo.cs              | 7 ++++++-
 New_College.Model/ViewModels/Result/CustomerInfoResult.cs  | 2 ++
 .../ViewModels/Result/TbSNeedDataInfoViewDto.cs            | 2 ++
 New_College.Services/D_LongIdMapServices.cs                | 4 +++-
 6 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/New_College.Api/Controllers/Front/PcVolunteerController.cs b/New_College.Api/Controllers/Front/PcVolunteerController.cs
index 0a8e666..417be48 100644
--- a/New_College.Api/Controllers/Front/PcVolunteerController.cs
+++ b/New_College.Api/Controllers/Front/PcVolunteerController.cs
@@ -265,12 +265,13 @@ namespace New_College.Api.Controllers.Front
                         fee = string.IsNullOrEmpty(a.Fee) ? "--" : a.Fee,
                         Major = a.MajorName,
                         MajorCode = a.MajorCode,
-                        // MajorGroup = c.MajorGroup,
-                        // MajorRemark = a.Remark,
+                        // MajorGroup = a.MajorGroup,
+                        //// MajorRemark = a.Remark,
                         planCount = a._plancount,
                         AcademicYear = a.AcademicYear,
                         Sort = s.OrderSort,
                         MajorSubjectClam = a._23subject,
+                        MajorGroup = a.MajorGroup,
                         Percentage = typeinfo.Where(e => e.planId == a.ID).FirstOrDefault().tage.ToString() + "%",
                         _23PlanCount = a._23Count == "0" ? "--" : a._23Count,
                         _22PlanCount = a._22Count == "0" ? "--" : a._22Count,
diff --git a/New_College.Api/New_College.Model.xml b/New_College.Api/New_College.Model.xml
index 1237bbe..205f9f5 100644
--- a/New_College.Api/New_College.Model.xml
+++ b/New_College.Api/New_College.Model.xml
@@ -2807,6 +2807,11 @@
             
             </summary>
         </member>
+        <member name="P:New_College.Model.Models.T_TbSNeedDataInfo.MajorGroup">
+            <summary>
+            专业组
+            </summary>
+        </member>
         <member name="P:New_College.Model.Models.T_TbSNeedDataInfo._plancount">
             <summary>
             最新招生人数
diff --git a/New_College.Model/Models/T_TbSNeedDataInfo.cs b/New_College.Model/Models/T_TbSNeedDataInfo.cs
index 14e6530..915dbea 100644
--- a/New_College.Model/Models/T_TbSNeedDataInfo.cs
+++ b/New_College.Model/Models/T_TbSNeedDataInfo.cs
@@ -76,7 +76,12 @@ namespace New_College.Model.Models
         [SugarColumn(ColumnName = "_24subject")]
         public string _24subject { get; set; }
 
-
+       
+        /// <summary>
+        /// 专业组
+        /// </summary>
+        [SugarColumn(ColumnName = "majorgroup")]
+        public string MajorGroup { get; set; }
         /// <summary>
         /// 最新招生人数
         /// </summary>
diff --git a/New_College.Model/ViewModels/Result/CustomerInfoResult.cs b/New_College.Model/ViewModels/Result/CustomerInfoResult.cs
index 4275014..faa629f 100644
--- a/New_College.Model/ViewModels/Result/CustomerInfoResult.cs
+++ b/New_College.Model/ViewModels/Result/CustomerInfoResult.cs
@@ -162,6 +162,8 @@ namespace New_College.Model.ViewModels
 
         public string BatchName { get; set; }
 
+        public bool Contract { get; set; } = false;
+
     }
     public class CustomerInfoListResult : BasePageRequest
     {
diff --git a/New_College.Model/ViewModels/Result/TbSNeedDataInfoViewDto.cs b/New_College.Model/ViewModels/Result/TbSNeedDataInfoViewDto.cs
index 4964ea3..2e1cafa 100644
--- a/New_College.Model/ViewModels/Result/TbSNeedDataInfoViewDto.cs
+++ b/New_College.Model/ViewModels/Result/TbSNeedDataInfoViewDto.cs
@@ -18,6 +18,7 @@ namespace New_College.Model.ViewModels
 
         public string UniversityName { get; set; }
 
+        public string MajorGroup { get; set; }
         public string MajorCode { get; set; }
 
         public string MajorName { get; set; }
@@ -110,6 +111,7 @@ namespace New_College.Model.ViewModels
 
         public string Province { get; set; }
 
+        public string MajorGroup { get; set; }
         public string MajorName { get; set; }
         public string _23subject { get; set; }
 
diff --git a/New_College.Services/D_LongIdMapServices.cs b/New_College.Services/D_LongIdMapServices.cs
index 7fd363e..e67f627 100644
--- a/New_College.Services/D_LongIdMapServices.cs
+++ b/New_College.Services/D_LongIdMapServices.cs
@@ -930,9 +930,10 @@ namespace New_College.Services
                 {
                     scoreline = "--";
                 }
+                string remark = !string.IsNullOrWhiteSpace(item.Remark) ? "(" + item.Remark + ")" : "";
                 list.Add(new NewPlanDescList()
                 {
-                    Name = item.Major,
+                    Name = item.Major + remark,
                     AcademicYear = item.AcademicYear,
                     SelectSubject = item.SelectSubject,
                     Money = string.IsNullOrWhiteSpace(item.Free) || item.Free == "0" || item.Free == "待定" ? "--" : item.Free,
@@ -2441,6 +2442,7 @@ namespace New_College.Services
                         Fee = a.Free,
                         Location = a.Location,
                         MajorCode = a.MajorCode,
+                        MajorGroup = a.MajorGroup,
                         MajorName = a.Major,
                         MastersDegree = u.Master_Count.ToString(),
                         UniversityName = a.UniversityName,