日期公式，隐藏表

blade-service/blade-manager/src/main/java/com/mixsmart/utils/CustomFunction.java

@@ -2883,6 +2883,49 @@ public class CustomFunction {
     }
 
 */
+    public static List<Object> toYear(List<Object> dateList){
+        return toDate(dateList,0);
+    }
+
+    public static List<Object> toMonth(List<Object> dateList){
+        return toDate(dateList,1);
+    }
+
+    public static List<Object> toDay(List<Object> dateList){
+        return toDate(dateList,2);
+    }
+
+    public static List<Object> toDate(List<Object> dateList,int type){
+        List<Object> result = new ArrayList<>();
+        if(ListUtils.isNotEmpty(dateList)){
+            for (Object o : dateList) {
+                String d = StringUtils.handleNull(o);
+                if (StringUtils.isNotEmpty(d)) {
+                  /*  if (d.contains(",")) {
+                        String[] arr = d.replaceAll("[\\[\\]\\s]+", "").split(",");
+                        d = arr[arr.length - 1];
+                    }*/
+                    DateTime dt = new DateTime(d);
+                    if(type==0) {
+                        result.add(dt.year());
+                    }else if(type==1) {
+                        result.add(dt.month()+1);
+                    }if(type==2) {
+                        result.add(dt.dayOfMonth());
+                    }
+                }
+            }
+        }
+        return result;
+    }
+
+
+/*    public static void main(String[] args) {
+        List<Object> list = Arrays.asList("2024年07月2日","2024-07-2","2024.07.2");
+        toYear(list).forEach(System.out::println);
+        toMonth(list).forEach(System.out::println);
+        toDay(list).forEach(System.out::println);
+    }*/
 
 
 

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

@@ -21,4 +21,5 @@ public class NodeTable {
     private Integer sort;
     private String htmlUrl;
     private Integer isBussShow;
+    private Integer status;
 }

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

@@ -53,6 +53,8 @@ public class ExecutorFormat extends FormulaExecutor {
         }
         /*合并单元格*/
         mergeCell();
+        /*隐藏表*/
+        tec.getTableAll().removeIf(e->StringUtils.isEquals(0,e.getStatus()));
     }
 
     public void mergeCell(){

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

@@ -2936,7 +2936,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
     }
 
     public List<NodeTable> getTableListMeter(Map<String,String> parent){
-      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,a.sort",NodeTable.class,parent.get("path")+"%",parent.get("projectId"),parent.get("wbsId"));
+      return this.getSqlList("select a.p_key_id as pkeyId,a.status, 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,a.sort",NodeTable.class,parent.get("path")+"%",parent.get("projectId"),parent.get("wbsId"));
     }