修改博盛接口和进度录入
This commit is contained in:
@@ -19,7 +19,7 @@ namespace BLL
|
||||
/// </summary>
|
||||
public static void StartMonitor()
|
||||
{
|
||||
int adTimeJ = 30;
|
||||
int adTimeJ = 30;
|
||||
if (messageTimer != null)
|
||||
{
|
||||
messageTimer.Stop();
|
||||
@@ -91,15 +91,15 @@ namespace BLL
|
||||
JArray arr = JArray.Parse(obj["Data"].ToString());
|
||||
string projectId = string.Empty;
|
||||
////根据传值项目主键
|
||||
var getProjectByFromProjectId = Funs.DB.Base_Project.FirstOrDefault(x => x.FromProjectId == fromprojectId && x.ProjectCode== OtherDepartId);
|
||||
var getProjectByFromProjectId = Funs.DB.Base_Project.FirstOrDefault(x => x.FromProjectId == fromprojectId && x.ProjectCode == OtherDepartId);
|
||||
if (getProjectByFromProjectId != null)
|
||||
{
|
||||
projectId = getProjectByFromProjectId.ProjectId;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
var getPByCode= Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectCode == OtherDepartId);
|
||||
|
||||
var getPByCode = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectCode == OtherDepartId);
|
||||
if (getPByCode != null)
|
||||
{
|
||||
getPByCode.FromProjectId = fromprojectId;
|
||||
@@ -216,11 +216,12 @@ namespace BLL
|
||||
try
|
||||
{
|
||||
List<Model.Bo_Sheng_Person> insertPersons = new List<Model.Bo_Sheng_Person>();
|
||||
List<Model.SitePerson_Person> insertSitePersons = new List<Model.SitePerson_Person>();
|
||||
foreach (var item in arr)
|
||||
{
|
||||
string getID = item["ID"].ToString();
|
||||
var getPerson = db.Bo_Sheng_Person.FirstOrDefault(x => x.ID == getID);
|
||||
if (!string.IsNullOrEmpty(getID) )
|
||||
if (!string.IsNullOrEmpty(getID))
|
||||
{
|
||||
if (getPerson == null)
|
||||
{
|
||||
@@ -291,14 +292,40 @@ namespace BLL
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
}
|
||||
var getSitePerson = db.SitePerson_Person.FirstOrDefault(x => x.IdentityCard == item["IdentifyID"].ToString());
|
||||
if (!string.IsNullOrEmpty(getID))
|
||||
{
|
||||
if (getSitePerson == null)
|
||||
{
|
||||
Model.SitePerson_Person newPerson = new Model.SitePerson_Person
|
||||
{
|
||||
PersonId = SQLHelper.GetNewID(),
|
||||
ProjectId = projectId,
|
||||
PersonName = item["Name"].ToString(),
|
||||
Sex = item["Sex"].ToString(),
|
||||
Birthday = Funs.GetNewDateTime(item["BirthDay"].ToString()),
|
||||
Address = item["Address"].ToString(),
|
||||
Nation = item["Nation"].ToString(),
|
||||
IdentityCard = item["IdentifyID"].ToString(),
|
||||
UnitId = BLL.UnitService.GetUnitIdByUnitName(item["DepartName"].ToString()),
|
||||
Telephone = item["Telephone"].ToString(),
|
||||
MaritalStatus = item["MaritalStatus"].ToString(),
|
||||
};
|
||||
insertSitePersons.Add(newPerson);
|
||||
}
|
||||
}
|
||||
|
||||
if (insertPersons.Count() > 0)
|
||||
{
|
||||
db.Bo_Sheng_Person.InsertAllOnSubmit(insertPersons);
|
||||
db.SubmitChanges();
|
||||
if (insertPersons.Count() > 0)
|
||||
{
|
||||
db.Bo_Sheng_Person.InsertAllOnSubmit(insertPersons);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
if (insertSitePersons.Count() > 0)
|
||||
{
|
||||
db.SitePerson_Person.InsertAllOnSubmit(insertSitePersons);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -370,7 +397,7 @@ namespace BLL
|
||||
{
|
||||
db.Bo_Sheng_Unit.InsertAllOnSubmit(insertUnits);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -454,7 +481,7 @@ namespace BLL
|
||||
{
|
||||
db.Bo_Sheng_Train.InsertAllOnSubmit(insertTrains);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -541,7 +568,7 @@ namespace BLL
|
||||
{
|
||||
db.Bo_Sheng_TrainPerson.InsertAllOnSubmit(insertTrainPersons);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -612,7 +639,7 @@ namespace BLL
|
||||
{
|
||||
db.Bo_Sheng_Exam.InsertAllOnSubmit(insertExams);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -693,7 +720,7 @@ namespace BLL
|
||||
{
|
||||
db.Bo_Sheng_PersonTrainRecord.InsertAllOnSubmit(insertPersonTrainRecords);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user