Merge branch 'master' of http://121.41.40.202:3000/zhuwei/bladex

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

@@ -32,4 +32,9 @@ public class WbsTreePrivateDTO3 implements Serializable {
      * 填报率
      */
     private String fillRate;
+
+    /**
+     * 节点类型
+     */
+    private String nodeType;
 }

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

@@ -91,4 +91,6 @@ public class WbsNodeTableVO implements Serializable {
 
     private String htmlUrl;
 
+    private String nodeType;
+
 }

blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -2794,6 +2794,10 @@ public class InformationWriteQueryController extends BladeController {
 
         //获取父节点信息
         informationQueryService.AsyncWbsTree(queries.getParentId() + "", queries.getParentId() + "", queries.getContractId(), "", "1");
+
+        //更新redis
+        this.informationQueryService.delAsyncWbsTree(queries.getContractId());
+
         return R.data(aBoolean);
     }
 
@@ -3163,14 +3167,13 @@ public class InformationWriteQueryController extends BladeController {
         treeContract.setNodeName(vo.getAllSelectedList().get(0).getNodeName());
         R<Boolean> booleanR = this.saveOrCopyNodeTree(saveList, saveLedger, 2, treeContract);
 
-        //更新redis
-        informationQueryService.AsyncWbsTree(treeContract.getId() + "", treeContract.getId() + "", treeContract.getContractId(), "", "1");
-        informationQueryService.AsyncWbsTree(treeContract.getParentId() + "", treeContract.getParentId() + "", treeContract.getContractId(), "", "1");
-
         //获取电签信息、默认信息
         List<WbsTreeContract> nowTabs = saveList.stream().filter(f -> new Integer(2).equals(f.getType())).collect(Collectors.toList());
         this.updateTextDictInfos(nowTabs, oldTabIds, vo.getProjectId());
 
+        //更新redis
+        informationQueryService.delAsyncWbsTree(treeContract.getContractId());
+
         return booleanR;
     }
 

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

@@ -1,5 +1,7 @@
 package org.springblade.manager.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.spire.xls.*;
@@ -204,7 +206,7 @@ public class WbsTreeContractController extends BladeController {
             parentId = primaryKeyId;
         }
         List<WbsTreeContractLazyVO> vos;
-        /*String dataInfoId;
+        String dataInfoId;
         if (("1").equals(classifyType)) {
             dataInfoId = contractId + "_" + parentId + "_" + classifyType + "_" + tableOwner;
         } else {
@@ -213,13 +215,13 @@ public class WbsTreeContractController extends BladeController {
         Object data = redisTemplate.opsForValue().get("blade-manager::contract:wbstree:" + dataInfoId);
         if (data != null) {
             vos = JSON.parseArray(data.toString(), WbsTreeContractLazyVO.class);
-        } else {*/
+        } else {
         vos = iWbsTreeContractService.lazyQueryContractWbsTree(parentId, contractId, contractIdRelation, tableOwner);
-            /*if (vos != null) {
+            if (vos != null) {
                 JSONArray array = JSONArray.parseArray(JSON.toJSONString(vos));
                 redisTemplate.opsForValue().set("blade-manager::contract:wbstree:" + dataInfoId, JSON.toJSON(array).toString());
             }
-        }*/
+        }
         return R.data(vos);
     }
 

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

@@ -478,6 +478,7 @@
                wt.excel_id                                                                          AS excelId,
                wt.sort,
                wt.status,
+               wt.node_type                                                                         AS nodeType,
                wt.fill_rate                                                                         AS "fillRate",
                wt.html_url                                                                          AS htmlUrl,
                (SELECT count(1)

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

@@ -335,6 +335,7 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                         .set(WbsTreePrivate::getTableType, list.getTableType())
                         .set(WbsTreePrivate::getTableOwner, list.getTableOwner())
                         .set(WbsTreePrivate::getFillRate, list.getFillRate())
+                        .set(WbsTreePrivate::getNodeType, list.getNodeType())
                         .eq(WbsTreePrivate::getPKeyId, list.getPKeyId())
                 );
             });