施工进度表

blade-service/blade-manager/src/main/java/com/mixsmart/utils/FormulaUtils.java

@@ -1416,8 +1416,8 @@ public class FormulaUtils {
         chart.getLegend().setItemFont(font);
         chart.getLegend().setVisible(false);
         XYPlot plot = (XYPlot) chart.getPlot();
-        plot.setDomainGridlinesVisible(true);
-        plot.setRangeGridlinesVisible(true);
+        plot.setDomainGridlinesVisible(false);
+        plot.setRangeGridlinesVisible(false);
         plot.setDomainGridlinePaint(Color.LIGHT_GRAY);
         plot.setRangeGridlinePaint(Color.LIGHT_GRAY);
         plot.setBackgroundPaint(Color.WHITE);
@@ -1457,7 +1457,7 @@ public class FormulaUtils {
         rangeAxis.setTickUnit(new NumberTickUnit(10));
         rangeAxis.setLabelFont(font);
         rangeAxis.setTickLabelFont(font);
-
+        rangeAxis.setVisible(false);
         return chart;
     }
     public static void mainT(String[] args) throws IOException {

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

@@ -1711,7 +1711,7 @@ public class ExecutorMeter extends FormulaExecutor {
             });
             /*每月合计进度*/
             try {
-                String totalAmount=dataList.stream().filter(e->StringUtils.isNotEquals(e.getChapterName(),"暂定金额")).map(ConstructionSchedule::getContractMoney).map(BaseUtils::str2BigDecimal).reduce(BigDecimal.ZERO,BigDecimal::add).toPlainString();
+                String totalAmount=dataList.stream().filter(e->StringUtils.isNotEquals(e.getChapterName(),"暂定金额")).map(ConstructionSchedule::getChangeMoney).map(BaseUtils::str2BigDecimal).reduce(BigDecimal.ZERO,BigDecimal::add).toPlainString();
                 /*合同计划结束日期年末*/
                 LocalDate planStartDate=LocalDate.parse(baseInfo.getStartDatePlan(),BaseUtils.chineseDateFm);
                 LocalDate planEndDate=LocalDate.parse(baseInfo.getEndDatePlan(),BaseUtils.chineseDateFm);