This commit is contained in:
杨红卫 2021-09-06 16:46:05 +08:00
parent 4955bbcba0
commit 8add136b66
1 changed files with 107 additions and 101 deletions

View File

@ -153,6 +153,9 @@ namespace WebAPI.Controllers
{ {
var getProject = ProjectService.GetProjectByProjectCode(person.ProjectCode); var getProject = ProjectService.GetProjectByProjectCode(person.ProjectCode);
if (getProject != null) if (getProject != null)
{
var getUnit = UnitService.getUnitByCollCropCodeUnitName(person.CollCropCode, person.UnitName);
if (getUnit != null)
{ {
var getPerson = PersonService.GetPersonByIdentityCard(getProject.ProjectId, person.IdentityCard); var getPerson = PersonService.GetPersonByIdentityCard(getProject.ProjectId, person.IdentityCard);
if (getPerson == null) if (getPerson == null)
@ -161,6 +164,7 @@ namespace WebAPI.Controllers
{ {
PersonId = SQLHelper.GetNewID(), PersonId = SQLHelper.GetNewID(),
ProjectId = getProject.ProjectId, ProjectId = getProject.ProjectId,
UnitId = getUnit.UnitId,
PersonName = person.PersonName, PersonName = person.PersonName,
IdentityCard = person.IdentityCard, IdentityCard = person.IdentityCard,
IdcardType = "SHENFEN_ZHENGJIAN", IdcardType = "SHENFEN_ZHENGJIAN",
@ -188,11 +192,6 @@ namespace WebAPI.Controllers
//CountryCode = person.CountryCode, //CountryCode = person.CountryCode,
//ProvinceCode = person.ProvinceCode, //ProvinceCode = person.ProvinceCode,
}; };
var getUnit = UnitService.getUnitByCollCropCodeUnitName(person.CollCropCode, person.UnitName);
if (getUnit != null)
{
newPerson.UnitId = getUnit.UnitId;
}
if (!string.IsNullOrEmpty(person.TeamGroupName) && !string.IsNullOrEmpty(newPerson.UnitId)) if (!string.IsNullOrEmpty(person.TeamGroupName) && !string.IsNullOrEmpty(newPerson.UnitId))
{ {
@ -216,6 +215,7 @@ namespace WebAPI.Controllers
}; };
db.ProjectData_TeamGroup.InsertOnSubmit(newTeamGroup); db.ProjectData_TeamGroup.InsertOnSubmit(newTeamGroup);
db.SubmitChanges(); db.SubmitChanges();
newPerson.TeamGroupId = newTeamGroup.TeamGroupId;
} }
} }
var getWorkArea = UnitWorkService.GetUnitWorkByUnitWorkName(getProject.ProjectId, person.WorkAreaName); var getWorkArea = UnitWorkService.GetUnitWorkByUnitWorkName(getProject.ProjectId, person.WorkAreaName);
@ -272,7 +272,13 @@ namespace WebAPI.Controllers
else else
{ {
responeData.code = 0; responeData.code = 0;
responeData.message = "项目号:" + person.ProjectCode + "不存在!"; responeData.message = "单位:" + person.UnitName + "施工平台不存在!";
}
}
else
{
responeData.code = 0;
responeData.message = "项目号:" + person.ProjectCode + "施工平台不存在!";
} }
} }
} }