Browse Source

汇总项目,Bug修改

MaiXinRong 8 years ago
parent
commit
97bd450350
2 changed files with 5 additions and 1 deletions
  1. 4 1
      ProjGather/ProjGather.pas
  2. 1 0
      Report/ProjGather/rpgGatherData.pas

+ 4 - 1
ProjGather/ProjGather.pas

@@ -228,7 +228,10 @@ begin
   FProjs := AProjs;
   FilterProjs;
   FSpecialProjTypes := ASpecialProjTypes;
-  FTree := TProjGatherTree.Create(FCommonProjs.Count, ASpecialProjTypes.Count);
+  if Assigned(ASpecialProjTypes) then
+    FTree := TProjGatherTree.Create(FCommonProjs.Count, ASpecialProjTypes.Count)
+  else
+    FTree := TProjGatherTree.Create(FCommonProjs.Count, 0);
   FTree.NewNodeID := 101;
   try
     for i := 0 to FCommonProjs.Count - 1 do

+ 1 - 0
Report/ProjGather/rpgGatherData.pas

@@ -106,6 +106,7 @@ begin
   CalcDgnData(SBills_Gather);
   for iProj := 0 to AProjCount - 1 do
     CalcDgnData(SBills_Proj+IntToStr(iProj+1));
+  CalcDgnData(SBills_TransProj);
   for iProj := 0 to ASProjCount - 1 do
     CalcDgnData(SBills_SProj+IntToStr(iProj+1));
 end;