fixed:update data code
parent
ff751a0cb7
commit
fe2a7d52b8
|
|
@ -6805,6 +6805,11 @@
|
||||||
排名
|
排名
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="P:New_College.Model.ViewModels.UniversityEnrollmentPlanResult.UniversityCode">
|
||||||
|
<summary>
|
||||||
|
院校编码
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
<member name="P:New_College.Model.ViewModels.UniversityEnrollmentPlanResult.Sff">
|
<member name="P:New_College.Model.ViewModels.UniversityEnrollmentPlanResult.Sff">
|
||||||
<summary>
|
<summary>
|
||||||
是否211
|
是否211
|
||||||
|
|
|
||||||
|
|
@ -40,6 +40,10 @@ namespace New_College.Common.Helper
|
||||||
|
|
||||||
public class WeChatPayTransactionsNativeQuery
|
public class WeChatPayTransactionsNativeQuery
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 0微信支付,1z支付宝支付
|
||||||
|
/// </summary>
|
||||||
|
public int PayType { get; set; }
|
||||||
public int? Total { get; set; }
|
public int? Total { get; set; }
|
||||||
public string Description { get; set; }
|
public string Description { get; set; }
|
||||||
public string NotifyUrl { get; set; }
|
public string NotifyUrl { get; set; }
|
||||||
|
|
|
||||||
|
|
@ -78,6 +78,12 @@ namespace New_College.Model.ViewModels
|
||||||
|
|
||||||
public int UniversityId { get; set; }
|
public int UniversityId { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 院校编码
|
||||||
|
/// </summary>
|
||||||
|
public string UniversityCode { get; set; }
|
||||||
|
|
||||||
public string UniversityName { get; set; }
|
public string UniversityName { get; set; }
|
||||||
|
|
||||||
public string Logo { get; set; }
|
public string Logo { get; set; }
|
||||||
|
|
|
||||||
|
|
@ -147,6 +147,11 @@ namespace New_College.Model.ViewModels
|
||||||
|
|
||||||
public string UniversityName { get; set; }
|
public string UniversityName { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public string UniversityCode { get; set; }
|
||||||
|
|
||||||
public string Province { get; set; }
|
public string Province { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
||||||
|
|
@ -106,7 +106,7 @@ namespace New_College.Repository
|
||||||
response.Add(new UniversityMapMajorItems()
|
response.Add(new UniversityMapMajorItems()
|
||||||
{
|
{
|
||||||
UId = a,
|
UId = a,
|
||||||
MIds = recommendInfo.Where(e => e.UniversityId == a).Select(c => c.PlanId).ToList()
|
MIds = recommendInfo.Where(e => e.UniversityId == a && e.Scoreline > 0).Select(c => c.PlanId).ToList()
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
return new MessageModel<List<UniversityMapMajorItems>>() { response = response };
|
return new MessageModel<List<UniversityMapMajorItems>>() { response = response };
|
||||||
|
|
@ -171,6 +171,7 @@ namespace New_College.Repository
|
||||||
// plans.Id,
|
// plans.Id,
|
||||||
plans.UId,
|
plans.UId,
|
||||||
plans.UniversityName,
|
plans.UniversityName,
|
||||||
|
plans.EnrollmentCode
|
||||||
//plans.AreaName,
|
//plans.AreaName,
|
||||||
//plans.Ownership,
|
//plans.Ownership,
|
||||||
//plans._211,
|
//plans._211,
|
||||||
|
|
@ -193,7 +194,7 @@ namespace New_College.Repository
|
||||||
// Nhef = universitys.Nhef,
|
// Nhef = universitys.Nhef,
|
||||||
// Rank = universitys.Rank <= 0 ? "--" : universitys.Rank.ToString(),
|
// Rank = universitys.Rank <= 0 ? "--" : universitys.Rank.ToString(),
|
||||||
UniversityName = p.UniversityName,
|
UniversityName = p.UniversityName,
|
||||||
|
UniversityCode = p.EnrollmentCode,
|
||||||
planCount = SqlFunc.AggregateSum(p.PlanCount),// plandesc.Where(x => x.UniversityId == item.Id).Select(x => x.Id).ToList()
|
planCount = SqlFunc.AggregateSum(p.PlanCount),// plandesc.Where(x => x.UniversityId == item.Id).Select(x => x.Id).ToList()
|
||||||
//PlanIds= SqlFunc.Subqueryable<D_PlanMajorDesc>().Where(s=>s.Id==p.Id).ToList(s => s.Id),
|
//PlanIds= SqlFunc.Subqueryable<D_PlanMajorDesc>().Where(s=>s.Id==p.Id).ToList(s => s.Id),
|
||||||
MjaorPlan = SqlFunc.AggregateCount(p.UId),
|
MjaorPlan = SqlFunc.AggregateCount(p.UId),
|
||||||
|
|
|
||||||
|
|
@ -1255,6 +1255,7 @@ namespace New_College.Services
|
||||||
Syl = nowuniversityinfo.Syl > 0,
|
Syl = nowuniversityinfo.Syl > 0,
|
||||||
UniversityId = item.UniversityId,
|
UniversityId = item.UniversityId,
|
||||||
UniversityName = item.UniversityName,
|
UniversityName = item.UniversityName,
|
||||||
|
UniversityCode = nowdesc.Any()?nowdesc.FirstOrDefault().EnrollmentCode:"",
|
||||||
Province = nowuniversityinfo.Area_Name,
|
Province = nowuniversityinfo.Area_Name,
|
||||||
Nature = nowuniversityinfo.Nature,
|
Nature = nowuniversityinfo.Nature,
|
||||||
Infos = nowdesc.Select(x => new PlanInfo()
|
Infos = nowdesc.Select(x => new PlanInfo()
|
||||||
|
|
@ -1594,7 +1595,7 @@ namespace New_College.Services
|
||||||
if (info.Count <= 0)
|
if (info.Count <= 0)
|
||||||
return new MessageModel<List<IdNameResult>>() { success = false, msg = "数据为空" };
|
return new MessageModel<List<IdNameResult>>() { success = false, msg = "数据为空" };
|
||||||
List<IdNameResult> list = new List<IdNameResult>() { };
|
List<IdNameResult> list = new List<IdNameResult>() { };
|
||||||
foreach (var item in info.OrderByDescending(c=>c.Year).ToList())
|
foreach (var item in info.OrderByDescending(c => c.Year).ToList())
|
||||||
{
|
{
|
||||||
if (item.Type != "不分文理")
|
if (item.Type != "不分文理")
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue