From d608db9ceb4c2a6945d1941c826b74dcb617075f Mon Sep 17 00:00:00 2001 From: xiaochanghai Date: Thu, 19 Dec 2024 10:49:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DB/Dapper/Extensions/EntityProperties.cs | 9 +-- Tiobon.Core.Services/BASE/BaseServices.cs | 57 +++++++++---------- .../Ghrh/Ghrh_HumanRequestServices.cs | 2 +- Tiobon.Core/Tiobon.Core.Model.xml | 30 ++++++++++ 4 files changed, 60 insertions(+), 38 deletions(-) diff --git a/Tiobon.Core.Common/DB/Dapper/Extensions/EntityProperties.cs b/Tiobon.Core.Common/DB/Dapper/Extensions/EntityProperties.cs index de6bbc98..33b6b505 100644 --- a/Tiobon.Core.Common/DB/Dapper/Extensions/EntityProperties.cs +++ b/Tiobon.Core.Common/DB/Dapper/Extensions/EntityProperties.cs @@ -1,18 +1,11 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; +using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Data; -using System.Linq; using System.Linq.Expressions; using System.Reflection; using System.Text; -using Tiobon.Core.Common.DB.Dapper.Entity; -using static Dapper.SqlMapper; -using Tiobon.Core.Model.Models; using Tiobon.Core.Model; -using AutoMapper.Execution; namespace Tiobon.Core.Common.DB.Dapper.Extensions; diff --git a/Tiobon.Core.Services/BASE/BaseServices.cs b/Tiobon.Core.Services/BASE/BaseServices.cs index 7106223e..92c96c91 100644 --- a/Tiobon.Core.Services/BASE/BaseServices.cs +++ b/Tiobon.Core.Services/BASE/BaseServices.cs @@ -1,8 +1,4 @@ -using NPOI.SS.Formula.Functions; -using Org.BouncyCastle.Utilities.Zlib; -using Tiobon.Core.Model; - -namespace Tiobon.Core.Services.BASE; +namespace Tiobon.Core.Services.BASE; /// /// 增删改查基础服务 @@ -48,7 +44,10 @@ public class BaseServices : IBaseServ var data = new TEntity(); var dto = Mapper.Map(data).ToANew(); - Type entityType = typeof(TEntity); + var entityInfo = Db.EntityMaintenance.GetEntityInfo(typeof(TEntity)); + + var keyName = entityInfo.Columns.Where(x => x.IsPrimarykey == true).FirstOrDefault()?.DbColumnName ?? "Id"; + string sql = @$"DECLARE @langId INT = 1,@ID BIGINT = '{objId}'; SELECT *, isnull @@ -76,8 +75,8 @@ public class BaseServices : IBaseServ + [dbo].[FLangKeyToValue] ('GHR_Common_000080', @langId, ' 最后修改') UpdateDataInfo - FROM {entityType.GetEntityTableName()} a - WHERE a.Id = @ID AND IsEnable='1'"; + FROM {entityInfo.DbTableName} a + WHERE a.{keyName} = @ID AND IsEnable='1'"; dto = await Db.Ado.SqlQuerySingleAsync(sql); return dto; } @@ -2063,27 +2062,27 @@ ORDER BY SortNo ASC"; -- select @Json exec [dbo].[PS_CreateWorkwxMsg] @Json,'Resume'"; -// Declare @Json nvarchar(max) = '' -// set @Json = (select '测试提醒' title, -// 'markdown' msgtype, -// '您有个简历待面试,面试时间：2024/12/15 00:00~08:08，请及时查看！ -//> **流程信息 * * -//> 申 请 人：< font color =\"info\">tisking 陶兰 -//> 假 别： < font color =\"warning\">事假 -//> 开始时间：< font color =\"comment\">2022-01-21 09:00 -//> 结束时间：< font color =\"comment\">2022-01-21 11:00 -//> -//> 请尽快核准" -// ' [description] , -// '' url, -// 'GHR' picurl, -// '' htmlStr, -// StaffID toStaffIDs -// from Ghra_Staff -// where StaffNo = 'tisking' -// for json path) -// select @Json -// exec[dbo].[PS_CreateWorkwxMsg] @Json,'Test' + // Declare @Json nvarchar(max) = '' + // set @Json = (select '测试提醒' title, + // 'markdown' msgtype, + // '您有个简历待面试,面试时间：2024/12/15 00:00~08:08，请及时查看！ + //> **流程信息 * * + //> 申 请 人：< font color =\"info\">tisking 陶兰 + //> 假 别： < font color =\"warning\">事假 + //> 开始时间：< font color =\"comment\">2022-01-21 09:00 + //> 结束时间：< font color =\"comment\">2022-01-21 11:00 + //> + //> 请尽快核准" + // ' [description] , + // '' url, + // 'GHR' picurl, + // '' htmlStr, + // StaffID toStaffIDs + // from Ghra_Staff + // where StaffNo = 'tisking' + // for json path) + // select @Json + // exec[dbo].[PS_CreateWorkwxMsg] @Json,'Test' diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_HumanRequestServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_HumanRequestServices.cs index d401b88e..7574c4c1 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_HumanRequestServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_HumanRequestServices.cs @@ -40,7 +40,7 @@ public class Ghrh_HumanRequestServices : BaseServices x.GradeId != null).Select(x => x.GradeId).ToList(); var jobIds = entitys.Where(x => x.JobId != null).Select(x => x.JobId).ToList(); var titleIds = entitys.Where(x => x.TitleId != null).Select(x => x.TitleId).ToList(); - var reportIds = entitys.Where(x => x.ReportId != null).Select(x => x.ReportId).ToList(); + var reportIds = entitys.Where(x => x.ReportId != null).Select(x => x.ReportId).ToList(); if (reportIds.Any()) { diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml index 415e4e5d..b90636c6 100644 --- a/Tiobon.Core/Tiobon.Core.Model.xml +++ b/Tiobon.Core/Tiobon.Core.Model.xml @@ -26797,6 +26797,36 @@ 修改信息 + + + 学历要求 + + + + + 工作年限 + + + + + 语言要求 + + + + + 知识要求 + + + + + 技能要求 + + + + + 工作内容 + + 厂区(Dto.View)