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

志愿表bug 修复

develop
old易 2023-11-22 15:24:29 +08:00
parent c9390b8982
commit 5b72847995
5 changed files with 73 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
New_College.Api/Controllers/Front/PcVolunteerController.cs
View File

@ -20,7 +20,7 @@ namespace New_College.Api.Controllers.Front
/// <summary>
/// PC志愿表管理
/// </summary>
[Route("api/front/[controller]/[action]")]
[Route("api/front/[controller]")]
[ApiController]
public class PcVolunteerController : ControllerBase
{
@ -42,8 +42,8 @@ namespace New_College.Api.Controllers.Front
/// </summary>
/// <param name="view"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<PageModel<VolunteerTableDtoView>>> Get([FromQuery] VolunteerTableRequestView view)
[HttpGet("GetPage")]
public async Task<MessageModel<PageModel<VolunteerTableDtoView>>> GetPage([FromQuery] VolunteerTableRequestView view)
{
if (view.CustomerId <= 0)
{
@ -66,11 +66,16 @@ namespace New_College.Api.Controllers.Front
SubjectClaim = c.SubjectClaim,
Type = c.Type,
VId = c.Id,
VolunteerTableName = c.VolunteerTableName
VolunteerTableName = c.VolunteerTableName,
BatchName = c.BatchName,
CreateTime = c.CreateTime,
ModifyTime = c.ModifyTime,
CP = "靠谱99%"
}).ToList();
response.pageCount = pagemodel.pageCount;
response.page = pagemodel.page;
response.PageSize = view.PageSize;
response.dataCount = pagemodel.dataCount;
return new MessageModel<PageModel<VolunteerTableDtoView>>()
{
msg = "获取成功",
@ -86,7 +91,7 @@ namespace New_College.Api.Controllers.Front
/// </summary>
/// <param name="id">志愿表Id</param>
/// <returns></returns>
[HttpGet("{id}")]
[HttpGet("Get")]
public async Task<MessageModel<VolunteerTableDetailDtoView>> Get(int id = 0)
{
@ -119,6 +124,9 @@ namespace New_College.Api.Controllers.Front
view.CustomerId = query.CustomerId;
view.Score = query.Score;
view.Type = query.Type;
view.BatchName = query.BatchName;
view.CreateTime = query.CreateTime;
view.ModifyTime = query.ModifyTime;
view.tableDetailItemsViews = items.Select(c => new VolunteerTableDetailItemsView()
{
UniversityId = c.UniversityId,
@ -127,7 +135,7 @@ namespace New_College.Api.Controllers.Front
_211 = planmajordesc.Where(e => e.UId == c.UniversityId).FirstOrDefault()._211,
_985 = planmajordesc.Where(e => e.UId == c.UniversityId).FirstOrDefault()._985,
_SYL = planmajordesc.Where(e => e.UId == c.UniversityId).FirstOrDefault()._SYL,
planMajorItems = planmajordesc.Select(s => new VolunteerTablePlanMajorItem()
planMajorItems = planmajordesc.Where(ww => ww.UId == c.UniversityId).Select(s => new VolunteerTablePlanMajorItem()
{
fee = s.Free,
Major = s.Major,
@ -137,7 +145,7 @@ namespace New_College.Api.Controllers.Front
planCount = s.PlanCount,
PlanId = s.Id,
SubjectClam = s.SelectSubject,
PlanItems = planmajorcomplist.Select(p => new PlanItem()
PlanItems = planmajorcomplist.Where(pp => pp.Major == s.Major && pp.UId == c.UniversityId).Select(p => new PlanItem()
{
PlanCount = p.PlanCount,
RankLine = p.LowScoreRank,
@ -164,7 +172,7 @@ namespace New_College.Api.Controllers.Front
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpPost]
[HttpPost("Post")]
public async Task<MessageModel<string>> Post([FromBody] VolunteerTableDtoView request)
{
var data = new MessageModel<string>();
@ -194,6 +202,7 @@ namespace New_College.Api.Controllers.Front
SubjectClaim = request.SubjectClaim,
Type = request.Type,
Score = request.Score,
BatchName = request.BatchName,
VolunteerTableName = request.VolunteerTableName,
});
@ -238,7 +247,7 @@ namespace New_College.Api.Controllers.Front
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpPut]
[HttpPut("Put")]
public async Task<MessageModel<string>> Put([FromBody] VolunteerTableDtoView request)
{
var data = new MessageModel<string>();
@ -260,6 +269,7 @@ namespace New_College.Api.Controllers.Front
UniversityId = c.UniversityId,
UniversityName = c.UniversityName,
VolunteerTableId = request.VId,
}).ToList();
var itemIds = await _VolunteerTableDetailServices.Add(itemlist);
if (status && itemIds > 0 && data.success)
@ -282,7 +292,7 @@ namespace New_College.Api.Controllers.Front
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpDelete("{id}")]
[HttpDelete("Delete/{id}")]
public async Task<MessageModel<string>> Delete(int id = 0)
{
var data = new MessageModel<string>();

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

@ -2462,6 +2462,11 @@
志愿表名称
</summary>
</member>
<member name="P:New_College.Model.Models.U_VolunteerTable.BatchName">
<summary>
批次名称
</summary>
</member>
<member name="P:New_College.Model.Models.U_VolunteerTable.Type">
<summary>
志愿填报类型（智能填报|一键填报）
@ -6535,6 +6540,11 @@
用户ID
</summary>
</member>
<member name="P:New_College.Model.ViewModels.VolunteerTableDetailDtoView.CP">
<summary>
靠谱率
</summary>
</member>
<member name="P:New_College.Model.ViewModels.VolunteerTableDetailDtoView.VolunteerTableName">
<summary>
志愿表名称
@ -6640,11 +6650,21 @@
用户ID
</summary>
</member>
<member name="P:New_College.Model.ViewModels.VolunteerTableDtoView.CP">
<summary>
靠谱率
</summary>
</member>
<member name="P:New_College.Model.ViewModels.VolunteerTableDtoView.VolunteerTableName">
<summary>
志愿表名称
</summary>
</member>
<member name="P:New_College.Model.ViewModels.VolunteerTableDtoView.BatchName">
<summary>
批次
</summary>
</member>
<member name="P:New_College.Model.ViewModels.VolunteerTableDtoView.Type">
<summary>
志愿填报类型（智能填报|一键填报）

2
New_College.Api/New_College.xml
View File

@ -522,7 +522,7 @@
PC志愿表管理
</summary>
</member>
<member name="M:New_College.Api.Controllers.Front.PcVolunteerController.Get(New_College.Model.ViewModels.VolunteerTableRequestView)">
<member name="M:New_College.Api.Controllers.Front.PcVolunteerController.GetPage(New_College.Model.ViewModels.VolunteerTableRequestView)">
<summary>
Pc端查询我的志愿列表
</summary>

5
New_College.Model/Models/U_VolunteerTable.cs
View File

@ -21,6 +21,11 @@ namespace New_College.Model.Models
public string VolunteerTableName { get; set; }
/// <summary>
///批次名称
/// </summary>
public string BatchName { get; set; }
/// <summary>
/// 志愿填报类型（智能填报|一键填报）
/// </summary>

27
New_College.Model/ViewModels/VolunteerTableDtoView.cs
View File

@ -18,6 +18,17 @@ namespace New_College.Model.ViewModels
/// </summary>
public int CustomerId { get; set; }
public string BatchName { get; set; }
public DateTime? CreateTime { get; set; }
public DateTime? ModifyTime { get; set; }
/// <summary>
/// 靠谱率
/// </summary>
public string CP { get; set; }
/// <summary>
/// 志愿表名称
/// </summary>
@ -146,11 +157,21 @@ namespace New_College.Model.ViewModels
/// </summary>
public int CustomerId { get; set; }
/// <summary>
///靠谱率
/// </summary>
public string CP { get; set; }
/// <summary>
/// 志愿表名称
/// </summary>
public string VolunteerTableName { get; set; }
/// <summary>
/// 批次
/// </summary>
public string BatchName { get; set; }
/// <summary>
/// 志愿填报类型（智能填报|一键填报）
@ -172,6 +193,12 @@ namespace New_College.Model.ViewModels
/// </summary>
public List<VolunteerTableDetailView> volunteerTableDetailViews { get; set; }
public DateTime? CreateTime { get; set; }
public DateTime? ModifyTime { get; set; }
}