计量相关

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/SubprojectInterimPaymentSummary.java

@@ -88,13 +88,13 @@ public class SubprojectInterimPaymentSummary {
     @JSONField(name = "key_21",label="按月计划与实际完成-ZJ",ordinal = 12)
     private List<List<Payment>> monthlyCompletion = new ArrayList<>() ;
     /**累计实际完成*/
-    @JSONField(name = "key_22",label="累计实际完成-ZJ",ordinal = 12)
+    @JSONField(name = "key_22",label="累计实际完成-ZJ",ordinal = 102)
     private String actualCompletion;
     /**本次实际完成*/
-    @JSONField(name = "key_23",label="本次实际完成-ZJ",ordinal = 12)
+    @JSONField(name = "key_23",label="本次实际完成-ZJ",ordinal = 102)
     private String currentCompletion;
     /**合同概要*/
-    @JSONField(name = "key_24",label="合同概要-ZJ",ordinal = 16)
+    @JSONField(name = "key_24",label="合同概要-ZJ",ordinal = 106)
     private String contractSummary;
 
 

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

@@ -392,6 +392,17 @@ public class ExecutorMeter extends FormulaExecutor {
                  FormData constructFd =tec.formDataMap.get(InterimPaymentCertificate.TBN+ StringPool.COLON+"key_11");
                  put2FormData(constructFd,StringUtils.number2String(total*0.75,2));
              }
+             if(MeterInfo.MB_ZJ.equals(tec.getMeterInfo().getConfig())){
+                 /*浙江*/
+                 Function<Function<InterimPaymentCertificate,String>,Function<List<InterimPaymentCertificate>,List<Object>>> fc=(f)-> dl->dl.stream().map(InterimPaymentCertificate::getCurrentPeriodPay).flatMap(e->{
+                     List<Object> l=IntStream.range(0,5).boxed().map(i->"").collect(Collectors.toList());
+                     l.set(0,e);
+                     return l.stream();
+                 }).collect(Collectors.toList());
+                 fieldDataFcMap.put(InterimPaymentCertificate.TBN+":key_4",fc.apply(InterimPaymentCertificate::getCurrentPeriodPay));
+                 fieldDataFcMap.put(InterimPaymentCertificate.TBN+":key_5",fc.apply(InterimPaymentCertificate::getPreviousPeriodEndPay));
+
+             }
             fieldDataFcMap.put(InterimPaymentCertificate.TBN+ StringPool.COLON+"key_9",(List<InterimPaymentCertificate> list)-> Collections.singletonList(list.stream().map(InterimPaymentCertificate::getCurrentPeriodPay).mapToDouble(BaseUtils::obj2DoubleZero).sum()));
             /*内容输出*/
             putOut();
@@ -661,10 +672,7 @@ public class ExecutorMeter extends FormulaExecutor {
                 });
                 /*实际完成，累计完成、按月完成*/
                 List<List<List<Payment>>> all =totalList.stream().map(SubprojectInterimPaymentSummary::getMonthlyCompletion).collect(Collectors.toList());
-                /*FormulaUtils.beRelyFrom(fdm,SubprojectInterimPaymentSummary.TBN+":key_22").forEach(e->e.setRepeat(true));
-                FormulaUtils.beRelyFrom(fdm,SubprojectInterimPaymentSummary.TBN+":key_23").forEach(e->e.setRepeat(true));
-                FormulaUtils.beRelyFrom(fdm,SubprojectInterimPaymentSummary.TBN+":key_24").forEach(e->e.setRepeat(true));*/
-                FormulaUtils.beRelyFrom(fdm,SubprojectInterimPaymentSummary.TBN,"key_22,key_23,key_24").forEach(e->e.setRepeat(true));
+                FormulaUtils.beRelyFrom(tec.getFormDataMap(),SubprojectInterimPaymentSummary.TBN,"key_22,key_23,key_24").forEach(e->e.setRepeat(true));
                 /*每月合计进度*/
                 List<String> monthlySum= IntStream.range(0,max).boxed().map(month->{
                     List<Payment> tmp=  all.stream().flatMap(row->row.get(month).stream()).collect(Collectors.toList());