计量

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

@@ -865,7 +865,7 @@ public class ExecutorMeter extends FormulaExecutor {
                    return v1;
                },LinkedHashMap::new)).values());*/
                 LinkedHashMap<String,List<MaterialsArrival>> group= list.stream().collect(Collectors.groupingBy(MaterialsArrival::getName, LinkedHashMap::new,Collectors.toList()));
-               int rowSize= capacity-1;
+               int rowSize= capacity;
                 AtomicInteger sn= new AtomicInteger(1);
                 AtomicBoolean isLast= new AtomicBoolean(false);
                 group.forEach((k,v)->{
@@ -880,11 +880,12 @@ public class ExecutorMeter extends FormulaExecutor {
                        isLast.set(sn.get()-1 == list.size());
                        tmp.addAll(data);
                        int over= rowSize-data.size();
-                      /* if(i==pages.size()-1){
-                           *//*最后一页合计*//*
+                       if(i==pages.size()-1){
+                           /*小计留一行*/
                            over--;
-                       }*/
+                       }
                        if(isLast.get()){
+                           /*合计留一行*/
                            over--;
                        }
                        if(over>0){

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

@@ -2820,7 +2820,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                         if(fb01.checked()) {
                             /*获取同一个treeCode前缀下的所有分项评定表*/
                           List<WtcEva>  wtcEvaList= this.getSqlList("select b.init_table_name initTableName ,b.node_name nodeName,b.p_key_id pKeyId from " +
-                                  "(select id from m_wbs_tree_contract where tree_code like '"+treeCode.getLast()+"%' and contract_id ="+wtcEva.getContractId()+" and major_data_type=2 and is_deleted=0 and node_type=5 ORDER BY tree_code" +
+                                  "(select id from m_wbs_tree_contract where tree_code like '"+treeCode.getLast()+"%' and contract_id ="+wtcEva.getContractId()+" and major_data_type=2 and is_deleted=0 and node_type in(4,5) ORDER BY tree_code" +
                                   ")a join m_wbs_tree_contract b on a.id=b.parent_id where b.contract_id ="+wtcEva.getContractId()+" and b.is_deleted=0",WtcEva.class);
                           wtcEvaList.removeIf(e->e.getNodeName().contains("附表"));
                           List<Item01> abList= new ArrayList<>();