diff --git a/New_College.Api/Controllers/Front/PcVolunteerController.cs b/New_College.Api/Controllers/Front/PcVolunteerController.cs
index fb7ad5f..194b1ad 100644
--- a/New_College.Api/Controllers/Front/PcVolunteerController.cs
+++ b/New_College.Api/Controllers/Front/PcVolunteerController.cs
@@ -20,7 +20,7 @@ namespace New_College.Api.Controllers.Front
///
/// PC志愿表管理
///
- [Route("api/front/[controller]/[action]")]
+ [Route("api/front/[controller]")]
[ApiController]
public class PcVolunteerController : ControllerBase
{
@@ -42,8 +42,8 @@ namespace New_College.Api.Controllers.Front
///
///
///
- [HttpGet]
- public async Task>> Get([FromQuery] VolunteerTableRequestView view)
+ [HttpGet("GetPage")]
+ public async Task>> 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>()
{
msg = "获取成功",
@@ -86,7 +91,7 @@ namespace New_College.Api.Controllers.Front
///
/// 志愿表Id
///
- [HttpGet("{id}")]
+ [HttpGet("Get")]
public async Task> 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
///
///
///
- [HttpPost]
+ [HttpPost("Post")]
public async Task> Post([FromBody] VolunteerTableDtoView request)
{
var data = new MessageModel();
@@ -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
///
///
///
- [HttpPut]
+ [HttpPut("Put")]
public async Task> Put([FromBody] VolunteerTableDtoView request)
{
var data = new MessageModel();
@@ -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
///
///
///
- [HttpDelete("{id}")]
+ [HttpDelete("Delete/{id}")]
public async Task> Delete(int id = 0)
{
var data = new MessageModel();
diff --git a/New_College.Api/New_College.Model.xml b/New_College.Api/New_College.Model.xml
index 3b5932a..a1fe867 100644
--- a/New_College.Api/New_College.Model.xml
+++ b/New_College.Api/New_College.Model.xml
@@ -2462,6 +2462,11 @@
志愿表名称
+
+
+ 批次名称
+
+
志愿填报类型(智能填报|一键填报)
@@ -6535,6 +6540,11 @@
用户ID
+
+
+ 靠谱率
+
+
志愿表名称
@@ -6640,11 +6650,21 @@
用户ID
+
+
+ 靠谱率
+
+
志愿表名称
+
+
+ 批次
+
+
志愿填报类型(智能填报|一键填报)
diff --git a/New_College.Api/New_College.xml b/New_College.Api/New_College.xml
index 85e0c34..a18ecf5 100644
--- a/New_College.Api/New_College.xml
+++ b/New_College.Api/New_College.xml
@@ -522,7 +522,7 @@
PC志愿表管理
-
+
Pc端查询我的志愿列表
diff --git a/New_College.Model/Models/U_VolunteerTable.cs b/New_College.Model/Models/U_VolunteerTable.cs
index 54a970e..602db93 100644
--- a/New_College.Model/Models/U_VolunteerTable.cs
+++ b/New_College.Model/Models/U_VolunteerTable.cs
@@ -21,6 +21,11 @@ namespace New_College.Model.Models
public string VolunteerTableName { get; set; }
+ ///
+ ///批次名称
+ ///
+ public string BatchName { get; set; }
+
///
/// 志愿填报类型(智能填报|一键填报)
///
diff --git a/New_College.Model/ViewModels/VolunteerTableDtoView.cs b/New_College.Model/ViewModels/VolunteerTableDtoView.cs
index 45b2c23..9c6d2a1 100644
--- a/New_College.Model/ViewModels/VolunteerTableDtoView.cs
+++ b/New_College.Model/ViewModels/VolunteerTableDtoView.cs
@@ -18,6 +18,17 @@ namespace New_College.Model.ViewModels
///
public int CustomerId { get; set; }
+ public string BatchName { get; set; }
+
+ public DateTime? CreateTime { get; set; }
+
+ public DateTime? ModifyTime { get; set; }
+
+ ///
+ /// 靠谱率
+ ///
+ public string CP { get; set; }
+
///
/// 志愿表名称
///
@@ -146,11 +157,21 @@ namespace New_College.Model.ViewModels
///
public int CustomerId { get; set; }
+
+ ///
+ ///靠谱率
+ ///
+ public string CP { get; set; }
///
/// 志愿表名称
///
public string VolunteerTableName { get; set; }
+ ///
+ /// 批次
+ ///
+ public string BatchName { get; set; }
+
///
/// 志愿填报类型(智能填报|一键填报)
@@ -172,6 +193,12 @@ namespace New_College.Model.ViewModels
///
public List volunteerTableDetailViews { get; set; }
+
+
+ public DateTime? CreateTime { get; set; }
+
+ public DateTime? ModifyTime { get; set; }
+
}