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

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

Browse Source
This commit is contained in:
李鹏飞
2023-08-04 17:07:06 +08:00
parent 78e8037f08 a039bc13c7
commit 6571d291e8
133 changed files with 4486 additions and 1325 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/ZHGL/Information/EPSummaryReportService.cs
+4 -2
View File
@@ -27,9 +27,9 @@ namespace BLL
/// <param name="unitId"></param>
/// <param name="yearId"></param>
/// <returns></returns>
public static Model.Information_EPSummaryReport GetEPSummaryReportByUnitIdAndYearId(string unitId, int yearId)
public static Model.Information_EPSummaryReport GetEPSummaryReportByUnitIdAndYearIdAndQuarters(string unitId, int yearId, int quarters)
{
return Funs.DB.Information_EPSummaryReport.FirstOrDefault(e => e.UnitId == unitId && e.YearId == yearId);
return Funs.DB.Information_EPSummaryReport.FirstOrDefault(e => e.UnitId == unitId && e.YearId == yearId && e.Quarter == quarters);
}
/// <summary>
@@ -43,6 +43,7 @@ namespace BLL
EPSummaryReportId = ePSummaryReport.EPSummaryReportId,
UnitId = ePSummaryReport.UnitId,
YearId = ePSummaryReport.YearId,
Quarter = ePSummaryReport.Quarter,
ResponsiblePerson = ePSummaryReport.ResponsiblePerson,
ResponsiblePersonTel = ePSummaryReport.ResponsiblePersonTel,
ContactPerson = ePSummaryReport.ContactPerson,
@@ -73,6 +74,7 @@ namespace BLL
{
newReport.UnitId = ePSummaryReport.UnitId;
newReport.YearId = ePSummaryReport.YearId;
newReport.Quarter = ePSummaryReport.Quarter;
newReport.ResponsiblePerson = ePSummaryReport.ResponsiblePerson;
newReport.ResponsiblePersonTel = ePSummaryReport.ResponsiblePersonTel;
newReport.ContactPerson = ePSummaryReport.ContactPerson;
SGGL/BLL/ZHGL/RealName/SynchroSetService.cs
+3 -2
View File
@@ -1518,12 +1518,13 @@ namespace BLL
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 pu in Funs.DB.Project_ProjectUnit on new { x.UnitId, x.ProjectId } equals new { pu.UnitId, pu.ProjectId }
where x.IdcardNumber != null && x.ChangeTime.HasValue
where x.ChangeTime.HasValue
&& (proCode == null || x.ProCode == proCode)
&& v.TeamId.HasValue && r.TeamId.HasValue
&& p.States == Const.State_1
&& !x.RealNamePushTime.HasValue
&& z.JTproCode != null && pu.IsSynchro == true
&& z.JTproCode.Length> 0
&& pu.IsSynchro == true
orderby x.ChangeTime descending
select new
{