必修查询表、学分查询 员工姓名工号合并

Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs

@@ -380,12 +380,15 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
             {
                 var sql = $"UPDATE Ghre_CourseSnap SET IsEnable = 0 WHERE CourseId = '{id}' AND IsEnable = 1";
                 await Db.Ado.ExecuteCommandAsync(sql);
+
                 var entity1 = Mapper.Map(entity).ToANew<InsertGhre_CourseSnapInput>();
                 var courseClassIds = JsonConvert.DeserializeObject<List<long>>(entity1.CourseClassId);
                 var classs = await _ghre_CourseClassServices.Query(x => courseClassIds.Contains(x.Id));
                 entity1.CourseClass = string.Join("、", classs.Select(o => o.ClassName));
                 entity1.CourseClass1 = string.Join("、", classs.Select(o => o.ClassName + "(" + o.ClassNo + ")"));
                 entity1.CourseId = id;
+
+                var examPaper = await Db.Queryable<Ghre_ExamPaper>().FirstAsync(x => x.LinkId == id && x.LinkType == "CourseId" && x.Status != Consts.DIC_COURSE_STATUS.DISABLED);
                 await _ghre_CourseSnapServices.Add(entity1);
             }
             #endregion

Tiobon.Core.Services/Ghre/Ghre_CreditPointServices.cs

@@ -9,9 +9,6 @@ using SqlSugar;
 using Tiobon.Core.Common;
 using Tiobon.Core.Model;
 using Newtonsoft.Json;
-using Microsoft.AspNetCore.Mvc;
-using Tiobon.Core.Common.DB.Dapper;
-using Tiobon.Core.Common.Helper;
 
 namespace Tiobon.Core.Services;
 
@@ -34,7 +31,7 @@ public class Ghre_CreditPointServices : BaseServices<Ghre_CreditPoint, Ghre_Cred
         string sql = @"SELECT *
                     FROM (SELECT StaffId Id,
                                  StaffNo,
-                                 StaffName,
+                                 StaffName + ' (' + StaffNo + ')' StaffName,
                                  DeptNo,
                                  DepteName,
                                  TitleName,