Simon
/
Tiobon.Web.Core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

Browse Source
master
xiaochanghai 10 months ago
parent ea99693401
commit 0e7a1072ae
5 changed files with 52 additions and 44 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      Tiobon.Core.Api/Properties/launchSettings.json
  2. 2
      Tiobon.Core.Model/View/Ghre/Ghre_ExamRecord.Dto.View.cs
  3. 12
      Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs
  4. 64
      Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
  5. 10
      Tiobon.Core.Services/Ghre/Ghre_StudyRuleServices.cs

2
Tiobon.Core.Api/Properties/launchSettings.json
Unescape View File

@ -16,7 +16,7 @@
"ASPNETCORE_ENVIRONMENT": "Development"
//"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "SkyAPM.Agent.AspNetCore"// 如果要开始skywalking，请取消此行注释
},
"applicationUrl": "http://localhost:9291"
"applicationUrl": "http://localhost:9292"
},
"IIS Express": {
"commandName": "IISExpress",

2
Tiobon.Core.Model/View/Ghre/Ghre_ExamRecord.Dto.View.cs
Unescape View File

@ -37,7 +37,7 @@ public class Ghre_ExamRecordDto : Ghre_ExamRecord
public string StaffName { get; set; }
public string DeptNo { get; set; }
public string DepteName { get; set; }
public string DeptName { get; set; }
public string DeptFullPateName { get; set; }
public string TitleName { get; set; }

12
Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs
Unescape View File

@ -307,7 +307,7 @@ public class Ghre_ExamRecordServices : BaseServices<Ghre_ExamRecord, Ghre_ExamRe
dbo.FO_DeptInfo (A.DeptID,
getdate (),
1,
'DeptFullPateName') DepteName,
'DeptName') DepteName,
A.PhotoUrl,
B.TitleName
FROM Ghra_Staff A LEFT JOIN Ghra_Title B ON B.TitleID = A.TitleID
@ -446,11 +446,15 @@ public class Ghre_ExamRecordServices : BaseServices<Ghre_ExamRecord, Ghre_ExamRe
if (exam.IsNull())
exam = await Db.Queryable<Ghre_Exam>()
.Where(x => x.Id == studyRecord.ExamId)
.FirstAsync(x => x.Status == Consts.DIC_EXAM_STATUS.RELEASED);
.FirstAsync(x => x.Status == Consts.DIC_EXAM_STATUS.RELEASED || x.Status == Consts.DIC_EXAM_STATUS.DISABLED);
if (exam.IsNull())
return ServiceResult<QueryExam>.OprateFailed("该门课程尚未开启考试，请联系HR ！");
if (exam.Status == Consts.DIC_EXAM_STATUS.DISABLED)
return ServiceResult<QueryExam>.OprateFailed("该考试已归档，暂不可考试 ！");
var dt = Db.GetDate();
if (exam.DateType == Consts.DicExamDateType.AFTER_HOW_LONG)
{
@ -606,8 +610,8 @@ public class Ghre_ExamRecordServices : BaseServices<Ghre_ExamRecord, Ghre_ExamRe
extend.StaffNo = record.StaffNo;
extend.StaffName = record.StaffName;
extend.DeptNo = record.StaffNo;
extend.DeptName = record.DepteName;
extend.DeptNo = record.DeptNo;
extend.DeptName = record.DeptName;
extend.StaffPhoto = record.StaffPhotoUrl;
extend.ExamName = record.ExamName + "(" + record.ExamNo + ")";
extend.ExamBeginDate = DateTimeHelper.ConvertToDayString(record.BeginTime);

64
Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
Unescape View File

@ -1688,41 +1688,41 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
}
}
var Ghre_Courses = await Db.Queryable<Ghre_Course>().ToListAsync();
for (int i = 0; i < Ghre_Courses.Count; i++)
{
#region 课程ID 同步至课件
if (!Ghre_Courses[i].CourseWareId.IsNull())
{
var wares = await Db.Queryable<Ghre_CourseWare>().Where(x => x.CourseIds.Contains(Ghre_Courses[i].Id.ToString()) && x.Id != Ghre_Courses[i].CourseWareId).ToListAsync();
for (int j = 0; j < wares.Count; j++)
{
var courseIds2 = new List<long>();
if (!string.IsNullOrWhiteSpace(wares[j].CourseIds))
courseIds2 = JsonConvert.DeserializeObject<List<long>>(wares[j].CourseIds);
courseIds2 = courseIds2.Where(x=>x!= Ghre_Courses[i].Id).ToList();
wares[j].CourseIds = JsonConvert.SerializeObject(courseIds2);
}
await Db.Updateable(wares).UpdateColumns(it => new { it.CourseIds }).ExecuteCommandAsync();
//var Ghre_Courses = await Db.Queryable<Ghre_Course>().ToListAsync();
//for (int i = 0; i < Ghre_Courses.Count; i++)
//{
// #region 课程ID 同步至课件
// if (!Ghre_Courses[i].CourseWareId.IsNull())
// {
// var wares = await Db.Queryable<Ghre_CourseWare>().Where(x => x.CourseIds.Contains(Ghre_Courses[i].Id.ToString()) && x.Id != Ghre_Courses[i].CourseWareId).ToListAsync();
// for (int j = 0; j < wares.Count; j++)
// {
// var courseIds2 = new List<long>();
// if (!string.IsNullOrWhiteSpace(wares[j].CourseIds))
// courseIds2 = JsonConvert.DeserializeObject<List<long>>(wares[j].CourseIds);
// courseIds2 = courseIds2.Where(x=>x!= Ghre_Courses[i].Id).ToList();
// wares[j].CourseIds = JsonConvert.SerializeObject(courseIds2);
// }
// await Db.Updateable(wares).UpdateColumns(it => new { it.CourseIds }).ExecuteCommandAsync();
var ware = await Db.Queryable<Ghre_CourseWare>().FirstAsync(x => x.Id == Ghre_Courses[i].CourseWareId);
if (ware != null)
{
var courseIds2 = new List<long>();
if (!string.IsNullOrWhiteSpace(ware.CourseIds))
courseIds2 = JsonConvert.DeserializeObject<List<long>>(ware.CourseIds);
// var ware = await Db.Queryable<Ghre_CourseWare>().FirstAsync(x => x.Id == Ghre_Courses[i].CourseWareId);
// if (ware != null)
// {
// var courseIds2 = new List<long>();
// if (!string.IsNullOrWhiteSpace(ware.CourseIds))
// courseIds2 = JsonConvert.DeserializeObject<List<long>>(ware.CourseIds);
if (!courseIds2.Any(x => x == Ghre_Courses[i].Id))
{
courseIds2.Add(Ghre_Courses[i].Id);
// if (!courseIds2.Any(x => x == Ghre_Courses[i].Id))
// {
// courseIds2.Add(Ghre_Courses[i].Id);
ware.CourseIds = JsonConvert.SerializeObject(courseIds2);
await Db.Updateable<Ghre_CourseWare>().SetColumns(it => it.CourseIds == ware.CourseIds).Where(it => it.Id == ware.Id).ExecuteCommandAsync();
}
}
}
#endregion
}
// ware.CourseIds = JsonConvert.SerializeObject(courseIds2);
// await Db.Updateable<Ghre_CourseWare>().SetColumns(it => it.CourseIds == ware.CourseIds).Where(it => it.Id == ware.Id).ExecuteCommandAsync();
// }
// }
// }
// #endregion
//}
return ServiceResult.OprateSuccess("执行成功！");
}
}

10
Tiobon.Core.Services/Ghre/Ghre_StudyRuleServices.cs
Unescape View File

@ -382,12 +382,13 @@ public class Ghre_StudyRuleServices : BaseServices<Ghre_StudyRule, Ghre_StudyRul
{
var staff = staffs[i];
var record = await Db.Queryable<Ghre_StudyRecordDto>()
var record = await Db.Queryable<Ghre_StudyRecord>()
.Where(x => x.StudyRuleId != ruleId && x.StaffId == staff.StaffID)
.WhereIF(!string.IsNullOrWhiteSpace(rule.Year), x => x.Year == rule.Year)
.WhereIF(rule.CourseId != null, x => x.CourseId == rule.CourseId)
.WhereIF(rule.CourseSceneId != null, x => x.CourseSceneId == rule.CourseSceneId)
.AS("Ghre_StudyRecord_V").FirstAsync();
//.AS("Ghre_StudyRecord_V")
.FirstAsync();
if (record is null)
{
inserts.Add(new Ghre_StudyRecord()
@ -460,10 +461,13 @@ public class Ghre_StudyRuleServices : BaseServices<Ghre_StudyRule, Ghre_StudyRul
WHERE A.StaffName IS NULL";
await Db.Ado.ExecuteCommandAsync(sql);
}
catch (Exception)
catch (Exception E)
{
await Db.Ado.RollbackTranAsync();
await Db.Updateable<Ghre_StudyRule>().Where(x => x.Id == ruleId)
.SetColumns(it => new Ghre_StudyRule() { Result = E.Message })//类只能在表达示里面不能提取
.ExecuteCommandAsync();
}
return true;
}

Write Preview
Loading…
Cancel
Save