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

【牛尾】培训计划

Browse Source
master
xiaochanghai 4 months ago
parent 304784cd81
commit ab8f53fad9
5 changed files with 70 additions and 11 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. 6
      Model/Tiobon.Web.pdm
  2. 3
      Tiobon.Core.Model/Base/Ghre/Ghre_UshioPlan.Dto.Base.cs
  3. 17
      Tiobon.Core.Model/View/Ghre/Ghre_UshioPlan.Dto.View.cs
  4. 2
      Tiobon.Core.Services/CommonServices.cs
  5. 49
      Tiobon.Core.Services/Ghre/Ghre_UshioPlanServices.cs

6
Model/Tiobon.Web.pdm
Unescape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<?PowerDesigner AppLocale="UTF16" ID="{C294868A-C3F3-41AD-98CC-78B6D4E0CC40}" Label="" LastModificationDate="1741227403" Name="Tiobon" Objects="3325" Symbols="124" Target="Microsoft SQL Server 2008" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="15.0.0.2613"?>
<?PowerDesigner AppLocale="UTF16" ID="{C294868A-C3F3-41AD-98CC-78B6D4E0CC40}" Label="" LastModificationDate="1741227864" Name="Tiobon" Objects="3325" Symbols="124" Target="Microsoft SQL Server 2008" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="15.0.0.2613"?>
<!-- do not edit this file -->
<Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@ -11606,8 +11606,8 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
</o:TableSymbol>
<o:TableSymbol Id="o161">
<a:CreationDate>1741165477</a:CreationDate>
<a:ModificationDate>1741165480</a:ModificationDate>
<a:Rect>((46253,-5550), (52147,-1650))</a:Rect>
<a:ModificationDate>1741227864</a:ModificationDate>
<a:Rect>((29678,-4275), (35572,-375))</a:Rect>
<a:AutoAdjustToText>0</a:AutoAdjustToText>
<a:LineColor>16711680</a:LineColor>
<a:FillColor>16744448</a:FillColor>

3
Tiobon.Core.Model/Base/Ghre/Ghre_UshioPlan.Dto.Base.cs
Unescape View File

@ -190,5 +190,6 @@ public class Ghre_UshioPlanBase
/// </summary>
public int? ReverseI2 { get; set; }
public List<int> StaffId { get; set; }
public List<int> StaffId { get; set; } = new List<int>();
public List<string> Months { get; set; } = new List<string>();
}

17
Tiobon.Core.Model/View/Ghre/Ghre_UshioPlan.Dto.View.cs
Unescape View File

@ -36,5 +36,20 @@ public class Ghre_UshioPlanDto : Ghre_UshioPlan
public string DeptName { get; set; }
public string SchoolName { get; set; }
public List<int> StaffId { get; set; }
public List<int> StaffId { get; set; } = new List<int>();
public List<string> Months { get; set; } = new List<string>();
public decimal? TotalDays { get; set; } = 0;
public string M1 { get; set; }
public string M2 { get; set; }
public string M3 { get; set; }
public string M4 { get; set; }
public string M5 { get; set; }
public string M6 { get; set; }
public string M7 { get; set; }
public string M8 { get; set; }
public string M9 { get; set; }
public string M10 { get; set; }
public string M11 { get; set; }
public string M12 { get; set; }
}

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

@ -2146,7 +2146,7 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
reorderedNumbers = new();
sort = result.JM_TableColumnT1.TableColumn.Where(x => x.field == "M1").SingleOrDefault()?.SortNo ?? 5;
name1 = await QueryLangValue("F_ResumeMaintenance_0216", "预算编制数");
name1 = "计划年月";
result.JM_TableColumnT1.TableColumn?.ForEach(x =>
{
if (months.Where(o => o == x.label).Any())

49
Tiobon.Core.Services/Ghre/Ghre_UshioPlanServices.cs
Unescape View File

@ -41,23 +41,27 @@ public class Ghre_UshioPlanServices : BaseServices<Ghre_UshioPlan, Ghre_UshioPla
var DT_TableDataT1 = result.result.DT_TableDataT1;
var deptIds = DT_TableDataT1.Select(x => x.DeptId).Distinct().ToList();
var courseIds = DT_TableDataT1.Select(x => x.CourseId).Distinct().ToList();
//var courseIds = DT_TableDataT1.Select(x => x.CourseId).Distinct().ToList();
var staffIds = new List<int>();
for (int i = 0; i < DT_TableDataT1.Count; i++)
{
if (DT_TableDataT1[i].StaffIds.IsNotEmptyOrNull())
staffIds.AddRange(JsonHelper.JsonToObj<List<int>>(DT_TableDataT1[i].StaffIds));
if (DT_TableDataT1[i].Month.IsNotEmptyOrNull())
DT_TableDataT1[i].Months = JsonHelper.JsonToObj<List<string>>(DT_TableDataT1[i].Month);
DT_TableDataT1[i].TrainCategory = await GetParaLabel("TrainingCategory", DT_TableDataT1[i].TrainCategory);
DT_TableDataT1[i].Month = await GetParaLabel("MonthSelect", DT_TableDataT1[i].Month);
}
staffIds = staffIds.Distinct().ToList();
var staffs = await Db.Queryable<Ghra_Staff>().Where(x => staffIds.Contains(x.StaffID)).ToListAsync();
var depts = await Db.Queryable<Ghro_Dept>().Where(x => deptIds.Contains(x.DeptID)).ToListAsync();
var courses = await Db.Queryable<Ghre_Course>().Where(x => courseIds.Contains(x.Id)).ToListAsync();
//var courses = await Db.Queryable<Ghre_Course>().Where(x => courseIds.Contains(x.Id)).ToListAsync();
for (int i = 0; i < DT_TableDataT1.Count; i++)
{
DT_TableDataT1[i].InOrOut = await GetParaLabel("CourseInOrOut", DT_TableDataT1[i].InOrOut);
if (DT_TableDataT1[i].StaffIds.IsNotEmptyOrNull())
{
var staffIds1 = JsonHelper.JsonToObj<List<int>>(DT_TableDataT1[i].StaffIds);
@ -65,8 +69,34 @@ public class Ghre_UshioPlanServices : BaseServices<Ghre_UshioPlan, Ghre_UshioPla
DT_TableDataT1[i].StaffNames = string.Join("、", staffs.Where(x => staffIds1.Contains(x.StaffID)).Select(x => x.StaffName));
}
DT_TableDataT1[i].CourseName = courses.Where(x => x.Id == DT_TableDataT1[i].CourseId).Select(x => x.CourseName).FirstOrDefault();
//DT_TableDataT1[i].CourseName = courses.Where(x => x.Id == DT_TableDataT1[i].CourseId).Select(x => x.CourseName).FirstOrDefault();
DT_TableDataT1[i].DeptName = depts.Where(x => x.DeptID == DT_TableDataT1[i].DeptId).Select(x => x.DeptName).FirstOrDefault();
if (DT_TableDataT1[i].TrainNum != null && DT_TableDataT1[i].TrainDays != null)
DT_TableDataT1[i].TotalDays = DT_TableDataT1[i].TrainNum * DT_TableDataT1[i].TrainDays;
if (DT_TableDataT1[i].Months.Any())
{
DT_TableDataT1[i].Months.ForEach(x =>
{
//if (x.ObjToInt() == 1) DT_TableDataT1[i] = "✔√";
if (x.ObjToInt() == 1) DT_TableDataT1[i].M1 = "✔";
else if (x.ObjToInt() == 2) DT_TableDataT1[i].M2 = "✔";
else if (x.ObjToInt() == 3) DT_TableDataT1[i].M3 = "✔";
else if (x.ObjToInt() == 4) DT_TableDataT1[i].M4 = "✔";
else if (x.ObjToInt() == 5) DT_TableDataT1[i].M5 = "✔";
else if (x.ObjToInt() == 6) DT_TableDataT1[i].M6 = "✔";
else if (x.ObjToInt() == 7) DT_TableDataT1[i].M7 = "✔";
else if (x.ObjToInt() == 8) DT_TableDataT1[i].M8 = "✔";
else if (x.ObjToInt() == 9) DT_TableDataT1[i].M9 = "✔";
else if (x.ObjToInt() == 10) DT_TableDataT1[i].M10 = "✔";
else if (x.ObjToInt() == 11) DT_TableDataT1[i].M11 = "✔";
else if (x.ObjToInt() == 12) DT_TableDataT1[i].M12 = "✔";
});
}
}
@ -102,6 +132,10 @@ public class Ghre_UshioPlanServices : BaseServices<Ghre_UshioPlan, Ghre_UshioPla
{
if (entity.StaffId != null)
entity.StaffIds = JsonHelper.ObjToJson(entity.StaffId);
entity.TrainNum = entity.StaffId.Count;
if (entity.Months != null)
entity.Month = JsonHelper.ObjToJson(entity.Months);
var result = await base.Add(entity);
return result;
@ -112,6 +146,9 @@ public class Ghre_UshioPlanServices : BaseServices<Ghre_UshioPlan, Ghre_UshioPla
if (editModel.StaffId != null)
editModel.StaffIds = JsonHelper.ObjToJson(editModel.StaffId);
if (editModel.Months != null)
editModel.Month = JsonHelper.ObjToJson(editModel.Months);
editModel.TrainNum = editModel.StaffId.Count;
var result = await base.Update(Id, editModel, null, ["Status"]);
return result;
}
@ -120,8 +157,14 @@ public class Ghre_UshioPlanServices : BaseServices<Ghre_UshioPlan, Ghre_UshioPla
{
var result = await base.QueryForm(body);
string StaffIds = result.result.DT_TableDataT1[0].StaffIds;
string Month = result.result.DT_TableDataT1[0].Month;
if (!string.IsNullOrWhiteSpace(StaffIds))
result.result.DT_TableDataT1[0].StaffId = JsonConvert.DeserializeObject<List<int>>(StaffIds);
if (!string.IsNullOrWhiteSpace(Month))
result.result.DT_TableDataT1[0].Months = JsonConvert.DeserializeObject<List<string>>(Month);
if (result.result.DT_TableDataT1[0].TrainNum != null && result.result.DT_TableDataT1[0].TrainDays != null)
result.result.DT_TableDataT1[0].TotalDays = result.result.DT_TableDataT1[0].TrainNum * result.result.DT_TableDataT1[0].TrainDays;
return result;
}
public async Task<ServiceResult<long>> InsertByStatus(InsertGhre_UshioPlanInput insertModel, string status)

Write Preview
Loading…
Cancel
Save