From e8e77b8a989369594d352b0b24a190cfed2fe4ce Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Thu, 17 Apr 2025 10:32:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=96=B0=E5=A2=9E=E5=AE=9A?=
 =?UTF-8?q?=E5=88=B6Excel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Tiobon.Core.Services/Ghre/Ghre_PlanServices.cs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Tiobon.Core.Services/Ghre/Ghre_PlanServices.cs b/Tiobon.Core.Services/Ghre/Ghre_PlanServices.cs
index 8ffeef14..0250c1ab 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_PlanServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_PlanServices.cs
@@ -483,7 +483,7 @@ public class Ghre_PlanServices : BaseServices<Ghre_Plan, Ghre_PlanDto, InsertGhr
         }
 
         var physicsPath1 = physicsPath + path + newFileName;
-        if (menuName == "F_TrainPlan_Temporary")
+        if (menuName == "F_TrainPlan_Temporary" || menuName == "F_UshioTrainPlan_Temporary")
             return ServiceResult<string>.OprateSuccess("计划暂存_" + DateTimeHelper.ConvertToSecondString1(DateTime.Now) + ".xlsx", physicsPath1);
         else
             return ServiceResult<string>.OprateSuccess("计划维护_" + DateTimeHelper.ConvertToSecondString1(DateTime.Now) + ".xlsx", physicsPath1);
@@ -587,8 +587,7 @@ public class Ghre_PlanServices : BaseServices<Ghre_Plan, Ghre_PlanDto, InsertGhr
                             });
 
 
-                            var ids = await Db.Queryable<Ghra_Staff>().Where(o => value1.Contains(o.StaffName) || value1.Contains(o.StaffNo) || value1.Contains(o.StaffEname)).Select(x => x.StaffID).ToListAsync();
-                            dict.Add("Month", JsonHelper.ObjToJson(ids));
+                           dict.Add("Month", JsonHelper.ObjToJson(value2));
                         }
                         else
                         {
@@ -689,9 +688,9 @@ public class Ghre_PlanServices : BaseServices<Ghre_Plan, Ghre_PlanDto, InsertGhr
         {
             dictList.ForEach(x =>
             {
-                if (menuName == "F_TrainPlan_Wait")
+                if (menuName == "F_TrainPlan_Wait" || menuName == "F_UshioTrainPlan_Wait")
                     x.Add("Status", "Wait");
-                else if (menuName == "F_TrainPlan_Temporary")
+                else if (menuName == "F_TrainPlan_Temporary" || menuName == "F_UshioTrainPlan_Temporary")
                     x.Add("Status", "Temporary");
             });
             await Db.Insertable(dictList).AS(entityType.GetEntityTableName()).ExecuteCommandAsync();