批单添加总计

hx-form/src/main/java/com/fjhx/form/service/impl/ReportServiceImpl.java

@@ -349,6 +349,9 @@ public class ReportServiceImpl implements ReportService {
         }
         Map<Long, CustomerVo> customerMap = customerList.stream().collect(Collectors.toMap(CustomerVo::getId, Function.identity()));
 
+        JSONObject totalBo = new JSONObject();
+        totalBo.put("customerShortName", "总计");
+
         List<JSONObject> outList = new ArrayList<>();
         for (Long customerId : customerIds) {
             //获取年初信息
@@ -411,10 +414,21 @@ public class ReportServiceImpl implements ReportService {
                 itemJson.put("adjustAmount", adjustAmount);
                 itemJson.put("balanceAmount", balanceAmount);
                 dataJson.put("" + i, itemJson);
+
+                //合计
+                JSONObject totalItemBo = ObjectUtil.defaultIfNull(totalBo.getJSONObject("" + i), new JSONObject());
+                totalItemBo.put("receivableAmount", ObjectUtil.defaultIfNull(totalItemBo.getBigDecimal("receivableAmount"), BigDecimal.ZERO).add(itemJson.getBigDecimal("receivableAmount")));
+                totalItemBo.put("receivedAmount", ObjectUtil.defaultIfNull(totalItemBo.getBigDecimal("receivedAmount"), BigDecimal.ZERO).add(itemJson.getBigDecimal("receivedAmount")));
+                totalItemBo.put("adjustAmount", ObjectUtil.defaultIfNull(totalItemBo.getBigDecimal("adjustAmount"), BigDecimal.ZERO).add(itemJson.getBigDecimal("adjustAmount")));
+                totalItemBo.put("balanceAmount", ObjectUtil.defaultIfNull(totalItemBo.getBigDecimal("balanceAmount"), BigDecimal.ZERO).add(itemJson.getBigDecimal("balanceAmount")));
+                totalBo.put("" + i, totalItemBo);
             }
             outList.add(dataJson);
         }
 
+        //合计
+        outList.add(totalBo);
+
         return outList;
     }