diff --git a/New_College.Api/Controllers/Front/TestController.cs b/New_College.Api/Controllers/Front/TestController.cs index 73b5fa5..5676ce3 100644 --- a/New_College.Api/Controllers/Front/TestController.cs +++ b/New_College.Api/Controllers/Front/TestController.cs @@ -75,7 +75,7 @@ namespace New_College.Api.Controllers.Front /// /// [HttpGet] - [Authorize] + public async Task> GetTestStatus([FromQuery] CategoryStatusQuery query) { var result = await test_CategoryInfoServices.GetTestStatus(query); @@ -125,15 +125,15 @@ namespace New_College.Api.Controllers.Front /// /// [HttpPost] - [Authorize] - public async Task> SavePsych([FromBody] SavePsychQuery query) + + public async Task> SavePsych([FromBody] SavePsychQuery query) { var result = await test_PsychMeasurementInfoServices.SavePsych(query); - return new MessageModel() + return new MessageModel() { - success = result, - msg = result == true ? "提交成功" : "提交失败", - response = result + success = result.Item2, + msg = result.Item2 == true ? "提交成功" : "提交失败", + response = result.Item1 }; } @@ -143,15 +143,15 @@ namespace New_College.Api.Controllers.Front /// /// [HttpPost] - [Authorize] - public async Task> SaveHolland(SaveHollandQuery query) + + public async Task> SaveHolland(SaveHollandQuery query) { var result = await test_PsychMeasurementInfoServices.SaveHolland(query); - return new MessageModel() + return new MessageModel() { - success = result, - msg = result == true ? "提交成功" : "提交失败", - response = result + success = result.Item2, + msg = result.Item2 ? "提交成功" : "提交失败", + response = result.Item1 }; } @@ -179,7 +179,7 @@ namespace New_College.Api.Controllers.Front /// /// [HttpGet] - [Authorize] + public async Task> GetHollandResult([FromQuery] ResultLookQuery query) { var result = await test_PsychMeasurementInfoServices.GetHollandResult(query); @@ -198,7 +198,7 @@ namespace New_College.Api.Controllers.Front /// /// [HttpGet] - [Authorize] + public async Task> GetHollandOccupDetail([FromQuery] ResultLookQuery query) { var result = await test_PsychMeasurementInfoServices.GetHollandOccupDetail(query); @@ -237,7 +237,7 @@ namespace New_College.Api.Controllers.Front /// /// [HttpGet] - [Authorize] + public async Task> GetMBTIResult([FromQuery] ResultLookQuery query) { var result = await test_PsychMeasurementInfoServices.GetMBTIResult(query); @@ -256,7 +256,7 @@ namespace New_College.Api.Controllers.Front /// /// [HttpGet] - [Authorize] + public async Task> SubjectChartRadar([FromQuery] ResultLookQuery query) { return await test_PsychMeasurementInfoServices.SubjectChartRadar(query); @@ -268,7 +268,7 @@ namespace New_College.Api.Controllers.Front /// /// [HttpGet] - [Authorize] + public async Task> GetHollandStatus([FromQuery] IdQuery query) { return await test_PsychMeasurementInfoServices.GetHollandStatus(query); @@ -280,7 +280,7 @@ namespace New_College.Api.Controllers.Front /// /// [HttpGet] - [Authorize] + public async Task> GetSubjectSelectStatus([FromQuery] IdQuery query) { return await test_PsychMeasurementInfoServices.GetSubjectSelectStatus(query); @@ -293,7 +293,7 @@ namespace New_College.Api.Controllers.Front /// /// [HttpGet] - [Authorize] + public async Task> GetSubjectSelect([FromQuery] IdQuery query) { return await v_SubjectSelectServices.GetSubjectSelect(query); @@ -305,7 +305,7 @@ namespace New_College.Api.Controllers.Front /// /// [HttpPost] - [Authorize] + public async Task> SaveSubjectSelect([FromBody] SubjectSelectQuery query) { return await v_SubjectSelectServices.SaveSubjectSelect(query); @@ -355,7 +355,7 @@ namespace New_College.Api.Controllers.Front /// [HttpGet] //[Authorize] - public async Task> GetHollandSubject([FromQuery]HollandSubjectQuery query) + public async Task> GetHollandSubject([FromQuery] HollandSubjectQuery query) { return await test_PsychMeasurementInfoServices.GetHollandSubject(query); } diff --git a/New_College.IServices/ITest_PsychMeasurementInfoServices.cs b/New_College.IServices/ITest_PsychMeasurementInfoServices.cs index 2d82e5d..a4c3dde 100644 --- a/New_College.IServices/ITest_PsychMeasurementInfoServices.cs +++ b/New_College.IServices/ITest_PsychMeasurementInfoServices.cs @@ -4,6 +4,7 @@ using New_College.Model.Models; using New_College.Model.ViewModels; using New_College.Model.ViewModels.Query; using New_College.Model.ViewModels.Result; +using System; using System.Collections.Generic; using System.Threading.Tasks; @@ -16,11 +17,11 @@ namespace New_College.IServices { Task> GetPsychListByCateAndCustomerId(PsychMeasurementQuery query); - Task SavePsych(SavePsychQuery query); + Task> SavePsych(SavePsychQuery query); Task GetPsychDetail(ResultLookQuery query); - Task SaveHolland(SaveHollandQuery query); + Task> SaveHolland(SaveHollandQuery query); Task GetHollandOccupDetail(ResultLookQuery query); diff --git a/New_College.Model/Models/D_MyHistoryInfo.cs b/New_College.Model/Models/D_MyHistoryInfo.cs index 13b4156..06a4104 100644 --- a/New_College.Model/Models/D_MyHistoryInfo.cs +++ b/New_College.Model/Models/D_MyHistoryInfo.cs @@ -13,7 +13,7 @@ namespace New_College.Model.Models /// /// 记录Id /// - public int UId { get; set; } + public long UId { get; set; } /// /// diff --git a/New_College.Model/Models/D_UserSettingBase.cs b/New_College.Model/Models/D_UserSettingBase.cs index 975919e..9d14d95 100644 --- a/New_College.Model/Models/D_UserSettingBase.cs +++ b/New_College.Model/Models/D_UserSettingBase.cs @@ -14,7 +14,7 @@ namespace New_College.Model.Models /// /// /// - public int CustomerId { get; set; } + public long CustomerId { get; set; } /// /// 0-pc,1-minpro /// diff --git a/New_College.Model/Models/RootEntity.cs b/New_College.Model/Models/RootEntity.cs index 5fefb8d..da849c4 100644 --- a/New_College.Model/Models/RootEntity.cs +++ b/New_College.Model/Models/RootEntity.cs @@ -64,7 +64,7 @@ namespace New_College.Model.Models /// /// 租户id /// - public virtual int? TenantId { get; set; } + public virtual long? TenantId { get; set; } } /// ///带上租户Id @@ -74,7 +74,7 @@ namespace New_College.Model.Models /// /// 租户id /// - public virtual int? TenantId { get; set; } + public virtual long? TenantId { get; set; } } diff --git a/New_College.Model/Models/Test_PsychMeasurementInfo.cs b/New_College.Model/Models/Test_PsychMeasurementInfo.cs index 2d236e1..6d44fb5 100644 --- a/New_College.Model/Models/Test_PsychMeasurementInfo.cs +++ b/New_College.Model/Models/Test_PsychMeasurementInfo.cs @@ -13,7 +13,7 @@ namespace New_College.Model.Models /// /// 学生Id /// - public int StudentId { get; set; } + public long StudentId { get; set; } /// /// 周期Id diff --git a/New_College.Model/Models/V_OrderInfo.cs b/New_College.Model/Models/V_OrderInfo.cs index fb6504e..4302309 100644 --- a/New_College.Model/Models/V_OrderInfo.cs +++ b/New_College.Model/Models/V_OrderInfo.cs @@ -52,7 +52,7 @@ namespace New_College.Model.Models /// /// 用户Id /// - public int CustomerId { get; set; } + public long CustomerId { get; set; } /// /// diff --git a/New_College.Model/Models/V_SubjectSelect.cs b/New_College.Model/Models/V_SubjectSelect.cs index f54b51f..18364f1 100644 --- a/New_College.Model/Models/V_SubjectSelect.cs +++ b/New_College.Model/Models/V_SubjectSelect.cs @@ -9,7 +9,7 @@ namespace New_College.Model.Models /// /// 用户Id /// - public int CustomerId { get; set; } + public long CustomerId { get; set; } /// /// 逗号隔开 diff --git a/New_College.Model/ViewModels/BaseResult.cs b/New_College.Model/ViewModels/BaseResult.cs index b938d75..4a12660 100644 --- a/New_College.Model/ViewModels/BaseResult.cs +++ b/New_College.Model/ViewModels/BaseResult.cs @@ -18,7 +18,7 @@ namespace New_College.Model.ViewModels public class IdQuery { - public int? CustomerId { get; set; } + public long? CustomerId { get; set; } public int Id { get; set; } public List Ids { get; set; } diff --git a/New_College.Model/ViewModels/Query/CategoryInfoQuery.cs b/New_College.Model/ViewModels/Query/CategoryInfoQuery.cs index 879481d..42a5953 100644 --- a/New_College.Model/ViewModels/Query/CategoryInfoQuery.cs +++ b/New_College.Model/ViewModels/Query/CategoryInfoQuery.cs @@ -25,6 +25,6 @@ namespace New_College.Model.ViewModels /// /// 用户Id /// - public int CustomerId { get; set; } + public long CustomerId { get; set; } } } diff --git a/New_College.Model/ViewModels/Query/EvaluationRequest.cs b/New_College.Model/ViewModels/Query/EvaluationRequest.cs index d89a59c..d504230 100644 --- a/New_College.Model/ViewModels/Query/EvaluationRequest.cs +++ b/New_College.Model/ViewModels/Query/EvaluationRequest.cs @@ -6,6 +6,6 @@ namespace New_College.Model.ViewModels.Query { public class EvaluationRequest { - public int CustomerId { get; set; } + public long CustomerId { get; set; } } } diff --git a/New_College.Model/ViewModels/Query/PsychMeasurementQuery.cs b/New_College.Model/ViewModels/Query/PsychMeasurementQuery.cs index bd275be..ec28108 100644 --- a/New_College.Model/ViewModels/Query/PsychMeasurementQuery.cs +++ b/New_College.Model/ViewModels/Query/PsychMeasurementQuery.cs @@ -17,7 +17,7 @@ namespace New_College.Model.ViewModels { public int CategoryId { get; set; } - public int StudentId { get; set; } + public long StudentId { get; set; } public string Tags { get; set; } @@ -32,7 +32,7 @@ namespace New_College.Model.ViewModels public int CategoryId { get; set; } - public int StudentId { get; set; } + public long StudentId { get; set; } public int CycleTimeId { get; set; } @@ -92,7 +92,7 @@ namespace New_College.Model.ViewModels public class ResultLookQuery { - public int StudentId { get; set; } + public long StudentId { get; set; } public int CategoryId { get; set; } diff --git a/New_College.Model/ViewModels/Query/SubjectSelectQuery.cs b/New_College.Model/ViewModels/Query/SubjectSelectQuery.cs index 7eb1e7c..1c10b84 100644 --- a/New_College.Model/ViewModels/Query/SubjectSelectQuery.cs +++ b/New_College.Model/ViewModels/Query/SubjectSelectQuery.cs @@ -9,7 +9,7 @@ namespace New_College.Model.ViewModels /// /// 用户Id /// - public int CustomerId { get; set; } + public long CustomerId { get; set; } /// /// 逗号隔开 diff --git a/New_College.Model/ViewModels/Query/VipCardQuery.cs b/New_College.Model/ViewModels/Query/VipCardQuery.cs index 4996a6b..cecd449 100644 --- a/New_College.Model/ViewModels/Query/VipCardQuery.cs +++ b/New_College.Model/ViewModels/Query/VipCardQuery.cs @@ -6,7 +6,7 @@ namespace New_College.Model.ViewModels { public class VipCardQuery: BasePageRequest { - public int CustomerId { get; set; } + public long CustomerId { get; set; } public string CardCode { get; set; } @@ -15,13 +15,13 @@ namespace New_College.Model.ViewModels public class OpenVipCardRequest { - public int CustomerId { get; set; } + public long CustomerId { get; set; } public string CardCode { get; set; } public string CardPwd { get; set; } - public int? TenantId { get; set; } + public long? TenantId { get; set; } } diff --git a/New_College.Model/ViewModels/UserSettingBaseRequest.cs b/New_College.Model/ViewModels/UserSettingBaseRequest.cs index bed9f95..e8acf40 100644 --- a/New_College.Model/ViewModels/UserSettingBaseRequest.cs +++ b/New_College.Model/ViewModels/UserSettingBaseRequest.cs @@ -8,7 +8,7 @@ namespace New_College.Model.ViewModels { public class UserSettingBaseRequest { - public int CustomerId { get; set; } + public long CustomerId { get; set; } } @@ -43,7 +43,7 @@ namespace New_College.Model.ViewModels public class UserBaseSettingDto { - public int CustomerId { get; set; } + public long CustomerId { get; set; } /// /// 0-pc,1-minpro /// diff --git a/New_College.Services/Test_PsychMeasurementInfoServices.cs b/New_College.Services/Test_PsychMeasurementInfoServices.cs index 1db0336..304363f 100644 --- a/New_College.Services/Test_PsychMeasurementInfoServices.cs +++ b/New_College.Services/Test_PsychMeasurementInfoServices.cs @@ -97,7 +97,7 @@ namespace New_College.Services /// 提交 /// /// - public async Task SavePsych(SavePsychQuery query) + public async Task> SavePsych(SavePsychQuery query) { var IsOpen = 1; var result = ""; @@ -161,11 +161,11 @@ namespace New_College.Services // UpdateGrow(query.CareerResult, query.CycleTimeId, query.CategoryId, query.StudentId); // #endregion //} - return true; + return new Tuple(info, info > 0); } else { - return false; + return new Tuple(0, false); } } @@ -404,7 +404,7 @@ namespace New_College.Services /// /// /// - public async Task SaveHolland(SaveHollandQuery query) + public async Task> SaveHolland(SaveHollandQuery query) { StringBuilder tagname = new StringBuilder(); if (query.CategoryId == 18) @@ -439,7 +439,7 @@ namespace New_College.Services IsOpen = 1, Result = tagname.ToString() }); - return info > 0 ? true : false; + return new Tuple(info, info > 0); } else if (query.CategoryId == 19) { @@ -458,9 +458,9 @@ namespace New_College.Services IsOpen = 1, Result = tagname.ToString() }); - return info > 0 ? true : false; + return new Tuple(info, info > 0); } - return false; + return new Tuple(0, false); } @@ -507,9 +507,9 @@ namespace New_College.Services { BaseProperty = baseprop, 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 - }; + }; return response; } diff --git a/New_College.Services/V_OrderInfoServices.cs b/New_College.Services/V_OrderInfoServices.cs index 7e76f99..e1181a6 100644 --- a/New_College.Services/V_OrderInfoServices.cs +++ b/New_College.Services/V_OrderInfoServices.cs @@ -210,7 +210,7 @@ namespace New_College.Services var CoustomerId = await v_CustomerInfoRepository.Query(x => x.Phone.Contains(query.Phone)); var ids = CoustomerId.Select(x => x.Id).ToList(); if (CoustomerId != null) - wheres = wheres.And(x => ids.Contains(x.CustomerId)); + wheres = wheres.And(x => ids.Contains((int)x.CustomerId)); } //根据卡片类别查询