diff --git a/New_College.Api/Controllers/Back/D_PlanMajorDescController.cs b/New_College.Api/Controllers/Back/D_PlanMajorDescController.cs index 37b7b08..d182316 100644 --- a/New_College.Api/Controllers/Back/D_PlanMajorDescController.cs +++ b/New_College.Api/Controllers/Back/D_PlanMajorDescController.cs @@ -220,12 +220,12 @@ namespace New_College.Api.Controllers UniversityName = c.UniversityName, Sort = sort, PlanMajorIds = c.PlanId.ToString(), - VolunteerRemark = JsonConvert.SerializeObject(new List() { new VolteerItem() + VolunteerRemark = new List() { new VolteerItem() { planId = c.PlanId, tage = c.Percentage, type = c.Type, - }}) + }} }); }); vollunterrrequest.volunteerTableDetailViews = vollitem; @@ -272,7 +272,7 @@ namespace New_College.Api.Controllers UniversityId = c.UniversityId, UniversityName = c.UniversityName, VolunteerTableId = id, - VolunteerRemark = c.VolunteerRemark + VolunteerRemark =JsonConvert.SerializeObject(c.VolunteerRemark) }).ToList(); itemIds = await _VolunteerTableDetailServices.Add(itemlist); } diff --git a/New_College.Api/Controllers/Front/PcVolunteerController.cs b/New_College.Api/Controllers/Front/PcVolunteerController.cs index 3210ba8..3007b08 100644 --- a/New_College.Api/Controllers/Front/PcVolunteerController.cs +++ b/New_College.Api/Controllers/Front/PcVolunteerController.cs @@ -16,6 +16,7 @@ using SqlSugar; using New_College.Common; using Microsoft.AspNetCore.Authorization; using StackExchange.Profiling.Internal; +using Newtonsoft.Json; namespace New_College.Api.Controllers.Front { @@ -249,7 +250,7 @@ namespace New_College.Api.Controllers.Front UniversityId = c.UniversityId, UniversityName = c.UniversityName, VolunteerTableId = id, - VolunteerRemark = c.VolunteerRemark + VolunteerRemark = JsonConvert.SerializeObject(c.VolunteerRemark) }).ToList(); itemIds = await _VolunteerTableDetailServices.Add(itemlist); } @@ -293,7 +294,7 @@ namespace New_College.Api.Controllers.Front Score = request.Score, SubjectClaim = request.SubjectClaim, Type = request.Type, - VolunteerTableName = request.VolunteerTableName + //VolunteerTableName = request.VolunteerTableName }); //删掉之前的志愿表,更新新的匹配进来 var itemids = (await _VolunteerTableDetailServices.Query(c => c.VolunteerTableId == request.VId)).Select(c => (object)c.Id).ToArray(); @@ -308,13 +309,14 @@ namespace New_College.Api.Controllers.Front UniversityCode = c.UniversityCode, UniversityId = c.UniversityId, UniversityName = c.UniversityName, - VolunteerRemark = c.VolunteerRemark, + VolunteerRemark = JsonConvert.SerializeObject(c.VolunteerRemark), VolunteerTableId = request.VId, - }).ToList(); + var itemIds = await _VolunteerTableDetailServices.Add(itemlist); - if (status && itemIds > 0 && data.success) + if (itemIds > 0 && data.success) { + _unitOfWork.CommitTran(); data.msg = "更新成功"; data.response = request?.VId.ObjToString(); @@ -324,6 +326,14 @@ namespace New_College.Api.Controllers.Front _unitOfWork.RollbackTran(); } } + else + { + return new MessageModel() + { + msg = "VId 必传", + success = false + }; + } return data; } diff --git a/New_College.Model/Models/U_VolunteerTableDetail.cs b/New_College.Model/Models/U_VolunteerTableDetail.cs index 5f08bbe..4561e07 100644 --- a/New_College.Model/Models/U_VolunteerTableDetail.cs +++ b/New_College.Model/Models/U_VolunteerTableDetail.cs @@ -1,4 +1,5 @@ -using SqlSugar; +using New_College.Model.ViewModels; +using SqlSugar; using System; using System.Collections.Generic; using System.Text; diff --git a/New_College.Model/ViewModels/VolunteerTableDtoView.cs b/New_College.Model/ViewModels/VolunteerTableDtoView.cs index e2f75e3..9f1ac47 100644 --- a/New_College.Model/ViewModels/VolunteerTableDtoView.cs +++ b/New_College.Model/ViewModels/VolunteerTableDtoView.cs @@ -246,7 +246,7 @@ namespace New_College.Model.ViewModels /// /// 增加志愿表内容Json /// - public string VolunteerRemark { get; set; } + public List VolunteerRemark { get; set; } /// /// 院校编码