From daa5200238a390faf26f436bd0cddda65d57edf4 Mon Sep 17 00:00:00 2001
From: geh <1923421292@qq.com>
Date: Mon, 4 Aug 2025 15:18:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=97=A5=E6=9C=9F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HSSE/SitePerson/PersonList.aspx.cs        | 43 ++++++++++++++-----
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs
index 4e0282f..5284e0f 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs
@@ -960,6 +960,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
                         }).FirstOrDefault();
 
                 string date1 = "";
+                string date11 = "";
                 string sign = "";
                 string sign1 = "";
                 Model.AttachFile attachFile = null;
@@ -1027,10 +1028,25 @@ namespace FineUIPro.Web.HSSE.SitePerson
                 }
 
                 // 构建格式化的字符串
-                date1 = dateTime1.HasValue
-                    ? $" {dateTime1.Value.Year} 年 {dateTime1.Value.Month:D2} 月 {dateTime1.Value.Day:D2} 日"
-                    : "";
+                // date1 = dateTime1.HasValue
+                //     ? $" {dateTime1.Value.Year} 年 {dateTime1.Value.Month:D2} 月 {dateTime1.Value.Day:D2} 日"
+                //     : "";
+                date1 = person.InTime.HasValue ? string.Format("{0:yyyy-MM-dd}", person.InTime.Value.AddDays(2)) : "";
 
+                if (!string.IsNullOrEmpty(InTime))
+                {
+                    DateTime dt = DateTime.Parse(InTime);
+                    dt = dt.AddDays(2);
+                    date1 = string.Format("{0:yyyy年MM月dd日}", dt);
+                }
+                
+                if (!string.IsNullOrEmpty(date1))
+                {
+                    DateTime dt = DateTime.Parse(date1);
+                    dt = dt.AddDays(2);
+                    date11 = string.Format("{0:yyyy年MM月dd日}", dt);
+                }
+                
                 string sign2 = AttachFileService.getFileUrl(person.PersonId + "_2");
                 if (!string.IsNullOrEmpty(sign2))
                 {
@@ -1041,9 +1057,16 @@ namespace FineUIPro.Web.HSSE.SitePerson
                     helper.AddImage(string.Empty, "sign2", 0, 0, 0, 0);
                 }
 
-                string date2 = personData.SignTime.HasValue
-                    ? $" {personData.SignTime.Value.Year} 年 {personData.SignTime.Value.Month:D2} 月 {personData.SignTime.Value.Day:D2} 日"
-                    : "";
+                // string date2 = personData.SignTime.HasValue
+                //     ? $" {personData.SignTime.Value.Year} 年 {personData.SignTime.Value.Month:D2} 月 {personData.SignTime.Value.Day:D2} 日"
+                //     : "";
+                string date2 = "";
+                if (!string.IsNullOrEmpty(date11))
+                {
+                    DateTime dt = DateTime.Parse(date11);
+                    dt = dt.AddDays(3);
+                    date2 = string.Format("{0:yyyy年MM月dd日}", dt);
+                }
 
                 string IdentityCard = person.IdentityCard;
                 string Telephone = person.Telephone;
@@ -1269,14 +1292,14 @@ namespace FineUIPro.Web.HSSE.SitePerson
                     fieldNames = new[]
                     {
                         "projectName", "name", "time", "sex", "InTime", "sign",
-                        "date1", "date2", "IdentityCard", "Telephone", "year", "month", "day",
+                        "date1","date11", "date2", "IdentityCard", "Telephone", "year", "month", "day",
                         "unitName", "workPostName", "TestStartTime","IdCard", "TestScores", "SValue", "SValueCount", "MValue",
                         "MValueCount", "JValue", "JValueCount"
                     };
 
                     fieldValues = new object[]
                     {
-                        projectName, name, time, sex, InTime, sign, date1, date2,
+                        projectName, name, time, sex, InTime, sign, date1,date11, date2,
                         IdentityCard, Telephone, year, month, day,
                         unitName, workPostName, TestStartTime,IdCard, TestScores, SValue, SValueCount, MValue, MValueCount,
                         JValue, JValueCount
@@ -1287,14 +1310,14 @@ namespace FineUIPro.Web.HSSE.SitePerson
                     fieldNames = new[]
                     {
                         "projectName", "name", "time", "sex", "InTime", "sign",
-                        "date1", "date2", "IdentityCard", "Telephone", "year", "month", "day",
+                        "date1","date11", "date2", "IdentityCard", "Telephone", "year", "month", "day",
                         "unitName", "workPostName", "TestStartTime", "testName", "IdCard", "TestScores", "SValue", "SValueCount",
                         "MValue", "MValueCount", "JValue", "JValueCount"
                     };
 
                     fieldValues = new object[]
                     {
-                        projectName, name, time, sex, InTime, sign, date1, date2,
+                        projectName, name, time, sex, InTime, sign, date1,date11, date2,
                         IdentityCard, Telephone, year, month, day,
                         unitName, workPostName, TestStartTime, testName, IdCard, TestScores, SValue, SValueCount,
                         MValue, MValueCount, JValue, JValueCount