This commit is contained in:
tanglong 2026-01-12 13:34:13 +08:00
parent 11a4b511c3
commit 31e943e5dd
5 changed files with 17 additions and 9 deletions

View File

@ -81,7 +81,7 @@ namespace YD_WeChatApplet.Api.Services.Impl
homeWorkEntity.SchoolCode = UserLoginContext.Current.SchoolCode; homeWorkEntity.SchoolCode = UserLoginContext.Current.SchoolCode;
homeWorkEntity.TeacherId = UserLoginContext.Current.UserId; homeWorkEntity.TeacherId = UserLoginContext.Current.UserId;
homeWorkEntity.TeacherName = UserLoginContext.Current.UserTrueName; homeWorkEntity.TeacherName = UserLoginContext.Current.UserTrueName;
homeWorkEntity.TeacherName = UserLoginContext.Current.UserName; //homeWorkEntity.TeacherName = UserLoginContext.Current.UserName;
homeWorkEntity.WorkStatus = 1; homeWorkEntity.WorkStatus = 1;
homeWorkEntity.CreateTime = DateTime.Now; homeWorkEntity.CreateTime = DateTime.Now;
homeWorkEntity.StartTime = currentDate.Date; homeWorkEntity.StartTime = currentDate.Date;
@ -105,11 +105,11 @@ namespace YD_WeChatApplet.Api.Services.Impl
/// <returns></returns> /// <returns></returns>
public async Task<PageDataDto<HomeWorkRecordDto>> HomeWorkRecordByTeacher(PatriarchHomeWorkHistoryDto dto) public async Task<PageDataDto<HomeWorkRecordDto>> HomeWorkRecordByTeacher(PatriarchHomeWorkHistoryDto dto)
{ {
var userId = UserLoginContext.Current.UserId; var userNo = UserLoginContext.Current.UserNo;
var currentTime = DateTime.Now; var currentTime = DateTime.Now;
var query = _sportsContext.HomeWork var query = _sportsContext.HomeWork
.Where(x => x.TeacherId == userId); .Where(x => x.TeacherNo == userNo);
switch (dto.WorkStatus) switch (dto.WorkStatus)
{ {

View File

@ -47,6 +47,7 @@ namespace YD_WeChatApplet.Api.Services.Impl
return res; return res;
var data = JsonConvert.DeserializeObject<JingShiResponse<TeacherClassData>>(json); var data = JsonConvert.DeserializeObject<JingShiResponse<TeacherClassData>>(json);
if (data != null && data.Code == 0) if (data != null && data.Code == 0)
{ {
string token = JwtHelper.IssueJwt(new UserInfoDto() string token = JwtHelper.IssueJwt(new UserInfoDto()
@ -55,7 +56,7 @@ namespace YD_WeChatApplet.Api.Services.Impl
UserName = data.Data.TeacherName, UserName = data.Data.TeacherName,
Role_Id = 2, Role_Id = 2,
PhoneNo = data.Data.TeacherNo, PhoneNo = data.Data.TeacherNo,
SchoolCode = AppSettings.JingShiTiJiao.Channel, SchoolCode = AppSettings.JingShiTiJiao.SchoolCode,
UserNo = data.Data.TeacherNo UserNo = data.Data.TeacherNo
}); });
@ -64,9 +65,6 @@ namespace YD_WeChatApplet.Api.Services.Impl
return data.Data; return data.Data;
} }
return res; return res;
} }
@ -152,7 +150,7 @@ namespace YD_WeChatApplet.Api.Services.Impl
UserName = data.Data.StudentName, UserName = data.Data.StudentName,
Role_Id = 2, Role_Id = 2,
PhoneNo = data.Data.TeacherNo, PhoneNo = data.Data.TeacherNo,
SchoolCode = AppSettings.JingShiTiJiao.Channel, SchoolCode = AppSettings.JingShiTiJiao.SchoolCode,
UserNo = data.Data.StudentNo UserNo = data.Data.StudentNo
}); });

View File

@ -141,6 +141,14 @@ namespace YD_WeChatApplet.Api.SmartSportsEntitys
[Column(TypeName = "int")] [Column(TypeName = "int")]
public int TeacherId { get; set; } public int TeacherId { get; set; }
/// <summary>
/// 老师编号
/// </summary>
[Display(Name = "老师编号")]
[Comment("老师编号")]
[Column(TypeName = "nvarchar(200)")]
public string TeacherNo { get; set; }
/// <summary> /// <summary>
///老师名称 ///老师名称
/// </summary> /// </summary>

View File

@ -115,5 +115,6 @@
public string Channel { get; set; } public string Channel { get; set; }
public string SecretKey { get; set; } public string SecretKey { get; set; }
public string BaseUrl { get; set; } public string BaseUrl { get; set; }
public string SchoolCode { get; set; }
} }
} }

View File

@ -70,6 +70,7 @@
"JingShiTiJiao": { "JingShiTiJiao": {
"Channel": "sk-yuedong", "Channel": "sk-yuedong",
"SecretKey": "JSTJ-kGfs6J7bkgdxr9mz", "SecretKey": "JSTJ-kGfs6J7bkgdxr9mz",
"BaseUrl": "https://api-test.aitibao.com" "BaseUrl": "https://api-test.aitibao.com",
"SchoolCode": "202512240056"
} }
} }