lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20210830

Browse Source
This commit is contained in:
杨红卫
2021-08-30 21:49:56 +08:00
parent 969c81925b
commit 8ce6070be5
110 changed files with 967 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/ZHGL/RealName/SynchroSetService.cs
+24 -15
View File
@@ -502,7 +502,7 @@ namespace BLL
JArray arr = JArray.Parse(obj["data"].ToString());
foreach (var item in arr)
{
proCode = item["proCode"].ToString();
string JTproCode = item["proCode"].ToString();
string proName = item["proName"].ToString();
string proShortName = item["proShortName"].ToString();
if (!string.IsNullOrEmpty(proCode))
@@ -512,6 +512,7 @@ namespace BLL
{
getProject.ProName = proName;
getProject.ProShortName = proShortName;
getProject.JTproCode = JTproCode;
Funs.DB.SubmitChanges();
}
else
@@ -520,6 +521,7 @@ namespace BLL
{
ID = SQLHelper.GetNewID(),
ProCode = proCode,
JTproCode=JTproCode,
ProName = proName,
ProShortName = proShortName
};
@@ -719,7 +721,7 @@ namespace BLL
select new
{
unitId=x.UnitId,
proCode = y.JTProjectCode,
proCode = z.JTproCode,
collCropCode = u.CollCropCode,
collCropType = db.Sys_Const.First(t => t.GroupId == ConstValue.Group_ProjectUnitType && t.ConstValue == x.UnitType).Remark,
entryTime = string.Format("{0:yyyy-MM-dd}", x.InTime),
@@ -840,7 +842,7 @@ namespace BLL
&& u.CollCropCode != null && u.CollCropCode != ""
select new
{
proCode = y.JTProjectCode,
proCode = z.JTproCode,
collCropCode = u.CollCropCode,
teamType = x.TeamTypeId,
teamName = x.TeamGroupName,
@@ -913,13 +915,14 @@ namespace BLL
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
join z in Funs.DB.RealName_Project on y.JTProjectCode equals z.ProCode
join u in Funs.DB.Base_Unit on x.UnitId equals u.UnitId
join v in Funs.DB.ProjectData_TeamGroup on x.TeamGroupId equals v.TeamGroupId
join w in Funs.DB.Base_WorkPost on x.WorkPostId equals w.WorkPostId
where ((x.IdentityCard != null && x.IdentityCard != "" && identityCard == null) || (identityCard != null && x.IdentityCard == identityCard))
&& y.JTProjectCode == proCode
&& y.JTProjectCode == proCode && z.JTproCode != null
&& v.TeamId.HasValue && x.HeadImage != null && x.HeadImage.Length > 0
&& ((type == Const.BtnModify && !x.RealNameUpdateTime.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))
&& (x.IdentityCard.Length == 15 || x.IdentityCard.Length == 18)
select new
{
@@ -942,7 +945,7 @@ namespace BLL
//positiveIdcardImage = db.AttachFile.First(t => (x.PersonId + "#1") == t.ToKeyId).ImageByte,
//negativeIdcardImage = db.AttachFile.First(t => (x.PersonId + "#5") == t.ToKeyId).ImageByte,
headImage = x.HeadImage,
proCode = y.JTProjectCode,
proCode = z.JTproCode,
teamId = v.TeamId,
mobile = x.Telephone,
teamLeaderFlag = (v.GroupLeaderId == x.PersonId ? "Y" : "N"),
@@ -1036,12 +1039,14 @@ namespace BLL
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
join z in Funs.DB.RealName_Project on y.JTProjectCode equals z.ProCode
join u in Funs.DB.Base_Unit on x.UnitId equals u.UnitId
join v in Funs.DB.ProjectData_TeamGroup on x.TeamGroupId equals v.TeamGroupId
join w in Funs.DB.Base_WorkPost on x.WorkPostId equals w.WorkPostId
where x.IdentityCard == identityCard && y.JTProjectCode == proCode
&& v.TeamId.HasValue && x.HeadImage != null && x.HeadImage.Length > 0
&& (x.IdentityCard.Length == 15 || x.IdentityCard.Length == 18)
&& (x.IdentityCard.Length == 15 || x.IdentityCard.Length == 18)
&& z.JTproCode != null
select new
{
name = x.PersonName,
@@ -1061,7 +1066,7 @@ namespace BLL
countryCode = x.CountryCode,
provinceCode = x.ProvinceCode,
headImage = x.HeadImage,
proCode = y.JTProjectCode,
proCode = z.JTproCode,
teamId = v.TeamId,
mobile = x.Telephone,
teamLeaderFlag = (v.GroupLeaderId == x.PersonId ? "Y" : "N"),
@@ -1160,15 +1165,17 @@ namespace BLL
join p in Funs.DB.SitePerson_Person on x.PersonId equals p.PersonId
join v in Funs.DB.ProjectData_TeamGroup on p.TeamGroupId equals v.TeamGroupId
join r in Funs.DB.RealName_CollTeam on v.TeamId equals r.TeamId
join z in Funs.DB.RealName_Project on x.ProCode equals z.ProCode
where x.IdcardNumber != null && x.IdcardType != null && x.ChangeTime.HasValue
&& (proCode == null || x.ProCode == proCode) && p.HeadImage != null && p.HeadImage.Length > 0
&& v.TeamId.HasValue && p.HeadImage != null && r.TeamId.HasValue
&& (p.IdentityCard.Length == 15 || p.IdentityCard.Length == 18)
&& (p.IdentityCard.Length == 15 || p.IdentityCard.Length == 18) && p.RealNameAddTime.HasValue
&& z.JTproCode != null
orderby x.ChangeTime descending
select new
{
p.PersonId,
proCode = x.ProCode,
proCode = z.JTproCode,
name = x.Name,
idcardType = x.IdcardType,
idcardNumber = x.IdcardNumber,
@@ -1247,7 +1254,7 @@ namespace BLL
{
var getProject = new
{
proCode
proCode = RealName_ProjectService.GeJTproCodeByproCode(proCode),
};
var returndata = BLL.APIGetHttpService.OutsideHttp(Funs.RealNameApiUrl + "/foreignApi/baseData/getCollTeam", "POST", null, newToken, JsonConvert.SerializeObject(getProject));
if (!string.IsNullOrEmpty(returndata))
@@ -1304,13 +1311,14 @@ namespace BLL
{
var getCollTeam = (from x in Funs.DB.ProjectData_TeamGroup
join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
join z in Funs.DB.RealName_Project on y.JTProjectCode equals z.ProCode
join u in Funs.DB.Base_Unit on x.UnitId equals u.UnitId
join s in Funs.DB.SitePerson_Person on x.GroupLeaderId equals s.PersonId into jonPerson
from s in jonPerson.DefaultIfEmpty()
where teamGroupIds.Contains(x.TeamGroupId)
where teamGroupIds.Contains(x.TeamGroupId) && z.JTproCode != null
select new
{
proCode = y.JTProjectCode,
proCode = z.JTproCode,
collCropCode = u.CollCropCode,
teamType = x.TeamTypeId,
teamName = x.TeamGroupName,
@@ -1344,9 +1352,10 @@ namespace BLL
{
var getData = (from x in db.SitePerson_Person
join y in db.Base_Project on x.ProjectId equals y.ProjectId
join z in Funs.DB.RealName_Project on y.JTProjectCode equals z.ProCode
join v in db.ProjectData_TeamGroup on x.TeamGroupId equals v.TeamGroupId
join w in db.Base_WorkPost on x.WorkPostId equals w.WorkPostId
where personList.Contains(x.PersonId)
where personList.Contains(x.PersonId) && z.JTproCode != null
select new
{
name = x.PersonName,
@@ -1368,7 +1377,7 @@ namespace BLL
//positiveIdcardImage = db.AttachFile.First(t => (x.PersonId + "#1") == t.ToKeyId).ImageByte,
//negativeIdcardImage = db.AttachFile.First(t => (x.PersonId + "#5") == t.ToKeyId).ImageByte,
headImage = x.HeadImage,
proCode = y.JTProjectCode,
proCode = z.JTproCode,
teamId = v.TeamId,
mobile = x.Telephone,
teamLeaderFlag = (v.GroupLeaderId == x.PersonId ? "Y" : "N"),