From e8c350d618901292bd59621424b909271e65bf6e Mon Sep 17 00:00:00 2001 From: xiaochanghai Date: Wed, 19 Feb 2025 10:05:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E5=91=98=E7=BE=A4=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/Tiobon.Web.pdm | 4 +- Tiobon.Core.Api/Tiobon.Core.Model.xml | 104 +++++++- Tiobon.Core.Common/Helper/JsonHelper.cs | 2 + .../Base/Ghre/Ghre_StaffGroup.Dto.Base.cs | 48 +++- .../Models/Ghre/Ghre_StaffGroup.cs | 22 +- .../View/Ghre/Ghre_StaffGroup.Dto.View.cs | 70 ++++++ .../Ghre/Ghre_StaffGroupServices.cs | 238 +++++++++++++++++- Tiobon.Core/Tiobon.Core.Model.xml | 104 +++++++- 8 files changed, 564 insertions(+), 28 deletions(-) diff --git a/Model/Tiobon.Web.pdm b/Model/Tiobon.Web.pdm index 3189686f..b5e92f55 100644 --- a/Model/Tiobon.Web.pdm +++ b/Model/Tiobon.Web.pdm @@ -1,5 +1,5 @@ - + @@ -29374,7 +29374,7 @@ LABL 0 Arial Unicode MS,8,N ApplicantId 1725602241 Administrator -1725604285 +1739859026 Administrator 申请人 bigint diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml index fc3d605a..52ad6bc8 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -6390,6 +6390,16 @@ 群组类别 + + + 直间接 + + + + + 用工形式 + + 厂区 @@ -6520,6 +6530,16 @@ 预留字段12 + + + 直间接 + + + + + 用工形式 + + 厂区 @@ -21396,6 +21416,16 @@ 群组类别 + + + 直间接 + + + + + 用工形式 + + 厂区 @@ -21446,12 +21476,12 @@ 不包含职称 - + 员工 - + 不包含员工 @@ -30562,6 +30592,76 @@ 修改信息 + + + 直间接 + + + + + 用工形式 + + + + + 厂区 + + + + + 不包含厂区 + + + + + 部门 + + + + + 不包含部门 + + + + + 岗位ID + + + + + 不包含岗位 + + + + + 职等 + + + + + 不包含职等 + + + + + 职称 + + + + + 不包含职称 + + + + + 员工 + + + + + 不包含员工 + + 培训记录(Dto.View) diff --git a/Tiobon.Core.Common/Helper/JsonHelper.cs b/Tiobon.Core.Common/Helper/JsonHelper.cs index 3712505e..0849a6ee 100644 --- a/Tiobon.Core.Common/Helper/JsonHelper.cs +++ b/Tiobon.Core.Common/Helper/JsonHelper.cs @@ -28,6 +28,8 @@ public class JsonHelper /// 返回对象 public static T JsonToObj(string strJson, bool isUseTextJson = false) { + if (strJson.IsNullOrEmpty()) + strJson = "[]"; if (isUseTextJson) { return System.Text.Json.JsonSerializer.Deserialize(strJson); diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_StaffGroup.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_StaffGroup.Dto.Base.cs index 52e05182..69342994 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_StaffGroup.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_StaffGroup.Dto.Base.cs @@ -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; } + /// + /// 直间接 + /// + [Display(Name = "StaffType1"), Description("直间接"), MaxLength(2000, ErrorMessage = "直间接 不能超过 2000 个字符")] + public string StaffType1 { get; set; } + + /// + /// 用工形式 + /// + [Display(Name = "StaffType2"), Description("用工形式"), MaxLength(2000, ErrorMessage = "用工形式 不能超过 2000 个字符")] + public string StaffType2 { get; set; } + /// /// 厂区 /// @@ -194,63 +206,73 @@ public class Ghre_StaffGroupBase /// public int? ReverseI2 { get; set; } + /// + /// 直间接 + /// + public List StaffType1s { get; set; } = new List(); + + /// + /// 用工形式 + /// + public List StaffType2s { get; set; } = new List(); + /// /// 厂区 /// - public string ZoneIds { get; set; } + public List ZoneIds { get; set; } = new List(); /// /// 不包含厂区 /// - public string ExclZoneIds { get; set; } + public List ExclZoneIds { get; set; } = new List(); /// /// 部门 /// - public string DeptIds { get; set; } + public List DeptIds { get; set; } = new List(); /// /// 不包含部门 /// - public string ExclDeptIds { get; set; } + public List ExclDeptIds { get; set; } = new List(); /// /// 岗位ID /// - public string TitleIds { get; set; } + public List TitleIds { get; set; } = new List(); /// /// 不包含岗位 /// - public string ExclTitleIds { get; set; } + public List ExclTitleIds { get; set; } = new List(); /// /// 职等 /// - public string GradeIds { get; set; } + public List GradeIds { get; set; } = new List(); /// /// 不包含职等 /// - public string ExclGradeIds { get; set; } + public List ExclGradeIds { get; set; } = new List(); /// /// 职称 /// - public string JobIds { get; set; } + public List JobIds { get; set; } = new List(); /// /// 不包含职称 /// - public string ExclJobIds { get; set; } + public List ExclJobIds { get; set; } = new List(); /// /// 员工 /// - public string StaffIds { get; set; } + public List StaffIds { get; set; } = new List(); /// /// 不包含员工 /// - public string ExclStaffIds { get; set; } + public List ExclStaffIds { get; set; } = new List(); } diff --git a/Tiobon.Core.Model/Models/Ghre/Ghre_StaffGroup.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_StaffGroup.cs index 3ebec8b1..789e9735 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_StaffGroup.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_StaffGroup.cs @@ -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; } + /// + /// 直间接 + /// + [Display(Name = "StaffType1"), Description("直间接"), MaxLength(2000, ErrorMessage = "直间接 不能超过 2000 个字符")] + public string StaffType1 { get; set; } + + /// + /// 用工形式 + /// + [Display(Name = "StaffType2"), Description("用工形式"), MaxLength(2000, ErrorMessage = "用工形式 不能超过 2000 个字符")] + public string StaffType2 { get; set; } + /// /// 厂区 /// @@ -105,14 +117,14 @@ public class Ghre_StaffGroup : BasePoco /// /// 员工 /// - [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; } /// /// 不包含员工 /// - [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; } /// /// 备注 diff --git a/Tiobon.Core.Model/View/Ghre/Ghre_StaffGroup.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_StaffGroup.Dto.View.cs index 3c7426d1..bb3f79d8 100644 --- a/Tiobon.Core.Model/View/Ghre/Ghre_StaffGroup.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_StaffGroup.Dto.View.cs @@ -31,4 +31,74 @@ public class Ghre_StaffGroupDto : Ghre_StaffGroup /// 修改信息 /// public string UpdateDataInfo { get; set; } + + /// + /// 直间接 + /// + public List StaffType1s { get; set; } = new List(); + + /// + /// 用工形式 + /// + public List StaffType2s { get; set; } = new List(); + + /// + /// 厂区 + /// + public List ZoneIds { get; set; } = new List(); + + /// + /// 不包含厂区 + /// + public List ExclZoneIds { get; set; } = new List(); + + /// + /// 部门 + /// + public List DeptIds { get; set; } = new List(); + + /// + /// 不包含部门 + /// + public List ExclDeptIds { get; set; } = new List(); + + /// + /// 岗位ID + /// + public List TitleIds { get; set; } = new List(); + + /// + /// 不包含岗位 + /// + public List ExclTitleIds { get; set; } = new List(); + + /// + /// 职等 + /// + public List GradeIds { get; set; } = new List(); + + /// + /// 不包含职等 + /// + public List ExclGradeIds { get; set; } = new List(); + + /// + /// 职称 + /// + public List JobIds { get; set; } = new List(); + + /// + /// 不包含职称 + /// + public List ExclJobIds { get; set; } = new List(); + + /// + /// 员工 + /// + public List StaffIds { get; set; } = new List(); + + /// + /// 不包含员工 + /// + public List ExclStaffIds { get; set; } = new List(); } diff --git a/Tiobon.Core.Services/Ghre/Ghre_StaffGroupServices.cs b/Tiobon.Core.Services/Ghre/Ghre_StaffGroupServices.cs index 342aa7d0..cc73c863 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_StaffGroupServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_StaffGroupServices.cs @@ -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> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true) + { + var result = await base.QueryFilterPage(filter, condition, IsEnable); + + var zoneIds = new List(); + var exclZoneIds = new List(); + var deptIds = new List(); + var exclDeptIds = new List(); + var titleIds = new List(); + var exclTitleIds = new List(); + var gradeIds = new List(); + var exclgGradeIds = new List(); + var jobIds = new List(); + var exclJobIds = new List(); + var staffIds = new List(); + var exclStaffIds = new List(); + result.result.DT_TableDataT1.ForEach(async x => + { + x.StaffType1s = JsonHelper.JsonToObj>(x.StaffType1); + x.StaffType2s = JsonHelper.JsonToObj>(x.StaffType2); + x.ZoneIds = JsonHelper.JsonToObj>(x.ZoneId); + x.ExclZoneIds = JsonHelper.JsonToObj>(x.ExclZoneId); + x.DeptIds = JsonHelper.JsonToObj>(x.DeptId); + x.ExclDeptIds = JsonHelper.JsonToObj>(x.ExclDeptId); + x.TitleIds = JsonHelper.JsonToObj>(x.TitleId); + x.ExclTitleIds = JsonHelper.JsonToObj>(x.ExclTitleId); + x.GradeIds = JsonHelper.JsonToObj>(x.GradeId); + x.ExclGradeIds = JsonHelper.JsonToObj>(x.ExclGradeId); + x.JobIds = JsonHelper.JsonToObj>(x.JobId); + x.ExclJobIds = JsonHelper.JsonToObj>(x.ExclJobId); + x.StaffIds = JsonHelper.JsonToObj>(x.StaffId); + x.ExclStaffIds = JsonHelper.JsonToObj>(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().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().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().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().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().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().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().Where(x => sponsorIds.Contains(x.StaffID)).ToListAsync(); + //var users = await Db.Queryable().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 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 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> QueryForm(QueryForm body) + { + var result = await base.QueryForm(body); + var DT_TableDataT1 = result.result.DT_TableDataT1[0]; + DT_TableDataT1.StaffType1s = JsonHelper.JsonToObj>(DT_TableDataT1.StaffType1); + DT_TableDataT1.StaffType2s = JsonHelper.JsonToObj>(DT_TableDataT1.StaffType2); + DT_TableDataT1.ZoneIds = JsonHelper.JsonToObj>(DT_TableDataT1.ZoneId); + DT_TableDataT1.ExclZoneIds = JsonHelper.JsonToObj>(DT_TableDataT1.ExclZoneId); + DT_TableDataT1.DeptIds = JsonHelper.JsonToObj>(DT_TableDataT1.DeptId); + DT_TableDataT1.ExclDeptIds = JsonHelper.JsonToObj>(DT_TableDataT1.ExclDeptId); + DT_TableDataT1.TitleIds = JsonHelper.JsonToObj>(DT_TableDataT1.TitleId); + DT_TableDataT1.ExclTitleIds = JsonHelper.JsonToObj>(DT_TableDataT1.ExclTitleId); + DT_TableDataT1.GradeIds = JsonHelper.JsonToObj>(DT_TableDataT1.GradeId); + DT_TableDataT1.ExclGradeIds = JsonHelper.JsonToObj>(DT_TableDataT1.ExclGradeId); + DT_TableDataT1.JobIds = JsonHelper.JsonToObj>(DT_TableDataT1.JobId); + DT_TableDataT1.ExclJobIds = JsonHelper.JsonToObj>(DT_TableDataT1.ExclJobId); + DT_TableDataT1.StaffIds = JsonHelper.JsonToObj>(DT_TableDataT1.StaffId); + DT_TableDataT1.ExclStaffIds = JsonHelper.JsonToObj>(DT_TableDataT1.ExclStaffId); + result.result.DT_TableDataT1[0] = DT_TableDataT1; + return result; + + } } \ No newline at end of file diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml index fc3d605a..52ad6bc8 100644 --- a/Tiobon.Core/Tiobon.Core.Model.xml +++ b/Tiobon.Core/Tiobon.Core.Model.xml @@ -6390,6 +6390,16 @@ 群组类别 + + + 直间接 + + + + + 用工形式 + + 厂区 @@ -6520,6 +6530,16 @@ 预留字段12 + + + 直间接 + + + + + 用工形式 + + 厂区 @@ -21396,6 +21416,16 @@ 群组类别 + + + 直间接 + + + + + 用工形式 + + 厂区 @@ -21446,12 +21476,12 @@ 不包含职称 - + 员工 - + 不包含员工 @@ -30562,6 +30592,76 @@ 修改信息 + + + 直间接 + + + + + 用工形式 + + + + + 厂区 + + + + + 不包含厂区 + + + + + 部门 + + + + + 不包含部门 + + + + + 岗位ID + + + + + 不包含岗位 + + + + + 职等 + + + + + 不包含职等 + + + + + 职称 + + + + + 不包含职称 + + + + + 员工 + + + + + 不包含员工 + + 培训记录(Dto.View)