From 36f2ee0a5da0fe64d3b2fdbefecc8bd65f05bc72 Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Mon, 10 Mar 2025 09:54:06 +0800
Subject: [PATCH] 1

---
 .../HostedService/QuartzJobHostedService.cs   |  2 +-
 .../Ghre/Ghre_ExamRecordServices.cs           | 24 +++++++++++++++----
 .../Jobs/Job_AutoIssueCertificate_Quartz.cs   |  1 +
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/Tiobon.Core.Extensions/HostedService/QuartzJobHostedService.cs b/Tiobon.Core.Extensions/HostedService/QuartzJobHostedService.cs
index a19cb024..3359833e 100644
--- a/Tiobon.Core.Extensions/HostedService/QuartzJobHostedService.cs
+++ b/Tiobon.Core.Extensions/HostedService/QuartzJobHostedService.cs
@@ -21,7 +21,7 @@ public class QuartzJobHostedService : IHostedService
 
     public async Task StartAsync(CancellationToken cancellationToken)
     {
-        _logger.LogInformation("Start QuartzJob Service!");
+        _logger.LogInformation("---Start QuartzJob Service!");
         await DoWork();
     }
 
diff --git a/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs
index afd516bc..7a851bf8 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs
@@ -1,4 +1,5 @@
 using AgileObjects.AgileMapper.Extensions;
+using Microsoft.Extensions.Logging;
 using MongoDB.Driver.Linq;
 using System.Net;
 using System.Text.RegularExpressions;
@@ -13,14 +14,16 @@ public class Ghre_ExamRecordServices : BaseServices<Ghre_ExamRecord, Ghre_ExamRe
 {
     private readonly IBaseRepository<Ghre_ExamRecord> _dal;
     //private readonly IGhre_ExamPaperServices _ghre_ExamPaperServices;
+    private readonly ILogger<Ghre_ExamRecordServices> _logger;
     public Ghre_ExamRecordServices(ICaching caching,
         //IGhre_ExamPaperServices ghre_ExamPaperServices,
-        IBaseRepository<Ghre_ExamRecord> dal)
+        IBaseRepository<Ghre_ExamRecord> dal, ILogger<Ghre_ExamRecordServices> logger)
     {
         this._dal = dal;
         base.BaseDal = dal;
         base._caching = caching;
         //_ghre_ExamPaperServices = ghre_ExamPaperServices;
+        _logger = logger;
     }
 
     public override async Task<ServicePageResult<Ghre_ExamRecordDto>> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true)
@@ -1463,6 +1466,7 @@ public class Ghre_ExamRecordServices : BaseServices<Ghre_ExamRecord, Ghre_ExamRe
             x.IsPass == true &&
             (x.IsIssueCertificate == null || x.IsIssueCertificate == false))
             .ToListAsync();
+        _logger.LogInformation($"【发放证书】查询到{records.Count}条考试数据");
         if (!records.Any())
             return ServiceResult.OprateSuccess("发放成功！");
 
@@ -1498,11 +1502,21 @@ public class Ghre_ExamRecordServices : BaseServices<Ghre_ExamRecord, Ghre_ExamRe
                             DateTime? ValidityPeriodTime = null;
 
                             if (rule.ValidityType == "StaticDuration" && rule.StaticNum != null)
+                            {
                                 ValidityPeriodTime = now.AddDays(rule.StaticNum.Value);
+                                ValidityPeriod = DateTimeHelper.ConvertToOnlySecondString(ValidityPeriodTime);
+                            }
                             else if (rule.ValidityType == "Option" && rule.ValidityTime != null)
+                            {
                                 ValidityPeriodTime = rule.ValidityTime;
+                                ValidityPeriod = DateTimeHelper.ConvertToSecondString(ValidityPeriodTime);
+
+                            }
                             else if (rule.ValidityType == "Unlimited")
+                            {
                                 ValidityPeriodTime = DateTime.MaxValue;
+                                ValidityPeriod = "长期";
+                            }
 
                             //发放证书
                             certificates.Add(new Ghre_Certificate()
@@ -1511,8 +1525,10 @@ public class Ghre_ExamRecordServices : BaseServices<Ghre_ExamRecord, Ghre_ExamRe
                                 StaffId = record.StaffId,
                                 CourseId = record.CourseId,
                                 AwardDate = now,
-                                //ValidityPeriod = ValidityPeriod,
-                                ValidityPeriodTime = ValidityPeriodTime
+                                ValidityPeriod = ValidityPeriod,
+                                ValidityPeriodTime = ValidityPeriodTime,
+                                Reverse1 = "考试通过发放"
+
                             });
                         }
                     }
@@ -1526,7 +1542,7 @@ public class Ghre_ExamRecordServices : BaseServices<Ghre_ExamRecord, Ghre_ExamRe
             record.IsIssueCertificate = true;
         }
 
-        await Db.Insertable(certificates).ExecuteReturnSnowflakeIdAsync();
+        await Db.Insertable(certificates).ExecuteReturnSnowflakeIdListAsync();
         await Db.Updateable(records)
             .UpdateColumns(it => new { it.IsIssueCertificate }, true)
             .ExecuteCommandAsync();
diff --git a/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_AutoIssueCertificate_Quartz.cs b/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_AutoIssueCertificate_Quartz.cs
index d02f18d3..df1b1ffa 100644
--- a/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_AutoIssueCertificate_Quartz.cs
+++ b/Tiobon.Core.Tasks/QuartzNet/Jobs/Job_AutoIssueCertificate_Quartz.cs
@@ -32,5 +32,6 @@ public class Job_AutoIssueCertificate_Quartz : JobBase, IJob
     {
         if (jobid > 0)
             await _services.IssueCertificate();
+         
     }
 }