万盛计量 从首页至本页

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/FormulaServiceImpl.java

@@ -4440,21 +4440,21 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                 }
                 groupedMeter.computeIfAbsent(firstChar, k -> new ArrayList<>()).add(vo1);
             }
+            //原合同金额 首页至本页
+            BigDecimal totalCurrentMeterMoney = BigDecimal.ZERO;
+            //工程变更金额 首页至本页
+            BigDecimal totalChangeMeterMoney = BigDecimal.ZERO;
+            //变更后合同金额 首页至本页
+            BigDecimal totalAfterCurrentMeterMoney = BigDecimal.ZERO;
+            //到上期末完成金额 首页至本页
+            BigDecimal totalBeforeEndMoney = BigDecimal.ZERO;
+            //本期完成金额 首页至本页
+            BigDecimal totalNowMoney = BigDecimal.ZERO;
+            //到本期末完成金额 首页至本页
+            BigDecimal totalNowEndMoney = BigDecimal.ZERO;
             //根据编号的不同建立不同的excel
             for (Map.Entry<String, List<MeterInventoryVO1>> listEntry : groupedMeter.entrySet()) {
                 List<MeterInventoryVO1> value = listEntry.getValue();
-                //原合同金额 首页至本页
-                BigDecimal totalCurrentMeterMoney = BigDecimal.ZERO;
-                //工程变更金额 首页至本页
-                BigDecimal totalChangeMeterMoney = BigDecimal.ZERO;
-                //变更后合同金额 首页至本页
-                BigDecimal totalAfterCurrentMeterMoney = BigDecimal.ZERO;
-                //到上期末完成金额 首页至本页
-                BigDecimal totalBeforeEndMoney = BigDecimal.ZERO;
-                //本期完成金额 首页至本页
-                BigDecimal totalNowMoney = BigDecimal.ZERO;
-                //到本期末完成金额 首页至本页
-                BigDecimal totalNowEndMoney = BigDecimal.ZERO;
                 //编号来划分
                 for (int i = 0; i < value.size(); i += 11) {
                     int endIndex = Math.min(i + 11, value.size());