Simon
/
Tiobon.Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

Browse Source
master
xiaochanghai 4 months ago
parent 34d22fc32a
commit 7b877f2360
6 changed files with 4899 additions and 4453 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 9032
      Model/Tiobon.Web.pdm
  2. 2
      Tiobon.Core.Model/ViewModels/Extend/ResumeTemplateGroupColumn.cs
  3. 10
      Tiobon.Core.Services/CommonServices.cs
  4. 18
      Tiobon.Core.Services/Ghre/Ghre_OpenClassScheduleServices.cs
  5. 9
      Tiobon.Core.Services/Ghre/Ghre_OpenClassStaffServices.cs
  6. 279
      Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs

9032
Model/Tiobon.Web.pdm
View File

File diff suppressed because it is too large Load Diff

2
Tiobon.Core.Model/ViewModels/Extend/ResumeTemplateGroupColumn.cs
Unescape View File

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

10
Tiobon.Core.Services/CommonServices.cs
Unescape View File

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

18
Tiobon.Core.Services/Ghre/Ghre_OpenClassScheduleServices.cs
Unescape View File

@ -1,7 +1,4 @@
using MySqlX.XDevAPI.Common; namespace Tiobon.Core.Services;
using Tiobon.Core.IServices;
namespace Tiobon.Core.Services;
/// <summary> /// <summary>
/// 开班课表 (服务) /// 开班课表 (服务)
@ -31,4 +28,17 @@ public class Ghre_OpenClassScheduleServices : BaseServices<Ghre_OpenClassSchedul
}); });
return data; 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);
}
} }

9
Tiobon.Core.Services/Ghre/Ghre_OpenClassStaffServices.cs
Unescape View File

@ -57,4 +57,13 @@ public class Ghre_OpenClassStaffServices : BaseServices<Ghre_OpenClassStaff, Ghr
} }
return result; 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);
}
} }

279
Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
Unescape View File

@ -1257,21 +1257,33 @@ END";
resumeTemplateID = await Db.Ado.GetLongAsync("select top 1 Id from Ghrh_ResumeTemplate where IsEnable=1 and IsPublish=1"); resumeTemplateID = await Db.Ado.GetLongAsync("select top 1 Id from Ghrh_ResumeTemplate where IsEnable=1 and IsPublish=1");
var sql = @$"DECLARE @ResumeTemplateID BIGINT = {resumeTemplateID} 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,
LEFT JOIN Ghrh_ResumeTemplateInfoGroupColumn B D.GroupType,
ON B.ResumeInfoColumnID = A.ID A.MapTableName,
AND B.IsDisplay = 1 A.MapColumnName,
AND B.IsEnable = 1 A.DataType,
AND A.IsEnable = 1 A.ColumnType,
JOIN Ghrh_ResumeTemplateInfoGroup C A.IsRequired,
ON B.ResumeTemplateInfoGroupID = C.Id A.DataSourceType,
JOIN Ghrh_ResumeInfoGroup D dbo.FS_GetdataSourceBySet (NULL, A.DataSourceType, A.DataSource)
ON C.ResumeInfoGroupId = D.ID AND D.IsEnable = 1 DataSource,
WHERE C.ResumeTemplateID = @ResumeTemplateID A.DataSourceID,
-- AND D.GroupType = 'Base' b.SortNo
ORDER BY D.GroupType, b.SortNo"; FROM Ghrh_ResumeInfoColumn A
LEFT JOIN Ghrh_ResumeTemplateInfoGroupColumn B
ON B.ResumeInfoColumnID = A.ID
AND B.IsDisplay = 1
AND B.IsEnable = 1
AND A.IsEnable = 1
JOIN Ghrh_ResumeTemplateInfoGroup C
ON B.ResumeTemplateInfoGroupID = C.Id
JOIN Ghrh_ResumeInfoGroup D
ON C.ResumeInfoGroupId = D.ID AND D.IsEnable = 1
WHERE C.ResumeTemplateID = @ResumeTemplateID
-- AND D.GroupType = 'Base'
ORDER BY D.GroupType, b.SortNo";
return await Db.Ado.SqlQueryAsync<ResumeFormColumn1>(sql); return await Db.Ado.SqlQueryAsync<ResumeFormColumn1>(sql);
} }
@ -4205,19 +4217,32 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1
var formColumns = await QueryResumeFormColumn(); var formColumns = await QueryResumeFormColumn();
string fileName = path + SnowFlakeSingle.instance.getID() + ".xlsx"; 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(); var dr = dt.NewRow();
dt.Rows.Add(dr); dt.Rows.Add(dr);
NPOIHelper.ExportExcel(dt, null, "简历导入模板", physicsPath + fileName); //NPOIHelper.ExportExcel(dt, null, "简历导入模板", physicsPath + fileName);
var physicsPath1 = physicsPath + fileName; var physicsPath1 = physicsPath + fileName;
physicsPath1 = ReportHelper.ImportTemplate(Db, formColumns1, dt, menuName);
//if (dataSourceLists.Any()) //if (dataSourceLists.Any())
// physicsPath1 = physicsPath + path + newFileName; // physicsPath1 = physicsPath + path + newFileName;
var result = ServiceResult<string>.OprateSuccess("简历导入模板_" + DateTimeHelper.ConvertToSecondString1(DateTime.Now) + ".xlsx", physicsPath1); var result = ServiceResult<string>.OprateSuccess("简历导入模板_" + DateTimeHelper.ConvertToSecondString1(DateTime.Now) + ".xlsx", physicsPath1);
@ -5339,109 +5364,109 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1
#endregion #endregion
#region 薪资项目同步 #region 薪资项目同步
// if (companyNo == "ShiHua") // if (companyNo == "ShiHua")
// { // {
// if (applyOrder != null && inTime != null && applyOrder.ProbationSalary != null) // if (applyOrder != null && inTime != null && applyOrder.ProbationSalary != null)
// if (applyOrder.ProbationSalary > 0) // if (applyOrder.ProbationSalary > 0)
// { // {
// var salaryConfig = await Db.Queryable<Ghrh_Config>().Where(x => x.ConfigCode == "ESS_Recruit_Custom_Check_In_Apply_Salary").FirstAsync(); // var salaryConfig = await Db.Queryable<Ghrh_Config>().Where(x => x.ConfigCode == "ESS_Recruit_Custom_Check_In_Apply_Salary").FirstAsync();
// var TempOrOfficial = salaryConfig?.ConfigValue ?? "Temp"; // var TempOrOfficial = salaryConfig?.ConfigValue ?? "Temp";
// var IsEnable = 2; // var IsEnable = 2;
// sql = $"SELECT SalaryChangeID FROM Ghrc_SalaryChange WHERE IsEnable>=1 and StaffID='{staffId}' and ChangeDate = '{inTime.Value.Date}'"; // sql = $"SELECT SalaryChangeID FROM Ghrc_SalaryChange WHERE IsEnable>=1 and StaffID='{staffId}' and ChangeDate = '{inTime.Value.Date}'";
// var SalaryChangeID = await Db.Ado.SqlQueryAsync<string>(sql); // var SalaryChangeID = await Db.Ado.SqlQueryAsync<string>(sql);
// if (SalaryChangeID.Any()) // if (SalaryChangeID.Any())
// { // {
// var sql1 = @$"UPDATE Ghrc_SalaryChange // var sql1 = @$"UPDATE Ghrc_SalaryChange
// SET IsEnable = 0, // SET IsEnable = 0,
// UpdateBy = {App.User.ID}, // UpdateBy = {App.User.ID},
// UpdateTime = GETDATE (), // UpdateTime = GETDATE (),
// UpdateProg = 'SyncToStaff' // UpdateProg = 'SyncToStaff'
// WHERE SalaryChangeID = {SalaryChangeID[0]} AND IsEnable >= 1; // WHERE SalaryChangeID = {SalaryChangeID[0]} AND IsEnable >= 1;
// UPDATE Ghrc_SalaryChangeDetail // UPDATE Ghrc_SalaryChangeDetail
// SET IsEnable = 0, // SET IsEnable = 0,
// UpdateBy = {App.User.ID}, // UpdateBy = {App.User.ID},
// UpdateTime = GETDATE (), // UpdateTime = GETDATE (),
// UpdateProg = 'SyncToStaff' // UpdateProg = 'SyncToStaff'
// WHERE SalaryChangeID = {SalaryChangeID[0]} AND IsEnable >= 1;"; // WHERE SalaryChangeID = {SalaryChangeID[0]} AND IsEnable >= 1;";
// await Db.Ado.ExecuteCommandAsync(sql1); // await Db.Ado.ExecuteCommandAsync(sql1);
// } // }
// sql = @$"open symmetric key GHR50AesKey decryption by certificate TiobonGHRCer; // sql = @$"open symmetric key GHR50AesKey decryption by certificate TiobonGHRCer;
// INSERT INTO [dbo].[Ghrc_SalaryChange] // INSERT INTO [dbo].[Ghrc_SalaryChange]
// ( StaffID,WorkNo, // ( StaffID,WorkNo,
// ChangeDate, // ChangeDate,
// ChangeTypeID , // ChangeTypeID ,
// ChangeReasonID , ChangeFlag, // ChangeReasonID , ChangeFlag,
// ToDoType,WorkState,RemarkSz, // ToDoType,WorkState,RemarkSz,
// SortNo,IsEnable,IsDefault,OperateLogID, // SortNo,IsEnable,IsDefault,OperateLogID,
// CreateBy,CreateTime,CreateProg, // CreateBy,CreateTime,CreateProg,
// TotalAmount // TotalAmount
// ) // )
// select {staffId},null, // select {staffId},null,
// '{inTime.Value.Date}', // '{inTime.Value.Date}',
// 23, -- // 23, --
// 1130, -- // 1130, --
// 0,'Todo',1,'', // 0,'Todo',1,'',
// 1,2,0,0, // 1,2,0,0,
// {App.User.ID},GETDATE(), 'SyncToStaff', // {App.User.ID},GETDATE(), 'SyncToStaff',
// dbo.FS_EncryptByKey({applyOrder?.ProbationSalary ?? 0}) // dbo.FS_EncryptByKey({applyOrder?.ProbationSalary ?? 0})
// Declare @N_SCID int = SCOPE_IDENTITY() // Declare @N_SCID int = SCOPE_IDENTITY()
// select @N_SCID"; // select @N_SCID";
// var @N_SCID = await Db.Ado.GetIntAsync(sql); // var @N_SCID = await Db.Ado.GetIntAsync(sql);
// sql = @"UPDATE A // sql = @"UPDATE A
// SET A.Reverse1 = b.SalaryItemNo, // SET A.Reverse1 = b.SalaryItemNo,
// A.UpdateTime = getdate (), // A.UpdateTime = getdate (),
// A.UpdateProg = 'SyncToStaff' // A.UpdateProg = 'SyncToStaff'
// FROM Ghrh_OfferApplyOrderSalary A // FROM Ghrh_OfferApplyOrderSalary A
// JOIN Ghrc_SalaryItem b ON A.SalaryItemId = b.SalaryItemID // JOIN Ghrc_SalaryItem b ON A.SalaryItemId = b.SalaryItemID
// WHERE A.Reverse1 IS NULL"; // WHERE A.Reverse1 IS NULL";
// await Db.Ado.ExecuteCommandAsync(sql); // await Db.Ado.ExecuteCommandAsync(sql);
// var items = await Db.Queryable<Ghrh_OfferApplyOrderSalary>().Where(x => x.OrderId == applyOrder.Id).ToListAsync(); // var items = await Db.Queryable<Ghrh_OfferApplyOrderSalary>().Where(x => x.OrderId == applyOrder.Id).ToListAsync();
// var S02 = items.Where(x => x.Reverse1 == "S02").FirstOrDefault()?.Amount ?? 0; // var S02 = items.Where(x => x.Reverse1 == "S02").FirstOrDefault()?.Amount ?? 0;
// var S03 = items.Where(x => x.Reverse1 == "S03").FirstOrDefault()?.Amount ?? 0; // var S03 = items.Where(x => x.Reverse1 == "S03").FirstOrDefault()?.Amount ?? 0;
// var S04 = items.Where(x => x.Reverse1 == "S04").FirstOrDefault()?.Amount ?? 0; // var S04 = items.Where(x => x.Reverse1 == "S04").FirstOrDefault()?.Amount ?? 0;
// var S05 = items.Where(x => x.Reverse1 == "S05").FirstOrDefault()?.Amount ?? 0; // var S05 = items.Where(x => x.Reverse1 == "S05").FirstOrDefault()?.Amount ?? 0;
// var S06 = items.Where(x => x.Reverse1 == "S06").FirstOrDefault()?.Amount ?? 0; // var S06 = items.Where(x => x.Reverse1 == "S06").FirstOrDefault()?.Amount ?? 0;
// var S21 = items.Where(x => x.Reverse1 == "S21").FirstOrDefault()?.Amount ?? 0; // var S21 = items.Where(x => x.Reverse1 == "S21").FirstOrDefault()?.Amount ?? 0;
// var S22 = items.Where(x => x.Reverse1 == "S22").FirstOrDefault()?.Amount ?? 0; // var S22 = items.Where(x => x.Reverse1 == "S22").FirstOrDefault()?.Amount ?? 0;
// var S23 = items.Where(x => x.Reverse1 == "S23").FirstOrDefault()?.Amount ?? 0; // var S23 = items.Where(x => x.Reverse1 == "S23").FirstOrDefault()?.Amount ?? 0;
// var S66 = items.Where(x => x.Reverse1 == "S66").FirstOrDefault()?.Amount ?? 0; // var S66 = items.Where(x => x.Reverse1 == "S66").FirstOrDefault()?.Amount ?? 0;
// var S68 = items.Where(x => x.Reverse1 == "S68").FirstOrDefault()?.Amount ?? 0; // var S68 = items.Where(x => x.Reverse1 == "S68").FirstOrDefault()?.Amount ?? 0;
// var S70 = items.Where(x => x.Reverse1 == "S70").FirstOrDefault()?.Amount ?? 0; // var S70 = items.Where(x => x.Reverse1 == "S70").FirstOrDefault()?.Amount ?? 0;
// sql = @$"open symmetric key GHR50AesKey decryption by certificate TiobonGHRCer; // sql = @$"open symmetric key GHR50AesKey decryption by certificate TiobonGHRCer;
// Declare @Regular_SalaryDetail table (SalaryItemNo nvarchar(100), Amount Decimal(18,2)) // Declare @Regular_SalaryDetail table (SalaryItemNo nvarchar(100), Amount Decimal(18,2))
//insert into @Regular_SalaryDetail //insert into @Regular_SalaryDetail
//select 'S02',{S02} //select 'S02',{S02}
//union all select 'S03',{S03} //union all select 'S03',{S03}
//union all select 'S04',{S04} //union all select 'S04',{S04}
//union all select 'S05',{S05} //union all select 'S05',{S05}
//union all select 'S06',{S06} //union all select 'S06',{S06}
//union all select 'S21',{S21} //union all select 'S21',{S21}
//union all select 'S22',{S22} //union all select 'S22',{S22}
//union all select 'S23',{S23} //union all select 'S23',{S23}
//union all select 'S66',{S66} //union all select 'S66',{S66}
//union all select 'S68',{S68} //union all select 'S68',{S68}
//union all select 'S70',{S70} //union all select 'S70',{S70}
//insert into ghrc_salaryChangeDetail(SalaryChangeID,StaffID,ChangeDate,SalaryItemID,Amount,CurrencyID,Createby,CreateProg, //insert into ghrc_salaryChangeDetail(SalaryChangeID,StaffID,ChangeDate,SalaryItemID,Amount,CurrencyID,Createby,CreateProg,
// Reverse1,IsEnable ) // Reverse1,IsEnable )
//select {@N_SCID},{staffId},'{inTime.Value.Date}',b.SalaryItemID,dbo.FS_EncryptByKey(a.Amount) Amount,2, //select {@N_SCID},{staffId},'{inTime.Value.Date}',b.SalaryItemID,dbo.FS_EncryptByKey(a.Amount) Amount,2,
// {App.User.ID}, 'SyncToStaff', // {App.User.ID}, 'SyncToStaff',
// null, {IsEnable} IsEnable // null, {IsEnable} IsEnable
//from @Regular_SalaryDetail a inner join Ghrc_SalaryItem b on a.SalaryItemNo = b.SalaryItemNo //from @Regular_SalaryDetail a inner join Ghrc_SalaryItem b on a.SalaryItemNo = b.SalaryItemNo
//where b.IsEnable = 1 //where b.IsEnable = 1
//and ISNULL(a.Amount,0) > 0"; //and ISNULL(a.Amount,0) > 0";
// await Db.Ado.ExecuteCommandAsync(sql); // await Db.Ado.ExecuteCommandAsync(sql);
// } // }
// } // }
#endregion #endregion
} }
await Db.Ado.CommitTranAsync(); await Db.Ado.CommitTranAsync();

Write Preview
Loading…
Cancel
Save