2024 4 26 号

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

@@ -174,4 +174,7 @@ public class WbsTree extends BaseEntity {
     @ApiModelProperty(value = "实体表id")
     private Long initTableId;
 
+    @ApiModelProperty(value = "委托单Id")
+    private Long erTreeId;
+
 }

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

@@ -217,4 +217,10 @@ public class WbsTreePrivate extends BaseEntity {
     @ApiModelProperty(value = "试验表关联的合同段id")
     private Long trialTabContractId;
 
+    /**
+     * 委托单Id
+     */
+    @ApiModelProperty(value = "委托单Id")
+    private Long erTreeId;
+
 }

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

@@ -53,6 +53,8 @@ public class TreeNodeVO extends BaseNode<TreeNode> {
 
     private String mixRatioTestIds;
 
+    private String erTreeId;
+
     public TreeNodeVO() {
     }
 

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

@@ -823,7 +823,7 @@ public class ContractInfoController extends BladeController {
     /**
      * 材料取样 获取合同段信息
      */
-    @GetMapping("/get-contractInfo")
+    @GetMapping("/get-ertract-Info")
     @ApiOperationSupport(order = 24)
     @ApiOperation(value = "材料取样-获取合同段信息", notes = "传入合同段id")
     public R<List<ContractInfo>> getContractInfoByContractId(@RequestParam String contractId) {

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

@@ -712,7 +712,7 @@ public class WbsTreePrivateController extends BladeController {
     }
 
     /**
-     * 试验-客户端试验获取表的HTML
+     *
      *
      * @param primaryKeyId
      * @return

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

@@ -34,6 +34,7 @@
         <result column="is_exist_form" property="isExistForm"/>
         <result column="import_matching_info" property="importMatchingInfo"/>
         <result column="init_table_id" property="initTableId"/>
+        <result column="et_tree_id" property="erTreeId"/>
     </resultMap>
 
     <resultMap id="treeNodeResultMap" type="org.springblade.manager.vo.TreeNodeVO">

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

@@ -37,6 +37,7 @@
         <result column="import_matching_info" property="importMatchingInfo"/>
         <result column="tab_file_type" property="tabFileType"/>
         <result column="trial_tab_contract_id" property="trialTabContractId"/>
+        <result column="er_tree_id" property="erTreeId"/>
     </resultMap>
 
     <resultMap id="resultMap2" type="org.springblade.manager.vo.WbsTreePrivateVO2">
@@ -78,6 +79,7 @@
         <result column="isExistForm" property="isExistForm"/>
         <result column="majorDataType" property="majorDataType"/>
         <result column="mixRatioTestIds" property="mixRatioTestIds"/>
+        <result column="erTreeId" property="erTreeId"/>
     </resultMap>
 
     <resultMap id="treeNodeResultMap2" type="org.springblade.manager.vo.TreeNodeVO">
@@ -341,6 +343,7 @@
             d.table_type,
             d.id,
             d.parent_id,
+            d.er_tree_id as erTreeId,
             CASE
                 WHEN d.parent_id = 0 THEN
                     (SELECT project_alias FROM m_project_info WHERE id = #{projectId})

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

@@ -209,7 +209,8 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
 
     @Override
     public List<WbsTreePrivateVO> lazyTree(String wbsId, String wbsType, Long parentId, String projectId) {
-        return ForestNodeMerger.merge(baseMapper.lazyTree(wbsId, Integer.valueOf(wbsType), parentId, projectId));
+        List<WbsTreePrivateVO> wbsTreePrivateVOS = baseMapper.lazyTree(wbsId, Integer.valueOf(wbsType), parentId, projectId);
+        return ForestNodeMerger.merge(wbsTreePrivateVOS);
     }
 
     @Override
@@ -2656,17 +2657,6 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
         Document doc = Jsoup.parse(htmlString);
         Element table = doc.select("table").first();
 
-        /*int maxCol = doc.select("Col").size();
-        Elements hc = doc.select("hc-form-select-search");
-        if (hc.size() >= 1) {
-            for (int i = 0; i < hc.size(); i++) {
-                Element dataX = hc.get(i);
-                dataX.removeAttr("pkeyId");
-                dataX.removeAttr("contractId");
-                dataX.attr("pkeyId", primaryKeyId + "");
-                dataX.attr("contractId", wbsTreePrivate.getContractId());
-            }
-        }*/
 
         //标题解决
         ProjectInfo projectInfo = projectInfoMapper.selectById(wbsTreePrivate.getProjectId());
@@ -2679,7 +2669,6 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
             Element tr = trs.get(i);
             Elements tds = tr.select("td");
             for (Element data : tds) {
-                //int colspan = data.attr("COLSPAN").equals("") ? 0 : Integer.parseInt(data.attr("COLSPAN"));
                 String style = data.attr("style");
                 if (style.contains("font-size")) {
                     int fontsize = Integer.parseInt(style.substring(style.indexOf("font-size:") + 10, style.indexOf(".0pt")));