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

20230627优化选择用户接口 角色不空 账号不空,优化生成卡号方法。

Browse Source
This commit is contained in:
杨红卫
2023-06-27 22:30:19 +08:00
parent ca2e5715b8
commit 225bc98fcd
9 changed files with 76 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/WebAPI/Controllers/HSSE/TestRecordController.cs
+7 -3
View File
@@ -342,10 +342,14 @@ namespace WebAPI.Controllers
}
}
else
{
SitePerson_PersonService.SendCardNo(getTestRecord.ProjectId, getTestRecord.TestManId);
APITestRecordService.updateAll(getTestRecord.TestPlanId);
{
APITestRecordService.updateAll(getTestRecord.TestPlanId);
responeData.message = "恭喜考试通过！您的成绩为：【" + getTestScores.ToString() + "】。";
var getSitePerson = SitePerson_PersonService. GetSitePersonByProjectIdPersonId(getTestRecord.ProjectId, getTestRecord.TestManId);
if (getSitePerson != null && string.IsNullOrEmpty(getSitePerson.CardNo))
{
string CarNo = SitePerson_PersonService.SendCardNo(getTestRecord.ProjectId, getTestRecord.TestManId);
}
}
responeData.data = new { getTestScores, getPassScores, returnTestRecordId };
SGGL/WebAPI/Controllers/PersonController.cs
+1 -1
View File
@@ -697,7 +697,7 @@ namespace WebAPI.Controllers
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
join persons in Funs.DB.Person_Persons on x.IdentityCard equals persons.IdentityCard
where x.ProjectId == projectId && !x.ExchangeTime.HasValue
&& x.States == Const.ProjectPersonStates_1 && x.CardNo != null && persons.PhotoUrl != null
&& x.States == Const.ProjectPersonStates_1 && x.CardNo.Length> 5 && persons.PhotoUrl != null
select new
{
x.PersonId,