优化

platform-dao/src/main/java/com/platform/dao/vo/export/preparation/ExportPreparationNumVO.java

@@ -44,9 +44,12 @@ public class ExportPreparationNumVO implements Serializable {
     /**
      * 申请部门
      */
-    @Excel(name = "总费用", orderNum = "3")
+    @Excel(name = "费用预算", orderNum = "3")
     private BigDecimal totalFee;
 
+    @Excel(name = "实际费用", orderNum = "3")
+    private BigDecimal totalActualFee;
+
     private List<PreparationVO> detailList;
 
 }

platform-service/src/main/java/com/platform/service/preparation/impl/PreparationServiceImpl.java

@@ -90,17 +90,20 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
                 ExportPreparationNumVO preparationNumVO = new ExportPreparationNumVO();
                 Integer preparationNum = 0;
                 BigDecimal totalFee = new BigDecimal(0);
+                BigDecimal totalActualFee = new BigDecimal(0);
                 String positionName = null;
                 List<PreparationVO> detailList = new ArrayList<>();
                 for (PreparationVO vo : list) {
                     if (id.equals(vo.getPositionId())) {
                         preparationNum++;
                         totalFee = totalFee.add(vo.getFee());
+                        totalActualFee = totalActualFee.add(vo.getActualFee());
                         positionName = vo.getPositionName();
                         detailList.add(vo);
                     }
                 }
                 preparationNumVO.setPreparationNum(preparationNum);
+                preparationNumVO.setTotalActualFee(totalActualFee);
                 preparationNumVO.setTotalFee(totalFee);
                 preparationNumVO.setPositionName(positionName);
                 preparationNumVO.setDetailList(detailList);