From f4f5d5f8e44c56f6e598728776fc3048d6ae67b3 Mon Sep 17 00:00:00 2001 From: xiaochanghai Date: Thu, 31 Oct 2024 18:37:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=8B=9B?= =?UTF-8?q?=E8=81=98=E8=A1=A8=E5=8D=95=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/Tiobon.Web.pdm | 178 ++++++++++-------- Tiobon.Core.Api/Tiobon.Core.Model.xml | 10 + .../Ghrh/Ghrh_ResumeStatement.Dto.Base.cs | 6 + .../Models/Ghrh/Ghrh_ResumeStatement.cs | 6 + .../ViewModels/Extend/ResumeViewTab.cs | 6 +- .../Ghrh/Ghrh_ResumeServices.cs | 29 ++- Tiobon.Core/Tiobon.Core.Model.xml | 10 + 7 files changed, 154 insertions(+), 91 deletions(-) diff --git a/Model/Tiobon.Web.pdm b/Model/Tiobon.Web.pdm index 8a3c4317..dd676750 100644 --- a/Model/Tiobon.Web.pdm +++ b/Model/Tiobon.Web.pdm @@ -1,5 +1,5 @@ - + @@ -37684,7 +37684,7 @@ Ghra_staff_InsureBase Ghrh_ResumeStatement 1730343108 Administrator -1730343555 +1730367610 Administrator 简历声明 @@ -37845,6 +37845,18 @@ Ghra_staff_InsureBase bigint +D2A35E76-8C70-432D-BDCE-B8E5BA175435 +声明代码 +StatementCode +1730367583 +Administrator +1730367633 +Administrator +声明代码 +nvarchar(32) +32 + + CB2D641A-98A8-4761-9035-21A9FD3F194F 是否 TrueOrFalse @@ -37855,7 +37867,7 @@ Ghra_staff_InsureBase 是否 bit - + F8BED39A-F292-4E74-A20D-EBA276D6363D 备注 RemarkSz @@ -37870,7 +37882,7 @@ Ghra_staff_InsureBase - + C62823F3-1792-435C-9B0D-47B089A442C2 默认标志 IsDefault @@ -37885,7 +37897,7 @@ Ghra_staff_InsureBase - + 89759A2B-8579-4E37-A02A-A04F1375D01D 删除标志 IsEnable @@ -37900,7 +37912,7 @@ Ghra_staff_InsureBase - + 47657968-B7C1-48E5-8009-FFF2957D2CA7 预留字段1 Reverse1 @@ -37912,7 +37924,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + D3760A85-B348-40C0-A8CB-392E710B1CD7 预留字段2 Reverse2 @@ -37924,7 +37936,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 1D31C5B6-42A2-45D8-B23C-AC1DC05A7645 预留字段3 Reverse3 @@ -37936,7 +37948,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 475EEE62-9BE6-4822-B51B-C29EE5D9AA02 预留字段4 Reverse4 @@ -37948,7 +37960,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 5E75F2E4-761F-4C40-98D1-7D826B84D1B1 预留字段5 Reverse5 @@ -37960,7 +37972,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 8BD0516C-CEBE-42E1-8A3D-20B0BBE64384 预留字段6 Reverse6 @@ -37972,7 +37984,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 99D317FF-4A2C-4DB0-B341-1F990C525D66 预留字段7 Reverse7 @@ -37984,7 +37996,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 49242367-12DE-46A8-A0E6-401FA9BF21DA 预留字段8 Reverse8 @@ -37996,7 +38008,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 95C75CCC-FBA1-42AA-970D-A3A502CBBE08 预留字段9 Reverse9 @@ -38008,7 +38020,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 4673A058-AA6F-4886-990D-74BF48AEB3B7 预留字段10 Reverse10 @@ -38020,7 +38032,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 0A707EB0-96C4-45E8-81D0-044C0F44AB40 预留字段I1 ReverseI1 @@ -38032,7 +38044,7 @@ Ghra_staff_InsureBase 0 int - + 7265863F-0A92-4A9D-8038-982AF9C2FCC2 预留字段I2 ReverseI2 @@ -38046,7 +38058,7 @@ Ghra_staff_InsureBase - + 5F376CA1-A4CE-4C34-811B-9FF645B9362E Key_1 Key_1 @@ -38060,10 +38072,10 @@ Ghra_staff_InsureBase - + - + @@ -38087,7 +38099,7 @@ Ghra_staff_InsureBase - + 7F0DCA7C-274D-48A8-B3D8-0FD7B707AFC2 1714101292 Administrator @@ -38121,7 +38133,7 @@ Ghra_staff_InsureBase - + D23C452C-4BB6-4C2A-AB2E-E8434D958A77 1714101335 Administrator @@ -38136,7 +38148,7 @@ Ghra_staff_InsureBase - + 55EBFC84-83AC-4EDF-BADD-29FA719652D1 Reference_13 Reference_13 @@ -38155,7 +38167,7 @@ Ghra_staff_InsureBase - + D4016F9D-5631-4F9E-A70D-D42133A4EBB7 1714107872 Administrator @@ -38189,7 +38201,7 @@ Ghra_staff_InsureBase - + BEBA3346-CCC6-41D9-B95B-12B8F81188BF 1714108449 Administrator @@ -38223,7 +38235,7 @@ Ghra_staff_InsureBase - + FC69BEF9-F863-4A65-903E-CB2850197526 1714109221 Administrator @@ -38257,7 +38269,7 @@ Ghra_staff_InsureBase - + ACE0AB02-0D27-4F1C-BF71-738C20DF96C2 1714120556 Administrator @@ -38291,7 +38303,7 @@ Ghra_staff_InsureBase - + B95672ED-9976-4742-9FFC-52B326620682 1715565535 Administrator @@ -38325,7 +38337,7 @@ Ghra_staff_InsureBase - + B6E89235-A6E0-460D-9228-DCA8C58EE2AD 1715570661 Administrator @@ -38359,7 +38371,7 @@ Ghra_staff_InsureBase - + 5D4938F3-7934-4F74-891C-97DC9DC47B1B 1716798640 Administrator @@ -38393,7 +38405,7 @@ Ghra_staff_InsureBase - + 179079CB-7169-4B19-A07A-A61C331F59CD 1716876897 Administrator @@ -38427,7 +38439,7 @@ Ghra_staff_InsureBase - + DD965546-2361-4301-82D7-446B823BDCFD 1717481682 Administrator @@ -38461,7 +38473,7 @@ Ghra_staff_InsureBase - + E78B14FB-C2C3-4DCA-A3B4-CA471817B9FC 1717726229 Administrator @@ -38495,7 +38507,7 @@ Ghra_staff_InsureBase - + 8C71D6B9-780B-4547-ADFD-986E619F4DCD 1719381914 Administrator @@ -38529,7 +38541,7 @@ Ghra_staff_InsureBase - + EB9D1A5A-99AB-44AD-9B1A-D45E66C0CFDE 1719468257 Administrator @@ -38563,7 +38575,7 @@ Ghra_staff_InsureBase - + ACF1454B-2C3F-40E5-ADC5-4A48787EB937 1720488320 Administrator @@ -38597,7 +38609,7 @@ Ghra_staff_InsureBase - + 55351100-6B8C-411A-838F-ADF17D7249C7 1721372650 Administrator @@ -38612,7 +38624,7 @@ Ghra_staff_InsureBase - + 465DBD55-7683-4A4B-91D3-B7019ED619F0 Reference_114 Reference_114 @@ -38631,7 +38643,7 @@ Ghra_staff_InsureBase - + CE1833FA-A783-4FAC-87BF-AA0FF8008532 1721280283 Administrator @@ -38665,7 +38677,7 @@ Ghra_staff_InsureBase - + 18F2EFF3-BD41-4F96-96C8-D8B15C7E2644 1721372603 Administrator @@ -38699,7 +38711,7 @@ Ghra_staff_InsureBase - + F7ECB7BC-BA8B-4606-B521-999C20FD5C43 1722318917 Administrator @@ -38733,7 +38745,7 @@ Ghra_staff_InsureBase - + 6764C448-6B6B-4DD7-AED9-8E74CDD1261A 1727335554 Administrator @@ -38767,7 +38779,7 @@ Ghra_staff_InsureBase - + C8D69BA0-B62F-4A3E-981C-59D5FC0C2A03 1727336760 Administrator @@ -38801,7 +38813,7 @@ Ghra_staff_InsureBase - + 09B3F4FA-149B-4BB2-8D4C-CB9E05153125 1727336895 Administrator @@ -38835,7 +38847,7 @@ Ghra_staff_InsureBase - + D0D47F43-60D2-4012-A1C6-7EE1F23B2B48 1727337857 Administrator @@ -38850,7 +38862,7 @@ Ghra_staff_InsureBase - + E261580B-7706-444D-9E7B-6A1A5968579B Reference_24 Reference_24 @@ -38869,7 +38881,7 @@ Ghra_staff_InsureBase - + A9F8F17E-368A-42BA-B603-19B2CAF61361 1728532955 Administrator @@ -38903,7 +38915,7 @@ Ghra_staff_InsureBase - + 88DE8617-23F2-4075-A9EB-3AEA05F12872 1728532977 Administrator @@ -38937,7 +38949,7 @@ Ghra_staff_InsureBase - + 36AE3FE2-B4E5-4FF7-ADD1-93D1ABD487CD 1728533087 Administrator @@ -38952,7 +38964,7 @@ Ghra_staff_InsureBase - + AB9D9DC4-987C-4E4B-9BD3-35091CDBA380 Reference_27 Reference_27 @@ -38971,7 +38983,7 @@ Ghra_staff_InsureBase - + E2D02611-09C9-42E2-AA43-22E820AF219C 1728626387 Administrator @@ -39005,7 +39017,7 @@ Ghra_staff_InsureBase - + 62F35C8E-87DA-43C4-AAE9-A47D112F8E0A 1728540045 Administrator @@ -39039,7 +39051,7 @@ Ghra_staff_InsureBase - + 3759DC14-1A7D-4121-AAE1-58CE6813A0AA 1728541044 Administrator @@ -39073,7 +39085,7 @@ Ghra_staff_InsureBase - + 1791558D-852F-437C-97F6-7F9D11EE26DB 1729662916 Administrator @@ -39107,7 +39119,7 @@ Ghra_staff_InsureBase - + 00049FDC-8297-463E-9347-A571E3AB9C9E 1729663415 Administrator @@ -39141,7 +39153,7 @@ Ghra_staff_InsureBase - + B7B6FBF6-DC05-4490-8656-A5DEAF831781 1730250294 Administrator @@ -39175,7 +39187,7 @@ Ghra_staff_InsureBase - + A0C97DD9-1C72-4A18-9FEE-EE6A9AEF21F8 1730336852 Administrator @@ -39209,7 +39221,7 @@ Ghra_staff_InsureBase - + 39FD6B5F-C473-44DF-969E-D851D388EBAE 1730340808 Administrator @@ -39243,7 +39255,7 @@ Ghra_staff_InsureBase - + C4EECAD7-F267-4702-A253-CA499692A254 1730346502 Administrator @@ -39265,7 +39277,7 @@ Ghra_staff_InsureBase - + A1DD77B6-E48E-4C9D-947D-D42E3C5240C2 dbo dbo @@ -39278,7 +39290,7 @@ Ghra_staff_InsureBase - + C012A467-0031-4F3C-9D9D-13408491E147 DefaultSchema 1597196432 @@ -39286,12 +39298,12 @@ Ghra_staff_InsureBase 1597196433 ttsoftxch - + - + 41D2B655-5319-49C5-9BA6-133BB8B097CA dbo dbo @@ -39303,7 +39315,7 @@ Ghra_staff_InsureBase - + 2153E033-C4DC-4F90-B2F4-3B0F44BD33D5 文本 TEXT @@ -39313,7 +39325,7 @@ Ghra_staff_InsureBase ttsoftxch text - + AC8799D0-82CA-4B70-ADAC-18D8797720A9 图片 IMAGE @@ -39323,7 +39335,7 @@ Ghra_staff_InsureBase Administrator image - + DEC04470-B84A-413E-9B2A-C265C5506182 加密 ENCRYPT_STRING @@ -39334,7 +39346,7 @@ Ghra_staff_InsureBase nvarchar(256) 256 - + 538C6297-7080-43C1-9455-AD6516B6FBB2 数字 NUMBER @@ -39346,7 +39358,7 @@ Ghra_staff_InsureBase 20 6 - + AF15A9FA-052F-43E5-9102-57F195CBCFDE 类别 TYPE @@ -39357,7 +39369,7 @@ Ghra_staff_InsureBase varchar(32) 32 - + D0936140-81BD-463E-B0ED-FE3F86828A2C 特长字符串 LONG_LONG_STRING @@ -39368,7 +39380,7 @@ Ghra_staff_InsureBase varchar(256) 256 - + 5FBDAFFC-EA04-407B-877F-58752C2E736C 金额 AMOUNT @@ -39380,7 +39392,7 @@ Ghra_staff_InsureBase 20 6 - + F461E3FD-0A64-4712-BC09-C0BA3C248E5B 描述 DESCRIPTION @@ -39391,7 +39403,7 @@ Ghra_staff_InsureBase varchar(4000) 4000 - + 703A2917-B6C4-4BC6-B2CB-6AB8E2B49D30 短字符串 SHORT_STRING @@ -39402,7 +39414,7 @@ Ghra_staff_InsureBase varchar(64) 64 - + 89A476D2-A1C0-428C-9875-26A50B7AFE1A 长字符串 LONG_STRING @@ -39424,7 +39436,7 @@ Ghra_staff_InsureBase varchar(2000) 2000 - + @@ -39438,7 +39450,7 @@ Ghra_staff_InsureBase char(1) 1 - + 82662C91-618F-4022-B9CD-1A431DC84A0A 名称 NAME @@ -39459,7 +39471,7 @@ Ghra_staff_InsureBase Administrator int - + 77F6BD58-5A9D-44F7-988C-76608A3F38B5 代码 CODE @@ -39491,7 +39503,7 @@ Ghra_staff_InsureBase varchar(32) 32 - + DA200725-BFB0-4351-9C3E-DC30C036538E STATUS STATUS @@ -39502,7 +39514,7 @@ Ghra_staff_InsureBase varchar(32) 32 - + CB2F08D6-BE17-4046-B94A-4FD00EDA9015 文件 FILE @@ -39512,7 +39524,7 @@ Ghra_staff_InsureBase feipeng image - + 7CC45A5C-15C8-4CA8-BBEB-66FE3DAB482F 字符串512 STRING_512 @@ -39525,7 +39537,7 @@ Ghra_staff_InsureBase - + B41C21E8-76E9-4031-8EF0-34743E5525C5 PUBLIC PUBLIC @@ -39534,13 +39546,13 @@ Ghra_staff_InsureBase 1597196433 ttsoftxch - - + + - + 02EF92C9-49BF-45C7-934A-23BA290D5595 Microsoft SQL Server 2008 MSSQLSRV2008 diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml index 52ca3782..f3be80ae 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -7000,6 +7000,11 @@ 声明ID + + + 声明代码 + + 是否 @@ -16611,6 +16616,11 @@ 声明ID + + + 声明代码 + + 是否 diff --git a/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeStatement.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeStatement.Dto.Base.cs index af58aac8..9200fb2d 100644 --- a/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeStatement.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeStatement.Dto.Base.cs @@ -36,6 +36,12 @@ namespace Tiobon.Core.Model.Models /// public long? StatementId { get; set; } + /// + /// 声明代码 + /// + [Display(Name = "StatementCode"), Description("声明代码"), MaxLength(2000, ErrorMessage = "声明代码 不能超过 32 个字符")] + public string StatementCode { get; set; } + /// /// 是否 /// diff --git a/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeStatement.cs b/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeStatement.cs index 72a8b6df..e4279263 100644 --- a/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeStatement.cs +++ b/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeStatement.cs @@ -38,6 +38,12 @@ namespace Tiobon.Core.Model.Models /// public long? StatementId { get; set; } + /// + /// 声明代码 + /// + [Display(Name = "StatementCode"), Description("声明代码"), MaxLength(2000, ErrorMessage = "声明代码 不能超过 32 个字符")] + public string StatementCode { get; set; } + /// /// 是否 /// diff --git a/Tiobon.Core.Model/ViewModels/Extend/ResumeViewTab.cs b/Tiobon.Core.Model/ViewModels/Extend/ResumeViewTab.cs index 230cfa5f..76b79c04 100644 --- a/Tiobon.Core.Model/ViewModels/Extend/ResumeViewTab.cs +++ b/Tiobon.Core.Model/ViewModels/Extend/ResumeViewTab.cs @@ -51,11 +51,11 @@ public class ResumeFormColumnChildren public class ResumeFormColumnSubmit { - public EditGhrh_ResumeInput Base { get; set; } + public EditGhrh_ResumeInput Base { get; set; } public List Education { get; set; } public List Family { get; set; } public List Licence { get; set; } - public List Statement { get; set; } + public Dictionary Statement { get; set; } public List Training { get; set; } public List WorkExp { get; set; } @@ -64,7 +64,7 @@ public class ResumeFormColumnSubmit public class ResumeAttachment { public long? AttachmentID { get; set; } - public string AttachFileExtension { get; set; } + public string AttachFileExtension { get; set; } public long? AttachFileSize { get; set; } public string RelativePath { get; set; } public string AttachmentName { get; set; } diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs index 574debd7..66efdc2b 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs @@ -74,7 +74,7 @@ public class Ghrh_ResumeServices : BaseServices x.IsRecommend != true); + whereExpression.And(x => x.IsRecommend == false || x.IsRecommend == null); break; case "HasRecommend": if (jsonParam.columnValue.ObjToInt() == 1) @@ -412,7 +412,9 @@ public class Ghrh_ResumeServices : BaseServices>.OprateSuccess("查询成功", dict); @@ -610,8 +612,9 @@ END"; Data.Licence = await _ghrh_ResumeLicenceServices.QueryDto(x => x.ResumeId != null && x.ResumeId == id);//简历培训记录 Data.Training = await _ghrh_ResumeTrainingServices.QueryDto(x => x.ResumeId != null && x.ResumeId == id);//证件 Data.Attachment = await Db.Queryable().Where(x => x.TableName == id.ObjToString()).ToListAsync(); - Data.Statement = await _ghrh_ResumeStatementServices.QueryDto(x => x.ResumeId != null && x.ResumeId == id);//证件 + var statements = await _ghrh_ResumeStatementServices.QueryDto(x => x.ResumeId != null && x.ResumeId == id);//证件 + Data.Statement = statements.ToDictionary(person => person.StatementCode, person => person.TrueOrFalse); obj.Data = Data; #endregion @@ -637,6 +640,12 @@ END"; obj.Promise = promiseList; #endregion + dynamic StatementRemark = new ExpandoObject(); + StatementRemark.Top = "员工本人声明(本人填写、提供的资料，是真实的、可靠的。如有虚假，则所签订的劳动合同将自动作废，由此产生的一切后果由本人负责。)"; + StatementRemark.CenterPart1 = "根据本人实际情况，在下列"; + StatementRemark.CenterPart2 = "中打“√”选择符合项目:"; + obj.StatementRemark = StatementRemark; + return ServiceResult.OprateSuccess("查询成功", obj); } @@ -686,8 +695,18 @@ END"; } if (resume.Statement != null && resume.Statement.Any()) { - resume.Statement.ForEach(x => x.ResumeId = id); - await _ghrh_ResumeStatementServices.Add(resume.Statement); + var inserts = new List(); + foreach (var item in resume.Statement) + { + inserts.Add(new InsertGhrh_ResumeStatementInput() + { + ResumeId = id, + StatementCode = item.Key, + TrueOrFalse = item.Value + }); + } + + await _ghrh_ResumeStatementServices.Add(inserts); } return ServiceResult.OprateSuccess(); diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml index 52ca3782..f3be80ae 100644 --- a/Tiobon.Core/Tiobon.Core.Model.xml +++ b/Tiobon.Core/Tiobon.Core.Model.xml @@ -7000,6 +7000,11 @@ 声明ID + + + 声明代码 + + 是否 @@ -16611,6 +16616,11 @@ 声明ID + + + 声明代码 + + 是否