后管-清表

关联元素表查询返回是否匹配清表信息

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/ExceTabTreVO.java

@@ -89,9 +89,4 @@ public class ExceTabTreVO extends ExcelTab implements INode<ExceTabTreVO> {
      * 元素表名称
      */
     private String tabChName;
-    /**
-     * 元素表表明
-     */
-    private String tabEnName;
-
 }

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsNodeTableVO.java

@@ -113,5 +113,7 @@ public class WbsNodeTableVO implements Serializable {
 
     @ApiModelProperty("是否隐藏：1显示 其他 代表隐藏")
     private Integer isBussShow;
+    @ApiModelProperty("是否匹配：1-代表匹配,0-不匹配")
+    private Integer isMatch;
 
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ExcelTabMapper.xml

@@ -59,7 +59,6 @@
         dept.tab_id,
         info.table_owner as tableOwner,
         info.tab_ch_name,
-        info.tab_en_name,
         (
         SELECT
         CASE WHEN count(1) > 0 THEN 1 ELSE 0 END

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeMapper.xml

@@ -559,7 +559,8 @@
                (SELECT CASE WHEN count(1) > 0 THEN 2 ELSE 1 END
                 FROM m_wbs_tab_relation_excel_tab b
                 WHERE wt.id = b.wbs_tab_id
-                  AND b.excel_tab_id = #{excelId})                          AS "isLinkTable"
+                  AND b.excel_tab_id = #{excelId})                          AS "isLinkTable",
+            (select IFNULL(wt.init_table_name = b.tab_en_name,1) from m_excel_tab a left join m_table_info b on a.tab_id = b.id where a.id = #{excelId}) isMatch
         FROM m_wbs_tree AS wt
         WHERE wt.type = 2
           AND wt.is_deleted = 0