From f8c499024fbfeb66de9816685575bfedf9e6fd54 Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Mon, 6 Jan 2025 11:29:12 +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

---
 .../Ghrh_ResumeTemplatePreviewController.cs   | 12 ++++++++----
 .../Ghrh/Ghrh_ResumeServices.cs               | 19 ++++++++++++++-----
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ResumeTemplatePreviewController.cs b/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ResumeTemplatePreviewController.cs
index 5b7b7247..84c0547b 100644
--- a/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ResumeTemplatePreviewController.cs
+++ b/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ResumeTemplatePreviewController.cs
@@ -1,8 +1,6 @@
-using Com.Ctrip.Framework.Apollo.Enums;
-using SqlSugar;
+using SqlSugar;
 using System.Dynamic;
 using Tiobon.Core.Common.DB.Dapper.Extensions;
-using Tiobon.Core.Common.Extensions;
 using Tiobon.Core.Model.ViewModels.Extend;
 
 namespace Tiobon.Core.Api.Controllers;
@@ -431,7 +429,13 @@ END";
 
         var statements = await _ghrh_ResumeStatementServices.QueryDto(x => x.ResumeId != null && x.ResumeId == id);//证件
 
-        ViewBag.StatementDic = statements.ToDictionary(person => person.StatementCode, person => person.TrueOrFalse);
+        var StatementDic = new Dictionary<string, bool?>();
+        statements.ForEach(statement =>
+        {
+            if (!StatementDic.ContainsKey(statement.StatementCode))
+                StatementDic.Add(statement.StatementCode, statement.TrueOrFalse);
+        });
+        ViewBag.StatementDic = StatementDic;
 
         #endregion
 
diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
index 0b56dfb1..9e6f644b 100644
--- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
+++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Hosting;
+using AgileObjects.AgileMapper.Extensions;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Hosting;
 using System.IO.Compression;
@@ -853,7 +854,9 @@ ORDER BY A.SortNo ASC";
             { "FileName",await QueryLangValue("Recruit_Resume_From_File_Name",langId,"文件名")   },
             { "FileSize",await QueryLangValue("Recruit_Resume_From_File_Size",langId,"文件大小")   },
             { "Remark",await QueryLangValue("Recruit_Resume_From_Remark",langId,"备注")   },
-            { "Option",await QueryLangValue("Recruit_Resume_From_Option",langId,"操作")   }
+            { "Option",await QueryLangValue("Recruit_Resume_From_Option",langId,"操作")   },
+            { "TrueText",await QueryLangValue("Recruit_Resume_From_TrueText",langId,"是")  },
+            { "FalseText", await QueryLangValue("Recruit_Resume_From_FalseText",langId,"否")  }
         };
         return ServiceResult<Dictionary<string, string>>.OprateSuccess("查询成功", dict);
 
@@ -1193,8 +1196,14 @@ END";
 
         Data.Attachment = await Db.Queryable<Ghrs_Attachment>().Where(x => x.TableName == id.ObjToString()).ToListAsync();
         var statements = await _ghrh_ResumeStatementServices.QueryDto(x => x.ResumeId != null && x.ResumeId == id);//证件
-
-        Data.Statement = statements.ToDictionary(person => person.StatementCode, person => person.TrueOrFalse);
+        var StatementDic = new Dictionary<string, bool?>();
+        statements.ForEach(statement =>
+        {
+            if (!StatementDic.ContainsKey(statement.StatementCode))
+                StatementDic.Add(statement.StatementCode, statement.TrueOrFalse);
+        });
+        Data.Statement = StatementDic;
+        //Data.Statement = statements.ToDictionary(person => person.StatementCode, person => person.TrueOrFalse);
         obj.Data = Data;
         #endregion
 
@@ -4807,7 +4816,7 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1
                 staffId = await Db.Insertable(dict).AS("Ghra_Staff").ExecuteReturnIdentityAsync();
             if (staffId > 0)
             {
-                string sql = $"update Ghra_Staff set Indate={inTime}  where StaffID={staffId} and Indate is null";
+                string sql = $"update Ghra_Staff set Indate='{inTime}'  where StaffID={staffId} and Indate is null";
                 if (inTime != null)
                     await Db.Ado.ExecuteCommandAsync(sql);
                 if (type != "Fast")