zjueva/JPHD-2021-backend
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

removed migration ,altered Guid to int

Browse Source
This commit is contained in:
ZhangJunyu
2022-02-22 17:14:10 +08:00
parent 166821a52e
commit e0115e0e07
48 changed files with 559 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utils/Arranger.cs
+11 -11
View File
@@ -24,12 +24,12 @@ namespace _2021_backend.Utils
var capb = 0;
foreach (var tm in a.Timelist)
{
var t = sessions.Find(x => x.Guid == tm);
var t = sessions.Find(x => x.Id == tm);
capa += t.Capacity - t.Students.Count;
}
foreach (var tm in b.Timelist)
{
var t = sessions.Find(x => x.Guid == tm);
var t = sessions.Find(x => x.Id == tm);
capb += t.Capacity - t.Students.Count;
}
return capa - capb;
@@ -43,7 +43,7 @@ namespace _2021_backend.Utils
var tmstr = "";
foreach (var tm in st.Timelist)
{
var t = sessions.Find(x => x.Guid == tm);
var t = sessions.Find(x => x.Id == tm);
cap += t.Capacity - t.Students.Count;
tmstr += t.Day.ToString("dd") + "-" + t.BeginTime.ToString("HH:mm-") + t.Place + " ";
}
@@ -61,7 +61,7 @@ namespace _2021_backend.Utils
var lst = students[m].Timelist;
var stu = students[m];
if (stu.Timelist.Contains(stu.InterviewTime) || stu.Timelist.Count() == 0 || stu.InterviewTime != Guid.Empty || stu.Status != status.已选时间)
if (stu.Timelist.Contains(stu.InterviewTime) || stu.Timelist.Count() == 0 || stu.InterviewTime != 0 || stu.Status != status.已选时间)
{
return m >= students.Count - 1 ? true : DFS(m + 1);
@@ -71,21 +71,21 @@ namespace _2021_backend.Utils
var tm = Context.Sessions.Find(stu.InterviewTime);
if (tm != null)
{
tm.Students.RemoveAll(it => it == stu.Guid);
tm.Students.RemoveAll(it => it == stu.Id);
}
stu.InterviewTime = Guid.Empty;
stu.InterviewTime = 0;
}
bool depth = false;
foreach (var i in lst)
{
var tm = sessions.Find(s => s.Guid == i);
var tm = sessions.Find(s => s.Id == i);
if (tm.Students.Count < tm.Capacity && tm.Day.CompareTo(DateTime.Now.AddHours(-14)) > 0)
{
status prev = students[m].Status;
Guid prevs = students[m].InterviewTime;
int prevs = students[m].InterviewTime;
students[m].Status = status.已选时间;
students[m].InterviewTime = tm.Guid;
tm.Students.Add(students[m].Guid);
students[m].InterviewTime = tm.Id;
tm.Students.Add(students[m].Id);
if (m == students.Count - 1)
{
return true;
@@ -97,7 +97,7 @@ namespace _2021_backend.Utils
{
students[m].Status = prev;
students[m].InterviewTime = prevs;
tm.Students.Remove(students[m].Guid);
tm.Students.Remove(students[m].Id);
continue;
}
else return true;
Utils/TencentSMS.cs
+5 -5
View File
@@ -80,9 +80,9 @@ namespace _2021_backend.Utils
var lst = obj.PullSmsReplyStatusSet;
foreach (var item in lst)
{
var msg = new SMS(item, stu.Guid);
var msg = new SMS(item, stu.Id);
Context.Add<SMS>(msg);
stu.Messages.Add(msg.Guid);
stu.Messages.Add(msg.Id);
}
Context.SaveChanges();
return true;
@@ -114,7 +114,7 @@ namespace _2021_backend.Utils
req.PhoneNumberSet[0] = "+86" + stu.Tel;
req.SmsSdkAppId = SMS_appid;
req.SignName = "ZJUEVA";
Guid index = stu.InterviewTime;
int index = stu.InterviewTime;
SMS sms = new SMS();
switch (type)
{
@@ -135,7 +135,7 @@ namespace _2021_backend.Utils
break;
case SMSType.TimeSet:
sms.Type = SMSType.TimeSet;
var q = from e in Context.Sessions where e.Guid == index select e;
var q = from e in Context.Sessions where e.Id == index select e;
var time = await q.FirstOrDefaultAsync();
req.TemplateParamSet = new string[] { stu.Name, time.Day.ToString("dd") ,time.BeginTime.ToString("HH"),time.BeginTime.ToString("mm"), time.BeginTime.AddHours(1).ToString("HH") ,time.BeginTime.AddMinutes(30).ToString("mm")};
req.TemplateId = SMSID_timeSet;
@@ -147,7 +147,7 @@ namespace _2021_backend.Utils
break;
}
sms.Tel = stu.Tel;
sms.Host = stu.Guid;
sms.Host = stu.Id;
var query = from e in Context.Users where e.stuID == sender select e;
var usr = await query.FirstOrDefaultAsync();
sms.Sender = usr == null ? "null" : usr.Name;