证书发放记录 新增预览接口

Tiobon.Core.Services/CommonServices.cs

@@ -857,6 +857,17 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
         var index = -1;
         switch (param.menuName)
         {
+            case "F_CertificationComparison":
+                result.JM_PageControlT1.Toolbar.Add(new Toolbar()
+                {
+                    display = true,
+                    fnKey = "TBD5YN",
+                    fnTitle = "预览",
+                    fnType = "row",
+                    icon = "ghr-preview",
+                    position = "left"
+                });
+                break;
             case "F_Training_CourseAndScene_Report":
                 {
                     toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "NewYN").FirstOrDefault();
@@ -1093,6 +1104,16 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
                 if (toolbar != null) toolbar.fnKey = "TBD3YN";
                 toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "CopyYN").FirstOrDefault();
                 if (toolbar != null) toolbar.fnKey = "TBD4YN";
+
+                result.JM_PageControlT1.Toolbar.Add(new Toolbar()
+                {
+                    display = true,
+                    fnKey = "TBD5YN",
+                    fnTitle = "记录",
+                    fnType = "row",
+                    icon = "ghr-preview",
+                    position = "left"
+                });
                 break;
             case "F_OnlineExamScores":
                 result.DT_Procedure.QueryProcedure = dt.Rows[0]["QueryProcedure"].ToString();
@@ -4299,7 +4320,7 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
                         break;
                 }
                 #endregion
-                 
+
                 break;
 
             case "F_ESS_ExternalTrainApplyOrder_Boltone": //外训申请_宝连通

Tiobon.Core.Services/Ghre/Ghre_CertificateRuleServices.cs

@@ -201,6 +201,18 @@ public class Ghre_CertificateRuleServices : BaseServices<Ghre_CertificateRule, G
     public async Task<ServiceResult<Ghre_CertificateRuleDto>> Preview(long id)
     {
         var result = await base.QueryById(id);
+
+        int? staffId = App.User.StaffId;
+        long? studyRecordId = null;
+
+        if (result is null)
+        {
+            var certificate = await Db.Queryable<Ghre_Certificate>().Where(x => x.Id == id).FirstAsync();
+            staffId = certificate.StaffId;
+            studyRecordId = certificate.Reverse1.IsNotEmptyOrNull() ? certificate.Reverse1.ObjToLong() : null;
+            result = await base.QueryById(certificate.CertificateRuleId);
+        }
+
         string CourseId1 = result.CourseId1;
         if (!string.IsNullOrWhiteSpace(CourseId1))
             result.CourseIds = JsonConvert.DeserializeObject<List<long?>>(CourseId1);
@@ -208,25 +220,29 @@ public class Ghre_CertificateRuleServices : BaseServices<Ghre_CertificateRule, G
         if (!string.IsNullOrWhiteSpace(CourseSceneId1))
             result.CourseSceneIds = JsonConvert.DeserializeObject<List<long?>>(CourseSceneId1);
 
-        var design = await Db.Queryable<Ghre_CertificateDesign>().Where(x => x.CertificateRuleId == id).FirstAsync();
+        var design = await Db.Queryable<Ghre_CertificateDesign>().Where(x => x.CertificateRuleId == result.Id).FirstAsync();
         if (design != null)
         {
-            var staff = await Db.Queryable<Ghra_Staff>().Where(x => x.StaffID == App.User.StaffId).FirstAsync();
+            var staff = await Db.Queryable<Ghra_Staff>().Where(x => x.StaffID == staffId).FirstAsync();
             var dept = await Db.Queryable<Ghro_Dept>().Where(x => x.DeptID == staff.DeptID).FirstAsync();
             var title = await Db.Queryable<Ghra_Title>().Where(x => x.TitleID == staff.TitleID).FirstAsync();
 
             var examRecord = await Db.Queryable<Ghre_ExamRecord>()
+                .WhereIF(studyRecordId != null, x => x.Id == studyRecordId)
                 .OrderByDescending(x => x.CreateTime)
                 .FirstAsync();
             var exam = await Db.Queryable<Ghre_Exam>().FirstAsync();
-            var studyRecord = await Db.Queryable<Ghre_StudyRecord>().Where(x => x.Id == examRecord.StudyRecordId).FirstAsync();
+            var studyRecord = await Db.Queryable<Ghre_StudyRecord>()
+                .WhereIF(examRecord != null, x => x.Id == examRecord.StudyRecordId)
+                .WhereIF(studyRecordId != null, x => x.Id == studyRecordId)
+                .FirstAsync();
 
             var course = await Db.Queryable<Ghre_Course>().FirstAsync();
             //var courseScene = await Db.Queryable<Ghre_CourseScene>().Where(x => x.Id == course.sc).FirstAsync();
 
             var design1 = Mapper.Map(design).ToANew<CertificateDesignerData>();
             var items = new List<CertificateDesignerItem>();
-            var designItems = await Db.Queryable<Ghre_CertificateDesignItem>().Where(x => x.CertificateRuleId == id).ToListAsync();
+            var designItems = await Db.Queryable<Ghre_CertificateDesignItem>().Where(x => x.CertificateRuleId == result.Id).ToListAsync();
             designItems.ForEach(x =>
             {
                 var item = Mapper.Map(x).ToANew<CertificateDesignerItem>();

Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs

@@ -1753,7 +1753,8 @@ public class Ghre_ExamRecordServices : BaseServices<Ghre_ExamRecord, Ghre_ExamRe
                 AwardDate = now,
                 ValidityPeriod = ValidityPeriod,
                 ValidityPeriodTime = ValidityPeriodTime,
-                Reverse1 = studyRecordId != null ? $"学习完成发放：{studyRecordId}" : $"考试完成发放：{studyRecordId}"
+                AwardSource = studyRecordId != null ? $"学习完成" : $"考试完成",
+                Reverse1 = studyRecordId != null ? $"{studyRecordId}" : $"{examRecordId}"
 
             };
             await Db.Insertable(certificate).ExecuteReturnSnowflakeIdAsync();