优化

Tiobon.Core.Model/ViewModels/Extend/ResumeTemplateGroupColumn.cs

@@ -42,6 +42,8 @@ public class ResumeFormColumn1
     public string DataSource { get; set; }
     public string DataSourceID { get; set; }
 
+    public int SortNo { get; set; }
+
 
 }
 

Tiobon.Core.Services/CommonServices.cs

@@ -1997,7 +1997,7 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
                     fnKey = "TBD5YN",
                     fnTitle = "开课",
                     fnType = "table",
-                    icon = "ghr-publish",
+                    icon = "ghr-icon-start",
                     position = "left"
                 }); result.JM_PageControlT1.Toolbar.Insert(index + 2, new Toolbar()
                 {
@@ -2005,7 +2005,7 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
                     fnKey = "TBD6YN",
                     fnTitle = "取消发布",
                     fnType = "table",
-                    icon = "ghr-publish",
+                    icon = "ghr-clear",
                     position = "left"
                 });
                 break;
@@ -2026,7 +2026,7 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
                     fnKey = "TBD5YN",
                     fnTitle = "结案",
                     fnType = "table",
-                    icon = "ghr-publish",
+                    icon = "ghr-icon-stop",
                     position = "left"
                 });
                 result.JM_PageControlT1.Toolbar.Insert(index + 2, new Toolbar()
@@ -2035,7 +2035,7 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
                     fnKey = "TBD6YN",
                     fnTitle = "取消开课",
                     fnType = "table",
-                    icon = "ghr-publish",
+                    icon = "ghr-clear",
                     position = "left"
                 });
                 break;
@@ -2056,7 +2056,7 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
                     fnKey = "TBD5YN",
                     fnTitle = "取消结案",
                     fnType = "table",
-                    icon = "ghr-publish",
+                    icon = "ghr-clear",
                     position = "left"
                 });
                 break;

Tiobon.Core.Services/Ghre/Ghre_OpenClassScheduleServices.cs

@@ -1,7 +1,4 @@
-using MySqlX.XDevAPI.Common;
+namespace Tiobon.Core.Services;
-using Tiobon.Core.IServices;
-
-namespace Tiobon.Core.Services;
 
 /// <summary>
 /// 开班课表 (服务)
@@ -31,4 +28,17 @@ public class Ghre_OpenClassScheduleServices : BaseServices<Ghre_OpenClassSchedul
         });
         return data;
     }
+
+    public override async Task<List<long>> Add(List<InsertGhre_OpenClassScheduleInput> listEntity)
+    {
+        for (int i = 0; i < listEntity.Count; i++)
+        {
+            if (listEntity[i].StartEndTime.Count == 2)
+            {
+                listEntity[i].StartTime = listEntity[i].StartEndTime[0];
+                listEntity[i].EndTime = listEntity[i].StartEndTime[1];
+            }
+        }
+        return await base.Add(listEntity);
+    }
 }

Tiobon.Core.Services/Ghre/Ghre_OpenClassStaffServices.cs

@@ -57,4 +57,13 @@ public class Ghre_OpenClassStaffServices : BaseServices<Ghre_OpenClassStaff, Ghr
         }
         return result;
     }
+
+    public override async Task<List<long>> Add(List<InsertGhre_OpenClassStaffInput> listEntity)
+    {
+        for (int i = 0; i < listEntity.Count; i++)
+        {
+            listEntity[i].Source = "Backend";
+        }
+        return await base.Add(listEntity);
+    }
 }

Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs

@@ -1257,9 +1257,21 @@ END";
         resumeTemplateID = await Db.Ado.GetLongAsync("select top 1 Id from Ghrh_ResumeTemplate where IsEnable=1 and IsPublish=1");
         var sql = @$"DECLARE @ResumeTemplateID   BIGINT = {resumeTemplateID}
 
-            SELECT A.ColumnName, A.ResumeInfoColumnName ColumnNameDesc, D.GroupType, A.MapTableName, A.MapColumnName, 
+            SELECT A.ColumnName,
-A.DataType, A.ColumnType, A.IsRequired, A.DataSourceType, A.DataSource, A.DataSourceID
+       A.ResumeInfoColumnName
-            FROM Ghrh_ResumeInfoColumn A
+          ColumnNameDesc,
+       D.GroupType,
+       A.MapTableName,
+       A.MapColumnName,
+       A.DataType,
+       A.ColumnType,
+       A.IsRequired,
+       A.DataSourceType,
+       dbo.FS_GetdataSourceBySet (NULL, A.DataSourceType, A.DataSource)
+          DataSource,
+       A.DataSourceID,
+       b.SortNo 
+FROM Ghrh_ResumeInfoColumn A
      LEFT JOIN Ghrh_ResumeTemplateInfoGroupColumn B
         ON     B.ResumeInfoColumnID = A.ID
            AND B.IsDisplay = 1
@@ -1269,9 +1281,9 @@ A.DataType, A.ColumnType, A.IsRequired, A.DataSourceType, A.DataSource, A.DataSo
         ON B.ResumeTemplateInfoGroupID = C.Id
      JOIN Ghrh_ResumeInfoGroup D
         ON C.ResumeInfoGroupId = D.ID AND D.IsEnable = 1
-            WHERE C.ResumeTemplateID = @ResumeTemplateID 
+WHERE C.ResumeTemplateID = @ResumeTemplateID
-            -- AND D.GroupType = 'Base'
+-- AND D.GroupType = 'Base'
-            ORDER BY D.GroupType, b.SortNo";
+ORDER BY D.GroupType, b.SortNo";
 
         return await Db.Ado.SqlQueryAsync<ResumeFormColumn1>(sql);
     }
@@ -4205,19 +4217,32 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1
         var formColumns = await QueryResumeFormColumn();
         string fileName = path + SnowFlakeSingle.instance.getID() + ".xlsx";
 
-        formColumns.Where(x => x.GroupType == "Base")
+        //formColumns.Where(x => x.GroupType == "Base")
-              .ToList()
+        //      .ToList()
-              .ForEach(x =>
+        //      .ForEach(x =>
-              {
+        //      {
-                  if (!dt.Columns.Contains(x.ColumnNameDesc))
+        //          if (!dt.Columns.Contains(x.ColumnNameDesc))
-                      dt.Columns.Add(x.ColumnNameDesc, typeof(string));
+        //              dt.Columns.Add(x.ColumnNameDesc, typeof(string));
-              });
+        //      });
-
+        var formColumns1 = formColumns.Select(x => new QueryExportColumn()
+        {
+            sortNum = x.SortNo,
+            label = x.ColumnNameDesc,
+            field = x.ColumnName,
+            dataSource = x.DataSource,
+            required = x.IsRequired == true ? "true" : "false",
+            dataType = x.DataType,
+            elementType = x.ColumnType,
+            dataSourceType = x.DataSourceType,
+            dataSourceId = null
+        }).ToList();
         var dr = dt.NewRow();
         dt.Rows.Add(dr);
-        NPOIHelper.ExportExcel(dt, null, "简历导入模板", physicsPath + fileName);
+        //NPOIHelper.ExportExcel(dt, null, "简历导入模板", physicsPath + fileName);
 
         var physicsPath1 = physicsPath + fileName;
+        physicsPath1 = ReportHelper.ImportTemplate(Db, formColumns1, dt, menuName);
+
         //if (dataSourceLists.Any())
         //    physicsPath1 = physicsPath + path + newFileName;
         var result = ServiceResult<string>.OprateSuccess("简历导入模板_" + DateTimeHelper.ConvertToSecondString1(DateTime.Now) + ".xlsx", physicsPath1);