|
|
@@ -241,7 +241,9 @@ public class ExecutorMeter extends FormulaExecutor {
|
|
|
this.specialList.add(new InterimPayCert());
|
|
|
this.specialList.add(new InterimSum());
|
|
|
/*分项工程中期支付汇总*/
|
|
|
+ /*this.specialList.add(new SubIMeterPaySw());*/
|
|
|
this.specialList.add(new SubIPaySum());
|
|
|
+ this.specialList.add(new SubIPaySumSw());
|
|
|
/*施工进度表*/
|
|
|
this.specialList.add(new ConSchChapter());
|
|
|
/*分项工程中期计量支付表*/
|
|
|
@@ -1072,7 +1074,7 @@ public class ExecutorMeter extends FormulaExecutor {
|
|
|
ipc.setCurrentPeriodEndChangeMoney(StringUtils.handleNullZero(sumChangeMoneyForChapter(changeTokenList2,ch)
|
|
|
,tec.getPayRadicScale()));
|
|
|
|
|
|
- /*由已知求未知*/
|
|
|
+ /*计算其它属性值*/
|
|
|
ipc.calculate();
|
|
|
//dataList.add(ipc);
|
|
|
paymentCertificateMap.put(ch,ipc);
|
|
|
@@ -1083,7 +1085,7 @@ public class ExecutorMeter extends FormulaExecutor {
|
|
|
interimPaymentCertificates= new ArrayList<>(paymentCertificateMap.values());
|
|
|
/*合同段支付项*/
|
|
|
List<MidPayItem> midPayItemList=tec.meterInfo.getMidPayItemList();
|
|
|
- /*Map<InterimPaymentCertificate,Map<Function<InterimPaymentCertificate,String>,Consumer<String>>> summaryConfigMap = new HashMap<>();*/
|
|
|
+ /*表报编辑的支付项信息*/
|
|
|
Map<Long,LinkedHashMap<String,InterimPayCertificateItem>>interimPayCertificateItemGroup=tec.meterInfo.getInterimPayCertificateItemGroup();
|
|
|
LinkedHashMap<String,InterimPayCertificateItem> previousMap = new LinkedHashMap<>();
|
|
|
if(tec.meterInfo.getPreviousPeriodInfo()!=null){
|
|
|
@@ -1496,7 +1498,22 @@ public class ExecutorMeter extends FormulaExecutor {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ @Data
|
|
|
+ @EqualsAndHashCode(callSuper = true)
|
|
|
+ public class SubIPaySumSw extends BaseSpecial<SubprojectInterimPaymentSummary> implements Special{
|
|
|
|
|
|
+ @Override
|
|
|
+ public boolean ready() {
|
|
|
+ return MeterInfo.MB_WS.equals(tec.meterInfo.getTemplate());
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void parse() {
|
|
|
+ builderFormDatas(SubprojectInterimPaymentSummary.class);
|
|
|
+
|
|
|
+ putOut();
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
@Data
|
|
|
@EqualsAndHashCode(callSuper = true)
|
|
|
@@ -2055,13 +2072,33 @@ public class ExecutorMeter extends FormulaExecutor {
|
|
|
|
|
|
}
|
|
|
|
|
|
+ @EqualsAndHashCode(callSuper = true)
|
|
|
+ @Data
|
|
|
+ public class SubIMeterPaySw extends BaseSpecial<SubInterimMeterPaySummary> implements Special{
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public boolean ready() {
|
|
|
+ return MeterInfo.MB_WS.equals(tec.meterInfo.getTemplate());
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void parse() {
|
|
|
+ /*生成模型元素*/
|
|
|
+ builderFormDatas(SubInterimMeterPaySummary.class);
|
|
|
+ SubInterimMeterPaySummary test =new SubInterimMeterPaySummary("测试");
|
|
|
+
|
|
|
+ dataList.add(test);
|
|
|
+ putOut();
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
@Data
|
|
|
@EqualsAndHashCode(callSuper = true)
|
|
|
public class SubIMeterPay extends BaseSpecial<SubInterimMeterPaySummary> implements Special{
|
|
|
/*分项工程中期计量支付表,计量支付数量汇总表*/
|
|
|
@Override
|
|
|
public boolean ready() {
|
|
|
- return current.size()>0;
|
|
|
+ return current.size()>0&&!MeterInfo.MB_WS.equals(tec.meterInfo.getTemplate());
|
|
|
}
|
|
|
|
|
|
/*分项工程名称*/
|
yangyj