修改BUG

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/ProjectAssignmentWbstreeDTO.java

@@ -49,13 +49,6 @@ public class ProjectAssignmentWbstreeDTO extends ProjectAssignmentWbstree {
     private String wbsTreeIds;
 
 
-    @JsonProperty(value = "wbsPrivateProjectTableName")
-    @ApiModelProperty(name = "wbsPrivateProjectTableName", value = "wbs私有库表名（用于后续入参）", required = true)
-    private String wbsPrivateProjectTableName;
-
-
-
-
 
 
 }

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

@@ -102,5 +102,5 @@ public interface WbsTreeMapper extends BaseMapper<WbsTree> {
 
     void createWbsTreeTable(@Param("tableName") String tableName);
 
-    Integer insertToNewWbsTreeTable(@Param("tableName") String tableName, @Param("wbsTree") WbsTree wbsTree);
+    Integer insertToNewWbsTreeTable(@Param("projectId") String projectId, @Param("wbsTree") WbsTree wbsTree);
 }

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

@@ -69,13 +69,14 @@
     </insert>
 
     <insert id="insertToNewWbsTreeTable">
-        INSERT INTO ${tableName}(
-        id,wbs_id,tenant_id,parent_id,ancestors,dept_category,dept_name,full_name,sort,remark,`type`,
+        INSERT INTO m_wbs_tree_private(
+        id,wbs_id,project_id,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)
         VALUES(
         #{wbsTree.id},
         #{wbsTree.wbsId},
+        #{projectId},
         #{wbsTree.tenantId},
         #{wbsTree.parentId},
         #{wbsTree.ancestors},

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

@@ -30,6 +30,7 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringPool;
 import org.springblade.manager.dto.FormElementDTO;
 import org.springblade.manager.dto.ProjectAssignmentWbstreeDTO;
+import org.springblade.manager.dto.WbsTreeDTO;
 import org.springblade.manager.excel.WbsTreeExcel;
 import org.springblade.manager.mapper.WbsTreeMapper;
 import org.springblade.manager.service.IWbsTreeService;
@@ -228,18 +229,13 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         if (StringUtils.isEmpty(wbsTreeIds)) {
             return false;
         }
-        String tableName = "m_wbs_tree_" + pawDTO.getProjectId() + "_" + DateUtil.time();
-        //初始化创建wbs项目级私有节点表
-        wbsTreeMapper.createWbsTreeTable(tableName);
-        //此处返回表名,用于后续接口入参
-        pawDTO.setWbsPrivateProjectTableName(tableName);
         //获取节点ids,查询出所需节点树
         List<WbsTree> list = findAllNodeList(wbsTreeIds);
         if (list != null) {
             list.forEach(System.out::print);
             //新增节点
             for (WbsTree wbsTree : list) {
-                Integer row = baseMapper.insertToNewWbsTreeTable(tableName, wbsTree);
+                Integer row = baseMapper.insertToNewWbsTreeTable(pawDTO.getProjectId(), wbsTree);
                 if (row > 0) {
                     System.out.println("新增节点成功,节点id: ----- " + wbsTree.getId());
                 }
@@ -248,6 +244,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         //初始化创建合同段私有wbs树
 
 
+        //初始化施工台账数据
 
 
         return true;

blade-service/blade-manager/src/main/java/sql/m_contract_info.sql

@@ -0,0 +1,56 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : localhost
+ Source Server Type    : MySQL
+ Source Server Version : 50736
+ Source Host           : localhost:3306
+ Source Schema         : bladex
+
+ Target Server Type    : MySQL
+ Target Server Version : 50736
+ File Encoding         : 65001
+
+ Date: 23/05/2022 10:15:01
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for m_contract_info
+-- ----------------------------
+DROP TABLE IF EXISTS `m_contract_info`;
+CREATE TABLE `m_contract_info`  (
+  `id` bigint(20) NOT NULL COMMENT '主键id\r\n',
+  `p_id` bigint(20) NULL DEFAULT NULL COMMENT '项目id',
+  `contract_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '合同段名称',
+  `contract_type` int(2) NULL DEFAULT NULL COMMENT '合同段类型',
+  `contract_number` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '合同段编号',
+  `contractor_unit_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业主单位名称',
+  `construction_unit_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '施工单位名称',
+  `supervision_unit_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '监理单位名称',
+  `contractor_join_time` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参与方进场时间',
+  `plan_start_time` datetime(0) NULL DEFAULT NULL COMMENT '计划开工时间',
+  `plan_end_time` datetime(0) NULL DEFAULT NULL COMMENT '计划完工时间',
+  `actual_start_time` datetime(0) NULL DEFAULT NULL COMMENT '实际开工时间',
+  `actual_end_time` datetime(0) NULL DEFAULT NULL COMMENT '实际完工时间',
+  `start_file_url` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '开工令文件',
+  `contract_amount` decimal(20, 2) NULL DEFAULT NULL COMMENT '合同段总金额',
+  `project_place` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '合同段工程位置',
+  `start_station` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '起始桩号',
+  `end_station` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '结束桩号',
+  `create_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `create_user` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_dept` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建部门',
+  `update_user` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人',
+  `update_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
+  `status` int(2) NULL DEFAULT NULL COMMENT '状态',
+  `is_deleted` int(2) NULL DEFAULT 0 COMMENT '是否已删除',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '合同段信息表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of m_contract_info
+-- ----------------------------
+SET FOREIGN_KEY_CHECKS = 1;

blade-service/blade-manager/src/main/java/sql/m_project_info.sql

@@ -0,0 +1,56 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : localhost
+ Source Server Type    : MySQL
+ Source Server Version : 50736
+ Source Host           : localhost:3306
+ Source Schema         : bladex
+
+ Target Server Type    : MySQL
+ Target Server Version : 50736
+ File Encoding         : 65001
+
+ Date: 23/05/2022 10:09:02
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for m_project_info
+-- ----------------------------
+DROP TABLE IF EXISTS `m_project_info`;
+CREATE TABLE `m_project_info`  (
+  `id` bigint(20) NOT NULL COMMENT '主键id',
+  `project_name` varchar(300) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '项目名称',
+  `project_alias` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '项目别名',
+  `project_number` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '项目编号',
+  `project_gist` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '项目大概',
+  `project_grade` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '工程等级',
+  `plan_start_time` datetime(0) NULL DEFAULT NULL COMMENT '计划开始时间',
+  `plan_end_time` datetime(0) NULL DEFAULT NULL COMMENT '计划完成时间',
+  `actual_start_time` datetime(0) NULL DEFAULT NULL COMMENT '实际开始时间',
+  `actual_end_time` datetime(0) NULL DEFAULT NULL COMMENT '实际完工时间',
+  `construcetion_date` int(5) NULL DEFAULT NULL COMMENT '施工期',
+  `estimated_amount` decimal(20, 2) NULL DEFAULT NULL COMMENT '建设合同金额',
+  `project_all_mileage` decimal(20, 0) NULL DEFAULT NULL COMMENT '项目总里程',
+  `project_pavement` decimal(20, 0) NULL DEFAULT NULL COMMENT '项目路面',
+  `project_subgrade` decimal(20, 0) NULL DEFAULT NULL COMMENT '项目路基',
+  `project_remark` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '项目备注',
+  `state` int(1) NULL DEFAULT NULL COMMENT '节点状态',
+  `is_open_sign` int(11) NULL DEFAULT NULL COMMENT '是否开启电签',
+  `create_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `create_user` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_dept` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建部门',
+  `update_user` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人',
+  `update_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
+  `status` int(2) NULL DEFAULT NULL COMMENT '状态',
+  `is_deleted` int(2) NULL DEFAULT 0 COMMENT '是否已删除',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '客户级项目表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of m_project_info
+-- ----------------------------
+SET FOREIGN_KEY_CHECKS = 1;

blade-service/blade-manager/src/main/java/sql/m_wbs_form_element.sql

@@ -0,0 +1,45 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : localhost
+ Source Server Type    : MySQL
+ Source Server Version : 50736
+ Source Host           : localhost:3306
+ Source Schema         : bladex
+
+ Target Server Type    : MySQL
+ Target Server Version : 50736
+ File Encoding         : 65001
+
+ Date: 23/05/2022 10:09:16
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for m_wbs_form_element
+-- ----------------------------
+DROP TABLE IF EXISTS `m_wbs_form_element`;
+CREATE TABLE `m_wbs_form_element`  (
+  `id` bigint(20) NOT NULL COMMENT '主键',
+  `f_id` bigint(20) NULL DEFAULT NULL COMMENT '表单id',
+  `e_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '元素名称',
+  `e_type` int(2) NULL DEFAULT NULL COMMENT '元素类型',
+  `e_length` int(30) NULL DEFAULT NULL COMMENT '元素长度',
+  `e_allow_deviation` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '允许偏差值',
+  `e_inspection_method` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '检查方法',
+  `create_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `create_user` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_dept` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建部门',
+  `update_user` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人',
+  `update_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
+  `status` int(2) NULL DEFAULT 0 COMMENT '状态是否启用 \'0\'启用 \'1\'禁用',
+  `is_deleted` int(2) NULL DEFAULT 0 COMMENT '是否已删除',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = 'wbs表单元素' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of m_wbs_form_element
+-- ----------------------------
+SET FOREIGN_KEY_CHECKS = 1;

blade-service/blade-manager/src/main/java/sql/m_wbs_info.sql

@@ -0,0 +1,42 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : localhost
+ Source Server Type    : MySQL
+ Source Server Version : 50736
+ Source Host           : localhost:3306
+ Source Schema         : bladex
+
+ Target Server Type    : MySQL
+ Target Server Version : 50736
+ File Encoding         : 65001
+
+ Date: 23/05/2022 10:09:24
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for m_wbs_info
+-- ----------------------------
+DROP TABLE IF EXISTS `m_wbs_info`;
+CREATE TABLE `m_wbs_info`  (
+  `id` bigint(20) NOT NULL COMMENT '主键id',
+  `wbs_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'wsb名称',
+  `wbs_type` int(2) NULL DEFAULT NULL COMMENT 'wsb属性',
+  `create_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `create_user` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_dept` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建部门',
+  `update_user` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人',
+  `update_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
+  `status` int(2) NULL DEFAULT 0 COMMENT '状态是否启用 \'0\'启用 \'1\'禁用',
+  `is_deleted` int(2) NULL DEFAULT 0 COMMENT '是否已删除',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = 'wbs动态库信息' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of m_wbs_info
+-- ----------------------------
+
+SET FOREIGN_KEY_CHECKS = 1;

blade-service/blade-manager/src/main/java/sql/m_wbs_tree.sql

@@ -0,0 +1,56 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : localhost
+ Source Server Type    : MySQL
+ Source Server Version : 50736
+ Source Host           : localhost:3306
+ Source Schema         : bladex
+
+ Target Server Type    : MySQL
+ Target Server Version : 50736
+ File Encoding         : 65001
+
+ Date: 23/05/2022 10:11:08
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for m_wbs_tree
+-- ----------------------------
+DROP TABLE IF EXISTS `m_wbs_tree`;
+CREATE TABLE `m_wbs_tree`  (
+  `id` bigint(20) NOT NULL COMMENT '主键id',
+  `wbs_id` bigint(20) NULL DEFAULT NULL COMMENT 'wbs库id',
+  `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID',
+  `parent_id` bigint(20) NULL DEFAULT 0 COMMENT '父主键',
+  `ancestors` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '祖级列表',
+  `dept_category` int(2) NULL DEFAULT NULL COMMENT '节点类型',
+  `dept_name` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '节点名',
+  `full_name` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '节点全称',
+  `sort` int(11) NULL DEFAULT NULL COMMENT '排序',
+  `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
+  `type` int(2) NULL DEFAULT NULL COMMENT '\'1\'节点 \'2\'表单',
+  `table_type` int(2) NULL DEFAULT NULL COMMENT '表单类型',
+  `create_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `create_user` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_dept` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建部门',
+  `update_user` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人',
+  `update_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
+  `status` int(2) NULL DEFAULT 0 COMMENT '状态',
+  `is_deleted` int(2) NULL DEFAULT 0 COMMENT '是否已删除',
+  `unique_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '唯一编号',
+  `partition_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '划分编号',
+  `is_expernode` int(2) NULL DEFAULT NULL COMMENT '是否是实验节点 \'0\'否 \'1\'是',
+  `is_concrete` int(2) NULL DEFAULT NULL COMMENT '是否有混泥土 \'0\'否 \'1\'是',
+  `table_owner` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '表单所属方',
+  `major_data_type` int(2) NULL DEFAULT NULL COMMENT '内业资料类型',
+  `init_table_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '初始化实体表名',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = 'wbs树节点表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of m_wbs_tree
+-- ----------------------------