修改初始化实体表p_key_id、group_id

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

@@ -28,7 +28,9 @@
 
     <update id="createTable">
         create table ${newTableName} (
-        `id` bigint(20) NOT NULL,
+        `id` bigint(20) NOT NULL COMMENT '主键id',
+        `p_key_id` bigint(20) COMMENT '合同段wbs树表单的p_key_id',
+        `group_id` bigint(20) COMMENT '分组id',
          ${sqlStr}
          PRIMARY KEY (`id`) USING BTREE
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8
@@ -59,7 +61,7 @@
         select * from m_wbs_form_element where is_deleted = 0
     </select>
     <select id="judgeFiled" resultType="Integer">
-     select count(*) from information_schema.columns where table_name = &quot;${tableName}&quot; and column_name = &quot;${eKey}&quot;
+        select count(*) from information_schema.columns where table_name = &quot;${tableName}&quot; and column_name = &quot;${eKey}&quot;
     </select>
 
     <select id="selectWbsTreeTableListByParentId" resultType="org.springblade.manager.dto.WbsFormElementDTO2">

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

@@ -199,6 +199,8 @@
     <update id="createTable">
         create table ${newTableName} (
         `id` bigint(20) NOT NULL,
+        `p_key_id` bigint(20) COMMENT '合同段wbs表的p_key_id',
+        `group_id` bigint(20) COMMENT '分组id',
          PRIMARY KEY (`id`) USING BTREE
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8
     </update>

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

@@ -600,6 +600,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
     private boolean importExcel2(ArrayList<Map<String, String>> result, WbsTree wbsTreeFu, WbsTree wbsTree1) {
         List<WbsTree> allNodeData = new ArrayList<>();
         //解析
+        int sortNumber = 1;
         for (Map<String, String> map : result) {
             for (Map.Entry<String, String> maps : map.entrySet()) {
                 if (StringUtils.isNotEmpty(maps.getValue())) {
@@ -629,16 +630,18 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                         wbsTreeFu.setParentId(id);
                         wbsTreeFu.setAncestors(ancestors);
 
+                        wbsTreeZi.setSort(sortNumber);
+                        sortNumber++;
+
+                        //结果集
+                        allNodeData.add(wbsTreeZi);
+
                     } else {
                         //相同节点参数跳过
                         wbsTreeFu.setParentId(wbsTree.getId());
                         wbsTreeFu.setAncestors(wbsTree.getAncestors());
 
                     }
-
-                    //结果集
-                    allNodeData.add(wbsTreeZi);
-
                 }
             }
         }
@@ -648,27 +651,22 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
     }
 
     private WbsTree buildTreeNode(WbsTree wbsTreeZi, List<WbsTree> allNodeData) {
-        /*List<WbsTree> wbsTrees = new ArrayList<>();
+        List<WbsTree> wbsTrees = new ArrayList<>();
         //判重
         for (WbsTree tree : allNodeData) {
             if (tree.getDeptName().equals(wbsTreeZi.getDeptName())
                     && tree.getWbsId().equals(wbsTreeZi.getWbsId())
                     && tree.getDeptCategory().equals(wbsTreeZi.getDeptCategory())
-                    && tree.getProjectNodeId().equals(wbsTreeZi.getProjectNodeId())
-                    && !tree.getAncestors().equals(wbsTreeZi.getAncestors())) {
+                    && tree.getProjectNodeId().equals(wbsTreeZi.getProjectNodeId())) {
                 //判断上级节点不同，当前节点名相同的tree选择问题，例如：第X跨的上级有上部构造现场浇筑、上部构造预制和安装，导致下方新增重复节点判断时找到的是前一个
-                wbsTrees.add(tree);
-                break;
+                if (!tree.getAncestors().equals(wbsTreeZi.getAncestors())) {
+                    wbsTrees.add(tree);
+                    break;
+                } else if (!tree.getParentId().equals(wbsTreeZi.getParentId())) {
+                    //TODO
+                }
             }
-        }*/
-
-        List<WbsTree> wbsTrees = allNodeData.stream().filter(f ->
-                f.getWbsId().equals(wbsTreeZi.getWbsId()) &&
-                        f.getDeptName().equals(wbsTreeZi.getDeptName()) &&
-                        f.getDeptCategory().equals(wbsTreeZi.getDeptCategory()) &&
-                        f.getProjectNodeId().equals(wbsTreeZi.getProjectNodeId()) &&
-                        !f.getAncestors().equals(wbsTreeZi.getAncestors())
-        ).collect(Collectors.toList());
+        }
 
         WbsTree wbsTree = null;
 
@@ -688,7 +686,6 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
             for (WbsTree tree : wbsTrees) {
                 if (wbsTreeZi.getDeptCategory() == 2 || wbsTreeZi.getDeptCategory() == 3
                         || wbsTreeZi.getDeptCategory() == 4 || wbsTreeZi.getDeptCategory() == 5 || wbsTreeZi.getDeptCategory() == 6) {
-
                     if (!wbsTreeZi.getParentId().equals(tree.getParentId()) && wbsTreeZi.getDeptName().equals(tree.getDeptName())) {
                         wbsTreeZi.setStatus(1);
                         wbsTreeZi.setType(1);
@@ -697,7 +694,6 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                             wbsTreeZi.setIsConcrete(0);
                             wbsTreeZi.setIsExpernode(0);
                         }
-                        // wbsTree = null;
                         break;
                     }
                 }

blade-service/blade-manager/src/main/java/org/springblade/manager/wrapper/ProjectInfoWrapper.java

@@ -31,25 +31,18 @@ import java.util.Objects;
  * @author liuyc
  * @since 2022-04-13
  */
-public class ProjectInfoWrapper extends BaseEntityWrapper<ProjectInfo, ProjectInfoVO>  {
+public class ProjectInfoWrapper extends BaseEntityWrapper<ProjectInfo, ProjectInfoVO> {
 
-	public static ProjectInfoWrapper build() {
-		return new ProjectInfoWrapper();
- 	}
+    public static ProjectInfoWrapper build() {
+        return new ProjectInfoWrapper();
+    }
 
-	@Override
-	public ProjectInfoVO entityVO(ProjectInfo projectInfo) {
-		ProjectInfoVO projectInfoVO = Objects.requireNonNull(BeanUtil.copy(projectInfo, ProjectInfoVO.class));
+    @Override
+    public ProjectInfoVO entityVO(ProjectInfo projectInfo) {
+        ProjectInfoVO projectInfoVO = Objects.requireNonNull(BeanUtil.copy(projectInfo, ProjectInfoVO.class));
+        //projectInfoVO.setProjectName(projectInfoVO.getProjectAlias());
 
-		//User createUser = UserCache.getUser(projectInfo.getCreateUser());
-		//User updateUser = UserCache.getUser(projectInfo.getUpdateUser());
-		//projectInfoVO.setCreateUserName(createUser.getName());
-		//projectInfoVO.setCreateUserInfo(createUser);
-		//projectInfoVO.setUpdateUserName(updateUser.getName());
-		//System.out.println(createUser);
-
-
-		return projectInfoVO;
-	}
+        return projectInfoVO;
+    }
 
 }