2-4

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

@@ -1446,7 +1446,7 @@ public class FormulaUtils {
             e.printStackTrace();
         }*/
         try {
-            ChartUtils.saveChartAsPNG(new File("C:/Users/yangyj/Desktop/Swap_space/poi_statistics.png"), chart, 800, 600);
+            ChartUtils.saveChartAsPNG(new File("C:/Users/yangyj/Desktop/Swap_space/poi_statistics.png"), chart, 1200, 900);
             // 保存图表到内存
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -1112,8 +1112,16 @@ public class ExecutorMeter extends FormulaExecutor {
                      InterimPaymentCertificate finalBlj = blj;
                      dataList.stream().filter(e->e.getChapterSeq().equals("合计")).findFirst().ifPresent(t->{
                          finalBlj.setCurrentPeriodPay("-"+multiFc.apply(t.getCurrentPeriodPay(),"0.1"));
+                         if(BaseUtils.obj2DoubleZero(t.getPreviousPeriodEndPay())>0) {
+                             finalBlj.setPreviousPeriodEndPay("-" + multiFc.apply(t.getPreviousPeriodEndPay(), "0.1"));
+                         }
+                         finalBlj.setCurrentPeriodEndPay("-"+multiFc.apply(t.getCurrentPeriodEndPay(),"0.1"));
                          dataList.stream().filter(e->e.getChapterSeq().equals("实际支付")).findFirst().ifPresent(w->{
                              w.setCurrentPeriodPay(addFc.apply(w.getCurrentPeriodPay(),finalBlj.getCurrentPeriodPay()));
+                             if(BaseUtils.obj2DoubleZero(t.getPreviousPeriodEndPay())>0) {
+                                 w.setPreviousPeriodEndPay(addFc.apply(w.getPreviousPeriodEndPay(), finalBlj.getPreviousPeriodEndPay()));
+                             }
+                             w.setCurrentPeriodEndPay(addFc.apply(w.getCurrentPeriodEndPay(),finalBlj.getCurrentPeriodEndPay()));
                          });
                      });
                      if(peerMap.size()>0) {
@@ -1767,12 +1775,12 @@ public class ExecutorMeter extends FormulaExecutor {
                     try {
                         LinkedHashMap<Long,Double> actualMap  = new LinkedHashMap<>();
                         monthMoney.forEach((yearMonth,sum)->{
-                            actualMap.put(BaseUtils.getTimeMs(yearMonth/100,yearMonth%100),sum.doubleValue());
+                            actualMap.put(BaseUtils.getTimeMs(yearMonth/100,yearMonth%100),Double.parseDouble(ratioFc.apply(sum.toPlainString(),totalAmount)));
                         });
 
                         LinkedHashMap<Long,Double> plannedMap =new LinkedHashMap<>();
                         planMonthMap.entrySet().stream().filter(kv->kv.getKey()<=max).forEach(kv->{
-                            plannedMap.put(BaseUtils.getTimeMs(kv.getKey()/100,kv.getKey()%100),kv.getValue().doubleValue());
+                            plannedMap.put(BaseUtils.getTimeMs(kv.getKey()/100,kv.getKey()%100),Double.parseDouble(ratioFc.apply(kv.getValue().toPlainString(),totalAmount)));
                         });
                         String path=FormulaUtils.chapterScheduleChartUrl(actualMap,plannedMap,planStartDate.getYear(),planEndDate.getYear());
                         BladeFile chartFile= tec.getNewIOSSClient().uploadFile( ConstructionSchedule.TBN+ SnowFlakeUtil.getId() + ".png",path);