修改BUG

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.springblade.business.entity.ConstructionLedger;
-import org.springblade.business.entity.InformationQuery;
 import org.springblade.business.feign.ConstructionLedgerFeignClient;
 import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.log.exception.ServiceException;
@@ -28,9 +27,7 @@ import java.util.stream.Collectors;
 
 @Service
 @AllArgsConstructor
-public class WbsTreeContractServiceImpl
-        extends BaseServiceImpl<WbsTreeContractMapper, WbsTreeContract>
-        implements IWbsTreeContractService {
+public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractMapper, WbsTreeContract> implements IWbsTreeContractService {
 
     private final ConstructionLedgerFeignClient constructionLedgerFeign;
     private final WbsTreePrivateMapper wbsTreePrivateMapper;
@@ -300,8 +297,7 @@ public class WbsTreeContractServiceImpl
         return diff;
     }
 
-    private List<WbsTreeContract> findAllNodeList(String wbsTreeIds, String projectId, String contractId, String
-            wbsId) {
+    private List<WbsTreeContract> findAllNodeList(String wbsTreeIds, String projectId, String contractId, String wbsId) {
         String[] ids = wbsTreeIds.split(",");
         List<Long> idList = new ArrayList<>();
         List<WbsTreeContract> list = new ArrayList<>();
@@ -319,8 +315,7 @@ public class WbsTreeContractServiceImpl
     }
 
     @Override
-    public List<WbsTreeContractTreeVO> lazyTreeTwo(String contractIdRelation, Long parentId, Integer
-            contractType, String contractId) {
+    public List<WbsTreeContractTreeVO> lazyTreeTwo(String contractIdRelation, Long parentId, Integer contractType, String contractId) {
         return ForestNodeMerger.merge(baseMapper.lazyTreeTwo(contractIdRelation, parentId, contractType, contractId));
     }
 

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

@@ -55,7 +55,6 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
     private final ContractInfoMapper contractInfoMapper;
     private final FormulaMapper formulaMapper;
 
-
     @Override
     public IPage<WbsTreeVO> selectWbsTreePage(IPage<WbsTreeVO> page, WbsTreeVO wbsTree) {
         return page.setRecords(baseMapper.selectWbsTreePage(page, wbsTree));
@@ -295,7 +294,6 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         return baseMapper.deleteLogicById(id) > 0;
     }
 
-
     private Boolean initTable(String tableName) {
         Integer row = baseMapper.createTable(tableName);
         if (row >= 0) {
@@ -481,100 +479,6 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         }
     }
 
-    private boolean importExcel(ArrayList<Map<String, String>> result, WbsTree wbsTreeFu, WbsTree wbsTree1) {
-        //解析
-        result.stream().forEach(map -> {
-            map.forEach((nodeType, nodeName) -> {
-                if (StringUtils.isNotEmpty(nodeName)) {
-                    //初始化节点参数
-                    WbsTree wbsTreeZi = new WbsTree();
-                    wbsTreeZi.setId(SnowFlakeUtil.getId());
-                    wbsTreeZi.setTenantId(AuthUtil.getTenantId());
-                    wbsTreeZi.setDeptName(nodeName);
-                    wbsTreeZi.setDeptCategory(Integer.valueOf(nodeType));
-                    wbsTreeZi.setWbsId(wbsTreeFu.getWbsId());
-                    wbsTreeZi.setParentId(wbsTreeFu.getParentId());
-                    wbsTreeZi.setAncestors(wbsTreeFu.getAncestors());
-                    wbsTreeZi.setProjectNodeId(wbsTree1.getProjectNodeId());
-                    //新增节点返回 未创建成功为wbsTree对象、成功为null
-                    WbsTree wbsTree = importTree(wbsTreeZi);
-
-                    if (wbsTree == null) {
-                        //后置赋值
-                        Long id = wbsTreeZi.getId();
-                        StringBuilder stringBuffer = new StringBuilder();
-                        StringBuilder appendStr = stringBuffer.append(",").append(wbsTreeZi.getParentId());
-                        String ancestors = wbsTreeZi.getAncestors() + appendStr;
-                        //修改节点ancestors
-                        updateData(ancestors, id);
-                        wbsTreeFu.setParentId(id);
-                        wbsTreeFu.setAncestors(ancestors);
-
-                    } else {
-
-                        wbsTreeFu.setParentId(wbsTree.getId());
-                        wbsTreeFu.setAncestors(wbsTree.getAncestors());
-
-                    }
-                }
-            });
-        });
-
-        //修改projectNodeId
-        int i = baseMapper.updateById(wbsTree1);
-        return i > 0;
-
-    }
-
-    private WbsTree importTree(WbsTree wbsTreeZi) {
-        //判断节点名称是否重复
-        List<WbsTree> wbsTrees = baseMapper.selectList(Wrappers.<WbsTree>query().lambda()
-                .eq(WbsTree::getWbsId, wbsTreeZi.getWbsId())
-                .eq(WbsTree::getDeptName, wbsTreeZi.getDeptName())
-                .eq(WbsTree::getDeptCategory, wbsTreeZi.getDeptCategory())
-                .eq(WbsTree::getProjectNodeId, wbsTreeZi.getProjectNodeId())
-                .ne(WbsTree::getAncestors, wbsTreeZi.getAncestors())
-        );
-
-        WbsTree trees = null;
-
-        if (wbsTrees.size() <= 0) { //不重复-直接新增
-            wbsTreeZi.setStatus(1);
-            wbsTreeZi.setType(1);
-            wbsTreeZi.setMajorDataType(0);
-            if (wbsTreeZi.getDeptCategory() == 6) {
-                wbsTreeZi.setIsConcrete(0);
-                wbsTreeZi.setIsExpernode(0);
-            }
-
-            baseMapper.insert(wbsTreeZi);
-
-        } else { //重复-判断是否同级,同级跳过,不同级新增
-            //获取当前相同节点对象信息
-            for (WbsTree tree : wbsTrees) {
-                //判断2 3 4 5 6级节点类型的名称是否重复,可根据实际情况更改控制的层级
-                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);
-                        wbsTreeZi.setMajorDataType(0);
-                        if (wbsTreeZi.getDeptCategory() == 6) {
-                            wbsTreeZi.setIsConcrete(0);
-                            wbsTreeZi.setIsExpernode(0);
-                        }
-                        baseMapper.insert(wbsTreeZi);
-                        break;
-                    }
-                }
-                trees = tree;
-            }
-        }
-
-        return trees;
-    }
-
     private boolean importExcel2(ArrayList<Map<String, String>> result, WbsTree wbsTreeFu, WbsTree wbsTree1) {
         List<WbsTree> allNodeData = new ArrayList<>();
         //解析
@@ -1013,7 +917,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                 if (pawDTO.getReferenceType().equals("public")) {
                     List<Long> ids1 = delIds.stream().map(Long::parseLong).collect(Collectors.toList());
                     //判断是否被合同段引用
-                    List<WbsTreeContract> wbsTreeContractList = wbsTreeContractMapper.selectContractList(pawDTO.getWbsId(),pawDTO.getProjectId(),ids1);
+                    List<WbsTreeContract> wbsTreeContractList = wbsTreeContractMapper.selectContractList(pawDTO.getWbsId(), pawDTO.getProjectId(), ids1);
 
                     if (wbsTreeContractList.size() > 0) {
                         List<ContractInfo> contractInfoArrayList = new ArrayList<>();
@@ -1246,6 +1150,9 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         wbsTreeContract.setExcelId(wbsTree.getExcelId());
         wbsTreeContract.setHtmlUrl(wbsTree.getHtmlUrl());
         wbsTreeContract.setIsBussShow(1);
+        if (wbsTree.getType() == 2) {
+            wbsTreeContract.setIsTypePrivatePid(wbsTree.getPKeyId());
+        }
         return wbsTreeContract;
     }