Merge branch 'develop' of http://192.168.100.104:49153/Volunteer/newgaokao into develop

New_College.Api/Controllers/Front/TestController.cs

@@ -75,7 +75,7 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpGet]
-        [Authorize]
+
         public async Task<MessageModel<CategoryStatusResult>> GetTestStatus([FromQuery] CategoryStatusQuery query)
         {
             var result = await test_CategoryInfoServices.GetTestStatus(query);
@@ -125,15 +125,15 @@ namespace New_College.Api.Controllers.Front
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        [Authorize]
-        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);
-            return new MessageModel<bool>()
+            return new MessageModel<int>()
             {
-                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
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpPost]
-        [Authorize]
-        public async Task<MessageModel<bool>> SaveHolland(SaveHollandQuery query)
+
+        public async Task<MessageModel<int>> SaveHolland(SaveHollandQuery query)
         {
             var result = await test_PsychMeasurementInfoServices.SaveHolland(query);
-            return new MessageModel<bool>()
+            return new MessageModel<int>()
             {
-                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
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpGet]
-        [Authorize]
+
         public async Task<MessageModel<TagtestingHollandResult>> GetHollandResult([FromQuery] ResultLookQuery query)
         {
             var result = await test_PsychMeasurementInfoServices.GetHollandResult(query);
@@ -198,7 +198,7 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpGet]
-        [Authorize]
+
         public async Task<MessageModel<HollandOccupDetail>> GetHollandOccupDetail([FromQuery] ResultLookQuery query)
         {
             var result = await test_PsychMeasurementInfoServices.GetHollandOccupDetail(query);
@@ -237,7 +237,7 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpGet]
-        [Authorize]
+
         public async Task<MessageModel<UserResult>> GetMBTIResult([FromQuery] ResultLookQuery query)
         {
             var result = await test_PsychMeasurementInfoServices.GetMBTIResult(query);
@@ -256,7 +256,7 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpGet]
-        [Authorize]
+
         public async Task<MessageModel<SubjectEvBillDTO>> SubjectChartRadar([FromQuery] ResultLookQuery query)
         {
             return await test_PsychMeasurementInfoServices.SubjectChartRadar(query);
@@ -268,7 +268,7 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpGet]
-        [Authorize]
+
         public async Task<MessageModel<string>> GetHollandStatus([FromQuery] IdQuery query)
         {
             return await test_PsychMeasurementInfoServices.GetHollandStatus(query);
@@ -280,7 +280,7 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpGet]
-        [Authorize]
+
         public async Task<MessageModel<bool>> GetSubjectSelectStatus([FromQuery] IdQuery query)
         {
             return await test_PsychMeasurementInfoServices.GetSubjectSelectStatus(query);
@@ -293,7 +293,7 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpGet]
-        [Authorize]
+
         public async Task<MessageModel<string>> GetSubjectSelect([FromQuery] IdQuery query)
         {
             return await v_SubjectSelectServices.GetSubjectSelect(query);
@@ -305,7 +305,7 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpPost]
-        [Authorize]
+
         public async Task<MessageModel<bool>> SaveSubjectSelect([FromBody] SubjectSelectQuery query)
         {
             return await v_SubjectSelectServices.SaveSubjectSelect(query);
@@ -355,7 +355,7 @@ namespace New_College.Api.Controllers.Front
         /// <returns></returns>
         [HttpGet]
         //[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);
         }

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<List<PsychMeasurementListResult>> GetPsychListByCateAndCustomerId(PsychMeasurementQuery query);
 
-        Task<bool> SavePsych(SavePsychQuery query);
+        Task<Tuple<int, bool>> SavePsych(SavePsychQuery query);
 
         Task<ShowPsychologicalResult> GetPsychDetail(ResultLookQuery query);
 
-        Task<bool> SaveHolland(SaveHollandQuery query);
+        Task<Tuple<int, bool>> SaveHolland(SaveHollandQuery query);
 
         Task<HollandOccupDetail> GetHollandOccupDetail(ResultLookQuery query);
 

New_College.Model/Models/D_MyHistoryInfo.cs

@@ -13,7 +13,7 @@ namespace New_College.Model.Models
         /// <summary>
         /// 记录Id
         /// </summary>
-        public int UId { get; set; }
+        public long UId { get; set; }
 
         /// <summary>
         /// 

New_College.Model/Models/D_UserSettingBase.cs

@@ -14,7 +14,7 @@ namespace New_College.Model.Models
         /// <summary>
         /// 
         /// </summary>
-        public int CustomerId { get; set; }
+        public long CustomerId { get; set; }
         /// <summary>
         /// 0-pc,1-minpro
         /// </summary>

New_College.Model/Models/RootEntity.cs

@@ -64,7 +64,7 @@ namespace New_College.Model.Models
         /// <summary>
         /// 租户id
         /// </summary>
-        public virtual int? TenantId { get; set; }
+        public virtual long? TenantId { get; set; }
     }
     /// <summary>
     ///带上租户Id
@@ -74,7 +74,7 @@ namespace New_College.Model.Models
         /// <summary>
         /// 租户id
         /// </summary>
-        public virtual int? TenantId { get; set; }
+        public virtual long? TenantId { get; set; }
     }
 
 

New_College.Model/Models/Test_PsychMeasurementInfo.cs

@@ -13,7 +13,7 @@ namespace New_College.Model.Models
         /// <summary>
         /// 学生Id
         /// </summary>
-        public int StudentId { get; set; }
+        public long StudentId { get; set; }
 
         /// <summary>
         /// 周期Id

New_College.Model/Models/V_OrderInfo.cs

@@ -52,7 +52,7 @@ namespace New_College.Model.Models
         /// <summary>
         /// 用户Id
         /// </summary>
-        public int CustomerId { get; set; }
+        public long CustomerId { get; set; }
 
         /// <summary>
         /// 

New_College.Model/Models/V_SubjectSelect.cs

@@ -9,7 +9,7 @@ namespace New_College.Model.Models
         /// <summary>
         /// 用户Id
         /// </summary>
-        public int CustomerId { get; set; }
+        public long CustomerId { get; set; }
 
         /// <summary>
         /// 逗号隔开

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<int> Ids { get; set; }

New_College.Model/ViewModels/Query/CategoryInfoQuery.cs

@@ -25,6 +25,6 @@ namespace New_College.Model.ViewModels
         /// <summary>
         /// 用户Id
         /// </summary>
-        public int CustomerId { get; set; }
+        public long CustomerId { get; set; }
     }
 }

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; }
     }
 }

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; }
 

New_College.Model/ViewModels/Query/SubjectSelectQuery.cs

@@ -9,7 +9,7 @@ namespace New_College.Model.ViewModels
         /// <summary>
         /// 用户Id
         /// </summary>
-        public int CustomerId { get; set; }
+        public long CustomerId { get; set; }
 
         /// <summary>
         /// 逗号隔开

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; }
     }
 
 

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; }
         /// <summary>
         /// 0-pc,1-minpro
         /// </summary>

New_College.Services/Test_PsychMeasurementInfoServices.cs

@@ -97,7 +97,7 @@ namespace New_College.Services
         /// 提交
         /// </summary>
         /// <returns></returns>
-        public async Task<bool> SavePsych(SavePsychQuery query)
+        public async Task<Tuple<int, bool>> 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<int, bool>(info, info > 0);
             }
             else
             {
-                return false;
+                return new Tuple<int, bool>(0, false);
             }
         }
 
@@ -404,7 +404,7 @@ namespace New_College.Services
         /// </summary>
         /// <param name="query"></param>
         /// <returns></returns>
-        public async Task<bool> SaveHolland(SaveHollandQuery query)
+        public async Task<Tuple<int, bool>> 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<int, bool>(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<int, bool>(info, info > 0);
             }
-            return false;
+            return new Tuple<int, bool>(0, false);
         }
 
 
@@ -507,7 +507,7 @@ 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;

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));
             }
 
             //根据卡片类别查询