From 454f393c075f0901880477b611b4884346e70186 Mon Sep 17 00:00:00 2001 From: 10191 <506754232@qq.com> Date: Tue, 28 Apr 2026 19:59:31 +0800 Subject: [PATCH 1/4] 11 --- SGGL/BLL/Common/YunMouHelper.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/SGGL/BLL/Common/YunMouHelper.cs b/SGGL/BLL/Common/YunMouHelper.cs index 169e1a4e..27d543b1 100644 --- a/SGGL/BLL/Common/YunMouHelper.cs +++ b/SGGL/BLL/Common/YunMouHelper.cs @@ -358,6 +358,7 @@ namespace BLL.Common string faceImageBase64 = ImageToByte64String(filename, System.Drawing.Imaging.ImageFormat.Jpeg); // 图片的base64编码 string data = "{\"employeeNo\":\"" + employeeNo + "\",\"personName\":\"" + personName + "\",\"faceImageBase64\":\"" + faceImageBase64 + "\",\"verifyImage\":true}"; string result = Post(YunMouUrl + "api/v1/open/basic/persons/update", data, "application/json;charset=UTF-8", access_token); + ErrLogInfo.WriteLog(personName + result); var j2 = JsonConvert.DeserializeObject(result); return j2.code; } From 92f86a586f272009018b3bd6f740968fa372ba02 Mon Sep 17 00:00:00 2001 From: 10191 <506754232@qq.com> Date: Wed, 29 Apr 2026 21:59:26 +0800 Subject: [PATCH 2/4] 11 --- SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs b/SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs index 7c8e0d29..ab60031d 100644 --- a/SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs +++ b/SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs @@ -398,7 +398,7 @@ namespace BLL foreach (var newPersonInOut in newPersonInOutList) { var getPUnit = getPUnitS.FirstOrDefault(x => x.UnitId == newPersonInOut.UnitId); - if (getPUnit.UnitType != Const.ProjectUnitType_3 && getPUnit.UnitType != Const.ProjectUnitType_4 && getPUnit.IsSynchro == true) + if (getPUnit!=null&&getPUnit.UnitType != Const.ProjectUnitType_3 && getPUnit.UnitType != Const.ProjectUnitType_4 && getPUnit.IsSynchro == true) { if (getRealNameP != null && newPersonInOut.ChangeTime.HasValue) { From a4fa48a1951b55dda6bc6d03f3e081e9369b0432 Mon Sep 17 00:00:00 2001 From: geh <1923421292@qq.com> Date: Thu, 30 Apr 2026 13:04:59 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=9A=90=E6=82=A3=E6=95=B4=E6=94=B9?= =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=87=BA=E4=B9=B1=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HSSE/Check/RectifyNotices.aspx.cs | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx.cs index 13e4c10e..7903b060 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx.cs @@ -7,6 +7,7 @@ using System.Data.SqlClient; using System.IO; using System.Linq; using System.Text; +using AspNet = System.Web.UI.WebControls; namespace FineUIPro.Web.HSSE.Check { @@ -342,6 +343,59 @@ namespace FineUIPro.Web.HSSE.Check Response.Write(GetGridTableHtml(Grid1)); Response.End(); } + public static string GetGridTableHtml(Grid grid) + { + StringBuilder sb = new StringBuilder(); + sb.Append(""); + sb.Append(""); + sb.Append(""); + + foreach (GridColumn column in grid.Columns) + { + if (column.ColumnID != "Actions" && !column.Hidden) + { + sb.AppendFormat("", column.HeaderText); + } + } + sb.Append(""); + foreach (GridRow row in grid.Rows) + { + sb.Append(""); + foreach (GridColumn column in grid.Columns) + { + if (column.ColumnID != "Actions" && !column.Hidden) + { + string html = row.Values[column.ColumnIndex].ToString(); + if (column.ColumnID == "tfNumber" && (row.FindControl("labNumber") as AspNet.Label) != null) + { + html = (row.FindControl("labNumber") as AspNet.Label).Text; + } + if (column.ColumnID == "CheckManNames" && (row.FindControl("Label2") as AspNet.Label) != null) + { + html = (row.FindControl("Label2") as AspNet.Label).Text; + } + // 处理CheckBox + if (html.Contains("f-grid-static-checkbox")) + { + if (!html.Contains("f-checked")) + { + html = "×"; + } + else + { + html = "√"; + } + } + sb.AppendFormat("", html); + // sb.AppendFormat("", html); + } + } + + sb.Append(""); + } + sb.Append("
{0}
{0}{0}
"); + return sb.ToString(); + } #endregion protected void rbStates_SelectedIndexChanged(object sender, EventArgs e) From b9b254956fb52ba7ce3d4476a0df4ccb7c8bb2cf Mon Sep 17 00:00:00 2001 From: 10191 <506754232@qq.com> Date: Thu, 30 Apr 2026 19:09:08 +0800 Subject: [PATCH 4/4] 11 --- SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs | 5 +++-- SGGL/WebAPI/Controllers/PersonController.cs | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs b/SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs index ab60031d..5e1c779e 100644 --- a/SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs +++ b/SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs @@ -198,6 +198,7 @@ namespace BLL InOutWay = personInOut.InOutWay ?? Const.InOutWay_Other, WorkAreaId = personInOut.WorkAreaId, WorkAreaName = personInOut.WorkAreaName, + IdentityCard = personInOut.IdentityCard, OldID = personInOut.OldID, Address = personInOut.Address, Remark = personInOut.Remark, @@ -210,7 +211,7 @@ namespace BLL { personIds.Add(personInOut.IdentityCard); } - newPersonInOutList.Add(personInOut); + newPersonInOutList.Add(newPersonInOut); } List person_Peoples = new List(); @@ -244,7 +245,7 @@ namespace BLL } } - if (!getPerson.OutTime.HasValue || getPerson.OutTime > DateTime.Now) + if (getPerson!=null && (!getPerson.OutTime.HasValue || getPerson.OutTime > DateTime.Now)) { //// 插入当日记录表 needInsertPersonInOutList.Add(newPersonInOut); diff --git a/SGGL/WebAPI/Controllers/PersonController.cs b/SGGL/WebAPI/Controllers/PersonController.cs index 35243ee1..fd9533c1 100644 --- a/SGGL/WebAPI/Controllers/PersonController.cs +++ b/SGGL/WebAPI/Controllers/PersonController.cs @@ -476,8 +476,9 @@ namespace WebAPI.Controllers { var getPerson = db.SitePerson_Person.FirstOrDefault(x => x.IdentityCard == person.IdentityCard.Trim() && x.ProjectId == person.ProjectId); if (getPerson != null && getPerson.PersonId != person.PersonId) + //if (getPerson != null && getPerson.SitePersonId != person.SitePersonId) { - responeData.code = 2; + responeData.code = 2; responeData.message = "人员身份证号码已存在！"; } else @@ -785,7 +786,7 @@ namespace WebAPI.Controllers catch (Exception ex) { responeData.code = 0; - responeData.message = ex.Message; + responeData.message = ex.StackTrace; } } return responeData;