2-4

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

@@ -39,6 +39,7 @@ import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
 import org.jfree.chart.renderer.xy.XYSplineRenderer;
 import org.jfree.chart.title.TextTitle;
 import org.jfree.chart.ui.RectangleEdge;
+import org.jfree.chart.ui.RectangleInsets;
 import org.jfree.chart.ui.TextAnchor;
 import org.jfree.data.category.CategoryDataset;
 import org.jfree.data.category.DefaultCategoryDataset;
@@ -1438,9 +1439,11 @@ public class FormulaUtils {
                 0.0f                           // 偏移量
         ));
         plot.setRenderer(renderer);
+        plot.setInsets(new RectangleInsets(0, 0, 0, 0));
 
         // 设置 DateAxis
         DateAxis monthAxis = (DateAxis) plot.getDomainAxis();
+        monthAxis.setTickMarkPosition(DateTickMarkPosition.MIDDLE);
         monthAxis.setDateFormatOverride(new SimpleDateFormat("yyyy年MM月"));
         monthAxis.setTickLabelsVisible(false); // 禁用标签
         monthAxis.setTickLabelFont(font);
@@ -1458,6 +1461,8 @@ public class FormulaUtils {
         rangeAxis.setLabelFont(font);
         rangeAxis.setTickLabelFont(font);
         rangeAxis.setVisible(false);
+        rangeAxis.setLabelInsets(new RectangleInsets(0, 0, 0, 0));
+        chart.setPadding(new RectangleInsets(0, 0, 0, 0));
         return chart;
     }
     public static void mainT(String[] args) throws IOException {

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

@@ -1722,9 +1722,9 @@ public class ExecutorMeter extends FormulaExecutor {
             BaseInfo baseInfo = tec.meterInfo.getBaseInfo();
             /*String contractAmount = BaseUtils.str2BigDecimal(tec.meterInfo.getBaseInfo().getContractAmount()).toPlainString();*/
             /*工程量清单金额（包含暂定金）*/
-            String meterAmount=dataList.stream().map(ConstructionSchedule::getContractMoney).map(BaseUtils::str2BigDecimal).reduce(BigDecimal.ZERO,BigDecimal::add).toPlainString();
+            String meterAmount=contractMoney.values().stream().map(a->a[0]).map(BaseUtils::str2BigDecimal).reduce(BigDecimal.ZERO,BigDecimal::add).toPlainString();
             /*工程量清单金额（包含暂定金）*/
-            String meterAmountChange=dataList.stream().map(ConstructionSchedule::getChangeMoney).map(BaseUtils::str2BigDecimal).reduce(BigDecimal.ZERO,BigDecimal::add).toPlainString();
+            String meterAmountChange=contractMoney.values().stream().map(a->a[1]).map(BaseUtils::str2BigDecimal).reduce(BigDecimal.ZERO,BigDecimal::add).toPlainString();
             dictMap.forEach((k,v)-> {
                 ConstructionSchedule cs = new ConstructionSchedule(v.getFormName());
                 BigDecimal[] sum = contractMoney.get(k);

blade-service/blade-meter/src/main/java/org/springblade/meter/utils/CollectionUtils.java

@@ -163,8 +163,8 @@ public class CollectionUtils {
 
 
     public static void imageOrientation(Sheet sheet, ClientAnchor anchor, DataVO dataVO) {
-        anchor.setDx1(Units.pixelToEMU(5));
-        anchor.setDy1(Units.pixelToEMU(5));
+        anchor.setDx1(Units.pixelToEMU(0));
+        anchor.setDy1(Units.pixelToEMU(0));
         anchor.setCol2(anchor.getCol1());
         anchor.setRow2(anchor.getRow1());
         int k = getMergedRegionIndex(sheet, CommonUtil.join(dataVO.getX(), dataVO.getY(), dataVO.getX(), dataVO.getY(), ","));