学员群组

master
xiaochanghai 4 months ago
parent 3205b4a5e5
commit e8c350d618
  1. 4
      Model/Tiobon.Web.pdm
  2. 104
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  3. 2
      Tiobon.Core.Common/Helper/JsonHelper.cs
  4. 48
      Tiobon.Core.Model/Base/Ghre/Ghre_StaffGroup.Dto.Base.cs
  5. 22
      Tiobon.Core.Model/Models/Ghre/Ghre_StaffGroup.cs
  6. 70
      Tiobon.Core.Model/View/Ghre/Ghre_StaffGroup.Dto.View.cs
  7. 238
      Tiobon.Core.Services/Ghre/Ghre_StaffGroupServices.cs
  8. 104
      Tiobon.Core/Tiobon.Core.Model.xml

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<?PowerDesigner AppLocale="UTF16" ID="{C294868A-C3F3-41AD-98CC-78B6D4E0CC40}" Label="" LastModificationDate="1739855568" Name="Tiobon" Objects="3188" Symbols="123" 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="1739859026" Name="Tiobon" Objects="3188" Symbols="123" 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">
@ -29374,7 +29374,7 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
<a:Code>ApplicantId</a:Code>
<a:CreationDate>1725602241</a:CreationDate>
<a:Creator>Administrator</a:Creator>
<a:ModificationDate>1725604285</a:ModificationDate>
<a:ModificationDate>1739859026</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier>
<a:Comment>申请人</a:Comment>
<a:DataType>bigint</a:DataType>

@ -6390,6 +6390,16 @@
群组类别
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupBase.StaffType1">
<summary>
直间接
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupBase.StaffType2">
<summary>
用工形式
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupBase.ZoneId">
<summary>
厂区
@ -6520,6 +6530,16 @@
预留字段12
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupBase.StaffType1s">
<summary>
直间接
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupBase.StaffType2s">
<summary>
用工形式
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupBase.ZoneIds">
<summary>
厂区
@ -21396,6 +21416,16 @@
群组类别
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroup.StaffType1">
<summary>
直间接
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroup.StaffType2">
<summary>
用工形式
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroup.ZoneId">
<summary>
厂区
@ -21446,12 +21476,12 @@
不包含职称
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroup.Staff">
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroup.StaffId">
<summary>
员工
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroup.ExclStaff">
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroup.ExclStaffId">
<summary>
不包含员工
</summary>
@ -30562,6 +30592,76 @@
修改信息
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupDto.StaffType1s">
<summary>
直间接
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupDto.StaffType2s">
<summary>
用工形式
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupDto.ZoneIds">
<summary>
厂区
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupDto.ExclZoneIds">
<summary>
不包含厂区
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupDto.DeptIds">
<summary>
部门
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupDto.ExclDeptIds">
<summary>
不包含部门
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupDto.TitleIds">
<summary>
岗位ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupDto.ExclTitleIds">
<summary>
不包含岗位
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupDto.GradeIds">
<summary>
职等
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupDto.ExclGradeIds">
<summary>
不包含职等
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupDto.JobIds">
<summary>
职称
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupDto.ExclJobIds">
<summary>
不包含职称
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupDto.StaffIds">
<summary>
员工
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupDto.ExclStaffIds">
<summary>
不包含员工
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_StudyRecordDto">
<summary>
培训记录(Dto.View)

@ -28,6 +28,8 @@ public class JsonHelper
/// <returns>返回对象</returns>
public static T JsonToObj<T>(string strJson, bool isUseTextJson = false)
{
if (strJson.IsNullOrEmpty())
strJson = "[]";
if (isUseTextJson)
{
return System.Text.Json.JsonSerializer.Deserialize<T>(strJson);

@ -6,7 +6,7 @@
*
* Ver
*
*V0.01 2025/2/17 14:20:03 SimonHsiao
*V0.01 2025/2/18 14:11:44 SimonHsiao
*
* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
*
@ -41,6 +41,18 @@ public class Ghre_StaffGroupBase
[Display(Name = "GroupType"), Description("群组类别"), MaxLength(32, ErrorMessage = "群组类别 不能超过 32 个字符")]
public string GroupType { get; set; }
/// <summary>
/// 直间接
/// </summary>
[Display(Name = "StaffType1"), Description("直间接"), MaxLength(2000, ErrorMessage = "直间接 不能超过 2000 个字符")]
public string StaffType1 { get; set; }
/// <summary>
/// 用工形式
/// </summary>
[Display(Name = "StaffType2"), Description("用工形式"), MaxLength(2000, ErrorMessage = "用工形式 不能超过 2000 个字符")]
public string StaffType2 { get; set; }
/// <summary>
/// 厂区
/// </summary>
@ -194,63 +206,73 @@ public class Ghre_StaffGroupBase
/// </summary>
public int? ReverseI2 { get; set; }
/// <summary>
/// 直间接
/// </summary>
public List<string> StaffType1s { get; set; } = new List<string>();
/// <summary>
/// 用工形式
/// </summary>
public List<string> StaffType2s { get; set; } = new List<string>();
/// <summary>
/// 厂区
/// </summary>
public string ZoneIds { get; set; }
public List<long> ZoneIds { get; set; } = new List<long>();
/// <summary>
/// 不包含厂区
/// </summary>
public string ExclZoneIds { get; set; }
public List<long> ExclZoneIds { get; set; } = new List<long>();
/// <summary>
/// 部门
/// </summary>
public string DeptIds { get; set; }
public List<long> DeptIds { get; set; } = new List<long>();
/// <summary>
/// 不包含部门
/// </summary>
public string ExclDeptIds { get; set; }
public List<long> ExclDeptIds { get; set; } = new List<long>();
/// <summary>
/// 岗位ID
/// </summary>
public string TitleIds { get; set; }
public List<long> TitleIds { get; set; } = new List<long>();
/// <summary>
/// 不包含岗位
/// </summary>
public string ExclTitleIds { get; set; }
public List<long> ExclTitleIds { get; set; } = new List<long>();
/// <summary>
/// 职等
/// </summary>
public string GradeIds { get; set; }
public List<long> GradeIds { get; set; } = new List<long>();
/// <summary>
/// 不包含职等
/// </summary>
public string ExclGradeIds { get; set; }
public List<long> ExclGradeIds { get; set; } = new List<long>();
/// <summary>
/// 职称
/// </summary>
public string JobIds { get; set; }
public List<long> JobIds { get; set; } = new List<long>();
/// <summary>
/// 不包含职称
/// </summary>
public string ExclJobIds { get; set; }
public List<long> ExclJobIds { get; set; } = new List<long>();
/// <summary>
/// 员工
/// </summary>
public string StaffIds { get; set; }
public List<long> StaffIds { get; set; } = new List<long>();
/// <summary>
/// 不包含员工
/// </summary>
public string ExclStaffIds { get; set; }
public List<long> ExclStaffIds { get; set; } = new List<long>();
}

@ -6,7 +6,7 @@
*
* Ver
*
*V0.01 2025/2/17 14:20:03 SimonHsiao
*V0.01 2025/2/18 14:11:44 SimonHsiao
*
* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
*
@ -42,6 +42,18 @@ public class Ghre_StaffGroup : BasePoco
[Display(Name = "GroupType"), Description("群组类别"), MaxLength(32, ErrorMessage = "群组类别 不能超过 32 个字符")]
public string GroupType { get; set; }
/// <summary>
/// 直间接
/// </summary>
[Display(Name = "StaffType1"), Description("直间接"), MaxLength(2000, ErrorMessage = "直间接 不能超过 2000 个字符")]
public string StaffType1 { get; set; }
/// <summary>
/// 用工形式
/// </summary>
[Display(Name = "StaffType2"), Description("用工形式"), MaxLength(2000, ErrorMessage = "用工形式 不能超过 2000 个字符")]
public string StaffType2 { get; set; }
/// <summary>
/// 厂区
/// </summary>
@ -105,14 +117,14 @@ public class Ghre_StaffGroup : BasePoco
/// <summary>
/// 员工
/// </summary>
[Display(Name = "Staff"), Description("员工"), MaxLength(2000, ErrorMessage = "员工 不能超过 2000 个字符")]
public string Staff { get; set; }
[Display(Name = "StaffId"), Description("员工"), MaxLength(2000, ErrorMessage = "员工 不能超过 2000 个字符")]
public string StaffId { get; set; }
/// <summary>
/// 不包含员工
/// </summary>
[Display(Name = "ExclStaff"), Description("不包含员工"), MaxLength(2000, ErrorMessage = "不包含员工 不能超过 2000 个字符")]
public string ExclStaff { get; set; }
[Display(Name = "ExclStaffId"), Description("不包含员工"), MaxLength(2000, ErrorMessage = "不包含员工 不能超过 2000 个字符")]
public string ExclStaffId { get; set; }
/// <summary>
/// 备注

@ -31,4 +31,74 @@ public class Ghre_StaffGroupDto : Ghre_StaffGroup
/// 修改信息
/// </summary>
public string UpdateDataInfo { get; set; }
/// <summary>
/// 直间接
/// </summary>
public List<string> StaffType1s { get; set; } = new List<string>();
/// <summary>
/// 用工形式
/// </summary>
public List<string> StaffType2s { get; set; } = new List<string>();
/// <summary>
/// 厂区
/// </summary>
public List<int> ZoneIds { get; set; } = new List<int>();
/// <summary>
/// 不包含厂区
/// </summary>
public List<int> ExclZoneIds { get; set; } = new List<int>();
/// <summary>
/// 部门
/// </summary>
public List<int> DeptIds { get; set; } = new List<int>();
/// <summary>
/// 不包含部门
/// </summary>
public List<int> ExclDeptIds { get; set; } = new List<int>();
/// <summary>
/// 岗位ID
/// </summary>
public List<int> TitleIds { get; set; } = new List<int>();
/// <summary>
/// 不包含岗位
/// </summary>
public List<int> ExclTitleIds { get; set; } = new List<int>();
/// <summary>
/// 职等
/// </summary>
public List<int> GradeIds { get; set; } = new List<int>();
/// <summary>
/// 不包含职等
/// </summary>
public List<int> ExclGradeIds { get; set; } = new List<int>();
/// <summary>
/// 职称
/// </summary>
public List<int> JobIds { get; set; } = new List<int>();
/// <summary>
/// 不包含职称
/// </summary>
public List<int> ExclJobIds { get; set; } = new List<int>();
/// <summary>
/// 员工
/// </summary>
public List<int> StaffIds { get; set; } = new List<int>();
/// <summary>
/// 不包含员工
/// </summary>
public List<int> ExclStaffIds { get; set; } = new List<int>();
}

@ -1,5 +1,8 @@
using Tiobon.Core.Common.DB.Dapper.Extensions;
using Tiobon.Core.IServices;
using NPOI.SS.Formula.Functions;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using Tiobon.Core.Model;
namespace Tiobon.Core.Services;
@ -15,10 +18,199 @@ public class Ghre_StaffGroupServices : BaseServices<Ghre_StaffGroup, Ghre_StaffG
base.BaseDal = dal;
base._caching = caching;
}
public override async Task<ServicePageResult<Ghre_StaffGroupDto>> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true)
{
var result = await base.QueryFilterPage(filter, condition, IsEnable);
var zoneIds = new List<int>();
var exclZoneIds = new List<int>();
var deptIds = new List<int>();
var exclDeptIds = new List<int>();
var titleIds = new List<int>();
var exclTitleIds = new List<int>();
var gradeIds = new List<int>();
var exclgGradeIds = new List<int>();
var jobIds = new List<int>();
var exclJobIds = new List<int>();
var staffIds = new List<int>();
var exclStaffIds = new List<int>();
result.result.DT_TableDataT1.ForEach(async x =>
{
x.StaffType1s = JsonHelper.JsonToObj<List<string>>(x.StaffType1);
x.StaffType2s = JsonHelper.JsonToObj<List<string>>(x.StaffType2);
x.ZoneIds = JsonHelper.JsonToObj<List<int>>(x.ZoneId);
x.ExclZoneIds = JsonHelper.JsonToObj<List<int>>(x.ExclZoneId);
x.DeptIds = JsonHelper.JsonToObj<List<int>>(x.DeptId);
x.ExclDeptIds = JsonHelper.JsonToObj<List<int>>(x.ExclDeptId);
x.TitleIds = JsonHelper.JsonToObj<List<int>>(x.TitleId);
x.ExclTitleIds = JsonHelper.JsonToObj<List<int>>(x.ExclTitleId);
x.GradeIds = JsonHelper.JsonToObj<List<int>>(x.GradeId);
x.ExclGradeIds = JsonHelper.JsonToObj<List<int>>(x.ExclGradeId);
x.JobIds = JsonHelper.JsonToObj<List<int>>(x.JobId);
x.ExclJobIds = JsonHelper.JsonToObj<List<int>>(x.ExclJobId);
x.StaffIds = JsonHelper.JsonToObj<List<int>>(x.StaffId);
x.ExclStaffIds = JsonHelper.JsonToObj<List<int>>(x.ExclStaffId);
zoneIds.AddRange(x.ZoneIds);
zoneIds.AddRange(x.ExclZoneIds);
deptIds.AddRange(x.DeptIds);
deptIds.AddRange(x.ExclDeptIds);
titleIds.AddRange(x.TitleIds);
titleIds.AddRange(x.ExclTitleIds);
gradeIds.AddRange(x.GradeIds);
gradeIds.AddRange(x.ExclGradeIds);
jobIds.AddRange(x.JobIds);
jobIds.AddRange(x.ExclJobIds);
staffIds.AddRange(x.StaffIds);
staffIds.AddRange(x.ExclStaffIds);
x.GroupType = await GetParaLabel("TrainingGroupType", x.GroupType);
for (int i = 0; i < x.StaffType1s.Count; i++)
{
x.StaffType1s[i] = await GetParaLabel("StaffType1", x.StaffType1s[i]);
}
for (int i = 0; i < x.StaffType2s.Count; i++)
{
x.StaffType2s[i] = await GetParaLabel("StaffType2", x.StaffType2s[i]);
}
x.StaffType1 = string.Join(",", x.StaffType1s);
x.StaffType2 = string.Join(",", x.StaffType2s);
});
if (zoneIds.Any())
{
var zones = await Db.Queryable<Ghra_Zone>().Where(x => zoneIds.Contains(x.ZoneID.Value)).ToListAsync();
result.result.DT_TableDataT1.ForEach(rule =>
{
rule.ZoneId = string.Join(",", zones.Where(o => rule.ZoneIds.Contains(o.ZoneID.Value)).Select(o => o.ZoneName));
rule.ExclZoneId = string.Join(",", zones.Where(o => rule.ExclZoneIds.Contains(o.ZoneID.Value)).Select(o => o.ZoneName));
});
}
if (deptIds.Any())
{
var depts = await Db.Queryable<Ghro_Dept>().Where(x => deptIds.Contains(x.DeptID.Value)).ToListAsync();
result.result.DT_TableDataT1.ForEach(rule =>
{
rule.DeptId = string.Join(",", depts.Where(o => rule.DeptIds.Contains(o.DeptID.Value)).Select(o => o.DeptName));
rule.ExclDeptId = string.Join(",", depts.Where(o => rule.ExclDeptIds.Contains(o.DeptID.Value)).Select(o => o.DeptName));
});
}
if (titleIds.Any())
{
var titles = await Db.Queryable<Ghra_Title>().Where(x => titleIds.Contains(x.TitleID.Value)).ToListAsync();
result.result.DT_TableDataT1.ForEach(rule =>
{
rule.TitleId = string.Join(",", titles.Where(o => rule.TitleIds.Contains(o.TitleID.Value)).Select(o => o.TitleName));
rule.ExclTitleId = string.Join(",", titles.Where(o => rule.ExclTitleIds.Contains(o.TitleID.Value)).Select(o => o.TitleName));
});
}
if (gradeIds.Any())
{
var grades = await Db.Queryable<Ghra_Grade>().Where(x => gradeIds.Contains(x.GradeID)).ToListAsync();
result.result.DT_TableDataT1.ForEach(rule =>
{
rule.GradeId = string.Join(",", grades.Where(o => rule.GradeIds.Contains(o.GradeID)).Select(o => o.GradeName));
rule.ExclGradeId = string.Join(",", grades.Where(o => rule.ExclGradeIds.Contains(o.GradeID)).Select(o => o.GradeName));
});
}
if (jobIds.Any())
{
var jobs = await Db.Queryable<Ghra_Job>().Where(x => jobIds.Contains(x.JobID.Value)).ToListAsync();
result.result.DT_TableDataT1.ForEach(rule =>
{
rule.JobId = string.Join(",", jobs.Where(o => rule.JobIds.Contains(o.JobID.Value)).Select(o => o.JobName));
rule.ExclJobId = string.Join(",", jobs.Where(o => rule.ExclJobIds.Contains(o.JobID.Value)).Select(o => o.JobName));
});
}
if (staffIds.Any())
{
var staffs = await Db.Queryable<Ghra_Staff>().Where(x => staffIds.Contains(x.StaffID)).ToListAsync();
result.result.DT_TableDataT1.ForEach(rule =>
{
rule.StaffId = string.Join(",", staffs.Where(o => rule.StaffIds.Contains(o.StaffID)).Select(o => o.StaffName));
rule.ExclStaffId = string.Join(",", staffs.Where(o => rule.ExclStaffIds.Contains(o.StaffID)).Select(o => o.StaffName));
});
}
//sponsorIds = sponsorIds.Distinct().ToList();
//var staffs = await Db.Queryable<Ghra_Staff>().Where(x => sponsorIds.Contains(x.StaffID)).ToListAsync();
//var users = await Db.Queryable<Ghrs_User>().Where(x => userIds.Contains(x.UserId)).ToListAsync();
//result.result.DT_TableDataT1.ForEach(async x =>
//{
// x.StaffType1s
// x.CourseSourceLabel = await GetParaLabel("TrainingRequestCourseSource", x.CourseSource);
// x.RequestSourceLabel = await GetParaLabel("TrainingRequestRequestSource", x.RequestSource);
// x.TrainClassLabel = await GetParaLabel("TrainingRequestTrainClass", x.TrainClass);
// x.TrainLevelLabel = await GetParaLabel("TrainingRequestTrainLevel", x.TrainLevel);
// x.InOrOutLabel = await GetParaLabel("CourseInOrOut", x.InOrOut);
// x.TeacherClassLabel = await GetParaLabel("TrainingTeacherType", x.InOrOut);
// //if (x.CourseId != null)
// // x.CourseName = courses.Where(o => x.CourseId == o.Id).FirstOrDefault()?.CourseName;
// if (x.DeptId != null)
// x.DeptName = depts.Where(o => x.DeptId == o.DeptID).FirstOrDefault()?.DeptName;
// if (x.SponsorId != null)
// x.SponsorName = staffs.Where(o => x.SponsorId == o.StaffID).FirstOrDefault()?.StaffName;
// if (x.TrainStaffIds.IsNotEmptyOrNull())
// x.TrainStaffNames = string.Join("、", staffs.Where(o => x.TrainStaffIds.Contains(o.StaffID)).Select(o => o.StaffName));
// if (x.AgreeUserId != null)
// x.AgreeUserName = users.Where(o => x.AgreeUserId == o.UserId).FirstOrDefault()?.UserName;
// if (x.RefuseUserId != null)
// x.RefuseUserName = users.Where(o => x.RefuseUserId == o.UserId).FirstOrDefault()?.UserName;
// if (x.WorkState.IsNotEmptyOrNull())
// {
// if (x.WorkState == 0) x.WorkStateLabel = "审批中";
// if (x.WorkState == 1) x.WorkStateLabel = "审批通过";
// }
// if (x.RequestNum.IsNotEmptyOrNull() && x.RequestNum > 0)
// if (x.TrainDays.IsNotEmptyOrNull() && x.TrainDays > 0)
// {
// var TotalTrainDays = x.TrainDays * x.RequestNum;
// x.TotalTrainDays = StringHelper.TrimDecimalString(TotalTrainDays);
// }
//});
return result;
}
public override async Task<long> Add(InsertGhre_StaffGroupInput entity)
{
entity.StaffType1 = JsonHelper.ObjToJson(entity.StaffType1s);
entity.StaffType2 = JsonHelper.ObjToJson(entity.StaffType2s);
entity.ZoneId = JsonHelper.ObjToJson(entity.ZoneIds);
entity.ExclZoneId = JsonHelper.ObjToJson(entity.ExclZoneIds);
entity.DeptId = JsonHelper.ObjToJson(entity.DeptIds);
entity.ExclDeptId = JsonHelper.ObjToJson(entity.ExclDeptIds);
entity.TitleId = JsonHelper.ObjToJson(entity.TitleIds);
entity.ExclTitleId = JsonHelper.ObjToJson(entity.ExclTitleIds);
entity.GradeId = JsonHelper.ObjToJson(entity.GradeIds);
entity.ExclGradeId = JsonHelper.ObjToJson(entity.ExclGradeIds);
entity.JobId = JsonHelper.ObjToJson(entity.JobIds);
entity.ExclJobId = JsonHelper.ObjToJson(entity.ExclJobIds);
entity.StaffId = JsonHelper.ObjToJson(entity.StaffIds);
entity.ExclStaffId = JsonHelper.ObjToJson(entity.ExclStaffIds);
var result = await base.Add(entity);
@ -27,8 +219,46 @@ public class Ghre_StaffGroupServices : BaseServices<Ghre_StaffGroup, Ghre_StaffG
public override async Task<bool> Update(long Id, EditGhre_StaffGroupInput entity)
{
var result = await base.Update(Id, entity, null, ["Status"]);
entity.StaffType1 = JsonHelper.ObjToJson(entity.StaffType1s);
entity.StaffType2 = JsonHelper.ObjToJson(entity.StaffType2s);
entity.ZoneId = JsonHelper.ObjToJson(entity.ZoneIds);
entity.ExclZoneId = JsonHelper.ObjToJson(entity.ExclZoneIds);
entity.DeptId = JsonHelper.ObjToJson(entity.DeptIds);
entity.ExclDeptId = JsonHelper.ObjToJson(entity.ExclDeptIds);
entity.TitleId = JsonHelper.ObjToJson(entity.TitleIds);
entity.ExclTitleId = JsonHelper.ObjToJson(entity.ExclTitleIds);
entity.GradeId = JsonHelper.ObjToJson(entity.GradeIds);
entity.ExclGradeId = JsonHelper.ObjToJson(entity.ExclGradeIds);
entity.JobId = JsonHelper.ObjToJson(entity.JobIds);
entity.ExclJobId = JsonHelper.ObjToJson(entity.ExclJobIds);
entity.StaffId = JsonHelper.ObjToJson(entity.StaffIds);
entity.ExclStaffId = JsonHelper.ObjToJson(entity.ExclStaffIds);
var result = await base.Update(Id, entity);
return result;
}
public override async Task<ServiceFormResult<Ghre_StaffGroupDto>> QueryForm(QueryForm body)
{
var result = await base.QueryForm(body);
var DT_TableDataT1 = result.result.DT_TableDataT1[0];
DT_TableDataT1.StaffType1s = JsonHelper.JsonToObj<List<string>>(DT_TableDataT1.StaffType1);
DT_TableDataT1.StaffType2s = JsonHelper.JsonToObj<List<string>>(DT_TableDataT1.StaffType2);
DT_TableDataT1.ZoneIds = JsonHelper.JsonToObj<List<int>>(DT_TableDataT1.ZoneId);
DT_TableDataT1.ExclZoneIds = JsonHelper.JsonToObj<List<int>>(DT_TableDataT1.ExclZoneId);
DT_TableDataT1.DeptIds = JsonHelper.JsonToObj<List<int>>(DT_TableDataT1.DeptId);
DT_TableDataT1.ExclDeptIds = JsonHelper.JsonToObj<List<int>>(DT_TableDataT1.ExclDeptId);
DT_TableDataT1.TitleIds = JsonHelper.JsonToObj<List<int>>(DT_TableDataT1.TitleId);
DT_TableDataT1.ExclTitleIds = JsonHelper.JsonToObj<List<int>>(DT_TableDataT1.ExclTitleId);
DT_TableDataT1.GradeIds = JsonHelper.JsonToObj<List<int>>(DT_TableDataT1.GradeId);
DT_TableDataT1.ExclGradeIds = JsonHelper.JsonToObj<List<int>>(DT_TableDataT1.ExclGradeId);
DT_TableDataT1.JobIds = JsonHelper.JsonToObj<List<int>>(DT_TableDataT1.JobId);
DT_TableDataT1.ExclJobIds = JsonHelper.JsonToObj<List<int>>(DT_TableDataT1.ExclJobId);
DT_TableDataT1.StaffIds = JsonHelper.JsonToObj<List<int>>(DT_TableDataT1.StaffId);
DT_TableDataT1.ExclStaffIds = JsonHelper.JsonToObj<List<int>>(DT_TableDataT1.ExclStaffId);
result.result.DT_TableDataT1[0] = DT_TableDataT1;
return result;
}
}

@ -6390,6 +6390,16 @@
群组类别
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupBase.StaffType1">
<summary>
直间接
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupBase.StaffType2">
<summary>
用工形式
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupBase.ZoneId">
<summary>
厂区
@ -6520,6 +6530,16 @@
预留字段12
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupBase.StaffType1s">
<summary>
直间接
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupBase.StaffType2s">
<summary>
用工形式
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupBase.ZoneIds">
<summary>
厂区
@ -21396,6 +21416,16 @@
群组类别
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroup.StaffType1">
<summary>
直间接
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroup.StaffType2">
<summary>
用工形式
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroup.ZoneId">
<summary>
厂区
@ -21446,12 +21476,12 @@
不包含职称
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroup.Staff">
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroup.StaffId">
<summary>
员工
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroup.ExclStaff">
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroup.ExclStaffId">
<summary>
不包含员工
</summary>
@ -30562,6 +30592,76 @@
修改信息
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupDto.StaffType1s">
<summary>
直间接
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupDto.StaffType2s">
<summary>
用工形式
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupDto.ZoneIds">
<summary>
厂区
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupDto.ExclZoneIds">
<summary>
不包含厂区
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupDto.DeptIds">
<summary>
部门
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupDto.ExclDeptIds">
<summary>
不包含部门
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupDto.TitleIds">
<summary>
岗位ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupDto.ExclTitleIds">
<summary>
不包含岗位
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupDto.GradeIds">
<summary>
职等
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupDto.ExclGradeIds">
<summary>
不包含职等
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupDto.JobIds">
<summary>
职称
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupDto.ExclJobIds">
<summary>
不包含职称
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupDto.StaffIds">
<summary>
员工
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupDto.ExclStaffIds">
<summary>
不包含员工
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_StudyRecordDto">
<summary>
培训记录(Dto.View)

Loading…
Cancel
Save