2-6 2-15

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

@@ -49,6 +49,9 @@ public class MeterPeriodInfo implements  DataModel{
     /**本期支付金额*/
     @JSONField(name = "key_6",label="本期支付金额",ordinal = 4)
     private String  curTotal;
+    /**本期小计金额（工程量）*/
+    @JSONField(name = "key_20",label="本期小计金额",ordinal = 4)
+    private String  subTotal;
     /**本期末累计支付金额*/
     @JSONField(name = "key_7",label="本期末累计支付金额",ordinal = 4)
     private String  total;
@@ -57,7 +60,7 @@ public class MeterPeriodInfo implements  DataModel{
     private String  cumulativeChangeMoney ;
     /**累计变更金额*/
     @JSONField(name = "key_9",label="开工累计天数",ordinal = 5)
-    private String  OperatingDays ;
+    private String operatingDays;
     /**请款理由*/
     @JSONField(name = "key_5",label="请款理由",ordinal = 5)
     private String  cause;

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

@@ -1773,7 +1773,7 @@ public static Map<String,List<Long>> relatedPages(List<FormData> curFormDatas ,L
                 return Optional.of(3);
             }else   if (unit.contains("米")||unit.contains("m")){
                 return Optional.of(2);
-            }else   if (RegexUtil.find("个|项|台|套|棵|块|处|座",unit)){
+            }else   if (RegexUtil.find("个|项|台|套|棵|块|处|座|kg",unit)){
                 return Optional.of(0);
             }
         }

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

@@ -57,6 +57,7 @@ public class ExecutorInit extends FormulaExecutor {
     public static final String SZ="[ 一二三四五六七八九十]+";
 
 
+    @Override
     public void handle() {
         List<DataModel> delay =tec.meterInfo.getDelay();
         /*合同段信息*/

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

@@ -1052,7 +1052,9 @@ public class ExecutorMeter extends FormulaExecutor {
                                 if (Arrays.stream(startIds).anyMatch(BaseUtils::isNumber)) {
                                     List<StartPayForm> list = startPayForm.stream().sorted(Comparator.comparingInt(StartPayForm::getPeriodSort)).filter(e -> {
                                         for (String s : startIds) {
-                                            if (StringUtils.isEquals(s, e.getMeterPeriodId())) return true;
+                                            if (StringUtils.isEquals(s, e.getMeterPeriodId())) {
+                                                return true;
+                                            }
                                         }
                                         return false;
                                     }).collect(Collectors.toList());
@@ -1113,6 +1115,7 @@ public class ExecutorMeter extends FormulaExecutor {
                              BigDecimal subtotal=  dataList.stream().limit(dataList.indexOf(certificate)).map(e->BaseUtils.str2BigDecimal(e.getCurrentPeriodEndPay())).reduce(BigDecimal.ZERO,BigDecimal::add);
                              /*小计本期累计支付*/
                              rebateIncentiveAdvPay.setSubtotal(subtotal.toPlainString());
+                             tec.periodInfo.setSubTotal( dataList.stream().limit(dataList.indexOf(certificate)).map(e->BaseUtils.str2BigDecimal(e.getCurrentPeriodPay())).reduce(BigDecimal.ZERO,BigDecimal::add).toPlainString());
                              String dyTotalAmount=baseInfo.getDyTotalAmount().toPlainString();
                              /*当前累计小计>=30 才扣回*/
                              if(Double.parseDouble(ratioFc.apply(subtotal.toPlainString(),baseInfo.getContractAmount().toPlainString()))>=30) {
@@ -2110,7 +2113,7 @@ public class ExecutorMeter extends FormulaExecutor {
                        InterimMeterPaySummary part = new InterimMeterPaySummary();
                        part.setItemName(meterApply.getEngineerDivide());
                        part.setMeterNumber(meterApply.getMeterNumber());
-                       part.setCompleted(imps.getCompleted());
+                       part.setCompleted(pay.getCompleted().toString());
                        addList.add(part);
                    }
                });