修改

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

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

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);
+
 }

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);

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);

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) {
@@ -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);

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)));
     }

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

@@ -88,7 +88,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(",")));
             }
@@ -217,6 +217,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);

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

@@ -99,6 +99,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 +139,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 +149,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">

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);
-        }
+        }*/
 
     }
 }