Merge branch 'master' of http://192.168.1.12:3000/maixinrong/measure

DataModules/ReportMemoryDm/rmWeiWuZjjlGatherDm.pas

@@ -51,6 +51,8 @@ type
     FFenBuName: string;
     FDanWeiName: string;
 
+    FIndexCode: string;
+
     function MergeStr(AStr1, AStr2: string): string;
   public
     constructor Create(ARec, AStageRec: TsdDataRecord; ANode: TBillsIDTreeNode);
@@ -252,6 +254,8 @@ begin
   vPegNode := GetPegNode(ANode);
   FFenBuName := GetNameFenBu(vLeafXmj, vPegNode);
   FDanWeiName := GetNameDanWei(vLeafXmj);
+
+  FIndexCode := B_CodeToIndexCode(FBillsCode);
 end;
 
 procedure TZjjl.Merge(ARec, AStageRec: TsdDataRecord; ANode: TBillsIDTreeNode);
@@ -311,6 +315,16 @@ end;
 
 function TrmWeiWuZjjlGatherData.AssignData(
   AProjectData: TProjectData): TDataSet;
+
+  function IndexCodeCompare(Item1, Item2: Pointer): Integer;
+  var
+    vZjjl1, vZjjl2: TZjjl;
+  begin
+    vZjjl1 := TZjjl(Item1);
+    vZjjl2 := TZjjl(Item2);
+    Result := CompareStr(vZjjl1.FIndexCode, vZjjl2.FIndexCode);
+  end;
+
 begin
   FZjjlList := TList.Create;
   try
@@ -319,6 +333,7 @@ begin
       FPreText := AProjectData.PhaseData.PhaseProperty.ZJJLPreText;
       FPhaseIndex := AProjectData.PhaseIndex;
       GatherZjjl(AProjectData);
+      FZjjlList.Sort(@IndexCodeCompare);
       WriteData;
     end;
     Result := cdsZjjl;