|
|
@@ -88,7 +88,7 @@ public class ExecutorMeter extends FormulaExecutor {
|
|
|
Optional<Integer> intOp= tec.getFormDataMap().values().stream()
|
|
|
.filter(e->e.executable()&& BaseUtils.inChain(codeFind,e.getFormula().getRely())).map(e->e.getCoordsList().size())
|
|
|
.collect(Collectors.groupingBy(i -> i, Collectors.counting()))
|
|
|
- .entrySet().stream()
|
|
|
+ .entrySet().stream().filter(e->e.getKey()>1)
|
|
|
.max(Map.Entry.comparingByValue())
|
|
|
.map(Map.Entry::getKey);
|
|
|
if(intOp.isPresent()){
|
|
|
@@ -109,6 +109,7 @@ public class ExecutorMeter extends FormulaExecutor {
|
|
|
this.specialList.add(new SubIPaySum());
|
|
|
this.specialList.add(new SubIMeterPay());
|
|
|
this.specialList.add(new IMeterPaySummary());
|
|
|
+ /*中间计量表*/
|
|
|
this.specialList.add(new IMeter());
|
|
|
}else if(MeterType.START.equals(tec.getMeterType())){
|
|
|
/*开工预付款支付证书处理*/
|
|
|
@@ -808,7 +809,7 @@ public class ExecutorMeter extends FormulaExecutor {
|
|
|
@Data
|
|
|
@EqualsAndHashCode(callSuper = true)
|
|
|
public class IMeter extends BaseSpecial<InterimMeter> implements Special{
|
|
|
- private Integer capacity=7;
|
|
|
+ /*中间计量表*/
|
|
|
@Override
|
|
|
public boolean ready() {
|
|
|
return current.size()>0;
|
|
|
@@ -821,12 +822,12 @@ public class ExecutorMeter extends FormulaExecutor {
|
|
|
Map<Long,List<Payment>> paymentGroup = current.stream().collect(Collectors.groupingBy(Payment::getMiddleMeterId));
|
|
|
for(MeterApply meterApply:meterApplyList){
|
|
|
List<Payment> paymentList = paymentGroup.get(meterApply.getId());
|
|
|
- List<List<Payment>> pageData = BaseUtils.splitList(paymentList,this.capacity);
|
|
|
+ List<List<Payment>> pageData = BaseUtils.splitList(paymentList,capacity);
|
|
|
for(List<Payment> payments:pageData){
|
|
|
/*根据清单数量决定一条中间计量申请显示多少页*/
|
|
|
InterimMeter iim = new InterimMeter();
|
|
|
BeanUtils.copyProperties(meterApply,iim);
|
|
|
- int over = this.capacity-payments.size();
|
|
|
+ int over = capacity-payments.size();
|
|
|
List<String> formNumberList= payments.stream().map(Payment::getNumber).collect(Collectors.toList());
|
|
|
List<String> itemNameList= payments.stream().map(Payment::getName).collect(Collectors.toList());
|
|
|
List<String> unitList= payments.stream().map(Payment::getUnit).collect(Collectors.toList());
|
yangyj