ソースを参照

Merge remote-tracking branch 'origin/master' into master

yangyj 2 年 前
コミット
fa6c69640c
18 ファイル変更243 行追加38 行削除
  1. 6 0
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/WbsTreeContract.java
  2. 5 0
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/feign/WbsTreeContractClient.java
  3. 1 1
      blade-service/blade-archive/pom.xml
  4. 1 1
      blade-service/blade-business/pom.xml
  5. 130 1
      blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java
  6. 2 2
      blade-service/blade-business/src/main/java/org/springblade/business/controller/NeiYeController.java
  7. 0 1
      blade-service/blade-business/src/main/java/org/springblade/business/feignClient/TaskClientImpl.java
  8. 4 0
      blade-service/blade-business/src/main/java/org/springblade/business/mapper/InformationQueryMapper.java
  9. 22 0
      blade-service/blade-business/src/main/java/org/springblade/business/mapper/InformationQueryMapper.xml
  10. 5 0
      blade-service/blade-business/src/main/java/org/springblade/business/service/IInformationQueryService.java
  11. 26 12
      blade-service/blade-business/src/main/java/org/springblade/business/service/impl/InformationQueryServiceImpl.java
  12. 1 1
      blade-service/blade-manager/pom.xml
  13. 2 2
      blade-service/blade-manager/src/main/java/com/mixsmart/utils/CustomFunction.java
  14. 12 4
      blade-service/blade-manager/src/main/java/org/springblade/manager/controller/FirstController.java
  15. 0 6
      blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreeContractController.java
  16. 15 2
      blade-service/blade-manager/src/main/java/org/springblade/manager/feign/WbsTreeContractClientImpl.java
  17. 4 2
      blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeContractMapper.xml
  18. 7 3
      blade-service/blade-manager/src/main/java/org/springblade/manager/utils/FileUtils.java

+ 6 - 0
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/WbsTreeContract.java

@@ -252,4 +252,10 @@ public class WbsTreeContract extends BaseEntity {
     @ApiModelProperty(value = "配合比试验ids")
     private String mixRatioTestIds;
 
+    /**
+     * 是否为引用元素
+     */
+    @ApiModelProperty(value = "是否为引用元素 1是 2否")
+    private Integer isEle;
+
 }

+ 5 - 0
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/feign/WbsTreeContractClient.java

@@ -145,4 +145,9 @@ public interface WbsTreeContractClient {
 
     @PostMapping(API_PREFIX + "/diySort")
     boolean diySort(@RequestBody List<String> sortLists);
+
+    // 获取合同端 收件信息表
+    @PostMapping(API_PREFIX + "/queryContractFirstTab")
+    List<WbsTreeContract> queryContractFirstTab(@RequestParam String contractId, @RequestParam String tabType);
+
 }

+ 1 - 1
blade-service/blade-archive/pom.xml

@@ -113,7 +113,7 @@
                     <target>${java.version}</target>
                     <encoding>${project.build.sourceEncoding}</encoding>
                     <compilerArguments>
-                        <bootclasspath>${java.home}/lib/rt.jar:${java.home}/lib/jce.jar:${java.home}/lib/jsse.jar
+                        <bootclasspath>${java.home}/lib/rt.jar;${java.home}/lib/jce.jar;${java.home}/lib/jsse.jar
                         </bootclasspath>
                     </compilerArguments>
                 </configuration>

+ 1 - 1
blade-service/blade-business/pom.xml

@@ -157,7 +157,7 @@
                     <target>${java.version}</target>
                     <encoding>${project.build.sourceEncoding}</encoding>
                     <compilerArguments>
-                        <bootclasspath>${java.home}/lib/rt.jar:${java.home}/lib/jce.jar:${java.home}/lib/jsse.jar
+                        <bootclasspath>${java.home}/lib/rt.jar;${java.home}/lib/jce.jar;${java.home}/lib/jsse.jar
                         </bootclasspath>
                     </compilerArguments>
                 </configuration>

+ 130 - 1
blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -540,7 +540,7 @@ public class InformationWriteQueryController extends BladeController {
      */
     @PostMapping("/queryNodeStatus")
     @ApiOperationSupport(order = 23)
-    @ApiOperation(value = "/查询节点状态")
+    @ApiOperation(value = "/查询节点状态-施工")
     public R<String> queryNodeStatus(@RequestParam String primaryKeyId, @RequestParam String classify) {
         //记录状态
         String status = "1";
@@ -597,6 +597,135 @@ public class InformationWriteQueryController extends BladeController {
         return R.data(status);
     }
 
+    /**
+     * 查询节点状态-监理
+     */
+    @PostMapping("/queryNodeStatus-jl")
+    @ApiOperationSupport(order = 23)
+    @ApiOperation(value = "/查询节点状态-监理")
+    public R<String> queryNodeStatusJl(@RequestParam String primaryKeyId, @RequestParam String classify) {
+        //记录状态
+        String status = "1";
+        //查询填报状态,type=1资料填报
+        InformationQuery businessData = this.informationQueryService.getOne(Wrappers.<InformationQuery>lambdaQuery().eq(InformationQuery::getWbsId, primaryKeyId).eq(InformationQuery::getClassify, classify).eq(InformationQuery::getType, 1));
+        if (businessData != null) {
+            switch (businessData.getStatus()) {
+                case 0:
+                case 3:
+                    //0属于未上报,3属于已废除,统一为待上报
+                    status = "2";
+                    break;
+                case 1:
+                case 2:
+                    //1属于待审批,2属于已审批,统一为已上报
+                    status = "3";
+                    break;
+                default:
+                    //如果不匹配,默认为未填报
+                    status = "1";
+                    //查询表格
+                    WbsTreeContract obj = this.wbsTreeContractClient.getContractNodeByPrimaryKeyId(primaryKeyId);
+                    if (ObjectUtils.isNotEmpty(obj)) {
+                        List<WbsTreeContract> tableList = this.wbsTreeContractClient.queryChildByParentId(obj, "queryTable", classify);
+                        if (tableList != null && tableList.size() > 0) {
+                            for (WbsTreeContract table : tableList) {
+                                if (new Integer("2").equals(table.getIsTabPdf())) {
+                                    //这些表格中,但凡有一个能够预览,就开放预览
+                                    status = "2";
+                                    break;
+                                }
+                            }
+                        }
+                        break;
+                    }
+            }
+        } else {
+            //查询表格
+            WbsTreeContract obj = this.wbsTreeContractClient.getContractNodeByPrimaryKeyId(primaryKeyId);
+            if (ObjectUtils.isNotEmpty(obj)) {
+                List<WbsTreeContract> tableList = this.wbsTreeContractClient.queryChildByParentId(obj, "queryTable", classify);
+                if (tableList != null && tableList.size() > 0) {
+                    for (WbsTreeContract table : tableList) {
+                        if (new Integer("2").equals(table.getIsTabPdf())) {
+                            //这些表格中,但凡有一个能够预览,就开放预览
+                            status = "2";
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+
+        return R.data(status);
+    }
+
+    /**
+     * 查询节点状态-首件
+     */
+    @PostMapping("/queryNodeStatus-sj")
+    @ApiOperationSupport(order = 23)
+    @ApiOperation(value = "/查询节点状态-首件")
+    @ApiModelProperty(value = "id",notes = "当前该条首件的记录id")
+    public R<String> queryNodeStatusSj(@RequestParam String primaryKeyId, @RequestParam String classify,String id) {
+        //记录状态
+        String status = "1";
+        //查询填报状态,type=3首件
+        InformationQuery businessData = this.informationQueryService.getOne(Wrappers.<InformationQuery>lambdaQuery()
+                .eq(InformationQuery::getId,id)
+                .eq(InformationQuery::getType, 3)
+        );
+        if (businessData != null) {
+            switch (businessData.getStatus()) {
+                case 0:
+                case 3:
+                    //0属于未上报,3属于已废除,统一为待上报
+                    status = "2";
+                    break;
+                case 1:
+                case 2:
+                    //1属于待审批,2属于已审批,统一为已上报
+                    status = "3";
+                    break;
+                default:
+                    //如果不匹配,默认为未填报
+                    status = "1";
+                    //查询表格
+                    WbsTreeContract obj = this.wbsTreeContractClient.getContractNodeByPrimaryKeyId(primaryKeyId);
+                    if (ObjectUtils.isNotEmpty(obj)) {
+                        List<WbsTreeContract> tableList = this.wbsTreeContractClient.queryChildByParentId(obj, "queryTable", classify);
+                        if (tableList != null && tableList.size() > 0) {
+                            for (WbsTreeContract table : tableList) {
+                                if (new Integer("2").equals(table.getIsTabPdf())) {
+                                    //这些表格中,但凡有一个能够预览,就开放预览
+                                    status = "2";
+                                    break;
+                                }
+                            }
+                        }
+                        break;
+                    }
+            }
+        } else {
+            //查询表格
+            WbsTreeContract obj = this.wbsTreeContractClient.getContractNodeByPrimaryKeyId(primaryKeyId);
+            if (ObjectUtils.isNotEmpty(obj)) {
+                List<WbsTreeContract> tableList = this.wbsTreeContractClient.queryChildByParentId(obj, "queryTable", classify);
+                if (tableList != null && tableList.size() > 0) {
+                    for (WbsTreeContract table : tableList) {
+                        if (new Integer("2").equals(table.getIsTabPdf())) {
+                            //这些表格中,但凡有一个能够预览,就开放预览
+                            status = "2";
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+
+        return R.data(status);
+    }
+
+
     /**
      * 查询节点状态-试验
      */

+ 2 - 2
blade-service/blade-business/src/main/java/org/springblade/business/controller/NeiYeController.java

@@ -84,14 +84,14 @@ public class NeiYeController {
                     String contractI = node.getContractId();
                     List<WbsTreeContract> treeS = wbsTreeContractClient.getContractWbsTreeByParentId(node.getId().toString(),contractI);
                     for (WbsTreeContract tree : treeS) {
-                        List<QueryProcessDataVO> dataResult = this.informationQueryService.queryProcessDataByParentIdAndContractId(tree.getId().toString(), contract.getContractType(), contractId);
+                        List<QueryProcessDataVO> dataResult = this.informationQueryService.queryProcessDataByParentIdAndContractIdTwo(tree.getId().toString(), contract.getContractType(), contractId);
                         if (dataResult != null && dataResult.size() > 0) {
                             queryDataResult.addAll(dataResult);
                             dataResult.clear();
                         }
                     }
                 }else {
-                    queryDataResult = this.informationQueryService.queryProcessDataByParentIdAndContractId(node.getId().toString(), contract.getContractType(), contractId);
+                    queryDataResult = this.informationQueryService.queryProcessDataByParentIdAndContractIdTwo(node.getId().toString(), contract.getContractType(), contractId);
                 }
             } else {
                 //填报节点

+ 0 - 1
blade-service/blade-business/src/main/java/org/springblade/business/feignClient/TaskClientImpl.java

@@ -46,7 +46,6 @@ public class TaskClientImpl implements TaskClient {
         if(task != null){
             //存在任务,根据formDataId查询(获取 私有项目的 p_key_ids)
             List<String> privatePrimaryKeyIds = this.informationQueryService.queryBusinessTableData(task.getFormDataId());
-
             if(privatePrimaryKeyIds != null && privatePrimaryKeyIds.size() > 0){
                 //查询这些表格的电签配置
                 return this.eVisaConfigClient.queryEVisaConfigByTableIds(privatePrimaryKeyIds, task.getContractId(), isFinal);

+ 4 - 0
blade-service/blade-business/src/main/java/org/springblade/business/mapper/InformationQueryMapper.java

@@ -44,6 +44,10 @@ public interface InformationQueryMapper extends BaseMapper<InformationQuery> {
 	 * 查询工序节点的填报记录
 	 */
 	List<QueryProcessDataVO> queryProcessDataByParentIdAndContractId(@Param("parentId") String parentId, @Param("classify") Integer classify, @Param("contractId") String contractId);
+	/**
+	 * 查询工序节点的填报记录
+	 */
+	List<QueryProcessDataVO> queryProcessDataByParentIdAndContractIdTwo(@Param("parentId") String parentId, @Param("classify") Integer classify, @Param("contractId") String contractId);
 
 	/**
 	 * 根据节点ID及其填报的类型获取填报记录

+ 22 - 0
blade-service/blade-business/src/main/java/org/springblade/business/mapper/InformationQueryMapper.xml

@@ -448,5 +448,27 @@
     <select id="getContractWbsTreeAll" resultType="org.springblade.manager.entity.WbsTreeContract">
         select p_key_id,id,node_name,node_type,parent_id,sort from m_wbs_tree_contract where project_id = #{obj.projectId} and contract_id = #{obj.contractId} and `type` = 1 and status = 1 and node_type in (1,2,3,4,5,6) order by sort
     </select>
+    <select id="queryProcessDataByParentIdAndContractIdTwo" resultMap="queryProcessDataMap">
+        SELECT
+            wtc.id AS treeId,
+            wtc.p_key_id,
+            wtc.ancestors,
+            wtc.major_data_type,
+            wtc.node_type AS nodeType,
+            IFNULL(if(length(trim(wtc.full_name)) > 0, wtc.full_name, wtc.node_name),wtc.node_name) AS title,
+            wtc.parent_id AS parentId,
+            uiq.id AS informationQueryId,
+            uiq.status,
+            uiq.type AS queryType
+        FROM
+            m_wbs_tree_contract AS wtc
+            LEFT JOIN u_information_query AS uiq ON wtc.p_key_id = uiq.wbs_id AND uiq.classify = #{classify} and uiq.is_deleted = 0
+        WHERE
+            wtc.type = 1
+          AND wtc.major_data_type in(1,2,3,4)
+          AND wtc.ancestors like concat('%',#{parentId},'%')
+          AND wtc.contract_id = #{contractId}
+          AND wtc.is_deleted = 0
+    </select>
 
 </mapper>

+ 5 - 0
blade-service/blade-business/src/main/java/org/springblade/business/service/IInformationQueryService.java

@@ -61,6 +61,11 @@ public interface IInformationQueryService extends BaseService<InformationQuery>
 	 */
 	List<QueryProcessDataVO> queryProcessDataByParentIdAndContractId(String parentId, Integer classify, String contractId);
 
+	/**
+	 * 查询工序节点的填报记录2
+	 */
+	List<QueryProcessDataVO> queryProcessDataByParentIdAndContractIdTwo(String parentId, Integer classify, String contractId);
+
 	/**
 	 * 保存填报时新增或修改填报资料记录表数据
 	 * @param wbsId 当前填报节点

+ 26 - 12
blade-service/blade-business/src/main/java/org/springblade/business/service/impl/InformationQueryServiceImpl.java

@@ -68,18 +68,22 @@ public class InformationQueryServiceImpl extends BaseServiceImpl<InformationQuer
 
         //查询这个业务数据绑定的表格,需要区分监理和施工
         if (query != null) {
-            // 获取wbs
-            WbsTreeContract tree = this.wbsTreeContractClient.getContractWbsTreeByPrimaryKeyId(query.getWbsId());
-            // 获取 合同端信息表
-            List<WbsTreeContract> tableList = this.wbsTreeContractClient.queryChildByParentId(tree, "queryTable", String.valueOf(query.getClassify()));
-            if (tableList != null && tableList.size() > 0) {
-                //删除掉无法溯源的数据
-                tableList.removeIf(node -> node.getIsTypePrivatePid() == null || node.getIsTypePrivatePid() <= 0 || StringUtils.isEmpty(node.getIsTypePrivatePid().toString()));
-
-                List<Long> privatePIdList = tableList.stream().map(WbsTreeContract::getIsTypePrivatePid).distinct().collect(Collectors.toList());
-
-                return JSONArray.parseArray(JSONObject.toJSONString(privatePIdList), String.class);
-            }
+                // 获取wbs
+                WbsTreeContract tree = this.wbsTreeContractClient.getContractWbsTreeByPrimaryKeyId(query.getWbsId());
+                List<WbsTreeContract> tableList = new ArrayList<>();
+                if(query.getType()==1){ //质检
+                    // 获取 合同端信息表
+                    tableList= this.wbsTreeContractClient.queryChildByParentId(tree, "queryTable", String.valueOf(query.getClassify()));
+                }else if(query.getType()==3){ //首件数据
+                    // 获取首件 数据节点信息
+                   tableList = this.wbsTreeContractClient.queryContractFirstTab(tree.getContractId(), "111");
+                }
+                if (tableList != null && tableList.size() > 0) {
+                    //删除掉无法溯源的数据
+                    tableList.removeIf(node -> node.getIsTypePrivatePid() == null || node.getIsTypePrivatePid() <= 0 || StringUtils.isEmpty(node.getIsTypePrivatePid().toString()));
+                    List<Long> privatePIdList = tableList.stream().map(WbsTreeContract::getIsTypePrivatePid).distinct().collect(Collectors.toList());
+                    return JSONArray.parseArray(JSONObject.toJSONString(privatePIdList), String.class);
+                }
         } else {
             //那么就可能是日志,检查是不是日志
             ContractLog log = this.contractLogService.getById(formDataId);
@@ -116,6 +120,16 @@ public class InformationQueryServiceImpl extends BaseServiceImpl<InformationQuer
         return result;
     }
 
+    @Override
+    public List<QueryProcessDataVO> queryProcessDataByParentIdAndContractIdTwo(String parentId, Integer classify, String contractId) {
+        List<QueryProcessDataVO> result = this.baseMapper.queryProcessDataByParentIdAndContractIdTwo(parentId, classify, contractId);
+        if (result == null || result.size() <= 0) {
+            result = this.baseMapper.queryProcessDataByParentIdAndContractIdTwo("", classify, contractId);
+        }
+        return result;
+    }
+
+
     private List<FirstInformation> setFirstLinkData(List<JSONObject> linkDataList, String businessId) {
         List<FirstInformation> linkList = new ArrayList<>();
 

+ 1 - 1
blade-service/blade-manager/pom.xml

@@ -170,7 +170,7 @@
                     <target>${java.version}</target>
                     <encoding>${project.build.sourceEncoding}</encoding>
                     <compilerArguments>
-                        <bootclasspath>${java.home}/lib/rt.jar:${java.home}/lib/jce.jar:${java.home}/lib/jsse.jar
+                        <bootclasspath>${java.home}/lib/rt.jar;${java.home}/lib/jce.jar;${java.home}/lib/jsse.jar
                         </bootclasspath>
                     </compilerArguments>
                 </configuration>

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

@@ -2801,9 +2801,9 @@ public class CustomFunction {
 		return "";
 	}
 
-	public static void main(String[] args) {
+	/*public static void main(String[] args) {
 		System.out.println();
-	}
+	}*/
 
 
 

+ 12 - 4
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/FirstController.java

@@ -14,6 +14,7 @@ import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
 import org.apache.commons.lang.StringUtils;
+import org.apache.poi.ss.usermodel.Cell;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
@@ -197,6 +198,9 @@ public class FirstController extends BladeController {
 
             //获取配置的路径
             String file_path = ParamCache.getValue(CommonConstant.SYS_LOCAL_URL);
+            //String file_path = "/Users/hongchuangyanfa/Desktop/";//ParamCache.getValue(CommonConstant.SYS_LOCAL_URL);
+
+
             //获取数据
             JSONObject firstJson = this.informationQueryClient.queryFirstBusinessDataByFirstId(firstId);
             if (firstJson != null) {
@@ -246,9 +250,9 @@ public class FirstController extends BladeController {
                                     for (int i = 0; i < columns.length; i++) {
                                         CellRange cellRange = columns[i];
                                         System.out.println(cellRange.getStyle().getFont().getSize());
-                                        if (cellRange.getStyle().getFont().getSize() >= 12 && StringUtils.isNotEmpty(cellRange.getText())) {
+                                        if (cellRange.getStyle().getFont().getSize() > 12 && StringUtils.isBlank(cellRange.getText())) {
                                             cellRange.setText(projectInfo.getProjectName());
-                                            cellRange.getStyle().getFont().setSize(20);
+                                            cellRange.getStyle().getFont().setSize(14);
                                             break;
                                         }
                                     }
@@ -310,7 +314,12 @@ public class FirstController extends BladeController {
                                                         pic.setHeight(Height);
                                                         sheet.getCellRange(y1, x1).getStyle().setShrinkToFit(true);
 
-                                                    } else {
+                                                    } else if(myData.equals("1") && data.html().indexOf("hc-form-checkbox-group")>=0){
+                                                         CellRange cell = sheet.getCellRange(y1, x1);
+                                                        String exceVal = cell.getText().replaceAll(" ","");
+                                                        cell.getCellStyle().getExcelFont().setFontName("EUDC");
+                                                        cell.setText(exceVal.replace("□","\u2611"));
+                                                    }else {
                                                         final CellRange cellRange = sheet.getCellRange(y1, x1);
                                                         cellRange.setText(myData);
                                                     }
@@ -355,7 +364,6 @@ public class FirstController extends BladeController {
                             BladeFile bladeFile = this.newIOSSClient.uploadFile(fileName + ".pdf", onePdfPath);
 
                             pdfUrls.add(bladeFile.getLink());
-
                             //将封面的pdf修改
                             String updatePdfUrl = "UPDATE u_information_query SET pdf_url = '" + bladeFile.getLink() + "' WHERE id = " + firstId;
                             this.jdbcTemplate.execute(updatePdfUrl);

+ 0 - 6
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreeContractController.java

@@ -117,12 +117,6 @@ public class WbsTreeContractController extends BladeController {
             @ApiImplicitParam(name = "stats", value = "状态码", required = true)
     })
     public R remove(@RequestParam("id") String id,@RequestParam("stats") String stats) {
-
-        WbsTreeContract wbsTreeContract = iWbsTreeContractService.getOne(Wrappers.<WbsTreeContract>query().lambda()
-                .eq(WbsTreeContract::getPKeyId, id).eq(WbsTreeContract::getIsDeleted,0) );
-        if(StringUtils.isEmpty(wbsTreeContract.getPdfUrl()) && stats.equals("0")){
-            return R.data(300,"1","该节点下有数据");
-        }
         return R.status(iWbsTreeContractService.remove(Wrappers.<WbsTreeContract>query().lambda()
                 .eq(WbsTreeContract::getPKeyId, id).eq(WbsTreeContract::getIsDeleted,0)));
     }

+ 15 - 2
blade-service/blade-manager/src/main/java/org/springblade/manager/feign/WbsTreeContractClientImpl.java

@@ -11,9 +11,11 @@ import org.springblade.common.constant.CommonConstant;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.manager.entity.ContractInfo;
 import org.springblade.manager.entity.ContractRelationJlyz;
+import org.springblade.manager.entity.WbsTree;
 import org.springblade.manager.entity.WbsTreeContract;
 import org.springblade.manager.service.IContractInfoService;
 import org.springblade.manager.service.IWbsTreeContractService;
+import org.springblade.manager.service.impl.WbsTreeContractServiceImpl;
 import org.springblade.manager.vo.WbsTreeContractTreeVO;
 import org.springblade.manager.vo.WbsTreeContractTreeVO3;
 import org.springblade.manager.vo.WbsTreeContractTreeVOS;
@@ -32,6 +34,8 @@ public class WbsTreeContractClientImpl implements WbsTreeContractClient {
 
     private final IWbsTreeContractService wbsTreeContractService;
 
+    private final WbsTreeContractServiceImpl wbsTreeContractServiceImpl;
+
     private final IDictBizClient dictBizClient;
 
     private final ISysClient sysClient;
@@ -88,7 +92,7 @@ public class WbsTreeContractClientImpl implements WbsTreeContractClient {
     public List<WbsTreeContract> queryChildByParentId(WbsTreeContract treeNode, String queryTable, String classify) {
         if ("queryTable".equals(queryTable)) {
             LambdaQueryWrapper<WbsTreeContract> wrapper = Wrappers.lambdaQuery();
-            wrapper.eq(WbsTreeContract::getParentId, treeNode.getId()).eq(WbsTreeContract::getContractId, treeNode.getContractId()).eq(WbsTreeContract::getType, "2");
+            wrapper.eq(WbsTreeContract::getParentId, treeNode.getId()).eq(WbsTreeContract::getContractId, treeNode.getContractId()).in(WbsTreeContract::getType, Arrays.asList("2,111".split(",")));
             if (StringUtils.isNotEmpty(classify)) {
                 wrapper.in(WbsTreeContract::getTableOwner, "1".equals(classify) ? Arrays.asList("1,2,3".split(",")) : Arrays.asList("4,5,6".split(",")));
             }
@@ -101,7 +105,7 @@ public class WbsTreeContractClientImpl implements WbsTreeContractClient {
 
     @Override
     public Boolean saveBatch(List<WbsTreeContract> list) {
-        return this.wbsTreeContractService.saveBatch(list);
+        return this.wbsTreeContractServiceImpl.insertBatch(list,1000);
     }
 
     @Override
@@ -217,6 +221,15 @@ public class WbsTreeContractClientImpl implements WbsTreeContractClient {
         return true;
     }
 
+    @Override
+    public List<WbsTreeContract> queryContractFirstTab(String contractId, String tabType) {
+        LambdaQueryWrapper<WbsTreeContract> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(WbsTreeContract::getContractId, contractId);
+        wrapper.eq(WbsTreeContract::getTableType, tabType);
+        wrapper.eq(WbsTreeContract::getIsDeleted, "0");
+        return this.wbsTreeContractService.list(wrapper);
+    }
+
     @Override
     public List<WbsTreeContractTreeVOS> queryCurrentContractLogList(String contractId) {
         ContractInfo contract = this.contractInfoService.getById(contractId);

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

@@ -49,6 +49,7 @@
         <result column="is_import_identification_node" property="isImportIdentificationNode"/>
         <result column="import_matching_info" property="importMatchingInfo"/>
         <result column="is_concealed_works_node" property="isConcealedWorksNode"/>
+        <result column="is_ele" property="isEle"/>
     </resultMap>
 
 
@@ -99,6 +100,7 @@
         <result column="is_import_identification_node" property="isImportIdentificationNode"/>
         <result column="import_matching_info" property="importMatchingInfo"/>
         <result column="is_concealed_works_node" property="isConcealedWorksNode"/>
+        <result column="is_ele" property="isEle"/>
         <collection property="appUserList" javaType="java.util.List" ofType="org.springblade.manager.entity.AppUser"
                     select="getuserInfoByaccount"
                     column="{sonId=p_key_id}">
@@ -138,7 +140,7 @@
                                         table_type, create_time, create_user, create_dept, update_user, update_time,
                                         `STATUS`, is_deleted,
                                         unique_code, partition_code, is_expernode, is_concrete, table_owner,
-                                        major_data_type, init_table_name, is_link_table, excel_id, html_url,is_type_private_pid)
+                                        major_data_type, init_table_name, is_link_table, excel_id, html_url,is_type_private_pid,is_ele)
         VALUES (#{pKeyId}, #{wbsTree.id}, #{wbsTree.wbsId}, #{wbsType}, #{wbsTree.projectId}, #{contractId}, 1,
                 #{wbsTree.tenantId}, #{wbsTree.parentId}, #{wbsTree.ancestors},
                 #{wbsTree.nodeType}, #{wbsTree.nodeName}, #{wbsTree.fullName}, #{wbsTree.sort}, #{wbsTree.remark},
@@ -148,7 +150,7 @@
                 #{wbsTree.status}, #{wbsTree.isDeleted}, #{wbsTree.uniqueCode}, #{wbsTree.partitionCode},
                 #{wbsTree.isExpernode}, #{wbsTree.isConcrete},
                 #{wbsTree.tableOwner}, #{wbsTree.majorDataType}, #{wbsTree.initTableName}, #{wbsTree.isLinkTable},
-                #{wbsTree.excelId},#{wbsTree.htmlUrl},#{wbsTree.pKeyId})
+                #{wbsTree.excelId},#{wbsTree.htmlUrl},#{wbsTree.pKeyId},1)
     </insert>
 
     <update id="deleteBatch">

+ 7 - 3
blade-service/blade-manager/src/main/java/org/springblade/manager/utils/FileUtils.java

@@ -301,8 +301,12 @@ public class FileUtils {
 
 
     public static void main11(String[] args) throws Exception {
-
-        String excelPath="/Users/hongchuangyanfa/Desktop/pdf/1625671101419880450.xlsx";
+            String data = "";
+        for(int i=1;i<=100;i++){
+            data +="name"+i+"  VARCHAR(500),";
+        }
+        System.out.println(data);
+  /*      String excelPath="/Users/hongchuangyanfa/Desktop/pdf/1625671101419880450.xlsx";
         File file_out = ResourceUtil.getFile("/Users/hongchuangyanfa/Desktop/pdf/123.xlsx");
         InputStream exceInp = new FileInputStream(file_out);//CommonUtil.getOSSInputStream("https://bladex-test-info.oss-cn-chengdu.aliyuncs.com//upload/20230130/2d98b5a4d6270d5d4f98847216c17888.xlsx");
         final org.apache.poi.ss.usermodel.Workbook workbook = WorkbookFactory.create(exceInp);
@@ -345,7 +349,7 @@ public class FileUtils {
         }
         if (workbook != null) {
             IoUtil.closeQuietly(workbook);
-        }
+        }*/
 
     }
 }