update logic

New_College.Api/Controllers/Front/PcVolunteerController.cs

@@ -15,6 +15,7 @@ using New_College.Repository.UnitOfWork;
 using SqlSugar;
 using New_College.Common;
 using Microsoft.AspNetCore.Authorization;
+using StackExchange.Profiling.Internal;
 namespace New_College.Api.Controllers.Front
 {
 
@@ -104,7 +105,6 @@ namespace New_College.Api.Controllers.Front
                     msg = "id 为必传参数"
                 };
             }
-
             var view = new VolunteerTableDetailDtoView();
             var query = await _VolunteerTableServices.QueryById(id);
             var items = await _VolunteerTableDetailServices.Query(c => c.VolunteerTableId == id);
@@ -115,7 +115,6 @@ namespace New_College.Api.Controllers.Front
                 PlanMajorIds.AddRange(ids);
             }
             var planmajordesc = await _planMajorDescServices.Query(c => SqlFunc.ContainsArray(PlanMajorIds, c.Id));//
-
             var location = planmajordesc.FirstOrDefault().Location;
             var majorlist = planmajordesc.Select(c => c.Major).ToList();
             var universityname = planmajordesc.Select(c => c.UniversityName).ToList();
@@ -134,6 +133,7 @@ namespace New_College.Api.Controllers.Front
             items.ForEach(s =>
             {
                 var planids = s.PlanMajorIds.Split(",", StringSplitOptions.RemoveEmptyEntries).Select(ss => int.Parse(ss)).ToList();
+                var typeinfo = s.VolunteerRemark.FromJson<List<VolteerItem>>();
                 var uitem = new VolunteerTableDetailItemsView()
                 {
                     //  Sort = s.Sort,
@@ -148,6 +148,8 @@ namespace New_College.Api.Controllers.Front
                         PlanId = c.Id,
                         Sort = s.OrderSort,
                         SubjectClam = c.SelectSubject,
+                        Percentage = typeinfo.Any() ? typeinfo.FirstOrDefault(d => d.planId == c.Id).tage : 0,
+                        Type = typeinfo.Any() ? typeinfo.FirstOrDefault(d => d.planId == c.Id).type : 0,
                         PlanItems = planmajorcomplist.Where(ee => ee.UId == s.UniversityId && ee.Major == c.Major).Select(tt => new PlanItem()
                         {
                             Count = (tt.PlanCount == 0 ? "--" : tt.PlanCount.ToString()),
@@ -243,6 +245,7 @@ namespace New_College.Api.Controllers.Front
                     UniversityId = c.UniversityId,
                     UniversityName = c.UniversityName,
                     VolunteerTableId = id,
+                    VolunteerRemark = c.VolunteerRemark
                 }).ToList();
                 itemIds = await _VolunteerTableDetailServices.Add(itemlist);
             }
@@ -301,6 +304,7 @@ namespace New_College.Api.Controllers.Front
                     UniversityCode = c.UniversityCode,
                     UniversityId = c.UniversityId,
                     UniversityName = c.UniversityName,
+                    VolunteerRemark = c.VolunteerRemark,
                     VolunteerTableId = request.VId,
 
                 }).ToList();

New_College.Api/New_College.Model.xml

@@ -2762,6 +2762,11 @@
             招生计划Id列表逗号隔开
             </summary>
         </member>
+        <member name="P:New_College.Model.Models.U_VolunteerTableDetail.VolunteerRemark">
+             <summary>
+            保存内容详情
+             </summary>
+        </member>
         <member name="P:New_College.Model.Models.V_CustomerInfo.AvatarUrl">
             <summary>
             用户头像
@@ -4255,6 +4260,16 @@
             选科组合
             </summary>
         </member>
+        <member name="P:New_College.Model.ViewModels.AIGoPlanMajorItem.Type">
+            <summary>
+            冲稳保
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.AIGoPlanMajorItem.Percentage">
+            <summary>
+            录取概率
+            </summary>
+        </member>
         <member name="P:New_College.Model.ViewModels.AIGoPlanMajorItem.PlanItems">
              <summary>
             
@@ -6220,6 +6235,11 @@
             位次
             </summary>
         </member>
+        <member name="P:New_College.Model.ViewModels.UniversityResult.collegeCode">
+            <summary>
+            原始code
+            </summary>
+        </member>
         <member name="T:New_College.Model.ViewModels.UniversityDetailResponse">
             <summary>
             
@@ -6555,6 +6575,16 @@
             点开学校 展示专业
             </summary>
         </member>
+        <member name="P:New_College.Model.ViewModels.PlanDescList.Type">
+            <summary>
+            冲稳保类型
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.PlanDescList.Percentage">
+            <summary>
+            
+            </summary>
+        </member>
         <member name="T:New_College.Model.ViewModels.CWBEnrollmentPlanResult">
             <summary>
             冲稳保返回
@@ -7180,6 +7210,16 @@
             招生计划历年分数情况
              </summary>
         </member>
+        <member name="P:New_College.Model.ViewModels.VolunteerTablePlanMajorItem.Type">
+            <summary>
+            冲稳保
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.VolunteerTablePlanMajorItem.Percentage">
+            <summary>
+            百分比
+            </summary>
+        </member>
         <member name="P:New_College.Model.ViewModels.VolunteerTablePlanMajorItem.PlanId">
             <summary>
             招生计划Id
@@ -7230,6 +7270,16 @@
             
             </summary>
         </member>
+        <member name="P:New_College.Model.ViewModels.VolteerItem.type">
+            <summary>
+            冲 稳 保
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.VolteerItem.tage">
+            <summary>
+            百分比
+            </summary>
+        </member>
         <member name="P:New_College.Model.ViewModels.VolunteerTableDetailView.UniversityId">
             <summary>
             院校Id
@@ -7240,6 +7290,11 @@
             院校名称
             </summary>
         </member>
+        <member name="P:New_College.Model.ViewModels.VolunteerTableDetailView.VolunteerRemark">
+            <summary>
+            增加志愿表内容Json
+            </summary>
+        </member>
         <member name="P:New_College.Model.ViewModels.VolunteerTableDetailView.UniversityCode">
             <summary>
             院校编码

New_College.Model/Models/U_VolunteerTableDetail.cs

@@ -35,5 +35,10 @@ namespace New_College.Model.Models
         /// 招生计划Id列表逗号隔开
         /// </summary>
         public string PlanMajorIds { get; set; }
+
+        /// <summary>
+        ///保存内容详情
+        /// </summary>
+        public string VolunteerRemark { get; set; }
     }
 }

New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs

@@ -212,6 +212,15 @@ namespace New_College.Model.ViewModels
         /// </summary>
         public string SubjectClam { get; set; }
 
+        /// <summary>
+        /// 冲稳保
+        /// </summary>
+        public int Type { get; set; }
+
+
+        /// <summary>
+        /// 录取概率
+        /// </summary>
         public int Percentage { get; set; }
 
         /// <summary>

New_College.Model/ViewModels/Query/PlanDetailQuery.cs

@@ -9,7 +9,7 @@ namespace New_College.Model.ViewModels
         ///// <summary>
         ///// 
         ///// </summary>
-        //public float Score { get; set; }
+        public int Score { get; set; }
 
         ///// <summary>
         ///// 院校Id

New_College.Model/ViewModels/Result/VolunteerResult.cs

@@ -152,6 +152,16 @@ namespace New_College.Model.ViewModels
         public string Money { get; set; }
         public int MajorId { get; set; }
         public float Scoreline { get; set; }
+
+        /// <summary>
+        /// 冲稳保类型
+        /// </summary>
+        public int Type { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int Percentage { get; set; }
     }
 
     /// <summary>

New_College.Model/ViewModels/VolunteerTableDtoView.cs

@@ -136,6 +136,16 @@ namespace New_College.Model.ViewModels
         /// </summary>
         public List<PlanItem> PlanItems { get; set; }
 
+        /// <summary>
+        /// 冲稳保
+        /// </summary>
+        public int Type { get; set; }
+
+        /// <summary>
+        /// 百分比
+        /// </summary>
+        public int Percentage { get; set; }
+
         /// <summary>
         /// 招生计划Id
         /// </summary>
@@ -204,7 +214,19 @@ namespace New_College.Model.ViewModels
 
     }
 
+    public class VolteerItem
+    {
+        public int planId { get; set; }
+        /// <summary>
+        /// 冲 稳 保
+        /// </summary>
+        public int type { get; set; }
+        /// <summary>
+        /// 百分比
+        /// </summary>
+        public int tage { get; set; }
 
+    }
 
 
     public class VolunteerTableDetailView
@@ -221,6 +243,11 @@ namespace New_College.Model.ViewModels
         /// </summary>
         public string UniversityName { get; set; }
 
+        /// <summary>
+        /// 增加志愿表内容Json
+        /// </summary>
+        public string VolunteerRemark { get; set; }
+
         /// <summary>
         /// 院校编码
         /// </summary>

New_College.Services/D_PlanMajorDescServices.cs

@@ -126,6 +126,7 @@ namespace New_College.Services
                     MajorRemark = t.Remark,
                     planCount = t.PlanCount,
                     SubjectClam = t.SelectSubject,
+                    Type = MajorPlanScoreTool.GetPlanScore(t.LowScore, request.Score),//冲稳保院校
                     Percentage = MajorPlanScoreTool.GetPlanPercentage(t.LowScore, request.Score),
                     PlanItems = list.Where(ss => ss.UId == c.UId && ss.Major == t.Major).Select(k => new PlanItem()
                     {

New_College.Services/T_EnrollmentPlanedescServices.cs

@@ -610,7 +610,9 @@ namespace New_College.Services
                     Money = newmoney,
                     PlanNum = item.PlanCount,
                     MajorId = item.Id,
-                    Scoreline = item.LowScore
+                    Scoreline = item.LowScore,
+                    Type = MajorPlanScoreTool.GetPlanScore(item.LowScore, query.Score),//还缺冲稳保
+                    Percentage = MajorPlanScoreTool.GetPlanPercentage(item.LowScore, query.Score),
                     //Subject = GetSub(item.Subjectclaim)
                 });
             }
@@ -696,11 +698,6 @@ namespace New_College.Services
             if (university.Count <= 0)
                 return new MessageModel<List<CWBEnrollmentPlanResult>>() { success = false, msg = "所选院校数据完善中..." };
             var universityids = university.Select(x => x.Id).ToList();
-            //var batchinfo = await t_EnrollmentBatchRepository.Query(x => x.Year == query.Year && x.AreaName == query.AreaName && !x.Batch_name.Contains("提前"));
-            //if (batchinfo.Count <= 0)
-            //    return new MessageModel<List<CWBEnrollmentPlanResult>>() { success = false, msg = "所属年份数据批次为空..." };
-            //var batchids = batchinfo.Select(s => s.Id).ToList();
-
             //通过条件筛选出所有的
             var wheres = PredicateBuilder.New<T_EnrollmentPlanedesc>();
             wheres.And(x => universityids.Contains(x.UniversityId) && x.IsDelete == false && x.PlanId == planinfo.FirstOrDefault().Id && x.BatchtypeId == query.BatchId && x.UniversityId > 0);