yly
/
NewGaoKaoApi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fix

develop
易大师 2021-02-21 23:22:38 +08:00
parent 68ce7e5ad2
commit 24d9764e78
8 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
New_College.Api/New_College.Model.xml
View File

@ -5219,6 +5219,16 @@
志愿表详情
</summary>
</member>
<member name="P:New_College.Model.ViewModels.VolunteerTableResult.AreaName">
<summary>
省市区名称
</summary>
</member>
<member name="P:New_College.Model.ViewModels.VolunteerTableResult.Year">
<summary>
年份
</summary>
</member>
<member name="T:New_College.Model.ViewModels.VolunteerTableListResult">
<summary>
志愿列表

2
New_College.Model/Models/V_VipCardInfo.cs
View File

@ -11,6 +11,8 @@ namespace New_College.Model.Models
/// </summary>
public string Code { get; set; }
public string Pwd { get; set; }
/// <summary>
/// 是否一绑定
/// </summary>

2
New_College.Model/ViewModels/Query/EnrollmentPlanRequest.cs
View File

@ -16,5 +16,7 @@ namespace New_College.Model.ViewModels.Query
public int PlanId { get; set; }
public string BatchName { get; set; }
}
}

2
New_College.Model/ViewModels/Query/VipCardQuery.cs
View File

@ -9,6 +9,8 @@ namespace New_College.Model.ViewModels
public int CustomerId { get; set; }
public string CardCode { get; set; }
public string CardPwd { get; set; }
}
public class AutoVipInfoQuery

1
New_College.Repository/BASE/T_EnrollmentPlaneRepository.cs
View File

@ -31,6 +31,7 @@ namespace New_College.Repository
.Where((plans, universitys) => plans.PlanId == request.PlanId)
.WhereIF(!string.IsNullOrEmpty(request.UniversityName), (plans, universitys, batchs) => universitys.Name.Contains(request.UniversityName))
.WhereIF(!string.IsNullOrEmpty(request.MajorName), (plans, universitys, batchs) => plans.MajorName.Contains(request.MajorName))
.WhereIF(!string.IsNullOrEmpty(request.BatchName), (plans, universitys, batchs) => batchs.Batch_name.Contains(request.BatchName))
.OrderBy((plans) => plans.OrderSort, OrderByType.Desc).Select((plans, universitys, batchs) => new EnrollmentPlansResult
{
Id = plans.Id,

4
New_College.Services/T_EnrollmentPlanedescServices.cs
View File

@ -988,7 +988,7 @@ namespace New_College.Services
Sff = item.Sff,
Syl = item.Syl,
AreaName = item.Area_Name,
Year = query.Year,
Year = query.Year.ToString(),
Infos = plansinfo.Select(x => new PlanInfo()
{
MajorId = x.Id,
@ -1670,7 +1670,7 @@ namespace New_College.Services
/// <returns></returns>
public async Task<MessageModel<List<VolunteerTableListResult>>> GetVolunteerTableList(IdQuery query)
{
var info = await u_VolunteerTableRepository.Query(x => x.IsDelete == false && x.CustomerId == query.Id);
var info = await u_VolunteerTableRepository.Query(x => x.IsDelete == false && x.CustomerId == query.CustomerId);
if (info.Count <= 0)
return new MessageModel<List<VolunteerTableListResult>>() { success = false, msg = "获取失败，暂无志愿表" };
return new MessageModel<List<VolunteerTableListResult>>()

12
New_College.Services/Test_PsychMeasurementInfoServices.cs
View File

@ -1267,16 +1267,22 @@ namespace New_College.Services
var holland = querys.Where(e => e.CategoryId == 18).FirstOrDefault();
a.Message = JsonConvert.DeserializeObject<TagtestingHollandResult>(holland.Result).TagName;
a.PId = holland.Id;
a.Status = 1;
break;
case "MBTI":
var mbti = querys.Where(e => e.CategoryId == 18).FirstOrDefault();
var mbti = querys.Where(e => e.CategoryId == 19).FirstOrDefault();
a.Message = mbti.Result;
a.PId = mbti.Id;
a.Status = 1;
break;
case "DISC":
var disc = querys.Where(e => e.CategoryId == 18).FirstOrDefault();
var disc = querys.Where(e => e.CategoryId == 20);
if (disc.Any())
{
a.PId = disc.FirstOrDefault().Id;
}
a.Message = "有魅力的、自信的、有说服力的、热情的、鼓舞人心的、乐观的、令人信服的、受欢迎的、好交际的、可信赖的";
a.PId = disc.Id;
a.Status = 1;
break;
}
});

18
New_College.Services/V_VipCardInfoServices.cs
View File

@ -45,7 +45,7 @@ namespace New_College.Services
var info = await v_CustomerInfoRepository.QueryById(query.CustomerId);
if (info == null)
return new MessageModel<bool>() { success = false, msg = "用户信息异常，你重新登录" };
var cardinfo = (await _dal.Query(x => x.IsDelete == false && x.Code == query.CardCode)).FirstOrDefault();
var cardinfo = (await _dal.Query(x => x.IsDelete == false && x.Code == query.CardCode && x.Pwd == query.CardPwd)).FirstOrDefault();
if (cardinfo == null || cardinfo != null && cardinfo.IsBind == 1)
return new MessageModel<bool>() { success = false, msg = "会员卡号有误或已被绑定" };
cardinfo.IsBind = 1;
@ -230,7 +230,7 @@ namespace New_College.Services
}
#region 生成卡号
#endregion
@ -243,9 +243,9 @@ namespace New_College.Services
{
var wheres = PredicateBuilder.New<V_VipCardInfo>();
wheres = wheres.And(x => x.IsDelete == false);
if (!string.IsNullOrWhiteSpace(query.IsBind) && query.IsBind!="2")
wheres = wheres.And(x => x.IsBind ==Convert.ToInt32( query.IsBind));
if (!string.IsNullOrWhiteSpace( query.Code ))
if (!string.IsNullOrWhiteSpace(query.IsBind) && query.IsBind != "2")
wheres = wheres.And(x => x.IsBind == Convert.ToInt32(query.IsBind));
if (!string.IsNullOrWhiteSpace(query.Code))
wheres = wheres.And(x => x.Code.Contains(query.Code));
if (!string.IsNullOrWhiteSpace(query.CardTypeId) && query.CardTypeId != "0")
wheres = wheres.And(x => x.CardTypeId == Convert.ToInt32(query.CardTypeId));
@ -324,11 +324,11 @@ namespace New_College.Services
//首先获取选择对应的CardType信息
var wheres = PredicateBuilder.New<V_VipCardType>();
wheres = wheres.And(x => x.IsDelete == false);
if (query.CardTypeId>0)
wheres = wheres.And(x => x.Id==query.CardTypeId);
if (query.CardTypeId > 0)
wheres = wheres.And(x => x.Id == query.CardTypeId);
var info = await v_VipCardTypeRepository.Query(wheres);
var CardTypeList = info.Select(x => x.Id).ToList();
var listCard = await v_VipCardTypeRepository.Query(x => query.CardTypeId==x.Id && x.IsDelete == false);
var listCard = await v_VipCardTypeRepository.Query(x => query.CardTypeId == x.Id && x.IsDelete == false);
var CardTypeOne = listCard.Where(x => x.Id == query.CardTypeId).FirstOrDefault();
@ -338,7 +338,7 @@ namespace New_College.Services
Day = CardTypeOne.Day,
Money = CardTypeOne.Money,
CardTypeId = CardTypeOne.Id,
CardTypeName= CardTypeOne.Name,
CardTypeName = CardTypeOne.Name,
});
if (result > 0)