计划新增定制Excel

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();