From ca5ceed30a1c4e423e249c3fe4a9d28cf7148099 Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Wed, 4 Sep 2024 16:04:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E8=AE=B0=E5=BD=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Ghre/Ghre_StudyRecordServices.cs               | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
index 1c728dc3..100accd0 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
@@ -51,12 +51,12 @@ public class Ghre_StudyRecordServices : BaseServices<Ghre_StudyRecord, Ghre_Stud
         var sql = @$" SELECT *
                     FROM Ghre_StudyRecord_V  A";
 
-        string conditions = " WHERE 1=1 ";
+        string conditions = " WHERE  BeginTime IS NOT NULL  ";
         if (await Db.Queryable<Ghrs_Menu>().Where(x => x.DataPrivType == "Priv" && x.MenuNo == filter.menuName).AnyAsync())
         {
             var staffIds = await GetUserStaffPrivIds((int)App.User.ID);
             if (staffIds.Any())
-                conditions = $" WHERE StaffId IN ({string.Join(",", staffIds.Select(id => "'" + id + "'"))})";
+                conditions = $" WHERE  BeginTime IS NOT NULL AND StaffId IN ({string.Join(",", staffIds.Select(id => "'" + id + "'"))})";
         }
 
         if (IsEnable == true)
@@ -136,7 +136,7 @@ public class Ghre_StudyRecordServices : BaseServices<Ghre_StudyRecord, Ghre_Stud
         var sql = @$" SELECT *
                     FROM Ghre_StudyRecord_V  A";
 
-        string conditions = " WHERE 1=1 ";
+        string conditions = $" WHERE BeginTime IS NOT NULL AND UserId= {App.User.ID} ";
         var IsEnable = true;
         string condition = string.Empty;
         if (IsEnable == true)
@@ -274,7 +274,8 @@ public class Ghre_StudyRecordServices : BaseServices<Ghre_StudyRecord, Ghre_Stud
 
         var snap = await Db.Queryable<Ghre_CourseSnap>().FirstAsync(x => x.CourseId == entity.CourseId);
         entity.CourseSnapId = snap?.Id;
-        entity.CourseType = "ManualInsert";
+        if (entity.CourseType.IsNullOrEmpty())
+            entity.CourseType = "ManualInsert";
         var result = await base.Add(entity);
 
         var id = SnowFlakeSingle.Instance.NextId();
@@ -700,9 +701,10 @@ public class Ghre_StudyRecordServices : BaseServices<Ghre_StudyRecord, Ghre_Stud
                     AdjustScore = AdjustScore ?? 0,
                     IsPass = isPass == "是" ? true : false,
                     ExamDate = dtExamDate,
-                    CourseBeginTime = dtCourseBeginTime,
-                    CourseEndTime = dtCourseEndTime,
+                    BeginTime = dtCourseBeginTime,
+                    EndTime = dtCourseEndTime,
                     RemarkSz = remarkSz,
+                    CourseType = "ExcelImport"
                 };
                 await Add(insert);
             }