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

Compare commits

base: yly:128b2ff4d347f338c7ac0e84ff4e2c21a12cb86b
Branches Tags
yly:develop
...
compare: yly:21b51214e1a1c315b4e21fe891ec509302e93142
Branches Tags
yly:develop

10 Commits
128b2ff4d3 ... 21b51214e1

Author SHA1 Message Date
old易 21b51214e1 调整同步数据接口 2024-09-29 16:12:11 +08:00
old易 25cc1b091e update appsetting 2024-09-28 14:49:40 +08:00
old易 636bca43f9 1 2024-09-28 14:46:07 +08:00
old易 a1c2a559af 合并冲突 2024-09-28 14:45:42 +08:00
old易 0a1a80e7cc 调整认证方式 2024-09-28 14:41:31 +08:00
liuyangyi e168d85e64 bug fixed 2024-07-13 22:23:47 +08:00
old易 d2b24a77c5 bug fixed 2024-07-11 11:49:30 +08:00
old易 b9a706e460 bug fixewd 2024-07-11 10:34:57 +08:00
old易 13d4ede485 bug fixed 2024-07-11 10:09:36 +08:00
old易 c6b52dab7d bug fixed 2024-07-10 15:15:13 +08:00
21 changed files with 533 additions and 263 deletions
Show Stats Expand all files Collapse all files

10
New_College.Api/Controllers/Front/CustomerController.cs
View File

@ -95,7 +95,7 @@ namespace New_College.Api.Controllers.Front
var single = singlelist.FirstOrDefault();
if (single != null)
{
updatesync(single.Phone);
// updatesync(single.Phone);
//var custome = new CustomerUpdateQuery()
//{
// StudentId = single.Id,
@ -179,14 +179,18 @@ namespace New_College.Api.Controllers.Front
var result = _services.AuthCode2Session(login.code);
if (result.openid != "" && result.openid != null)
{
var loginstatus = _services.Logined(new LoginQuery() { openId = result.openid }).Result;
var loginstatus = _services.Logined(new LoginQuery() { openId = result.openid, unionId = result.unionid }).Result;
if (loginstatus.Item1)
{
response = loginstatus.Item2;
}
else
{
var save = _services.CustomerSave(new DecryptUserInfoRequest() { openid = result.openid }).Result;
var save = _services.CustomerSave(new DecryptUserInfoRequest()
{
openid = result.openid,
UnionId = result.unionid
}).Result;
response.OpenId = result.openid;
response.Id = save;
}

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

@ -120,7 +120,7 @@ namespace New_College.Api.Controllers.Front
var location = planmajordesc.FirstOrDefault().Location;
var majorlist = planmajordesc.Select(c => c.MajorName).ToList();
var universityname = planmajordesc.Select(c => c.UniversityName).Distinct().ToList();
var planmajorcomplist = await _TbSNeedDataInfoServices.Query(c => c.Location == location && SqlFunc.ContainsArray(majorlist, c.MajorName) && SqlFunc.ContainsArray(universityname, c.UniversityName));//
var planmajorcomplist = await _TbSNeedDataInfoServices.Query(c => c.Location == location && SqlFunc.ContainsArray(majorlist, c.MajorName) && SqlFunc.ContainsArray(universityname, c.UniversityName) && c._plancount > 0);//
view.VolunteerTableName = query.VolunteerTableName;
view.SubjectClaim = query.SubjectClaim.Length > 2 ? "综合" : query.SubjectClaim;
@ -319,7 +319,7 @@ namespace New_College.Api.Controllers.Front
});
var stream =await PdfOptHelper.CreatePdfAsync(string.Format("{0}-{1}-{2}", query.VolunteerTableName, query.SubjectClaim, query.Score), unversityheaders.ToList(), majorlistheaders.ToList(), ulist, query.CreateTime.Value);
var stream = await PdfOptHelper.CreatePdfAsync(string.Format("{0}-{1}-{2}", query.VolunteerTableName, query.SubjectClaim, query.Score), unversityheaders.ToList(), majorlistheaders.ToList(), ulist, query.CreateTime.Value);
// 返回 PDF 文件
return File(stream.ToArray(), "application/pdf", string.Format("{0}.pdf", DateTime.Now.ToString("yyyyMMddhhssfff_")));

6
New_College.Api/Controllers/HealthCheckController.cs
View File

@ -72,13 +72,13 @@ namespace New_College.Controllers
//更新院校分数线
// await d_LongIdMapServices.UpdateSchoolScoreLine23("河南省","理科");
// await d_LongIdMapServices.PlanNeedProSync("上海市", 2024, "综合", "本科");
// await d_LongIdMapServices.PlanNeedProSync("山东省", 2024, "综合", "普通类二段");
//await d_LongIdMapServices.SyncnewNeedProSData("上海市", 2024, "综合", "本科");
//await d_LongIdMapServices.SyncnewNeedProSData("山东省", 2024, "综合", "普通类二段");
// await v_CustomerInfoServices.CustomeBillExport();
await d_LongIdMapServices.UpdatePlanProInf("上海市");
//await d_LongIdMapServices.UpdatePlanProInf("山东省", "普通类二段");
return true;

160
New_College.Api/Controllers/OAuthController.cs
View File

@ -29,48 +29,6 @@ namespace New_College.Controllers
_CustomerInfoServices = v_CustomerInfoServices;
}
/// <summary>
///三方登录
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
//[Route("login")]
//public async Task<MessageModel<string>> Login([FromQuery] ThridLoginRequestDto dto)
//{
// string token = string.Empty;
// if (dto == null)
// {
// return new MessageModel<string>()
// {
// success = false,
// msg = "参数错误",
// };
// }
// if (ThridConfig.secretKey != dto.secretKey)
// {
// return new MessageModel<string>()
// {
// success = false,
// msg = "密钥错误",
// };
// }
// //首先判断是否存在账户|
// //不存在则创建新的账户|
// //存在则直接登录|
// return new MessageModel<string>()
// {
// msg = "ok",
// success = true,
// response = token
// };
//}
/// <summary>
/// Oauth2验证回调
/// </summary>
@ -85,92 +43,52 @@ namespace New_College.Controllers
var response = new CasDoorToken();
string jwtStr = string.Empty;
bool suc = false;
var getaccesstoken = CasdoorHttpHelper.Http_Post<CasdoorGetTokenResponse>("api/login/oauth/access_token", null, new StringContent(Newtonsoft.Json.JsonConvert.SerializeObject(new CasdoorRequest() { code = code, grant_type = "authorization_code", client_id = CasdoorConfig.ClientId, client_secret = CasdoorConfig.ClientSecret }), Encoding.UTF8, "application/json"));//获取access_token
var headers = new System.Collections.Generic.Dictionary<string, string>
{
{ "Authorization", string.Format("Bearer {0}", getaccesstoken.access_token) }
};
if (getaccesstoken.access_token == null)
{
return new MessageModel<CasDoorToken>()
{
msg = "code已失效",
success = false,
status = 401,
};
}
response.servicetoken = getaccesstoken.access_token;
var userinfo = CasdoorHttpHelper.Http_Get<CasdoorUserInfoDto>("/api/userinfo", headers, new Dictionary<string, string>());
var user = (await _CustomerInfoServices.Query(q => q.UUID == userinfo.sub)).FirstOrDefault();
if (user == null)
{
if (!string.IsNullOrWhiteSpace(userinfo.phone))
{
var baseuser = (await _CustomerInfoServices.Query(q => q.Phone == userinfo.phone)).FirstOrDefault();
if (baseuser != null)
var userinfo = CasdoorHttpHelper.Http_Post<JWTSSOResult<MinProWxOutPut>>("/api/syswechat/user_info", null,
new StringContent(Newtonsoft.Json.JsonConvert.SerializeObject(
new CasdoorRequest()
{
if (string.IsNullOrEmpty(baseuser.NickName))
{
if (!string.IsNullOrWhiteSpace(baseuser.Phone))
{
baseuser.NickName = baseuser.Phone;
}
}
baseuser.UUID = userinfo.sub;
user = baseuser;
await _CustomerInfoServices.Update(baseuser);
}
else
code = code,
client_id = CasdoorConfig.ClientId,
client_secret = CasdoorConfig.ClientSecret
}),
Encoding.UTF8, "application/json"));//
if (userinfo.code == 200 && userinfo.type == "success")
{
var user = (await _CustomerInfoServices.Query(q => q.UUID == userinfo.result.UnionId)).FirstOrDefault();
if (user != null)
{
//没有用户则注册一个新用户
user = new Model.Models.V_CustomerInfo()
{
//没有用户则注册一个新用户
user = new Model.Models.V_CustomerInfo()
{
IsDelete = false,
UUID = userinfo.sub,
Phone = userinfo.phone,
OpenId = userinfo.aud,
CreateTime = DateTime.UtcNow,
IsVIP = false,
Gender = 0,
Subject = 1
};
user.Id = await _CustomerInfoServices.Add(user);
}
IsDelete = false,
UUID = userinfo.result.UnionId,
Phone = userinfo.result.Mobile,
GZOpenId = userinfo.result.OpenId,
CreateTime = DateTime.UtcNow,
IsVIP = false,
Gender = 0,
Subject = 1,
NickName = userinfo.result.NickName,
ModifyTime = DateTime.UtcNow,
TenantId = userinfo.result.TenantId,
AvatarUrl = userinfo.result.Avatar,
CustomerType = CustomerTypeEnum.General
};
user.Id = await _CustomerInfoServices.Add(user);
}
else
{
return new MessageModel<CasDoorToken>()
{
success = false,
msg = "该账户不存在或已注销"
};
user.GZOpenId = userinfo.result.OpenId;
user.ModifyTime = DateTime.UtcNow;
await _CustomerInfoServices.Update(user);
}
var tokenModel = new SSOTokenModelJwt { UserId = user.Id.ToString(), NickName = user.NickName, LoginMode = LoginModeEnum.APP.ToString() };
jwtStr = JwtHelper.ssoIssueJwt(tokenModel);
response.token = jwtStr;
response.Id = user.Id;
suc = true;
}
else
{
if (string.IsNullOrEmpty(user.NickName))
{
var single = await _CustomerInfoServices.QueryById(user.Id);
if (!string.IsNullOrWhiteSpace(user.Phone))
{
single.NickName = user.Phone;
}
if (!string.IsNullOrWhiteSpace(user.UserCode))
{
single.NickName = user.UserCode;
}
await _CustomerInfoServices.Update(single);
}
}
TokenModelJwt tokenModel = new TokenModelJwt { Uid = user.Id, Role = "users" };
jwtStr = JwtHelper.IssueJwt(tokenModel);
response.token = jwtStr;
response.Id = user.Id;
suc = true;
return new MessageModel<CasDoorToken>()
{
success = suc,

102
New_College.Api/New_College.Model.xml
View File

@ -3147,6 +3147,11 @@
小程序openid
</summary>
</member>
<member name="P:New_College.Model.Models.V_CustomerInfo.GZOpenId">
<summary>
公众号openid
</summary>
</member>
<member name="P:New_College.Model.Models.V_CustomerInfo.NickName">
<summary>
用户名
@ -3249,7 +3254,7 @@
</member>
<member name="P:New_College.Model.Models.V_CustomerInfo.UUID">
<summary>
CasdoorId
UnionId
</summary>
</member>
<member name="P:New_College.Model.Models.V_ExaminationPolicy.AreaId">
@ -3529,6 +3534,36 @@
找不到指定资源
</summary>
</member>
<member name="F:New_College.Model.PlatformTypeEnum.微信公众号">
<summary>
微信公众号
</summary>
</member>
<member name="F:New_College.Model.PlatformTypeEnum.微信小程序">
<summary>
微信小程序
</summary>
</member>
<member name="F:New_College.Model.PlatformTypeEnum.QQ">
<summary>
QQ
</summary>
</member>
<member name="F:New_College.Model.PlatformTypeEnum.Alipay">
<summary>
支付宝
</summary>
</member>
<member name="F:New_College.Model.LoginModeEnum.PC">
<summary>
PC模式
</summary>
</member>
<member name="F:New_College.Model.LoginModeEnum.APP">
<summary>
APP
</summary>
</member>
<member name="M:New_College.Model.Seed.DBSeed.SeedAsync(New_College.Model.Seed.MyContext,System.String)">
<summary>
异步添加种子数据
@ -5760,6 +5795,71 @@
选项标签
</summary>
</member>
<member name="P:New_College.Model.ViewModels.MinProWxOutPut.Id">
<summary>
系统用户Id
</summary>
</member>
<member name="P:New_College.Model.ViewModels.MinProWxOutPut.PlatformType">
<summary>
平台类型
</summary>
</member>
<member name="P:New_College.Model.ViewModels.MinProWxOutPut.OpenId">
<summary>
OpenId
</summary>
</member>
<member name="P:New_College.Model.ViewModels.MinProWxOutPut.UnionId">
<summary>
UnionId
</summary>
</member>
<member name="P:New_College.Model.ViewModels.MinProWxOutPut.NickName">
<summary>
昵称
</summary>
</member>
<member name="P:New_College.Model.ViewModels.MinProWxOutPut.Avatar">
<summary>
头像
</summary>
</member>
<member name="P:New_College.Model.ViewModels.MinProWxOutPut.Mobile">
<summary>
手机号码
</summary>
</member>
<member name="P:New_College.Model.ViewModels.MinProWxOutPut.Sex">
<summary>
性别
</summary>
</member>
<member name="P:New_College.Model.ViewModels.MinProWxOutPut.Language">
<summary>
语言
</summary>
</member>
<member name="P:New_College.Model.ViewModels.MinProWxOutPut.City">
<summary>
城市
</summary>
</member>
<member name="P:New_College.Model.ViewModels.MinProWxOutPut.Province">
<summary>
省
</summary>
</member>
<member name="P:New_College.Model.ViewModels.MinProWxOutPut.Country">
<summary>
国家
</summary>
</member>
<member name="P:New_College.Model.ViewModels.MinProWxOutPut.TenantId">
<summary>
租户Id
</summary>
</member>
<member name="P:New_College.Model.ViewModels.CategoryStatusResult.TestNum">
<summary>
测试次数

14
New_College.Api/appsettings.Development.json
View File

@ -116,10 +116,10 @@
}
],
"Audience": {
"Secret": "sdfsdfsrty25634kkhllghtdgdfss345t678fs", //不要太短，16位+
"SecretFile": "C:\\my-file\\new_college.audience.secret.txt", //安全。内容就是Secret
"Issuer": "New_College",
"Audience": "wr"
"Secret": "9c1cbc3f546eda35168c3aa3cb91780fbe703f0996c6d123ea96dc85c70bbc0a", //不要太短，16位+
"SecretFile": "", //安全。内容就是Secret
"Issuer": "YCYMEDUCENTER",
"Audience": "YCYMEDUCENTER"
},
"Startup": {
"Cors": {
@ -215,12 +215,12 @@
"endpoint": "https://oss-cn-shanghai.aliyuncs.com"
},
"Casdoor": {
"Endpoint": "http://192.168.104.107:8000",
"Endpoint": "https://api.sso.ycymedu.com",
"OrganizationName": "六纬生涯",
"ApplicationName": "六纬生涯",
"ApplicationType": "webapi",
"ClientId": "776d639918192c449537",
"ClientSecret": "d556f0692052a2df56614282dd86895b04783262",
"ClientId": "18592781518917",
"ClientSecret": "9c1cbc3f546eda35168c3aa3cb91780fbe703f0996c6d123ea96dc85c70bbc0a",
"CallbackPath": "http://test.sso.ycymedu.com/login/oauth/authorize?client_id=776d639918192c449537&response_type=code&redirect_uri=http://192.168.100.106:8080/Home/FirstPage&scope=read&state=casdoor",
"RequireHttpsMetadata": false
},

2
New_College.Api/appsettings.json
View File

@ -117,7 +117,7 @@
],
"Audience": {
"Secret": "sdfsdfsrty25634kkhllghtdgdfss345t678fs", //不要太短，16位+
"SecretFile": "C:\\my-file\\new_college.audience.secret.txt", //安全。内容就是Secret
"SecretFile": "", //安全。内容就是Secret
"Issuer": "New_College",
"Audience": "wr"
},

10
New_College.Common/Helper/MajorPlanScoreTool.cs
View File

@ -17,6 +17,10 @@ namespace New_College.Common
/// <returns></returns>
public static int GetPlanPercentage(int LowScore, int requestScore)
{
if (LowScore == 0)
{
return 90;
}
//int minscore = requestScore - 60;//最小
//int constscore = requestScore;//中位数
//int maxscore = requestScore + 15;//最大
@ -29,10 +33,14 @@ namespace New_College.Common
{
percentage = new Random().Next(31, 80);
}
if (LowScore >= requestScore && LowScore <= requestScore + 15)
if (LowScore >= requestScore && LowScore <= requestScore + 30)
{
percentage = new Random().Next(1, 30);
}
//else
//{
// percentage = new Random().Next(1, 30);
//}
return percentage;
}

78
New_College.Extensions/Authorizations/OverWrite/JwtHelper.cs
View File

@ -94,6 +94,61 @@ namespace New_College.AuthHelper.OverWrite
};
return tm;
}
public static string ssoIssueJwt(SSOTokenModelJwt tokenModel)
{
string iss = Appsettings.app(new string[] { "Audience", "Issuer" });
string aud = Appsettings.app(new string[] { "Audience", "Audience" });
string secret = AppSecretConfig.Audience_Secret_String;
//var claims = new Claim[] //old
var claims = new List<Claim>
{
/*
* 特别重要：
1、这里将用户的部分信息，比如 uid 存到了Claim 中，如果你想知道如何在其他地方将这个 uid从 Token 中取出来，请看下边的SerializeJwt() 方法，或者在整个解决方案，搜索这个方法，看哪里使用了！
2、你也可以研究下 HttpContext.User.Claims ，具体的你可以看看 Policys/PermissionHandler.cs 类中是如何使用的。
*/
new Claim(JwtRegisteredClaimNames.Jti, tokenModel.UserId.ToString()),
new Claim(JwtRegisteredClaimNames.Iat, $"{new DateTimeOffset(DateTime.Now).ToUnixTimeSeconds()}"),
new Claim(JwtRegisteredClaimNames.Nbf,$"{new DateTimeOffset(DateTime.Now).ToUnixTimeSeconds()}") ,
//这个就是过期时间，目前是过期1000秒，可自定义，注意JWT有自己的缓冲过期时间
new Claim (JwtRegisteredClaimNames.Exp,$"{new DateTimeOffset(DateTime.Now.AddDays(7)).ToUnixTimeSeconds()}"),
new Claim(ClaimTypes.Expiration, DateTime.Now.AddDays(1000).ToString()),
new Claim(JwtRegisteredClaimNames.Iss,iss),
new Claim(JwtRegisteredClaimNames.Aud,aud),
new Claim(JwtRegisteredClaimNames.Name,tokenModel.NickName),
//new Claim(ClaimTypes.Role,tokenModel.Role),//为了解决一个用户多个角色(比如：Admin,System)，用下边的方法
};
// 可以将一个用户的多个角色全部赋予；
// 作者：DX 提供技术支持；
// claims.AddRange(tokenModel.Role.Split(',').Select(s => new Claim(ClaimTypes.Role, s)));
//秘钥 (SymmetricSecurityKey 对安全性的要求，密钥的长度太短会报出异常)
var key = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(secret));
var creds = new SigningCredentials(key, SecurityAlgorithms.HmacSha256);
var jwt = new JwtSecurityToken(
issuer: iss,
claims: claims,
signingCredentials: creds);
var jwtHandler = new JwtSecurityTokenHandler();
var encodedJwt = jwtHandler.WriteToken(jwt);
return encodedJwt;
}
}
/// <summary>
@ -115,4 +170,27 @@ namespace New_College.AuthHelper.OverWrite
public string Work { get; set; }
}
public class SSOTokenModelJwt
{
/// <summary>
/// 用户Id
/// </summary>
public string UserId = "UserId";
/// <summary>
/// 昵称
/// </summary>
public string NickName = "NickName";
/// <summary>
/// 登录模式PC、APP
/// </summary>
public string LoginMode = "LoginMode";
}
}

2
New_College.IServices/ID_LongIdMapServices.cs
View File

@ -32,7 +32,7 @@ namespace New_College.IServices
/// <returns></returns>
Task<bool> UpdatePlanScoreLine();
Task<bool> UpdateSchoolScoreLine23(string Location,string subjectType);
Task<bool> UpdatePlanProInf(string Location);
Task<bool> UpdatePlanProInf(string Location, string batchname);
Task<bool> Import();
Task<bool> UpdateUniveristyInf();

11
New_College.Model/Models/V_CustomerInfo.cs
View File

@ -2,6 +2,7 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Text;
namespace New_College.Model.Models
@ -26,6 +27,13 @@ namespace New_College.Model.Models
[SugarColumn(IsNullable = true)]
public string OpenId { get; set; }
/// <summary>
/// 公众号openid
/// </summary>
[SugarColumn(IsNullable = true)]
public string GZOpenId { get; set; }
/// <summary>
/// 用户名
/// </summary>
@ -106,6 +114,7 @@ namespace New_College.Model.Models
public string Subjectgroup { get; set; }
/// <summary>
///
/// </summary>
@ -144,7 +153,7 @@ namespace New_College.Model.Models
/// <summary>
/// CasdoorId
/// UnionId
/// </summary>
[SugarColumn(IsNullable = true)]
public string UUID { get; set; }

2
New_College.Model/Request/DecryptUserInfoRequest.cs
View File

@ -7,7 +7,7 @@ namespace New_College.Model.Request
{
public class DecryptUserInfoRequest : GetPhoneInfo
{
public string UnionId { get; set; }
/// <summary>
/// 用户头像
/// </summary>

3
New_College.Model/Request/LoginQuery.cs
View File

@ -15,6 +15,9 @@ namespace New_College.Model.Request
/// 退出重新登录时传此值
/// </summary>
public string code { get; set; }
public string unionId { get; set; }
}

41
New_College.Model/ResponseEnum.cs
View File

@ -20,4 +20,45 @@ namespace New_College.Model
[Description("服务器错误")]
ServerError = 500
}
public enum PlatformTypeEnum
{ /// <summary>
/// 微信公众号
/// </summary>
[Description("微信公众号")]
微信公众号 = 1,
/// <summary>
/// 微信小程序
/// </summary>
[Description("微信小程序")]
微信小程序 = 2,
/// <summary>
/// QQ
/// </summary>
[Description("QQ")]
QQ = 3,
/// <summary>
/// 支付宝
/// </summary>
[Description("支付宝")]
Alipay = 4,
}
public enum LoginModeEnum
{
/// <summary>
/// PC模式
/// </summary>
[Description("PC模式")]
PC = 1,
/// <summary>
/// APP
/// </summary>
[Description("APP")]
APP = 2
}
}

82
New_College.Model/ViewModels/Result/CasDoorTokenResult.cs
View File

@ -16,11 +16,91 @@ namespace New_College.Model.ViewModels
public string error_description { get; set; }
}
public class JWTSSOResult<T>
{
public int code { get; set; }
public string type { get; set; }
public string message { get; set; }
public T result { get; set; }
public object extras { get; set; }
public string time { get; set; }
}
public class MinProWxOutPut
{
/// <summary>
/// 系统用户Id
/// </summary>
public long Id { get; set; }
/// <summary>
/// 平台类型
/// </summary>
public PlatformTypeEnum PlatformType { get; set; } = PlatformTypeEnum.微信公众号;
/// <summary>
/// OpenId
/// </summary>
public string OpenId { get; set; }
/// <summary>
/// UnionId
/// </summary>
public string? UnionId { get; set; }
/// <summary>
/// 昵称
/// </summary>
public string? NickName { get; set; }
/// <summary>
/// 头像
/// </summary>
public string? Avatar { get; set; }
/// <summary>
/// 手机号码
/// </summary>
public string? Mobile { get; set; }
/// <summary>
/// 性别
/// </summary>
public int? Sex { get; set; }
/// <summary>
/// 语言
/// </summary>
public string? Language { get; set; }
/// <summary>
/// 城市
/// </summary>
public string? City { get; set; }
/// <summary>
/// 省
/// </summary>
public string? Province { get; set; }
/// <summary>
/// 国家
/// </summary>
public string? Country { get; set; }
/// <summary>
/// 租户Id
/// </summary>
public long? TenantId { get; set; }
}
public class CasdoorRequest
{
public string grant_type { get; set; }
//public string grant_type { get; set; }
public string client_id { get; set; }
public string client_secret { get; set; }
public string code { get; set; }

30
New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs
View File

@ -200,7 +200,7 @@ namespace New_College.Repository
majornames = majoraslist.Select(x => x.MajorName).ToList();
}
StringBuilder sqlstr = new StringBuilder();
sqlstr.AppendFormat("SELECT * from T_TbSNeedDataInfo where SubjectType='{0}' ", subjecttype);
sqlstr.AppendFormat("SELECT * from T_TbSNeedDataInfo where SubjectType='{0}' and _plancount>0 ", subjecttype);
if (regionlist.Any())
{
@ -216,21 +216,31 @@ namespace New_College.Repository
}
if (string.IsNullOrEmpty(query.Type))
{
sqlstr.AppendFormat(" and (_23Score BETWEEN {0} and {1})", query.Score - 60, query.Score + 15);
sqlstr.AppendFormat(" and ((_23Score BETWEEN {0} and {1})", query.Score - 60, query.Score + 15);
}
if (query.Type == "冲")
{
sqlstr.AppendFormat(" and (_23Score BETWEEN {0} and {1})", query.Score, query.Score + 15);
sqlstr.AppendFormat(" and ((_23Score BETWEEN {0} and {1})", query.Score, query.Score + 15);
}
if (query.Type == "稳")
{
sqlstr.AppendFormat(" and (_23Score BETWEEN {0} and {1})", query.Score - 26, query.Score - 1);
sqlstr.AppendFormat(" and ((_23Score BETWEEN {0} and {1})", query.Score - 26, query.Score - 1);
}
if (query.Type == "保")
{
sqlstr.AppendFormat(" and (_23Score BETWEEN {0} and {1})", query.Score - 60, query.Score - 26);
sqlstr.AppendFormat(" and ((_23Score BETWEEN {0} and {1})", query.Score - 60, query.Score - 26);
}
if (query.BatchName == "普通类二段" || query.BatchName.Contains("专科"))
{
sqlstr.AppendLine(" or _23Score <=0 and EducationCategory='专科') ");
}
else
{
sqlstr.AppendLine(" ) ");
}
if (majornames.Any() && majornames.Count() > 0)
{
sqlstr.Append(" and (");
@ -254,8 +264,14 @@ namespace New_College.Repository
{
sqlstr.AppendFormat(" and (_23subject like'%{0}%' or _23subject like'%{1}%' or _23subject like'%{2}%' or _23subject like'%{3}%' )", claim01, claim02, claim03, "不限");
}
sqlstr.Append("and _23ScoreLine>0 order by _23ScoreLine ");
//if (query.BatchName == "普通类二段" || query.BatchName.Contains("专科"))
//{
// sqlstr.AppendLine(" or _23Score <=0 and EducationCategory='专科') order by _23ScoreLine ");
//}
//else
//{
sqlstr.Append(" order by _23ScoreLine ");
// }
var recommendInfo = await this.Db.SqlQueryable<TbSNeedDataInfoViewDto>(sqlstr.ToString()).ToListAsync();

196
New_College.Services/D_LongIdMapServices.cs
View File

@ -2453,13 +2453,13 @@ namespace New_College.Services
_plancount = a.PlanCount,
BatchName = a.BatchName,
SubjectType = subjectType,
_23ScoreLine = a.LowScoreRank,
_23Score = a.LowScore.ToString(),
//_23ScoreLine = a.LowScoreRank,
//_23Score = a.LowScore.ToString(),
_Score = a.LowScore.ToString(),
_24subject = a.SelectSubject,
_23subject = a.SelectSubject,
_23Count = majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().PlanCount.ToString() : "0",
// _23Score = majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScore.ToString() : "0",
_23Score = majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScore.ToString() : "0",
// _23ScoreLine = majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0",
_22Count = majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().PlanCount.ToString() : "0",
_22Score = majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScore.ToString() : "0",
@ -2481,134 +2481,136 @@ namespace New_College.Services
/// 更新招生计划数据
/// </summary>
/// <returns></returns>
public async Task<bool> UpdatePlanProInf(string Location)
public async Task<bool> UpdatePlanProInf(string Location, string batchname)
{
var tbinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == Location);
var tbinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == Location && e.BatchName == batchname);
var universitylist = await d_UniversityRepository.Query(e => e.IsDelete == false);
// var majorlist = await d_MajorRepository.Query(e => e.Type == 2 && e.IsDelete == false);
#region************************更新招生计划合计****************************
// var majorlist = await d_PlanMajorScoreLineRepository.Query(e => e.Location == Location && e.Years == 2023);
// var qliylist = await d_QualificationLineRepository.Query(e => e.Location == Location && e.Years == 2023);
var majorlist = await d_PlanMajorScoreLineRepository.Query(e => e.Location == Location && e.Years == 2023);
var qliylist = await d_QualificationLineRepository.Query(e => e.Location == Location && e.Years == 2023);
// var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == Location && c.Years == 2023 && c.IsDelete == false);
//tbinfo.ForEach(o =>
//{
// if (plist.Any(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName))
// {
// o._21Count = plist.Where(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().PlanCount.ToString();
// o.AcademicYear = plist.Where(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().AcademicYear;
// }
// if (majorlist.Any(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName))
// {
// o._21Score = majorlist.Where(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScore.ToString();
// o._21ScoreLine = majorlist.Where(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScoreRank.ToString();
// }
// if (qliylist.Any(e => e.UniversityName == o.UniversityName))
// {
// o._23SchoolScore = qliylist.Where(e => e.UniversityName == o.UniversityName).FirstOrDefault().LowScore.ToString();
// o._23SchoolScoreLine = qliylist.Where(e => e.UniversityName == o.UniversityName).FirstOrDefault().LowScoreRank.ToString();
// //o._23SchoolAvgScore=
// }
tbinfo.ForEach(o =>
{
//});
if (majorlist.Any(e => e.MajorCode == o.MajorCode && e.UniversityName == o.UniversityName))
{
o._23Count = majorlist.Where(e => e.MajorCode == o.MajorCode && e.UniversityName == o.UniversityName).FirstOrDefault().PlanCount.ToString();
o._23Score = majorlist.Where(e => e.MajorCode == o.MajorCode && e.UniversityName == o.UniversityName).FirstOrDefault().LowScore.ToString();
o._23ScoreLine = majorlist.Where(e => e.MajorCode == o.MajorCode && e.UniversityName == o.UniversityName).FirstOrDefault().LowScoreRank;
// o.AcademicYear = majorlist.Where(e => e.MajorCode == o.MajorCode && e.UniversityName == o.UniversityName).FirstOrDefault().r;
}
//await t_TbSNeedDataInfoRepository.BatchUpdate(tbinfo);
if (majorlist.Any(e => e.UniversityName == o.UniversityName))
{
o._23SchoolScore = qliylist.Where(e => e.UniversityName == o.UniversityName).Min(e=>e.LowScore).ToString();
o._23SchoolScoreLine = qliylist.Where(e => e.UniversityName == o.UniversityName).Max(e=>e.LowScoreRank).ToString();
//o._23SchoolAvgScore=
}
});
await t_TbSNeedDataInfoRepository.BatchUpdate(tbinfo);
#endregion************************更新招生计划合计****************************
#region ***********************更新相关参数***************************
// var tbsdinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == "山东省");
//var pronew = await d_PlanMajorDescProRepository.Query(e => e.IsDelete == false && e.Location == Location && e.Years == 2024 && e.BatchName == "本科");
// var majorlist = await d_PlanMajorScoreLineRepository.Query(e => e.Location == Location);
//var tbsdinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == "山东省");
// var pronew = await d_PlanMajorDescProRepository.Query(e => e.IsDelete == false && e.Location == Location && e.Years == 2023 && e.BatchName == "普通类二段");
// var majorlist = await d_PlanMajorScoreLineRepository.Query(e => e.Location == Location);
tbinfo.ForEach(o =>
{
//if (majorlist.Any(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName))
//{
// if (o._21Score == "0")
// {
// o._21Score = majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScore.ToString() : "0";
// o._21ScoreLine = majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0";
// o._21Count = majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().PlanCount.ToString() : "0";
// }
{
if (o._21Score == "0" || o._21Score == null)
{
o._21Score = majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScore.ToString() : "0";
o._21ScoreLine = majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0";
o._21Count = majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2021 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().PlanCount.ToString() : "0";
}
// if (o._22Score == "0")
// {
// o._22Score = majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScore.ToString() : "0";
// o._22ScoreLine = majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0";
// o._22Count = majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().PlanCount.ToString() : "0";
// }
if (o._22Score == "0" || o._22Score == null)
{
o._22Score = majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScore.ToString() : "0";
o._22ScoreLine = majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0";
o._22Count = majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().PlanCount.ToString() : "0";
}
// if (o._23Score == "0")
// {
// o._23Score = majorlist.Where(e => e.Years == 2023 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScore.ToString() : "0";
// o._23ScoreLine = majorlist.Where(e => e.Years == 2023 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0";
// o._23Count = majorlist.Where(e => e.Years == 2023 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().PlanCount.ToString() : "0";
// }
//}
if (o._23Score == "0" || o._23Score == null)
{
o.MajorName = o.MajorName.Contains("(") ? o.MajorName.Split("(")[0] : o.MajorName;
o._23Score = majorlist.Where(e => e.Years == 2023 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScore.ToString() : "0";
o._23ScoreLine = majorlist.Where(e => e.Years == 2023 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScoreRank : 0;
o._23Count = majorlist.Where(e => e.Years == 2023 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().PlanCount.ToString() : "0";
}
}
//o._23Score = pronew.Where(e => e.UniversityName == o.UniversityName && e.MajorCode == o.MajorCode).FirstOrDefault().LowScore.ToString();
//o._23ScoreLine = pronew.Where(e => e.UniversityName == o.UniversityName && e.MajorCode == o.MajorCode).FirstOrDefault().LowScoreRank;
//o._Score = pronew.Where(e => e.UniversityName == o.UniversityName && e.MajorCode == o.MajorCode).FirstOrDefault().LowScore.ToString();
//if (tbsdinfo.Any(a => a.UniversityName == o.UniversityName))
//{
//o.UniversityRank = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().UniversityRank;
//o.City = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().City;
//o.EmploymentQuality = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().EmploymentQuality;
//o.EnrollmentCode = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().EnrollmentCode;
//if (tbsdinfo.Any(a => a.UniversityName == o.UniversityName && a.MajorName.Contains(o.MajorName)))
//{
// o.Fee = tbsdinfo.Where(a => a.UniversityName == o.UniversityName && a.MajorName.Contains(o.MajorName)).FirstOrDefault().Fee;
// o.MjaorLevel = tbsdinfo.Where(a => a.UniversityName == o.UniversityName && a.MajorName.Contains(o.MajorName)).FirstOrDefault().MjaorLevel;
// o.MajorCount = tbsdinfo.Where(a => a.UniversityName == o.UniversityName && a.MajorName.Contains(o.MajorName)).FirstOrDefault().LnstitutionalLevel;
// o.MajorRankPercentage = tbsdinfo.Where(a => a.UniversityName == o.UniversityName && a.MajorName.Contains(o.MajorName)).FirstOrDefault().LnstitutionalLevel;
// o.FirstType = tbsdinfo.Where(a => a.UniversityName == o.UniversityName && a.MajorName.Contains(o.MajorName)).FirstOrDefault().FirstType;
//}
// o.UniversityRank = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().UniversityRank;
// o.City = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().City;
// o.EmploymentQuality = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().EmploymentQuality;
// o.EnrollmentCode = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().EnrollmentCode;
// if (tbsdinfo.Any(a => a.UniversityName == o.UniversityName && a.MajorName.Contains(o.MajorName)))
// {
// o.Fee = tbsdinfo.Where(a => a.UniversityName == o.UniversityName && a.MajorName.Contains(o.MajorName)).FirstOrDefault().Fee;
// o.MjaorLevel = tbsdinfo.Where(a => a.UniversityName == o.UniversityName && a.MajorName.Contains(o.MajorName)).FirstOrDefault().MjaorLevel;
// o.MajorCount = tbsdinfo.Where(a => a.UniversityName == o.UniversityName && a.MajorName.Contains(o.MajorName)).FirstOrDefault().LnstitutionalLevel;
// o.MajorRankPercentage = tbsdinfo.Where(a => a.UniversityName == o.UniversityName && a.MajorName.Contains(o.MajorName)).FirstOrDefault().LnstitutionalLevel;
// o.FirstType = tbsdinfo.Where(a => a.UniversityName == o.UniversityName && a.MajorName.Contains(o.MajorName)).FirstOrDefault().FirstType;
// }
// o.LnstitutionalLevel = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().LnstitutionalLevel;
//o.MastersDegree = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().MastersDegree;
//o.MastersMajor = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().MastersMajor;
// o.MastersDegree = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().MastersDegree;
// o.MastersMajor = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().MastersMajor;
//o.Nature = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().Nature;
//o.Ownership = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().Ownership;
//o.PhDMajor = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().PhDMajor;
//o.PhDPoint = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().PhDPoint;
//o.ProfessionalAssessment = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().ProfessionalAssessment;
//o.Province = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().Province;
//o.VRUrl = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().VRUrl;
// }
// o.Nature = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().Nature;
// o.Ownership = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().Ownership;
// o.PhDMajor = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().PhDMajor;
// o.PhDPoint = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().PhDPoint;
// o.ProfessionalAssessment = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().ProfessionalAssessment;
// o.Province = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().Province;
// o.VRUrl = tbsdinfo.Where(a => a.UniversityName == o.UniversityName).FirstOrDefault().VRUrl;
//}
if (universitylist.Any(e => e.Name == o.UniversityName))
{
//if (universitylist.Any(e => e.Name == o.UniversityName))
//{
if (string.IsNullOrWhiteSpace(o.LnstitutionalLevel))
{
string str = string.Empty;
if (universitylist.Where(e => e.Name == o.UniversityName).FirstOrDefault().Nhef > 0)
{
str += "985/";
}
if (universitylist.Where(e => e.Name == o.UniversityName).FirstOrDefault().Sff > 0)
{
str += "211/";
}
if (universitylist.Where(e => e.Name == o.UniversityName).FirstOrDefault().Syl > 0)
{
str += "双一流/";
}
if (str.Contains("985") && str.Contains("211"))
{
str += "保研资格/";
}
o.LnstitutionalLevel = str;
}
}
// if (string.IsNullOrWhiteSpace(o.LnstitutionalLevel))
// {
// string str = string.Empty;
// if (universitylist.Where(e => e.Name == o.UniversityName).FirstOrDefault().Nhef > 0)
// {
// str += "985/";
// }
// if (universitylist.Where(e => e.Name == o.UniversityName).FirstOrDefault().Sff > 0)
// {
// str += "211/";
// }
// if (universitylist.Where(e => e.Name == o.UniversityName).FirstOrDefault().Syl > 0)
// {
// str += "双一流/";
// }
// if (str.Contains("985") && str.Contains("211"))
// {
// str += "保研资格/";
// }
// o.LnstitutionalLevel = str;
// }
//}
});
await t_TbSNeedDataInfoRepository.BatchUpdate(tbinfo);
@ -2650,7 +2652,7 @@ namespace New_College.Services
#region 更新专业计划信息
//var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == "上海市" && c.Years == 2024 && c.IsDelete == false);
//// var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == "河南省" && c.Years == 2024 && c.IsDelete == false);
//var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == "山东省" && c.Years == 2024 && c.IsDelete == false && c.Id >= 3407221);
//plist.ForEach(p =>
//{
// //var newmodel = tbinfo.Where(e => (e.EnrollmentCode == p.EnrollmentCode || e.UniversityName == p.UniversityName) && e.MajorCode == p.MajorCode).FirstOrDefault();

11
New_College.Services/D_PlanMajorDescServices.cs
View File

@ -239,7 +239,7 @@ namespace New_College.Services
.AndIF(!string.IsNullOrWhiteSpace(request.Major), c => SqlFunc.Contains(c.MajorName, request.Major))
// .AndIF(!string.IsNullOrWhiteSpace(request.SubjectClaim), c => SqlFunc.Contains(c.SelectSubject, request.SubjectClaim)) //此条件不带
.AndIF(!string.IsNullOrWhiteSpace(request.SubjectClaim), c =>
(!SqlFunc.Contains(c._24subject, "&") && SqlFunc.Contains(c._24subject, claim01) || SqlFunc.Contains(c._24subject, claim02) || SqlFunc.Contains(c._24subject, claim03) || c._24subject == "不限")||
(!SqlFunc.Contains(c._24subject, "&") && SqlFunc.Contains(c._24subject, claim01) || SqlFunc.Contains(c._24subject, claim02) || SqlFunc.Contains(c._24subject, claim03) || c._24subject == "不限") ||
(SqlFunc.Contains(c._24subject, "&") && SqlFunc.Contains(c._24subject, claim01) && SqlFunc.Contains(c._24subject, claim02) && SqlFunc.Contains(c._24subject, claim03))
)
//.AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName == request.BatchName)
@ -365,25 +365,24 @@ namespace New_College.Services
claim02 = claim[1];
claim03 = claim[2];
}
//request.PageSize = 150;//山东省
request.Year = request.Year > 2024 ? 2024 : request.Year;
// var claim = request.SubjectClaim.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList();
Expression<Func<T_TbSNeedDataInfo, bool>> expression3 = Expressionable.Create<T_TbSNeedDataInfo>()
.And(c => c.Location == request.Location)
.And(c => c.SubjectType == batchtypeName)
.And(c => c._23ScoreLine > 0)
.And(c => c._plancount > 0)
.AndIF(request.Score > 0 && (request.BatchName.Contains("本科") || request.BatchName.Contains("一段")), c => c._23ScoreLine > 0)
.AndIF(!string.IsNullOrWhiteSpace(request.SubjectClaim),
c =>
(!SqlFunc.Contains(c._24subject, "&") && SqlFunc.Contains(c._24subject, claim01) || SqlFunc.Contains(c._24subject, claim02) || SqlFunc.Contains(c._24subject, claim03) || c._24subject == "不限") ||
(SqlFunc.Contains(c._24subject, "&") && SqlFunc.Contains(c._24subject, claim01) && SqlFunc.Contains(c._24subject, claim02) && SqlFunc.Contains(c._24subject, claim03))
)
.AndIF(!string.IsNullOrWhiteSpace(request.Major), c => SqlFunc.Contains(c.MajorName, request.Major))
.AndIF(!string.IsNullOrWhiteSpace(request.Province), c => SqlFunc.Contains(request.Province, c.Province))
//.AndIF(!string.IsNullOrWhiteSpace(request.SchoolType), c => c.SchoolType == request.SchoolType)
.AndIF(request.Score > 0, c => SqlFunc.Between(c._23Score, request.Score - 60, request.Score + 15))
.AndIF(request.Score > 0 && (request.BatchName.Contains("本科") || request.BatchName.Contains("一段")), c => SqlFunc.Between(c._23Score, request.Score - 60, request.Score + 15))
.AndIF(request.Score > 0 && (request.BatchName.Contains("专科") || request.BatchName.Contains("二段")), c => SqlFunc.Between(c._23Score, request.Score - 150, request.Score + 20)||c._23Score== "0")
.AndIF(request.Syl.HasValue && request.Syl == 1, c => SqlFunc.Contains(c.LnstitutionalLevel, "双一流"))
.AndIF(request._211.HasValue && request._211 == 1, c => SqlFunc.Contains(c.LnstitutionalLevel, "211"))
.AndIF(request._985.HasValue && request._985 == 1, c => SqlFunc.Contains(c.LnstitutionalLevel, "985"))

4
New_College.Services/T_EnrollmentPlanedescServices.cs
View File

@ -1258,7 +1258,7 @@ namespace New_College.Services
Money = x.Fee,
Year = x.AcademicYear,
PlanName = x.MajorName + (!string.IsNullOrWhiteSpace(x.Remark) ? "(" + x.Remark + ")" : ""),
PlanNum = int.Parse(x._23Count),
PlanNum = x._plancount,
Scoreline = x._23Score == "0" ? "-" : x._23Score,
LowScoreRank = x._23ScoreLine == 0 ? "-" : x._23ScoreLine.ToString(),
Subject = x._24subject
@ -1287,7 +1287,7 @@ namespace New_College.Services
Money = x.Fee,
Year = x.AcademicYear,
PlanName = x.MajorName + (!string.IsNullOrWhiteSpace(x.Remark) ? "(" + x.Remark + ")" : ""),
PlanNum = int.Parse(x._23Count),
PlanNum = x._plancount,
Scoreline = x._23Score == "0" ? "-" : x._23Score,
LowScoreRank = x._23ScoreLine == 0 ? "-" : x._23ScoreLine.ToString(),
YearName = yearName,

11
New_College.Services/T_TbSNeedDataInfoPevServices.cs
View File

@ -96,12 +96,17 @@ namespace New_College.Services
sbsql.AppendFormat(" and '{0}' like '%Nature%'", request.Nature);
}
if (request.EndScore > request.StartScore)
{
sbsql.AppendFormat(" and (_23Score BETWEEN {0} and {1})", request.Score - 60, request.Score + 15);
int start = request.Score - 60;
if (request.BatchName == "普通类二段" || request.BatchName.Contains("专科"))
{ start = request.Score - 100; }
sbsql.AppendFormat(" and (_23Score BETWEEN {0} and {1})", start, request.Score + 15);
}
if (request.BatchName == "普通类二段" || request.BatchName.Contains("专科"))
{
sbsql.AppendLine(" or _23Score <=0 and EducationCategory='专科'");
}
var list = await _dal.QuerySql(sbsql.ToString());
return list;
}

13
New_College.Services/V_CustomerInfoServices.cs
View File

@ -595,10 +595,16 @@ namespace New_College.Services
var userinfo = (await _dal.Query(w => w.OpenId == query.openId && w.IsDelete == false)).ToList().FirstOrDefault();
if (userinfo != null)
{
if (!userinfo.IsVIP)
if (string.IsNullOrWhiteSpace(userinfo.UUID))
{
await SyncXET(userinfo);
userinfo.UUID = query.unionId;
await _dal.Update(userinfo);
}
//if (!userinfo.IsVIP)
//{
// await SyncXET(userinfo);
//}
return new Tuple<bool, CustomerInfoResult>(true, new CustomerInfoResult()
{
AreaId = userinfo.AreaId,
@ -680,7 +686,8 @@ namespace New_College.Services
var i = await _dal.Add(new V_CustomerInfo()
{
OpenId = register.openid,
CustomerType = CustomerTypeEnum.General
CustomerType = CustomerTypeEnum.General,
UUID=register.UnionId
});
return i;
}