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

修改上报集团问题

This commit is contained in:
高飞 2023-07-10 15:00:56 +08:00
parent 479f1d9d44
commit 0e6ee80134
4 changed files with 173 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
SGGL/BLL/JDGL/WBS/WorkloadStatisticsService.cs
View File

@ -2822,17 +2822,7 @@ namespace BLL
} }
} }
private static IQueryable<Model.WBS_CostControl> getCostControls = from x in db.WBS_CostControl select x;
private static IQueryable<Model.View_WBS_CostControlDetail> getDetails = from x in db.View_WBS_CostControlDetail select x;
private static IQueryable<Model.View_WBS_CostControlParentDetail> getParentDetails = from x in db.View_WBS_CostControlParentDetail select x;
private static IQueryable<Model.Wbs_WbsSet> getWbsSets = from x in db.Wbs_WbsSet select x;
private static IQueryable<Model.WBS_WbsSetInit> getWbsSetInits = from x in db.WBS_WbsSetInit select x;
private static IQueryable<Model.Wbs_UnitProject> getUnitProjects = from x in db.Wbs_UnitProject select x;
private static IQueryable<Model.Wbs_UnitProjectInit> getUnitProjectInits = from x in db.Wbs_UnitProjectInit select x;
private static IQueryable<Model.WBS_CnProfession> getCnProfessions = from x in db.WBS_CnProfession select x;
private static IQueryable<Model.WBS_CnProfessionInit> getCnProfessionInits = from x in db.WBS_CnProfessionInit select x;
private static IQueryable<Model.Project_Installation> getInstallations = from x in db.Project_Installation select x;
private static IQueryable<Model.View_WBS_CostControlDetailStatistics> getCostControlDetailStatisticss = from x in db.View_WBS_CostControlDetailStatistics select x;
/// <summary> /// <summary>
@ -2841,9 +2831,22 @@ namespace BLL
/// <returns></returns> /// <returns></returns>
public static DataTable GetAllTreeDataTable(string projectId, string IsOut) public static DataTable GetAllTreeDataTable(string projectId, string IsOut)
{ {
using (var db = new Model.SGGLDB(Funs.ConnString))
{
IQueryable<Model.WBS_CostControl> getCostControls = from x in db.WBS_CostControl select x;
IQueryable<Model.View_WBS_CostControlDetail> getDetails = from x in db.View_WBS_CostControlDetail select x;
IQueryable<Model.View_WBS_CostControlParentDetail> getParentDetails = from x in db.View_WBS_CostControlParentDetail select x;
IQueryable<Model.Wbs_WbsSet> getWbsSets = from x in db.Wbs_WbsSet select x;
IQueryable<Model.WBS_WbsSetInit> getWbsSetInits = from x in db.WBS_WbsSetInit select x;
IQueryable<Model.Wbs_UnitProject> getUnitProjects = from x in db.Wbs_UnitProject select x;
IQueryable<Model.Wbs_UnitProjectInit> getUnitProjectInits = from x in db.Wbs_UnitProjectInit select x;
IQueryable<Model.WBS_CnProfession> getCnProfessions = from x in db.WBS_CnProfession select x;
IQueryable<Model.WBS_CnProfessionInit> getCnProfessionInits = from x in db.WBS_CnProfessionInit select x;
IQueryable<Model.Project_Installation> getInstallations = from x in db.Project_Installation select x;
IQueryable<Model.View_WBS_CostControlDetailStatistics> getCostControlDetailStatisticss = from x in db.View_WBS_CostControlDetailStatistics select x;
List<Model.View_WBS_CostControlDetailStatistics> CostControlDetailStatisticsList = new List<Model.View_WBS_CostControlDetailStatistics>(); List<Model.View_WBS_CostControlDetailStatistics> CostControlDetailStatisticsList = new List<Model.View_WBS_CostControlDetailStatistics>();
DataTable table = new DataTable(); DataTable table = new DataTable();
var installation = Funs.DB.Project_Installation.FirstOrDefault(x => x.SuperInstallationId == "0" && x.ProjectId == projectId); var installation = db.Project_Installation.FirstOrDefault(x => x.SuperInstallationId == "0" && x.ProjectId == projectId);
if (installation != null) if (installation != null)
{ {
DateTime startDate, endDate, startMonth, endMonth; DateTime startDate, endDate, startMonth, endMonth;
@ -3014,6 +3017,7 @@ namespace BLL
} }
return table; return table;
} }
}
} }
} }

1
SGGL/BLL/WebService/CNCECHSSEWebService.cs
View File

@ -47,6 +47,7 @@
var client = new RestClient(baseurl); var client = new RestClient(baseurl);
client.Timeout = -1; client.Timeout = -1;
var request = new RestRequest(Method.POST); var request = new RestRequest(Method.POST);
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
request.AddHeader("Content-Type", "multipart/form-data");//注意头部必须是form-data request.AddHeader("Content-Type", "multipart/form-data");//注意头部必须是form-data
// client.UserAgent = "apifox/1.0.0 (https://www.apifox.cn)"; // client.UserAgent = "apifox/1.0.0 (https://www.apifox.cn)";
//request.AddFile("file", @"E:\微信\WeChat\WeChat Files\wxid_9140361403112\FileStorage\File\2022-08\焊接管理尾项20220809.docx"); //request.AddFile("file", @"E:\微信\WeChat\WeChat Files\wxid_9140361403112\FileStorage\File\2022-08\焊接管理尾项20220809.docx");

3
SGGL/BLL/ZHGL/DataSync/ServerService.cs
View File

@ -4,6 +4,7 @@ using RestSharp;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Net;
using System.Security.Policy; using System.Security.Policy;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -20,6 +21,7 @@ namespace BLL
var client = new RestClient(baseurl); var client = new RestClient(baseurl);
client.Timeout = -1; client.Timeout = -1;
var request = new RestRequest(Method.POST); var request = new RestRequest(Method.POST);
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
var thisUnit = UnitService.GetUnitByUnitId(Const.UnitId_CWCEC); var thisUnit = UnitService.GetUnitByUnitId(Const.UnitId_CWCEC);
request.AddParameter("UnitName", thisUnit.UnitName); request.AddParameter("UnitName", thisUnit.UnitName);
request.AddParameter("CollCropCode", thisUnit.CollCropCode); request.AddParameter("CollCropCode", thisUnit.CollCropCode);
@ -54,6 +56,7 @@ namespace BLL
var client = new RestClient(baseurl); var client = new RestClient(baseurl);
client.Timeout = -1; client.Timeout = -1;
var request = new RestRequest(Method.POST); var request = new RestRequest(Method.POST);
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
var tokenItem = GetToken(); var tokenItem = GetToken();
request.AddHeader("token", tokenItem.Token); request.AddHeader("token", tokenItem.Token);
request.AddJsonBody(JsonBody); request.AddJsonBody(JsonBody);

2
SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.cs
View File

@ -8,6 +8,7 @@ using BLL;
using Newtonsoft.Json; using Newtonsoft.Json;
using RestSharp; using RestSharp;
using Model; using Model;
using System.Net;
namespace FineUIPro.Web.SysManage namespace FineUIPro.Web.SysManage
{ {
@ -970,6 +971,7 @@ namespace FineUIPro.Web.SysManage
var client = new RestClient(baseurl); var client = new RestClient(baseurl);
client.Timeout = -1; client.Timeout = -1;
var request = new RestRequest(Method.POST); var request = new RestRequest(Method.POST);
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
var thisUnit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_CWCEC); var thisUnit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_CWCEC);
request.AddParameter("UnitName", thisUnit.UnitName); request.AddParameter("UnitName", thisUnit.UnitName);
request.AddParameter("CollCropCode", thisUnit.CollCropCode); request.AddParameter("CollCropCode", thisUnit.CollCropCode);