zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
李超
2023-07-13 10:09:58 +08:00
parent e4b7694e42 83407432a9
commit dc33ea0366
20 changed files with 271 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/HSSE/InformationProject/ProjectEPSummaryReportService.cs
+2
View File
@@ -33,6 +33,7 @@ namespace BLL
ProjectId = ePSummaryReport.ProjectId,
UnitId = ePSummaryReport.UnitId,
YearId = ePSummaryReport.YearId,
Quarter= ePSummaryReport.Quarter,
ResponsiblePerson = ePSummaryReport.ResponsiblePerson,
ResponsiblePersonTel = ePSummaryReport.ResponsiblePersonTel,
ContactPerson = ePSummaryReport.ContactPerson,
@@ -63,6 +64,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/WebService/CNCECHSSEWebService.cs
+10 -9
View File
@@ -803,7 +803,7 @@
{
try
{
var upReport = from x in db.Environmental_ChemicalReport
where x.ChemicalReportId == chemicalReportId
select new Model.ChemicalReport
@@ -965,7 +965,7 @@
{
try
{
var upReport = from x in db.Environmental_EnergyReport
where x.EnergyReportId == energyReportId
select new Model.EnergyReport
@@ -1072,7 +1072,7 @@
{
try
{
var upReport = from x in db.Environmental_ArchitectureReport
where x.ArchitectureReportId == chemicalReportId
select new Model.ArchitectureReport
@@ -1167,7 +1167,7 @@
{
try
{
var upReport = from x in db.Information_WorkSummaryReport
where x.WorkSummaryReportId == workSummaryReportId
select new Model.WorkSummaryReport
@@ -1259,7 +1259,7 @@
{
try
{
var upReport = from x in db.Information_QualityWorkSummaryReport
where x.QualityWorkSummaryReportId == qualityWorkSummaryReportId
select new Model.QualityWorkSummaryReport
@@ -1350,7 +1350,7 @@
{
try
{
var upReport = from x in db.Information_SafetyBriefing
where x.SafetyBriefingId == safetyBriefingId
select new Model.SafetyBriefing
@@ -1443,7 +1443,7 @@
{
try
{
var upReport = from x in db.Information_QuarterlyProjectQuality
where x.QuarterlyProjectQualityId == quarterlyProjectQualityId
select new Model.QuarterlyProjectQuality
@@ -1549,7 +1549,7 @@
{
try
{
var upReport = from x in db.Information_EPSummaryReport
where x.EPSummaryReportId == ePSummaryReportId
select new Model.EPSummaryReport
@@ -1557,6 +1557,7 @@
EPSummaryReportId = x.EPSummaryReportId,
UnitId = x.UnitId,
YearId = x.YearId,
Quarter = x.Quarter,
ResponsiblePerson = x.ResponsiblePerson,
ResponsiblePersonTel = x.ResponsiblePersonTel,
ContactPerson = x.ContactPerson,
@@ -6788,5 +6789,5 @@
}
}
}
}
}
}
SGGL/BLL/ZHGL/DataSync/ServerService.cs
+3
View File
@@ -4,6 +4,7 @@ using RestSharp;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Security.Policy;
using System.Text;
using System.Threading.Tasks;
@@ -20,6 +21,7 @@ namespace BLL
var client = new RestClient(baseurl);
client.Timeout = -1;
var request = new RestRequest(Method.POST);
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
var thisUnitId = BLL.Const.UnitId_CD;
var thisUnit = BLL.UnitService.GetUnitByUnitId(thisUnitId);
request.AddParameter("UnitName", thisUnit.UnitName);
@@ -55,6 +57,7 @@ namespace BLL
var client = new RestClient(baseurl);
client.Timeout = -1;
var request = new RestRequest(Method.POST);
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
var tokenItem = GetToken();
request.AddHeader("token", tokenItem.Token);
request.AddJsonBody(JsonBody);
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;