简历档案新增、修改、复制、作废 按钮及功能

Tiobon.Core.Api/Tiobon.Core.Model.xml

@@ -13705,7 +13705,7 @@
             预留字段11
             </summary>
         </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghrh_ResumeTrainingBase.ReverseI2">
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_ResumeTrainingBase.IsPass1">
             <summary>
             预留字段12
             </summary>

Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeTraining.Dto.Base.cs

@@ -140,5 +140,6 @@ public class Ghrh_ResumeTrainingBase
     /// <summary>
     /// 预留字段12
     /// </summary>
+    public int? IsPass1 { get; set; }
     public int? ReverseI2 { get; set; }
 }

Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeTraining.Dto.EditInput.cs

@@ -13,7 +13,7 @@
 *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│
 *│　作者：SimonHsiao                                                  │
 *└──────────────────────────────────┘
-*/ 
+*/
 
 namespace Tiobon.Core.Model.Models;
 
@@ -24,4 +24,6 @@ namespace Tiobon.Core.Model.Models;
 public class EditGhrh_ResumeTrainingInput : Ghrh_ResumeTrainingBase
 {
     public List<Ghre_Attachment> AttachmentIDs { get; set; }
+
+
 }

Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeLicence.Dto.View.cs

@@ -15,8 +15,6 @@
 *└──────────────────────────────────┘
 */
 
-using Tiobon.Core.Model.ViewModels.Extend;
-
 namespace Tiobon.Core.Model.Models;
 
 /// <summary>
@@ -33,7 +31,7 @@ public class Ghrh_ResumeLicenceDto : Ghrh_ResumeLicence
     /// 修改信息
     /// </summary>
     public string UpdateDataInfo { get; set; }
-    public List<ResumeAttachment> AttachmentIDs { get; set; }
+    public List<Ghrs_Attachment> AttachmentIDs { get; set; }
     /// <summary>
     /// 生效日
     /// </summary>

Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeTraining.Dto.View.cs

@@ -33,7 +33,7 @@ public class Ghrh_ResumeTrainingDto : Ghrh_ResumeTraining
     /// 修改信息
     /// </summary>
     public string UpdateDataInfo { get; set; }
-    public List<ResumeAttachment> AttachmentIDs { get; set; }
+    public List<Ghrs_Attachment> AttachmentIDs { get; set; }
     /// <summary>
     /// 开始日期
     /// </summary>
@@ -49,4 +49,8 @@ public class Ghrh_ResumeTrainingDto : Ghrh_ResumeTraining
     /// </summary>
     public string IsPassLabel { get; set; }
     public string StaffName { get; set; }
+
+
+    public int? IsPass1 { get; set; }
+
 }

Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeWorkExp.Dto.View.cs

@@ -39,6 +39,6 @@ public class Ghrh_ResumeWorkExpDto : Ghrh_ResumeWorkExp
     public string EndDate1 { get; set; }
 
 
-    public List<ResumeAttachment> AttachmentIDs { get; set; }
+    public List<Ghrs_Attachment> AttachmentIDs { get; set; } = new List<Ghrs_Attachment>();
     public string StaffName { get; set; }
 }

Tiobon.Core.Services/Ghrh/Ghrh_ResumeEduBGServices.cs

@@ -80,9 +80,9 @@ public class Ghrh_ResumeEduBGServices : BaseServices<Ghrh_ResumeEduBG, Ghrh_Resu
 
     public override async Task<long> Add(InsertGhrh_ResumeEduBGInput entity)
     {
-        var result = await Add(entity);
+        var result = await Add([entity]);
 
-        return result;
+        return result.First();
     }
 
     public override async Task<List<long>> Add(List<InsertGhrh_ResumeEduBGInput> listEntity)

Tiobon.Core.Services/Ghrh/Ghrh_ResumeLicenceServices.cs

@@ -1,4 +1,6 @@
-namespace Tiobon.Core.Services;
+using Tiobon.Core.Common.DB.Dapper.Extensions;
+
+namespace Tiobon.Core.Services;
 
 /// <summary>
 /// 证件 (服务)
@@ -24,7 +26,7 @@ public class Ghrh_ResumeLicenceServices : BaseServices<Ghrh_ResumeLicence, Ghrh_
             await SetLabel(x);
             x.AttachmentIDs = attachments
             .Where(o => o.TableName == x.Id.ToString())
-            .Select(o => new ResumeAttachment()
+            .Select(o => new Ghrs_Attachment()
             {
                 AttachmentID = o.AttachmentID,
                 AttachFileExtension = o.AttachFileExtension,
@@ -55,6 +57,48 @@ public class Ghrh_ResumeLicenceServices : BaseServices<Ghrh_ResumeLicence, Ghrh_
         }
         return result;
     }
+
+
+
+    public override async Task<long> Add(InsertGhrh_ResumeLicenceInput entity)
+    {
+        var result = await Add([entity]);
+
+        return result.First();
+    }
+
+
+    public override async Task<bool> Update(long Id, EditGhrh_ResumeLicenceInput editModel)
+    { 
+        var result = await base.Update(Id, editModel);
+
+        if (editModel.AttachmentIDs != null && editModel.AttachmentIDs.Any())
+        {
+            await Db.Updateable<Ghrs_Attachment>()
+                           .SetColumns(x => new Ghrs_Attachment() { TableName = null })
+                            .Where(it => it.TableName == Id.ToString())
+                            .ExecuteCommandAsync();
+
+            var ids = editModel.AttachmentIDs.Select(x => x.RelativePath).ToList();
+            await Db.Updateable<Ghrs_Attachment>()
+                    .SetColumns(x => new Ghrs_Attachment() { TableName = Id.ToString() })
+                     .Where(it => it.AttachmentID != null && ids.Contains(it.RelativePath))
+                     .ExecuteCommandAsync();
+        }
+
+        return result;
+    }
+
+    public override async Task<ServiceFormResult<Ghrh_ResumeLicenceDto>> QueryForm(QueryForm body)
+    {
+        var result = await base.QueryForm(body);
+
+
+        result.result.DT_TableDataT1[0].AttachmentIDs = await Db.Queryable<Ghrs_Attachment>().Where(x => x.TableName == body.id.ObjToString()).ToListAsync();
+       return result;
+
+    }
+
     #region 字典映射、全称、单位转换等
     /// <summary>
     /// 字典映射、全称、单位转换等

Tiobon.Core.Services/Ghrh/Ghrh_ResumeTrainingServices.cs

@@ -24,7 +24,7 @@ public class Ghrh_ResumeTrainingServices : BaseServices<Ghrh_ResumeTraining, Ghr
             await SetLabel(x);
             x.AttachmentIDs = attachments
             .Where(o => o.TableName == x.Id.ToString())
-            .Select(o => new ResumeAttachment()
+            .Select(o => new Ghrs_Attachment()
             {
                 AttachmentID = o.AttachmentID,
                 AttachFileExtension = o.AttachFileExtension,
@@ -77,6 +77,7 @@ public class Ghrh_ResumeTrainingServices : BaseServices<Ghrh_ResumeTraining, Ghr
         var result = new List<long>();
         for (int i = 0; i < listEntity.Count; i++)
         {
+            listEntity[i].IsPass = listEntity[i].IsPass1 == 1 ? true : false;
             var id = await base.Add(listEntity[i]);
             if (listEntity[i].AttachmentIDs != null && listEntity[i].AttachmentIDs.Any())
             {
@@ -91,6 +92,47 @@ public class Ghrh_ResumeTrainingServices : BaseServices<Ghrh_ResumeTraining, Ghr
         return result;
     }
 
+    public override async Task<long> Add(InsertGhrh_ResumeTrainingInput entity)
+    {
+        var result = await Add([entity]);
+
+        return result.First();
+    }
+
+
+    public override async Task<bool> Update(long Id, EditGhrh_ResumeTrainingInput editModel)
+    {
+        editModel.IsPass = editModel.IsPass1 == 1 ? true : false;
+        var result = await base.Update(Id, editModel);
+
+        if (editModel.AttachmentIDs != null && editModel.AttachmentIDs.Any())
+        {
+            await Db.Updateable<Ghrs_Attachment>()
+                           .SetColumns(x => new Ghrs_Attachment() { TableName = null })
+                            .Where(it => it.TableName == Id.ToString())
+                            .ExecuteCommandAsync();
+
+            var ids = editModel.AttachmentIDs.Select(x => x.RelativePath).ToList();
+            await Db.Updateable<Ghrs_Attachment>()
+                    .SetColumns(x => new Ghrs_Attachment() { TableName = Id.ToString() })
+                     .Where(it => it.AttachmentID != null && ids.Contains(it.RelativePath))
+                     .ExecuteCommandAsync();
+        }
+
+        return result;
+    }
+
+    public override async Task<ServiceFormResult<Ghrh_ResumeTrainingDto>> QueryForm(QueryForm body)
+    {
+        var result = await base.QueryForm(body);
+
+
+        result.result.DT_TableDataT1[0].AttachmentIDs = await Db.Queryable<Ghrs_Attachment>().Where(x => x.TableName == body.id.ObjToString()).ToListAsync();
+        result.result.DT_TableDataT1[0].IsPass1 = result.result.DT_TableDataT1[0].IsPass == true ? 1 : 0;
+        return result;
+
+    }
+
     #region Excel导入
     public override async Task<ServiceResult<string>> DownloadExcel(string menuName)
     {

Tiobon.Core.Services/Ghrh/Ghrh_ResumeWorkExpServices.cs

@@ -1,4 +1,7 @@
-namespace Tiobon.Core.Services;
+using Tiobon.Core.Common.DB.Dapper.Extensions;
+using Tiobon.Core.Model.Models;
+
+namespace Tiobon.Core.Services;
 
 /// <summary>
 /// 工作经历 (服务)
@@ -24,7 +27,7 @@ public class Ghrh_ResumeWorkExpServices : BaseServices<Ghrh_ResumeWorkExp, Ghrh_
             await SetLabel(x);
             x.AttachmentIDs = attachments
             .Where(o => o.TableName == x.Id.ToString())
-            .Select(o => new ResumeAttachment()
+            .Select(o => new Ghrs_Attachment()
             {
                 AttachmentID = o.AttachmentID,
                 AttachFileExtension = o.AttachFileExtension,
@@ -56,6 +59,45 @@ public class Ghrh_ResumeWorkExpServices : BaseServices<Ghrh_ResumeWorkExp, Ghrh_
         return result;
     }
 
+    public override async Task<long> Add(InsertGhrh_ResumeWorkExpInput entity)
+    {
+        var result = await Add([entity]);
+
+        return result.First();
+    }
+
+    public override async Task<bool> Update(long Id, EditGhrh_ResumeWorkExpInput editModel)
+    {
+        var result = await base.Update(Id, editModel);
+
+        if (editModel.AttachmentIDs != null && editModel.AttachmentIDs.Any())
+        {
+            await Db.Updateable<Ghrs_Attachment>()
+                           .SetColumns(x => new Ghrs_Attachment() { TableName = null })
+                            .Where(it => it.TableName == Id.ToString())
+                            .ExecuteCommandAsync();
+
+            var ids = editModel.AttachmentIDs.Select(x => x.RelativePath).ToList();
+            await Db.Updateable<Ghrs_Attachment>()
+                    .SetColumns(x => new Ghrs_Attachment() { TableName = Id.ToString() })
+                     .Where(it => it.AttachmentID != null && ids.Contains(it.RelativePath))
+                     .ExecuteCommandAsync();
+        }
+
+        return result;
+    }
+
+    public override async Task<ServiceFormResult<Ghrh_ResumeWorkExpDto>> QueryForm(QueryForm body)
+    {
+        var result = await base.QueryForm(body);
+
+
+        result.result.DT_TableDataT1[0].AttachmentIDs = await Db.Queryable<Ghrs_Attachment>().Where(x => x.TableName == body.id.ObjToString()).ToListAsync();
+        return result;
+
+    }
+
+
     #region 字典映射、全称、单位转换等
     /// <summary>
     /// 字典映射、全称、单位转换等

Tiobon.Core/Tiobon.Core.Model.xml

@@ -13705,7 +13705,7 @@
             预留字段11
             </summary>
         </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghrh_ResumeTrainingBase.ReverseI2">
+        <member name="P:Tiobon.Core.Model.Models.Ghrh_ResumeTrainingBase.IsPass1">
             <summary>
             预留字段12
             </summary>