lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/lpf/SGGL_SeDin_New

Browse Source
This commit is contained in:
李鹏飞
2026-05-04 17:13:10 +08:00
parent 790a4d7dfa ed76184db2
commit e624dbe84b
4 changed files with 62 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/Common/YunMouHelper.cs
+1
View File
@@ -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<dynamic>(result);
return j2.code;
}
SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs
+4 -3
View File
@@ -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<Model.SitePerson_Person> person_Peoples = new List<Model.SitePerson_Person>();
@@ -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);
@@ -398,7 +399,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)
{