按月计划-暂定金额不计

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

@@ -1075,7 +1075,7 @@ public class ExecutorMeter extends FormulaExecutor {
                      InterimPaymentCertificate jgtz= new InterimPaymentCertificate("价格调整");
                      LinkedHashMap<Integer,List<MaterialAdjust>> materialAdjustMap= tec.meterInfo.getMaterialAdjustListMap();
                      /*材料调差*/
-                     if(materialAdjustMap!=null) {
+                     if(materialAdjustMap!=null&&materialAdjustMap.size()>0) {
                          Function<Integer, String> countFc = category -> materialAdjustMap.get(category).stream().map(MaterialAdjust::getAdjustMoney).reduce(BigDecimal.ZERO, BigDecimal::add).toPlainString();
                          jgtz.setPreviousPeriodEndPay(StringUtils.number2String(countFc.apply(MeterInfo.PRE),0));
                          jgtz.setCurrentPeriodPay(StringUtils.number2String(countFc.apply(MeterInfo.CUR),0));
@@ -1711,7 +1711,7 @@ public class ExecutorMeter extends FormulaExecutor {
             });
             /*每月合计进度*/
             try {
-                String totalAmount=dataList.stream().map(ConstructionSchedule::getContractMoney).map(BaseUtils::str2BigDecimal).reduce(BigDecimal.ZERO,BigDecimal::add).toPlainString();
+                String totalAmount=dataList.stream().filter(e->StringUtils.isNotEquals(e.getChapterName(),"暂定金额")).map(ConstructionSchedule::getContractMoney).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);

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

@@ -2860,6 +2860,10 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                                 }
                             }
                         }
+                    }else if(wtcEva.getInitTableName().equals("m_20231027094738_1717719671702028288")){
+                        /*单位评定表一*/
+                    }else if(wtcEva.getInitTableName().equals("m_20231027094746_1717719707244560384")){
+                        /*单位评定表二*/
                     }
                 }
             }catch (Exception e){