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

bug fixed

develop
old易 2023-12-28 10:52:22 +08:00
parent 080d3f02eb
commit 9369273746
4 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
New_College.Api/Controllers/Back/D_PlanMajorDescController.cs
View File

@ -220,12 +220,12 @@ namespace New_College.Api.Controllers
UniversityName = c.UniversityName, UniversityName = c.UniversityName,
Sort = sort, Sort = sort,
PlanMajorIds = c.PlanId.ToString(), PlanMajorIds = c.PlanId.ToString(),
VolunteerRemark = JsonConvert.SerializeObject(new List<VolteerItem>() { new VolteerItem() VolunteerRemark = new List<VolteerItem>() { new VolteerItem()
{ {
planId = c.PlanId, planId = c.PlanId,
tage = c.Percentage, tage = c.Percentage,
type = c.Type, type = c.Type,
}}) }}
}); });
}); });
vollunterrrequest.volunteerTableDetailViews = vollitem; vollunterrrequest.volunteerTableDetailViews = vollitem;
@ -272,7 +272,7 @@ namespace New_College.Api.Controllers
UniversityId = c.UniversityId, UniversityId = c.UniversityId,
UniversityName = c.UniversityName, UniversityName = c.UniversityName,
VolunteerTableId = id, VolunteerTableId = id,
VolunteerRemark = c.VolunteerRemark VolunteerRemark =JsonConvert.SerializeObject(c.VolunteerRemark)
}).ToList(); }).ToList();
itemIds = await _VolunteerTableDetailServices.Add(itemlist); itemIds = await _VolunteerTableDetailServices.Add(itemlist);
} }

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

@ -16,6 +16,7 @@ using SqlSugar;
using New_College.Common; using New_College.Common;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using StackExchange.Profiling.Internal; using StackExchange.Profiling.Internal;
using Newtonsoft.Json;
namespace New_College.Api.Controllers.Front namespace New_College.Api.Controllers.Front
{ {
@ -249,7 +250,7 @@ namespace New_College.Api.Controllers.Front
UniversityId = c.UniversityId, UniversityId = c.UniversityId,
UniversityName = c.UniversityName, UniversityName = c.UniversityName,
VolunteerTableId = id, VolunteerTableId = id,
VolunteerRemark = c.VolunteerRemark VolunteerRemark = JsonConvert.SerializeObject(c.VolunteerRemark)
}).ToList(); }).ToList();
itemIds = await _VolunteerTableDetailServices.Add(itemlist); itemIds = await _VolunteerTableDetailServices.Add(itemlist);
} }
@ -293,7 +294,7 @@ namespace New_College.Api.Controllers.Front
Score = request.Score, Score = request.Score,
SubjectClaim = request.SubjectClaim, SubjectClaim = request.SubjectClaim,
Type = request.Type, 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(); 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, UniversityCode = c.UniversityCode,
UniversityId = c.UniversityId, UniversityId = c.UniversityId,
UniversityName = c.UniversityName, UniversityName = c.UniversityName,
VolunteerRemark = c.VolunteerRemark, VolunteerRemark = JsonConvert.SerializeObject(c.VolunteerRemark),
VolunteerTableId = request.VId, VolunteerTableId = request.VId,
}).ToList(); }).ToList();
var itemIds = await _VolunteerTableDetailServices.Add(itemlist); var itemIds = await _VolunteerTableDetailServices.Add(itemlist);
if (status && itemIds > 0 && data.success) if (itemIds > 0 && data.success)
{ {
_unitOfWork.CommitTran(); _unitOfWork.CommitTran();
data.msg = "更新成功"; data.msg = "更新成功";
data.response = request?.VId.ObjToString(); data.response = request?.VId.ObjToString();
@ -324,6 +326,14 @@ namespace New_College.Api.Controllers.Front
_unitOfWork.RollbackTran(); _unitOfWork.RollbackTran();
} }
} }
else
{
return new MessageModel<string>()
{
msg = "VId 必传",
success = false
};
}
return data; return data;
} }

3
New_College.Model/Models/U_VolunteerTableDetail.cs
View File

@ -1,4 +1,5 @@
using SqlSugar; using New_College.Model.ViewModels;
using SqlSugar;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;

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

@ -246,7 +246,7 @@ namespace New_College.Model.ViewModels
/// <summary> /// <summary>
/// 增加志愿表内容Json /// 增加志愿表内容Json
/// </summary> /// </summary>
public string VolunteerRemark { get; set; } public List<VolteerItem> VolunteerRemark { get; set; }
/// <summary> /// <summary>
/// 院校编码 /// 院校编码