diff --git a/Model/Tiobon.Web.pdm b/Model/Tiobon.Web.pdm index dd4c2d61..f282a98d 100644 --- a/Model/Tiobon.Web.pdm +++ b/Model/Tiobon.Web.pdm @@ -1,5 +1,5 @@ - + @@ -13900,7 +13900,7 @@ LABL 0 Arial Unicode MS,8,N Ghre_Course 1713839845 Administrator -1738822136 +1740024007 Administrator 课程 @@ -14063,6 +14063,17 @@ LABL 0 Arial Unicode MS,8,N 64 +C7365459-E3F3-49CA-8372-60D1FCEDF4A0 +课程分类ID2 +CourseClassId2 +1717723947 +Administrator +1717723991 +Administrator +课程分类ID +bigint + + 1335D331-DAA5-4CD0-9A46-A58317A9F23F 课程分类ID CourseClassId @@ -14074,17 +14085,6 @@ LABL 0 Arial Unicode MS,8,N nvarchar(2000) 2000 - -C7365459-E3F3-49CA-8372-60D1FCEDF4A0 -课程分类ID2 -CourseClassId2 -1717723947 -Administrator -1717723991 -Administrator -课程分类ID -bigint - 7A5BBC82-D331-4B1E-9332-138AA3B4BC05 课程场景ID @@ -51745,7 +51745,7 @@ Ghra_staff_InsureBase - + diff --git a/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs b/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs index f713bf3f..aab3e8b5 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs @@ -1111,8 +1111,12 @@ public class Ghre_CourseServices : BaseServices Update(long Id, EditGhre_RequestInput entity) { + + if (entity.RequestSource == "Dept") + { + if (await QueryCompanyCode() == "Ushio") + { + if (entity.TrainStaffIds.Any() && entity.TrainStaffIds.Count != entity.RequestNum) + throw new Exception("培训对象数量须和需求人数保持一致!"); + } + else + { + if (entity.TrainStaffIds.Count != entity.RequestNum) + throw new Exception("培训对象数量须和需求人数保持一致!"); + } + } if (entity.TrainStaffIds.IsNotEmptyOrNull()) entity.TrainStaffId = JsonHelper.ObjToJson(entity.TrainStaffIds); else entity.TrainStaffId = null; @@ -353,16 +375,26 @@ FROM Ghre_Request A var value = dt.Rows[i][x.label].ToString(); var courseSource = dt.Rows[i]["课程来源"].ToString(); - if (x.label == "需求来源" && value == "部门需求" && CompanyCode == "Ushio") + if (x.label == "需求来源" && value == "部门需求") { + var RequestNum = dt.Rows[i]["需求人数"].ObjToInt(); var TrainStaffIds1 = dt.Rows[i]["培训对象"].ToString(); TrainStaffIds1 = TrainStaffIds1.Replace(",", ","); TrainStaffIds1 = TrainStaffIds1.Replace(";", ","); TrainStaffIds1 = TrainStaffIds1.Replace(";", ","); var value1 = value.Split(',').ToList(); - if (value1.Any() && value1.Count != RequestNum) - throw new Exception("需求人数与培训对象人数不一致,请确认数据重新提交!"); + if (CompanyCode == "Ushio") + { + if (value1.Any() && value1.Count != RequestNum) + throw new Exception("培训对象数量须和需求人数保持一致!!"); + } + else + { + if (value1.Count != RequestNum) + throw new Exception("培训对象数量须和需求人数保持一致!!"); + } + } if (x.label == "需求课程" || x.label == "新增课程") diff --git a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs index 8e10cacc..a317798f 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs @@ -855,6 +855,11 @@ public class Ghre_StudyRecordServices : BaseServices public async Task> QueryESS(QueryBody filter, string condition, bool? IsEnable = true) { + if (await QueryCompanyCode() == "Ushio" && string.IsNullOrWhiteSpace(filter.orderBy)) + { + filter.orderBy = "CoursePublishTime DESC"; + } + else if (string.IsNullOrWhiteSpace(filter.orderBy)) filter.orderBy = "JoinTime DESC"; @@ -884,7 +889,7 @@ public class Ghre_StudyRecordServices : BaseServices