bug

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -567,6 +567,11 @@ public class ExcelTabController extends BladeController {
         //关联项目下所有的合同段
         if (aPrivate.getType() != 10) {
             aPrivate.setHtmlUrl(thmlUrl);
+
+            //关联清表后 表单名和清表一样
+            aPrivate.setNodeName(excelTab.getName());
+            aPrivate.setFullName(excelTab.getName());
+
             wbsTreeContractService.updateAllNodeTabById(aPrivate);
         }
         return R.success("关联成功");
@@ -1495,7 +1500,7 @@ public class ExcelTabController extends BladeController {
         // 合并pdf加载
         excelTabService.getBussPdfs(nodeid, classify, contractId, projectId);
 
-        return R.success("1");
+        return R.data("操作成功");
     }
 
 

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

@@ -397,6 +397,8 @@
     <select id="updateAllNodeTabById" resultType="org.springblade.manager.entity.WbsTreeContract">
         update m_wbs_tree_contract
         set excel_id=#{aPrivate.excelId},
+            node_name = #{aPrivate.nodeName},
+            full_name = #{aPrivate.fullName},
             is_link_table=2,
             html_url=#{aPrivate.htmlUrl}
         where type = 2

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

@@ -44,7 +44,6 @@ public interface WbsTreePrivateMapper extends EasyBaseMapper<WbsTreePrivate> {
 
     List<TreeNodeVOByTabType> tabTypeLazyTree(IPage page, Long parentId, String projectId, String titleName);
 
-
     List<TreeNodeVOByTabType> tabTypeLazyTreeAll(IPage page, Long parentId, String titleName);
 
     int updateByPKeyId(@Param("pKeyId") Long pKeyId, @Param("wbsTP") WbsTreePrivate wbsTP);

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

@@ -542,7 +542,8 @@
 
     <!-- 项目级 表单类型分类 wbs树 -->
     <select id="tabTypeLazyTree" resultMap="treeNodeResultMapTabType">
-        SELECT p_key_id as id,p_key_id as primaryKeyId,title,parent_id,fill_rate as fillRate,initTableId,
+        SELECT a.exceIds AS excelIds,
+        p_key_id as id,p_key_id as primaryKeyId,title,parent_id,fill_rate as fillRate,initTableId,
         (SELECT dict_value from blade_dict where code='table_type' and dict_key not in(-1,0) and dict_key=table_type )
         as tabType,
         (SELECT count(1) FROM m_wbs_form_element WHERE f_id = initTableId and is_deleted=0) AS "elementTotal",
@@ -574,7 +575,9 @@
         table_owner,0 as initTableId,0 as exceIds from blade_dict where code='table_type' and dict_key not in(-1,0)
         union all
         SELECT p_key_id,node_name as title,table_type as parent_id,table_type,fill_rate,table_owner,init_table_id as
-        initTableId,GROUP_CONCAT(excel_id) as excelIds from m_wbs_tree_private WHERE project_id=#{projectId} and
+        initTableId,
+        IFNULL(GROUP_CONCAT( excel_id ),-1) AS excelIds
+        from m_wbs_tree_private WHERE project_id=#{projectId} and
         is_deleted=0 and type=10 and table_type is not NULL GROUP BY node_name
         ) a where 1=1
         <if test="parentId != null and parentId != ''">

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

@@ -612,7 +612,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                 return R.fail("操作失败");
             }
         }
-        return R.fail("操作成功");
+        return R.success("操作成功");
     }
 
     // 获取用户
@@ -1076,7 +1076,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             }
         }
 
-        String listPdf = file_path + "pdf/" + nodeId + ".pdf";
+        String listPdf = file_path + "/pdf/" + nodeId + ".pdf";
         File tabpdf2 = ResourceUtil.getFile(listPdf);
         if (tabpdf2.exists()) {
             tabpdf2.delete();
@@ -1207,7 +1207,6 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             }
         }
 
-
         // 移除Id 和 p_key_id
         reData.remove("id");
         reData.remove("p_key_id");