20210908 实名制推送日志增加推送内容、返回数据字段
This commit is contained in:
@@ -184,6 +184,7 @@ namespace BLL
|
||||
try
|
||||
{
|
||||
string access_token = string.Empty;
|
||||
string pushContent = string.Empty;
|
||||
string clientId = SynchroSet.ClientId;
|
||||
string userName = SynchroSet.UserName;
|
||||
string password = Funs.EncryptionPassword(SynchroSet.Password);
|
||||
@@ -197,8 +198,9 @@ namespace BLL
|
||||
timestamp,
|
||||
sign
|
||||
};
|
||||
string contenttype = "application/json;charset=utf-8";
|
||||
var returndata = BLL.APIGetHttpService.OutsideHttp(Funs.RealNameApiUrl + "/foreignApi/auth/accessToken", "POST", contenttype, null, JsonConvert.SerializeObject(getToken));
|
||||
string contenttype = "application/json;charset=utf-8";
|
||||
pushContent= JsonConvert.SerializeObject(getToken);
|
||||
var returndata = BLL.APIGetHttpService.OutsideHttp(Funs.RealNameApiUrl + "/foreignApi/auth/accessToken", "POST", contenttype, null,pushContent);
|
||||
if (!string.IsNullOrEmpty(returndata))
|
||||
{
|
||||
JObject obj = JObject.Parse(returndata);
|
||||
@@ -209,16 +211,16 @@ namespace BLL
|
||||
SynchroSet.Tokenendtime = DateTime.Now.AddHours(23);
|
||||
SynchroSet.Timestamp = Funs.GetNewDateTime(timestamp);
|
||||
SaveSynchroSet(SynchroSet);
|
||||
InsertRealNamePushLog(null, SynchroSet.ProCode, "获取凭证", obj["success"].ToString(), obj["code"].ToString(), obj["message"].ToString());
|
||||
InsertRealNamePushLog(null, SynchroSet.ProCode, "获取凭证", obj["success"].ToString(), obj["code"].ToString(), obj["message"].ToString(),access_token, pushContent);
|
||||
}
|
||||
else
|
||||
{
|
||||
InsertRealNamePushLog(null, SynchroSet.ProCode, "获取凭证", "False", "", returndata);
|
||||
InsertRealNamePushLog(null, SynchroSet.ProCode, "获取凭证", "False", "", returndata, access_token, pushContent);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
InsertRealNamePushLog(null, SynchroSet.ProCode, "获取凭证", "False", "", "获取凭证失败" + JsonConvert.SerializeObject(getToken));
|
||||
InsertRealNamePushLog(null, SynchroSet.ProCode, "获取凭证", "False", "", "获取凭证失败", access_token, pushContent);
|
||||
}
|
||||
return access_token;
|
||||
}
|
||||
@@ -234,7 +236,7 @@ namespace BLL
|
||||
/// <summary>
|
||||
/// 实名制推送记录日志
|
||||
/// </summary>
|
||||
public static void InsertRealNamePushLog(string ProjectId, string JTProjectCode, string PushType, string Success, string Code, string Message)
|
||||
public static void InsertRealNamePushLog(string ProjectId, string JTProjectCode, string PushType, string Success, string Code, string Message, string ReturnData, string PushContent)
|
||||
{
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
@@ -248,6 +250,8 @@ namespace BLL
|
||||
Code = Code,
|
||||
Message = Message,
|
||||
PushTime = DateTime.Now,
|
||||
ReturnData = ReturnData,
|
||||
PushContent = PushContent,
|
||||
};
|
||||
db.RealName_PushLog.InsertOnSubmit(newLog);
|
||||
db.SubmitChanges();
|
||||
@@ -269,6 +273,8 @@ namespace BLL
|
||||
string mess = string.Empty;
|
||||
string sucess = string.Empty;
|
||||
string code = string.Empty;
|
||||
string data = string.Empty;
|
||||
string pushContent = string.Empty;
|
||||
string contenttype = "application/json;charset=unicode";
|
||||
string url = Funs.RealNameApiUrl + "/foreignApi/baseData/getDict";
|
||||
var dictTypeCode = new
|
||||
@@ -279,7 +285,8 @@ namespace BLL
|
||||
{
|
||||
{ "token", getaccess_token(null) }
|
||||
};
|
||||
var returndata = BLL.APIGetHttpService.OutsideHttp(url, "POST", contenttype, newToken, JsonConvert.SerializeObject(dictTypeCode));
|
||||
pushContent = JsonConvert.SerializeObject(dictTypeCode);
|
||||
var returndata = BLL.APIGetHttpService.OutsideHttp(url, "POST", contenttype, newToken, pushContent);
|
||||
if (!string.IsNullOrEmpty(returndata))
|
||||
{
|
||||
JObject obj = JObject.Parse(returndata);
|
||||
@@ -288,7 +295,8 @@ namespace BLL
|
||||
sucess = obj["success"].ToString();
|
||||
if (Convert.ToBoolean(obj["success"].ToString()))
|
||||
{
|
||||
JArray arr = JArray.Parse(obj["data"].ToString());
|
||||
data = obj["data"].ToString();
|
||||
JArray arr = JArray.Parse(data);
|
||||
foreach (var item in arr)
|
||||
{
|
||||
string dictCode = item["dictCode"].ToString();
|
||||
@@ -335,7 +343,7 @@ namespace BLL
|
||||
}
|
||||
}
|
||||
}
|
||||
InsertRealNamePushLog(null, null, "获取基础字典[" + type + "]", sucess, code, mess);
|
||||
InsertRealNamePushLog(null, null, "获取基础字典[" + type + "]", sucess, code, mess,data,pushContent);
|
||||
return mess;
|
||||
}
|
||||
catch (Exception ex)
|
||||
@@ -358,13 +366,15 @@ namespace BLL
|
||||
string mess = string.Empty;
|
||||
string sucess = string.Empty;
|
||||
string code = string.Empty;
|
||||
string data = string.Empty;
|
||||
string pushContent = string.Empty;
|
||||
string contenttype = "application/json;charset=unicode";
|
||||
|
||||
string url = Funs.RealNameApiUrl + "/foreignApi/baseData/getCountry";
|
||||
Hashtable newToken = new Hashtable
|
||||
{
|
||||
{ "token", getaccess_token(null) }
|
||||
};
|
||||
};
|
||||
var returndata = BLL.APIGetHttpService.OutsideHttp(url, "POST", contenttype, newToken, null);
|
||||
if (!string.IsNullOrEmpty(returndata))
|
||||
{
|
||||
@@ -374,7 +384,8 @@ namespace BLL
|
||||
sucess = obj["success"].ToString();
|
||||
if (Convert.ToBoolean(obj["success"].ToString()))
|
||||
{
|
||||
JArray arr = JArray.Parse(obj["data"].ToString());
|
||||
data = obj["data"].ToString();
|
||||
JArray arr = JArray.Parse(data);
|
||||
foreach (var item in arr)
|
||||
{
|
||||
string countryId = item["countryId"].ToString();
|
||||
@@ -405,7 +416,7 @@ namespace BLL
|
||||
}
|
||||
}
|
||||
}
|
||||
InsertRealNamePushLog(null, null, "获取国家数据", sucess, code, mess);
|
||||
InsertRealNamePushLog(null, null, "获取国家数据", sucess, code, mess, data, pushContent);
|
||||
return mess;
|
||||
}
|
||||
#endregion
|
||||
@@ -422,6 +433,8 @@ namespace BLL
|
||||
string mess = string.Empty;
|
||||
string sucess = string.Empty;
|
||||
string code = string.Empty;
|
||||
string data = string.Empty;
|
||||
string pushContent = string.Empty;
|
||||
string contenttype = "application/json;charset=unicode";
|
||||
|
||||
string url = Funs.RealNameApiUrl + "/foreignApi/baseData/getCity";
|
||||
@@ -436,7 +449,8 @@ namespace BLL
|
||||
{
|
||||
{ "token", getaccess_token(null) }
|
||||
};
|
||||
var returndata = BLL.APIGetHttpService.OutsideHttp(url, "POST", contenttype, newToken, JsonConvert.SerializeObject(country));
|
||||
pushContent = JsonConvert.SerializeObject(country);
|
||||
var returndata = BLL.APIGetHttpService.OutsideHttp(url, "POST", contenttype, newToken,pushContent);
|
||||
if (!string.IsNullOrEmpty(returndata))
|
||||
{
|
||||
JObject obj = JObject.Parse(returndata);
|
||||
@@ -445,7 +459,8 @@ namespace BLL
|
||||
sucess = obj["success"].ToString();
|
||||
if (Convert.ToBoolean(obj["success"].ToString()))
|
||||
{
|
||||
JArray arr = JArray.Parse(obj["data"].ToString());
|
||||
data = obj["data"].ToString();
|
||||
JArray arr = JArray.Parse(data);
|
||||
foreach (var item in arr)
|
||||
{
|
||||
string provinceCode = item["provinceCode"].ToString();
|
||||
@@ -476,7 +491,7 @@ namespace BLL
|
||||
}
|
||||
}
|
||||
}
|
||||
InsertRealNamePushLog(null, null, "获取省份数据", sucess, code, mess);
|
||||
InsertRealNamePushLog(null, null, "获取省份数据", sucess, code, mess, data, pushContent);
|
||||
return mess;
|
||||
}
|
||||
#endregion
|
||||
@@ -492,6 +507,8 @@ namespace BLL
|
||||
string mess = string.Empty;
|
||||
string sucess = string.Empty;
|
||||
string code = string.Empty;
|
||||
string data = string.Empty;
|
||||
string pushContent = string.Empty;
|
||||
string contenttype = "application/json;charset=unicode";
|
||||
string url = Funs.RealNameApiUrl + "/foreignApi/baseData/getProjectList";
|
||||
Hashtable newToken = new Hashtable
|
||||
@@ -507,7 +524,8 @@ namespace BLL
|
||||
sucess = obj["success"].ToString();
|
||||
if (Convert.ToBoolean(obj["success"].ToString()))
|
||||
{
|
||||
JArray arr = JArray.Parse(obj["data"].ToString());
|
||||
data = obj["data"].ToString();
|
||||
JArray arr = JArray.Parse(data);
|
||||
foreach (var item in arr)
|
||||
{
|
||||
string JTproCode = item["proCode"].ToString();
|
||||
@@ -540,7 +558,7 @@ namespace BLL
|
||||
}
|
||||
}
|
||||
}
|
||||
InsertRealNamePushLog(null, proCode, "获取项目数据", sucess, code, mess);
|
||||
InsertRealNamePushLog(null, proCode, "获取项目数据", sucess, code, mess, data, pushContent);
|
||||
return mess;
|
||||
}
|
||||
#endregion
|
||||
@@ -558,6 +576,8 @@ namespace BLL
|
||||
string mess = string.Empty;
|
||||
string sucess = string.Empty;
|
||||
string code = string.Empty;
|
||||
string data = string.Empty;
|
||||
string pushContent = string.Empty;
|
||||
string contenttype = "application/json;charset=unicode";
|
||||
string url = Funs.RealNameApiUrl + "/foreignApi/baseData/getCollTeam";
|
||||
var getProjects = from x in Funs.DB.RealName_Project where proCode == null || x.ProCode == proCode select x;
|
||||
@@ -571,7 +591,8 @@ namespace BLL
|
||||
{
|
||||
{ "token", getaccess_token(citem.ProCode) }
|
||||
};
|
||||
var returndata = BLL.APIGetHttpService.OutsideHttp(url, "POST", contenttype, newToken, JsonConvert.SerializeObject(getProject));
|
||||
pushContent = JsonConvert.SerializeObject(getProject);
|
||||
var returndata = BLL.APIGetHttpService.OutsideHttp(url, "POST", contenttype, newToken, pushContent);
|
||||
if (!string.IsNullOrEmpty(returndata))
|
||||
{
|
||||
JObject obj = JObject.Parse(returndata);
|
||||
@@ -582,7 +603,8 @@ namespace BLL
|
||||
{
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
JArray arr = JArray.Parse(obj["data"].ToString());
|
||||
data = obj["data"].ToString();
|
||||
JArray arr = JArray.Parse(data);
|
||||
foreach (var item in arr)
|
||||
{
|
||||
long? teamId = Funs.GetNewlong(item["teamId"].ToString());
|
||||
@@ -631,12 +653,12 @@ namespace BLL
|
||||
}
|
||||
else
|
||||
{
|
||||
InsertRealNamePushLog(null, proCode, "获取施工队数据", sucess, code, mess);
|
||||
InsertRealNamePushLog(null, proCode, "获取施工队数据", sucess, code, mess, data, pushContent);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
InsertRealNamePushLog(null, proCode, "获取施工队数据", sucess, code, mess);
|
||||
InsertRealNamePushLog(null, proCode, "获取施工队数据", sucess, code, mess, data, pushContent);
|
||||
}
|
||||
}
|
||||
return mess;
|
||||
@@ -661,6 +683,8 @@ namespace BLL
|
||||
string mess = string.Empty;
|
||||
string sucess = string.Empty;
|
||||
string code = string.Empty;
|
||||
string data = string.Empty;
|
||||
string pushContent = string.Empty;
|
||||
string contenttype = "application/json;charset=unicode";
|
||||
string url = Funs.RealNameApiUrl + "/foreignApi/accept/collCompany";
|
||||
var getUnit = (from x in db.Base_Unit
|
||||
@@ -676,13 +700,15 @@ namespace BLL
|
||||
{
|
||||
{ "token", getaccess_token(null) }
|
||||
};
|
||||
var returndata = BLL.APIGetHttpService.OutsideHttp(url, "POST", contenttype, newToken, JsonConvert.SerializeObject(listObject));
|
||||
pushContent = JsonConvert.SerializeObject(listObject);
|
||||
var returndata = BLL.APIGetHttpService.OutsideHttp(url, "POST", contenttype, newToken, pushContent);
|
||||
if (!string.IsNullOrEmpty(returndata))
|
||||
{
|
||||
JObject obj = JObject.Parse(returndata);
|
||||
mess = obj["message"].ToString();
|
||||
code = obj["code"].ToString();
|
||||
sucess = obj["success"].ToString();
|
||||
data = obj["data"].ToString();
|
||||
if (Convert.ToBoolean(obj["success"].ToString()))
|
||||
{
|
||||
foreach (var item in getUnit)
|
||||
@@ -693,7 +719,7 @@ namespace BLL
|
||||
}
|
||||
}
|
||||
|
||||
InsertRealNamePushLog(null, null, "推送参建企业数据", sucess, code, mess);
|
||||
InsertRealNamePushLog(null, null, "推送参建企业数据", sucess, code, mess, data, pushContent);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -716,6 +742,8 @@ namespace BLL
|
||||
string mess = string.Empty;
|
||||
string sucess = string.Empty;
|
||||
string code = string.Empty;
|
||||
string data = string.Empty;
|
||||
string pushContent = string.Empty;
|
||||
string contenttype = "application/json;charset=unicode";
|
||||
|
||||
string url = Funs.RealNameApiUrl + "/foreignApi/accept/proCollCompany";
|
||||
@@ -754,13 +782,15 @@ namespace BLL
|
||||
};
|
||||
|
||||
PushCollCompany(getProjectUnits.Select(x => x.unitId).Distinct().ToList(), newToken);
|
||||
var returndata = BLL.APIGetHttpService.OutsideHttp(url, "POST", contenttype, newToken, JsonConvert.SerializeObject(listObject));
|
||||
pushContent = JsonConvert.SerializeObject(listObject);
|
||||
var returndata = BLL.APIGetHttpService.OutsideHttp(url, "POST", contenttype, newToken, pushContent);
|
||||
if (!string.IsNullOrEmpty(returndata))
|
||||
{
|
||||
JObject obj = JObject.Parse(returndata);
|
||||
mess = obj["message"].ToString();
|
||||
code = obj["code"].ToString();
|
||||
sucess = obj["success"].ToString();
|
||||
data = obj["data"].ToString();
|
||||
if (Convert.ToBoolean(obj["success"].ToString()))
|
||||
{
|
||||
foreach (var item in getProjectUnits)
|
||||
@@ -774,7 +804,7 @@ namespace BLL
|
||||
}
|
||||
}
|
||||
}
|
||||
InsertRealNamePushLog(null, proCode, "推送项目参建企业数据", sucess, code, mess);
|
||||
InsertRealNamePushLog(null, proCode, "推送项目参建企业数据", sucess, code, mess, data, pushContent);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -795,6 +825,8 @@ namespace BLL
|
||||
string mess = string.Empty;
|
||||
string sucess = string.Empty;
|
||||
string code = string.Empty;
|
||||
string data = string.Empty;
|
||||
string pushContent = string.Empty;
|
||||
string contenttype = "application/json;charset=unicode";
|
||||
string url = Funs.RealNameApiUrl + "/foreignApi/accept/collCompany";
|
||||
var getUnit = (from x in db.Base_Unit
|
||||
@@ -805,14 +837,16 @@ namespace BLL
|
||||
var listObject = new
|
||||
{
|
||||
list = getUnit.Select(x => new { collCompanyName = x.UnitName, collCropCode = x.CollCropCode, isChina = x.IsChina })
|
||||
};
|
||||
var returndata = BLL.APIGetHttpService.OutsideHttp(url, "POST", contenttype, newToken, JsonConvert.SerializeObject(listObject));
|
||||
};
|
||||
pushContent = JsonConvert.SerializeObject(listObject);
|
||||
var returndata = BLL.APIGetHttpService.OutsideHttp(url, "POST", contenttype, newToken, pushContent);
|
||||
if (!string.IsNullOrEmpty(returndata))
|
||||
{
|
||||
JObject obj = JObject.Parse(returndata);
|
||||
mess = obj["message"].ToString();
|
||||
code = obj["code"].ToString();
|
||||
sucess = obj["success"].ToString();
|
||||
data = obj["data"].ToString();
|
||||
if (Convert.ToBoolean(obj["success"].ToString()))
|
||||
{
|
||||
foreach (var item in getUnit)
|
||||
@@ -822,6 +856,7 @@ namespace BLL
|
||||
}
|
||||
}
|
||||
}
|
||||
InsertRealNamePushLog(null, null, "推送参建企业数据", sucess, code, mess, data, pushContent);
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
@@ -836,6 +871,8 @@ namespace BLL
|
||||
string mess = string.Empty;
|
||||
string sucess = string.Empty;
|
||||
string code = string.Empty;
|
||||
string data = string.Empty;
|
||||
string pushContent = string.Empty;
|
||||
string contenttype = "application/json;charset=unicode";
|
||||
|
||||
string url = Funs.RealNameApiUrl + "/foreignApi/accept/collTeam";
|
||||
@@ -874,13 +911,15 @@ namespace BLL
|
||||
{
|
||||
{ "token", getaccess_token(proCode) }
|
||||
};
|
||||
var returndata = BLL.APIGetHttpService.OutsideHttp(url, "POST", contenttype, newToken, JsonConvert.SerializeObject(listObject));
|
||||
pushContent = JsonConvert.SerializeObject(listObject);
|
||||
var returndata = BLL.APIGetHttpService.OutsideHttp(url, "POST", contenttype, newToken, pushContent);
|
||||
if (!string.IsNullOrEmpty(returndata))
|
||||
{
|
||||
JObject obj = JObject.Parse(returndata);
|
||||
mess = obj["message"].ToString();
|
||||
code = obj["code"].ToString();
|
||||
sucess = obj["success"].ToString();
|
||||
data = obj["data"].ToString();
|
||||
if (obj["success"] != null && Convert.ToBoolean(obj["success"].ToString()))
|
||||
{
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
@@ -897,7 +936,7 @@ namespace BLL
|
||||
}
|
||||
}
|
||||
}
|
||||
InsertRealNamePushLog(null, proCode, "推送项目部/施工队数据", sucess, code, mess);
|
||||
InsertRealNamePushLog(null, proCode, "推送项目部/施工队数据", sucess, code, mess, data, pushContent);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -920,6 +959,9 @@ namespace BLL
|
||||
string mess = string.Empty;
|
||||
string sucess = string.Empty;
|
||||
string code = string.Empty;
|
||||
string data = string.Empty;
|
||||
string pushContent = string.Empty;
|
||||
|
||||
string contenttype = "application/json;charset=unicode";
|
||||
var getData = (from x in Funs.DB.SitePerson_Person
|
||||
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
|
||||
@@ -930,7 +972,8 @@ namespace BLL
|
||||
where (identityCard == null || x.IdentityCard == identityCard)
|
||||
&& y.JTProjectCode == proCode && z.JTproCode != null && x.IsCardNoOK ==true
|
||||
&& v.TeamId.HasValue && x.HeadImage != null && x.HeadImage.Length > 0
|
||||
&& ((type == Const.BtnModify && !x.RealNameUpdateTime.HasValue && x.RealNameAddTime.HasValue) || (type != Const.BtnModify && !x.RealNameAddTime.HasValue && x.IsUsed && !x.OutTime.HasValue))
|
||||
&& ((type == Const.BtnModify && !x.RealNameUpdateTime.HasValue
|
||||
&& x.RealNameAddTime.HasValue) || (type != Const.BtnModify && !x.RealNameAddTime.HasValue && x.IsUsed && !x.OutTime.HasValue))
|
||||
&& p.UnitType != Const.ProjectUnitType_3 && p.UnitType != Const.ProjectUnitType_4
|
||||
select new
|
||||
{
|
||||
@@ -979,7 +1022,9 @@ namespace BLL
|
||||
{
|
||||
list = getData.Select(x => new { x.name, x.idcardType, x.idcardNumber, x.idcardStartDate, x.idcardEndDate, x.idcardForever, x.politicsStatus, x.eduLevel, x.maritalStatus, x.sex, x.idcardAddress, x.homeAddress, x.birthday, x.nation, x.countryCode, x.provinceCode, x.proCode, x.teamId, x.mobile, x.teamLeaderFlag, x.userType, x.workType, x.isLeave, x.entryTime, x.exitTime })
|
||||
};
|
||||
returndata = BLL.APIGetHttpService.OutsideHttp(Funs.RealNameApiUrl + "/foreignApi/accept/updatePersons", "POST", contenttype, newToken, JsonConvert.SerializeObject(updatelistObject));
|
||||
|
||||
pushContent = JsonConvert.SerializeObject(updatelistObject);
|
||||
returndata = BLL.APIGetHttpService.OutsideHttp(Funs.RealNameApiUrl + "/foreignApi/accept/updatePersons", "POST", contenttype, newToken, pushContent);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -987,7 +1032,9 @@ namespace BLL
|
||||
{
|
||||
list = getData.Select(x => new { x.name, x.idcardType, x.idcardNumber, x.idcardStartDate, x.idcardEndDate, x.idcardForever, x.politicsStatus, x.eduLevel, x.maritalStatus, x.sex, x.idcardAddress, x.homeAddress, x.birthday, x.nation, x.countryCode, x.provinceCode, x.headImage, x.proCode, x.teamId, x.mobile, x.teamLeaderFlag, x.userType, x.workType, x.isLeave, x.entryTime, x.exitTime })
|
||||
};
|
||||
returndata = BLL.APIGetHttpService.OutsideHttp(Funs.RealNameApiUrl + "/foreignApi/accept/persons", "POST", contenttype, newToken, JsonConvert.SerializeObject(addlistObject));
|
||||
|
||||
pushContent = JsonConvert.SerializeObject(addlistObject);
|
||||
returndata = BLL.APIGetHttpService.OutsideHttp(Funs.RealNameApiUrl + "/foreignApi/accept/persons", "POST", contenttype, newToken, pushContent);
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(returndata))
|
||||
@@ -996,6 +1043,7 @@ namespace BLL
|
||||
mess = obj["message"].ToString();
|
||||
code = obj["code"].ToString();
|
||||
sucess = obj["success"].ToString();
|
||||
data = obj["data"].ToString();
|
||||
if (obj["success"] != null && Convert.ToBoolean(obj["success"].ToString()) )
|
||||
{
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
@@ -1017,7 +1065,7 @@ namespace BLL
|
||||
}
|
||||
}
|
||||
|
||||
InsertRealNamePushLog(null, proCode, "推送人员数据", sucess, code, mess);
|
||||
InsertRealNamePushLog(null, proCode, "推送人员数据", sucess, code, mess, data, pushContent);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1044,6 +1092,8 @@ namespace BLL
|
||||
string mess = string.Empty;
|
||||
string sucess = string.Empty;
|
||||
string code = string.Empty;
|
||||
string data = string.Empty;
|
||||
string pushContent = string.Empty;
|
||||
string contenttype = "application/json;charset=unicode";
|
||||
var getData = (from x in Funs.DB.SitePerson_Person
|
||||
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
|
||||
@@ -1100,7 +1150,8 @@ namespace BLL
|
||||
{
|
||||
list = getData.Select(x => new { x.name, x.idcardType, x.idcardNumber, x.idcardStartDate, x.idcardEndDate, x.idcardForever, x.politicsStatus, x.eduLevel, x.maritalStatus, x.sex, x.idcardAddress, x.homeAddress, x.birthday, x.nation, x.countryCode, x.provinceCode, x.proCode, x.teamId, x.mobile, x.teamLeaderFlag, x.userType, x.workType, x.isLeave, x.entryTime, x.exitTime })
|
||||
};
|
||||
returndata = BLL.APIGetHttpService.OutsideHttp(Funs.RealNameApiUrl + "/foreignApi/accept/updatePersons", "POST", contenttype, newToken, JsonConvert.SerializeObject(updatelistObject));
|
||||
pushContent = JsonConvert.SerializeObject(updatelistObject);
|
||||
returndata = BLL.APIGetHttpService.OutsideHttp(Funs.RealNameApiUrl + "/foreignApi/accept/updatePersons", "POST", contenttype, newToken, pushContent);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1108,7 +1159,8 @@ namespace BLL
|
||||
{
|
||||
list = getData.Select(x => new { x.name, x.idcardType, x.idcardNumber, x.idcardStartDate, x.idcardEndDate, x.idcardForever, x.politicsStatus, x.eduLevel, x.maritalStatus, x.sex, x.idcardAddress, x.homeAddress, x.birthday, x.nation, x.countryCode, x.provinceCode, x.headImage, x.proCode, x.teamId, x.mobile, x.teamLeaderFlag, x.userType, x.workType, x.isLeave, x.entryTime, x.exitTime })
|
||||
};
|
||||
returndata = BLL.APIGetHttpService.OutsideHttp(Funs.RealNameApiUrl + "/foreignApi/accept/persons", "POST", contenttype, newToken, JsonConvert.SerializeObject(addlistObject));
|
||||
pushContent = JsonConvert.SerializeObject(addlistObject);
|
||||
returndata = BLL.APIGetHttpService.OutsideHttp(Funs.RealNameApiUrl + "/foreignApi/accept/persons", "POST", contenttype, newToken, pushContent);
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(returndata))
|
||||
@@ -1117,6 +1169,7 @@ namespace BLL
|
||||
mess = obj["message"].ToString();
|
||||
code = obj["code"].ToString();
|
||||
sucess = obj["success"].ToString();
|
||||
data = obj["data"].ToString();
|
||||
if (obj["success"] != null && Convert.ToBoolean(obj["success"].ToString()))
|
||||
{
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
@@ -1138,7 +1191,7 @@ namespace BLL
|
||||
}
|
||||
}
|
||||
|
||||
InsertRealNamePushLog(null, proCode, "推送人员数据", sucess, code, mess);
|
||||
InsertRealNamePushLog(null, proCode, "推送人员数据", sucess, code, mess, data, pushContent);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1167,6 +1220,8 @@ namespace BLL
|
||||
string mess = string.Empty;
|
||||
string sucess = string.Empty;
|
||||
string code = string.Empty;
|
||||
string data = string.Empty;
|
||||
string pushContent = string.Empty;
|
||||
//string contenttype = "application/json;charset=unicode";
|
||||
string url = Funs.RealNameApiUrl + "/foreignApi/accept/attendance";
|
||||
var getData = (from x in Funs.DB.RealName_PersonInOutNow
|
||||
@@ -1179,6 +1234,7 @@ namespace BLL
|
||||
&& v.TeamId.HasValue && p.HeadImage != null && r.TeamId.HasValue
|
||||
&& p.IsCardNoOK ==true && z.JTproCode != null
|
||||
&& (!p.OutTime.HasValue || p.OutTime > x.ChangeTime)
|
||||
&& !x.RealNamePushTime.HasValue
|
||||
orderby x.ChangeTime descending
|
||||
select new
|
||||
{
|
||||
@@ -1212,14 +1268,15 @@ namespace BLL
|
||||
addTeam(getData.Select(x => x.TeamGroupId).Distinct().ToList(), newToken);
|
||||
getTeam(proCode, newToken);
|
||||
addPerson(getData.Select(x => x.PersonId).Distinct().ToList(), newToken);
|
||||
|
||||
var returndata = BLL.APIGetHttpService.OutsideHttp(url, "POST", null, newToken, JsonConvert.SerializeObject(listObject));
|
||||
pushContent = JsonConvert.SerializeObject(listObject);
|
||||
var returndata = BLL.APIGetHttpService.OutsideHttp(url, "POST", null, newToken, pushContent);
|
||||
if (!string.IsNullOrEmpty(returndata))
|
||||
{
|
||||
JObject obj = JObject.Parse(returndata);
|
||||
mess = obj["message"].ToString();
|
||||
code = obj["code"].ToString();
|
||||
sucess = obj["success"].ToString();
|
||||
data = obj["data"].ToString();
|
||||
if (obj["success"] != null && Convert.ToBoolean(obj["success"].ToString()))
|
||||
{
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
@@ -1237,7 +1294,26 @@ namespace BLL
|
||||
}
|
||||
}
|
||||
}
|
||||
InsertRealNamePushLog(null, proCode, "推送考勤数据", sucess, code, mess);
|
||||
InsertRealNamePushLog(null, proCode, "推送考勤数据", sucess, code, mess, data, pushContent);
|
||||
if (data.Contains("无法入场"))
|
||||
{
|
||||
foreach (var item in getData)
|
||||
{
|
||||
if (data.Contains(item.idcardNumber))
|
||||
{
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
var getPersonInOutNow = db.RealName_PersonInOutNow.FirstOrDefault(x => x.IdcardNumber == item.idcardNumber);
|
||||
if (getPersonInOutNow != null)
|
||||
{
|
||||
getPersonInOutNow.RealNamePushTime = DateTime.Now;
|
||||
// db.RealName_PersonInOutNow.DeleteOnSubmit(getPersonInOutNow);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user