修改合同段初始化excelId

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

@@ -180,6 +180,8 @@ public class WbsTreeContract extends BaseEntity {
     /**
      * 清表Id
      */
-    @ApiModelProperty(value = "是否关联清表 '0'否 '1'是")
-    private long excelId;
+    @ApiModelProperty(value = "清表Id")
+    private Long excelId;
+
+
 }

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

@@ -37,6 +37,7 @@
         <result column="init_table_name" property="initTableName"/>
         <result column="is_link_table" property="isLinkTable"/>
         <result column="wbs_type" property="wbsType"/>
+        <result column="excel_id" property="excelId"/>
     </resultMap>
 
     <resultMap id="resultMap2" type="org.springblade.manager.vo.WbsTreeContractVO">
@@ -69,26 +70,26 @@
         INSERT INTO m_wbs_tree_contract(
         p_key_id,id,wbs_id,wbs_type,project_id,contract_id,contract_type,tenant_id,parent_id,ancestors,dept_category,dept_name,full_name,sort,remark,`type`,
         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)
+        unique_code,partition_code,is_expernode,is_concrete,table_owner,major_data_type,init_table_name,is_link_table,excel_id)
         VALUES(
         #{snowId},#{wbsTree.id},#{wbsTree.wbsId},#{wbsType},#{wbsTree.projectId},#{contractId},1,#{wbsTree.tenantId},#{wbsTree.parentId},#{wbsTree.ancestors},
         #{wbsTree.deptCategory},#{wbsTree.deptName},#{wbsTree.fullName},#{wbsTree.sort},#{wbsTree.remark},#{wbsTree.type},
         #{wbsTree.tableType},#{wbsTree.createTime},#{wbsTree.createUser},#{wbsTree.createDept},#{wbsTree.updateUser},#{wbsTree.updateTime},
         #{wbsTree.status},#{wbsTree.isDeleted},#{wbsTree.uniqueCode},#{wbsTree.partitionCode},#{wbsTree.isExpernode},#{wbsTree.isConcrete},
-        #{wbsTree.tableOwner},#{wbsTree.majorDataType},#{wbsTree.initTableName},#{wbsTree.isLinkTable})
+        #{wbsTree.tableOwner},#{wbsTree.majorDataType},#{wbsTree.initTableName},#{wbsTree.isLinkTable},#{wbsTree.excelId})
     </insert>
 
     <insert id="insertByCondition">
         INSERT INTO m_wbs_tree_contract(
         p_key_id,id,wbs_id,wbs_type,project_id,contract_id,contract_type,tenant_id,parent_id,ancestors,dept_category,dept_name,full_name,sort,remark,`type`,
         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)
+        unique_code,partition_code,is_expernode,is_concrete,table_owner,major_data_type,init_table_name,is_link_table,excel_id)
         VALUES(
         #{pKeyId},#{wbsTree.id},#{wbsTree.wbsId},#{wbsType},#{wbsTree.projectId},#{contractId},1,#{wbsTree.tenantId},#{wbsTree.parentId},#{wbsTree.ancestors},
         #{wbsTree.deptCategory},#{wbsTree.deptName},#{wbsTree.fullName},#{wbsTree.sort},#{wbsTree.remark},#{wbsTree.type},
         #{wbsTree.tableType},#{wbsTree.createTime},#{wbsTree.createUser},#{wbsTree.createDept},#{wbsTree.updateUser},#{wbsTree.updateTime},
         #{wbsTree.status},#{wbsTree.isDeleted},#{wbsTree.uniqueCode},#{wbsTree.partitionCode},#{wbsTree.isExpernode},#{wbsTree.isConcrete},
-        #{wbsTree.tableOwner},#{wbsTree.majorDataType},#{wbsTree.initTableName},#{wbsTree.isLinkTable})
+        #{wbsTree.tableOwner},#{wbsTree.majorDataType},#{wbsTree.initTableName},#{wbsTree.isLinkTable},#{wbsTree.excelId})
     </insert>
 
     <update id="deleteBatch">
@@ -184,7 +185,8 @@
             update_user,
             update_time,
             STATUS,
-            is_deleted
+            is_deleted,
+            excel_id
         FROM
             m_wbs_tree_contract
         WHERE
@@ -230,7 +232,8 @@
             update_user,
             update_time,
             STATUS,
-            is_deleted
+            is_deleted,
+            excel_id
         FROM
             m_wbs_tree_contract
         WHERE
@@ -275,7 +278,8 @@
             update_user,
             update_time,
             STATUS,
-            is_deleted
+            is_deleted,
+            excel_id
         FROM
             m_wbs_tree_contract
         WHERE
@@ -364,7 +368,8 @@
             update_user,
             update_time,
             STATUS,
-            is_deleted
+            is_deleted,
+            excel_id
         FROM
             m_wbs_tree_contract
         WHERE

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

@@ -168,6 +168,7 @@ public class WbsTreeContractServiceImpl
         wbsTreeContract.setMajorDataType(wbsTree.getMajorDataType());
         wbsTreeContract.setInitTableName(wbsTree.getInitTableName());
         wbsTreeContract.setIsLinkTable(wbsTree.getIsLinkTable());
+        wbsTreeContract.setExcelId(wbsTree.getExcelId());
         return wbsTreeContract;
     }
 

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

@@ -550,6 +550,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                     .eq(WbsTreePrivate::getProjectId, pawDTO.getProjectId())
                     .eq(WbsTreePrivate::getType, 1)
             );
+
             wbsTreePrivates.stream().forEach(wbsTreePrivate -> {
                 idList2.add(String.valueOf(wbsTreePrivate.getId()));
             });