调整返回值

develop
liuyangyi 2024-05-26 00:27:40 +08:00
parent 2334f3a8f6
commit 3aa8cf9bad
3 changed files with 34 additions and 33 deletions

View File

@ -75,7 +75,7 @@ namespace New_College.Api.Controllers.Front
/// <param name="query"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
public async Task<MessageModel<CategoryStatusResult>> GetTestStatus([FromQuery] CategoryStatusQuery query) public async Task<MessageModel<CategoryStatusResult>> GetTestStatus([FromQuery] CategoryStatusQuery query)
{ {
var result = await test_CategoryInfoServices.GetTestStatus(query); var result = await test_CategoryInfoServices.GetTestStatus(query);
@ -125,15 +125,15 @@ namespace New_College.Api.Controllers.Front
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public async Task<MessageModel<bool>> SavePsych([FromBody] SavePsychQuery query) public async Task<MessageModel<int>> SavePsych([FromBody] SavePsychQuery query)
{ {
var result = await test_PsychMeasurementInfoServices.SavePsych(query); var result = await test_PsychMeasurementInfoServices.SavePsych(query);
return new MessageModel<bool>() return new MessageModel<int>()
{ {
success = result, success = result.Item2,
msg = result == true ? "提交成功" : "提交失败", msg = result.Item2 == true ? "提交成功" : "提交失败",
response = result response = result.Item1
}; };
} }
@ -143,15 +143,15 @@ namespace New_College.Api.Controllers.Front
/// <param name="query"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public async Task<MessageModel<bool>> SaveHolland(SaveHollandQuery query) public async Task<MessageModel<int>> SaveHolland(SaveHollandQuery query)
{ {
var result = await test_PsychMeasurementInfoServices.SaveHolland(query); var result = await test_PsychMeasurementInfoServices.SaveHolland(query);
return new MessageModel<bool>() return new MessageModel<int>()
{ {
success = result, success = result.Item2,
msg = result == true ? "提交成功" : "提交失败", msg = result.Item2 ? "提交成功" : "提交失败",
response = result response = result.Item1
}; };
} }
@ -179,7 +179,7 @@ namespace New_College.Api.Controllers.Front
/// <param name="query"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
public async Task<MessageModel<TagtestingHollandResult>> GetHollandResult([FromQuery] ResultLookQuery query) public async Task<MessageModel<TagtestingHollandResult>> GetHollandResult([FromQuery] ResultLookQuery query)
{ {
var result = await test_PsychMeasurementInfoServices.GetHollandResult(query); var result = await test_PsychMeasurementInfoServices.GetHollandResult(query);
@ -198,7 +198,7 @@ namespace New_College.Api.Controllers.Front
/// <param name="query"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
public async Task<MessageModel<HollandOccupDetail>> GetHollandOccupDetail([FromQuery] ResultLookQuery query) public async Task<MessageModel<HollandOccupDetail>> GetHollandOccupDetail([FromQuery] ResultLookQuery query)
{ {
var result = await test_PsychMeasurementInfoServices.GetHollandOccupDetail(query); var result = await test_PsychMeasurementInfoServices.GetHollandOccupDetail(query);
@ -237,7 +237,7 @@ namespace New_College.Api.Controllers.Front
/// <param name="query"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
public async Task<MessageModel<UserResult>> GetMBTIResult([FromQuery] ResultLookQuery query) public async Task<MessageModel<UserResult>> GetMBTIResult([FromQuery] ResultLookQuery query)
{ {
var result = await test_PsychMeasurementInfoServices.GetMBTIResult(query); var result = await test_PsychMeasurementInfoServices.GetMBTIResult(query);
@ -256,7 +256,7 @@ namespace New_College.Api.Controllers.Front
/// <param name="query"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
public async Task<MessageModel<SubjectEvBillDTO>> SubjectChartRadar([FromQuery] ResultLookQuery query) public async Task<MessageModel<SubjectEvBillDTO>> SubjectChartRadar([FromQuery] ResultLookQuery query)
{ {
return await test_PsychMeasurementInfoServices.SubjectChartRadar(query); return await test_PsychMeasurementInfoServices.SubjectChartRadar(query);
@ -268,7 +268,7 @@ namespace New_College.Api.Controllers.Front
/// <param name="query"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
public async Task<MessageModel<string>> GetHollandStatus([FromQuery] IdQuery query) public async Task<MessageModel<string>> GetHollandStatus([FromQuery] IdQuery query)
{ {
return await test_PsychMeasurementInfoServices.GetHollandStatus(query); return await test_PsychMeasurementInfoServices.GetHollandStatus(query);
@ -280,7 +280,7 @@ namespace New_College.Api.Controllers.Front
/// <param name="query"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
public async Task<MessageModel<bool>> GetSubjectSelectStatus([FromQuery] IdQuery query) public async Task<MessageModel<bool>> GetSubjectSelectStatus([FromQuery] IdQuery query)
{ {
return await test_PsychMeasurementInfoServices.GetSubjectSelectStatus(query); return await test_PsychMeasurementInfoServices.GetSubjectSelectStatus(query);
@ -293,7 +293,7 @@ namespace New_College.Api.Controllers.Front
/// <param name="query"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
public async Task<MessageModel<string>> GetSubjectSelect([FromQuery] IdQuery query) public async Task<MessageModel<string>> GetSubjectSelect([FromQuery] IdQuery query)
{ {
return await v_SubjectSelectServices.GetSubjectSelect(query); return await v_SubjectSelectServices.GetSubjectSelect(query);
@ -305,7 +305,7 @@ namespace New_College.Api.Controllers.Front
/// <param name="query"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public async Task<MessageModel<bool>> SaveSubjectSelect([FromBody] SubjectSelectQuery query) public async Task<MessageModel<bool>> SaveSubjectSelect([FromBody] SubjectSelectQuery query)
{ {
return await v_SubjectSelectServices.SaveSubjectSelect(query); return await v_SubjectSelectServices.SaveSubjectSelect(query);
@ -355,7 +355,7 @@ namespace New_College.Api.Controllers.Front
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
//[Authorize] //[Authorize]
public async Task<MessageModel<string>> GetHollandSubject([FromQuery]HollandSubjectQuery query) public async Task<MessageModel<string>> GetHollandSubject([FromQuery] HollandSubjectQuery query)
{ {
return await test_PsychMeasurementInfoServices.GetHollandSubject(query); return await test_PsychMeasurementInfoServices.GetHollandSubject(query);
} }

View File

@ -4,6 +4,7 @@ using New_College.Model.Models;
using New_College.Model.ViewModels; using New_College.Model.ViewModels;
using New_College.Model.ViewModels.Query; using New_College.Model.ViewModels.Query;
using New_College.Model.ViewModels.Result; using New_College.Model.ViewModels.Result;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -16,11 +17,11 @@ namespace New_College.IServices
{ {
Task<List<PsychMeasurementListResult>> GetPsychListByCateAndCustomerId(PsychMeasurementQuery query); Task<List<PsychMeasurementListResult>> GetPsychListByCateAndCustomerId(PsychMeasurementQuery query);
Task<bool> SavePsych(SavePsychQuery query); Task<Tuple<int, bool>> SavePsych(SavePsychQuery query);
Task<ShowPsychologicalResult> GetPsychDetail(ResultLookQuery query); Task<ShowPsychologicalResult> GetPsychDetail(ResultLookQuery query);
Task<bool> SaveHolland(SaveHollandQuery query); Task<Tuple<int, bool>> SaveHolland(SaveHollandQuery query);
Task<HollandOccupDetail> GetHollandOccupDetail(ResultLookQuery query); Task<HollandOccupDetail> GetHollandOccupDetail(ResultLookQuery query);

View File

@ -97,7 +97,7 @@ namespace New_College.Services
/// 提交 /// 提交
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public async Task<bool> SavePsych(SavePsychQuery query) public async Task<Tuple<int, bool>> SavePsych(SavePsychQuery query)
{ {
var IsOpen = 1; var IsOpen = 1;
var result = ""; var result = "";
@ -161,11 +161,11 @@ namespace New_College.Services
// UpdateGrow(query.CareerResult, query.CycleTimeId, query.CategoryId, query.StudentId); // UpdateGrow(query.CareerResult, query.CycleTimeId, query.CategoryId, query.StudentId);
// #endregion // #endregion
//} //}
return true; return new Tuple<int, bool>(info, info > 0);
} }
else else
{ {
return false; return new Tuple<int, bool>(0, false);
} }
} }
@ -404,7 +404,7 @@ namespace New_College.Services
/// </summary> /// </summary>
/// <param name="query"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
public async Task<bool> SaveHolland(SaveHollandQuery query) public async Task<Tuple<int, bool>> SaveHolland(SaveHollandQuery query)
{ {
StringBuilder tagname = new StringBuilder(); StringBuilder tagname = new StringBuilder();
if (query.CategoryId == 18) if (query.CategoryId == 18)
@ -439,7 +439,7 @@ namespace New_College.Services
IsOpen = 1, IsOpen = 1,
Result = tagname.ToString() Result = tagname.ToString()
}); });
return info > 0 ? true : false; return new Tuple<int, bool>(info, info > 0);
} }
else if (query.CategoryId == 19) else if (query.CategoryId == 19)
{ {
@ -458,9 +458,9 @@ namespace New_College.Services
IsOpen = 1, IsOpen = 1,
Result = tagname.ToString() Result = tagname.ToString()
}); });
return info > 0 ? true : false; return new Tuple<int, bool>(info, info > 0);
} }
return false; return new Tuple<int, bool>(0, false);
} }
@ -507,9 +507,9 @@ namespace New_College.Services
{ {
BaseProperty = baseprop, BaseProperty = baseprop,
Description = description, Description = description,
OccupationProperty = occupationprop.Replace(" ","").Replace("1","").Replace("2", "").Replace("3", "").Replace("4", "").Replace("5", "").Split('.', StringSplitOptions.RemoveEmptyEntries).ToList(), OccupationProperty = occupationprop.Replace(" ", "").Replace("1", "").Replace("2", "").Replace("3", "").Replace("4", "").Replace("5", "").Split('.', StringSplitOptions.RemoveEmptyEntries).ToList(),
Occupation = occupation Occupation = occupation
}; };
return response; return response;
} }