后管清表列表优化

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

@@ -76,5 +76,9 @@ public class WbsTreePrivateVO extends WbsTreePrivate implements INode<WbsTreePri
      */
     private List<String> tableFileTypes;
 
+    /**
+     * 项目名称
+     */
+    private String updateUserName;
 
 }

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

@@ -32,6 +32,7 @@ import org.springblade.manager.service.*;
 import org.springblade.manager.vo.*;
 import org.springblade.manager.wrapper.WbsTreePrivateWrapper;
 import org.springblade.system.cache.DictCache;
+import org.springblade.system.user.entity.User;
 import org.springframework.beans.BeanUtils;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -508,7 +509,14 @@ public class WbsTreePrivateController extends BladeController {
         WbsTreePrivate detail = wbsTreePrivateService.getOne(Condition.getQueryWrapper(wbsTree));
         if (detail != null) {
             detail.setFullName(detail.getImportMatchingInfo());
-            return R.data(WbsTreePrivateWrapper.build().entityVO(detail));
+            WbsTreePrivateVO wbsTreePrivateVO = WbsTreePrivateWrapper.build().entityVO(detail);
+            if (detail.getUpdateUser() != null) {
+                List<User> users = jdbcTemplate.query("select name from blade_user where id = " + detail.getUpdateUser(), new BeanPropertyRowMapper<>(User.class));
+                if (!users.isEmpty()) {
+                    wbsTreePrivateVO.setUpdateUserName(users.get(0).getName());
+                }
+            }
+            return R.data(wbsTreePrivateVO);
         }
         return R.fail(200, "未查询到信息");
     }

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

@@ -83,6 +83,5 @@ public interface ExcelTabMapper extends BaseMapper<ExcelTab> {
 
     List<ExcelTabVO> selectRootExcelTab(IPage<ExcelTabVO> page, @Param("projectId") Long projectId,@Param("rootIds") Collection<Long> rootIds);
 
-    @Select("select *, (select name from blade_user where id = a.create_user) as createUserName from m_excel_tab a where id = #{id}")
-    ExcelTabVO getById(Long id);
+    List<ExcelTabVO> getByIds(Collection<Long> ids);
 }

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

@@ -194,7 +194,7 @@
         ORDER BY dept.create_time
     </select>
     <select id="selectExcelTabPage" resultType="org.springblade.manager.vo.ExcelTabVO">
-        select x.id,x.create_time,x.name,x.table_template_type,
+        select x.id,x.create_time,x.name,x.table_template_type,x.tab_type,
         (SELECT bdb.dict_value from blade_dict_biz bdb WHERE code = 'table_template_type' AND dict_key = x.table_template_type) as tableTemplateTypeName,
         (SELECT count(1) from m_excel_tab a where FIND_IN_SET(x.id,a.alias) and a.is_deleted = 0 and a.file_type=3) as
         tab_cout
@@ -210,6 +210,7 @@
                 AND x.table_template_type = #{param2.tableTemplateType}
             </if>
         </if>
+        order by x.sort
     </select>
     <select id="getWaterByTableId" resultType="org.springblade.manager.entity.ExcelTab">
         select * from m_excel_tab met WHERE met.parent_id = 0 AND met.table_template_type = 2 AND met.is_deleted = 0
@@ -238,6 +239,16 @@
             </if>
         ) as t on a.id = t.project_id where project_id is not null
     </select>
+    <select id="getByIds" resultType="org.springblade.manager.vo.ExcelTabVO">
+        select *, (select name from blade_user where id = a.create_user) as createUserName, (SELECT bdb.dict_value from blade_dict_biz bdb WHERE code = 'table_template_type' AND dict_key = x.table_template_type) as tableTemplateTypeName
+        from m_excel_tab a where is_deleted = 0
+        <if test="ids !=null">
+            and id in
+            <foreach collection="ids" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+    </select>
 
 
     <delete id="removeBussTabInfoById">

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

@@ -149,8 +149,8 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             List<ExcelTabVO> records  = baseMapper.selectRootExcelTab(page, excelTab.getProjectId(), null);
             if (!records.isEmpty()) {
                 List<Long> ids = records.stream().map(ExcelTabVO::getId).collect(Collectors.toList());
-                List<ExcelTab> excelTabs = this.listByIds(ids);
-                Map<Long, ExcelTab> map = excelTabs.stream().collect(toMap(ExcelTab::getId, v -> v));
+                List<ExcelTabVO> excelTabs = this.baseMapper.getByIds(ids);
+                Map<Long, ExcelTabVO> map = excelTabs.stream().collect(toMap(ExcelTabVO::getId, v -> v));
                 records.forEach(v -> {
                     ProjectInfoVO1 projectInfoVO1 = new ProjectInfoVO1();
                     projectInfoVO1.setProjectId(v.getProjectId());
@@ -186,7 +186,11 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 
     @Override
     public ExcelTabVO templateDetail(Long id) {
-        ExcelTabVO excelTabVO = this.baseMapper.getById(id);
+        List<ExcelTabVO> excelTabVOs = this.baseMapper.getByIds(Collections.singleton(id));
+        if (excelTabVOs == null || excelTabVOs.isEmpty()) {
+            return new ExcelTabVO();
+        }
+        ExcelTabVO excelTabVO = excelTabVOs.get(0);
         if (excelTabVO == null || (excelTabVO.getParentId() != null && excelTabVO.getParentId() > 0)) {
             return excelTabVO;
         }