报表顺序

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

@@ -45,6 +45,7 @@ public class ExecutorInit extends FormulaExecutor {
         }else if(MeterType.INTERIM.equals(tec.getMeterType())){
             /*计量期*/
             tec.periodInfo=interimMeterPeriodFc.apply(tec.getReportId());
+            tec.periodInfo.setPeriodName(tec.periodInfo.getPeriodNumber());
             /*计量单元树*/
             tec.setMeterTreeMap(getMeterTreeMapAsync(tec.getContractId()));
         }

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

@@ -2716,7 +2716,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
     }
 
     public List<NodeTable> getTableListMeter(Map<String,String> parent){
-      return this.getSqlList("select p_key_id pkeyId, node_name nodeName ,init_table_name initTableName,html_url htmlUrl ,excel_id excelId from  m_wbs_tree_private where ancestors like ? and LENGTH(html_url)>0 and is_deleted=0 and project_id=? and wbs_id=?",NodeTable.class,parent.get("path")+"%",parent.get("projectId"),parent.get("wbsId"));
+      return this.getSqlList("select a.p_key_id as pkeyId, a.node_name as nodeName, a.init_table_name as initTableName, a.html_url as htmlUrl, a.excel_id as excelId from m_wbs_tree_private a join m_wbs_tree_private b on(a.parent_id=b.id and a.project_id=b.project_id) where a.ancestors like ? and LENGTH(a.html_url) > 0 and a.is_deleted = 0 and a.project_id = ? and a.wbs_id = ?  ORDER BY b.sort",NodeTable.class,parent.get("path")+"%",parent.get("projectId"),parent.get("wbsId"));
     }