bug fixed
parent
080d3f02eb
commit
9369273746
|
|
@ -220,12 +220,12 @@ namespace New_College.Api.Controllers
|
|||
UniversityName = c.UniversityName,
|
||||
Sort = sort,
|
||||
PlanMajorIds = c.PlanId.ToString(),
|
||||
VolunteerRemark = JsonConvert.SerializeObject(new List<VolteerItem>() { new VolteerItem()
|
||||
VolunteerRemark = new List<VolteerItem>() { 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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<string>()
|
||||
{
|
||||
msg = "VId 必传",
|
||||
success = false
|
||||
};
|
||||
}
|
||||
return data;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
using SqlSugar;
|
||||
using New_College.Model.ViewModels;
|
||||
using SqlSugar;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
|
|
|||
|
|
@ -246,7 +246,7 @@ namespace New_College.Model.ViewModels
|
|||
/// <summary>
|
||||
/// 增加志愿表内容Json
|
||||
/// </summary>
|
||||
public string VolunteerRemark { get; set; }
|
||||
public List<VolteerItem> VolunteerRemark { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 院校编码
|
||||
|
|
|
|||
Loading…
Reference in New Issue