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

报表修改

Browse Source
This commit is contained in:
夏菊
2025-07-11 18:07:04 +08:00
parent cf027d4abe
commit fd3b00ed44
21 changed files with 456 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/EnvironmentalCheckService.cs
+1 -1
View File
@@ -21,7 +21,7 @@ namespace BLL
public static ReturnData PushEnvironmentalCheckData()
{
var db = Funs.DB;
var items = (from x in db.EnvironmentalCheck where x.IsPushed == false select x).ToList();
var items = (from x in db.EnvironmentalCheck where x.IsPushed == null || x.IsPushed == false orderby x.CreateTime descending select x).ToList();
Model.ReturnData responeData = new Model.ReturnData();
if (items.Count() > 0)
{
SGGL/BLL/WebService/CNCECHSSEWebService.cs
+4
View File
@@ -3355,6 +3355,9 @@
Quarter = x.Quarter,
YearId = x.YearId,
CompileMan = x.CompileMan,
KeyWorkNum = x.KeyWorkNum,
KeyWorkOKNum = x.KeyWorkOKNum,
KeyWorkOKRate = x.KeyWorkOKRate,
};
var upReportItem = from x in db.Information_ActionWorkLedgerItem
@@ -3407,6 +3410,7 @@
return code;
}
}
/// <summary>
/// DrillConductedQuarterlyReportApi调用
/// </summary>
SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs
+4 -2
View File
@@ -3987,13 +3987,15 @@ namespace BLL
ProjectId = gg.Key.ProjectId,
ProjectName = gg.Key.ProjectName,
ProjectCode = gg.Key.ProjectCode,
CompletedNum = gg.Count(x => x.States == "1" && x.IsSuperLargerHazard == false),
OperativesNum = gg.Where(x => x.IsSuperLargerHazard == false).Sum(x => x.OperativesNum) ?? 0,
TrainPersonNum = gg.Where(x => x.IsSuperLargerHazard == false).Sum(x => x.TrainPersonNum) ?? 0,
CompletedNum = gg.Count(x => x.States == "1" && x.IsSuperLargerHazard == false),
ConstructionNum = gg.Count(x => x.States == "2" && x.IsSuperLargerHazard == false),
FinishedNum = gg.Count(x => x.States == "3" && x.IsSuperLargerHazard == false),
ArgumentNum = gg.Count(x => x.IsArgument == true && x.IsSuperLargerHazard == false),
SuperCompletedNum = gg.Count(x => x.States == "1" && x.IsSuperLargerHazard == true),
SuperOperativesNum = gg.Where(x => x.IsSuperLargerHazard == true).Sum(x => x.OperativesNum) ?? 0,
SuperTrainPersonNum = gg.Where(x => x.IsSuperLargerHazard == true).Sum(x => x.TrainPersonNum) ?? 0,
SuperCompletedNum = gg.Count(x => x.States == "1" && x.IsSuperLargerHazard == true),
SuperConstructionNum = gg.Count(x => x.States == "2" && x.IsSuperLargerHazard == true),
SuperFinishedNum = gg.Count(x => x.States == "3" && x.IsSuperLargerHazard == true),
SuperArgumentNum = gg.Count(x => x.IsArgument == true && x.IsSuperLargerHazard == true),
SGGL/BLL/ZHGL/Information/ActionWorkLedgerService.cs
+3
View File
@@ -81,6 +81,9 @@ namespace BLL
newActionWorkLedger.UpState = ActionWorkLedger.UpState;
newActionWorkLedger.HandleState = ActionWorkLedger.HandleState;
newActionWorkLedger.HandleMan = ActionWorkLedger.HandleMan;
newActionWorkLedger.KeyWorkNum = ActionWorkLedger.KeyWorkNum;
newActionWorkLedger.KeyWorkOKNum = ActionWorkLedger.KeyWorkOKNum;
newActionWorkLedger.KeyWorkOKRate = ActionWorkLedger.KeyWorkOKRate;
Funs.DB.SubmitChanges();
}
}