소스 검색

修改新增复制节点的操作记录,新增批量复制节点操作记录

qianxb 2 년 전
부모
커밋
959d1582df

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

@@ -1443,7 +1443,7 @@ public class InformationWriteQueryController extends BladeController {
                     }
                 });
             }
-
+            needCopyNode.setNodeName(vo.getNeedCopyNodeName());
             //复制保存节点、表信息
             R<Boolean> booleanR = this.saveOrCopyNodeTree(saveList, saveLedger, 32, needCopyNode);
 
@@ -1636,8 +1636,15 @@ public class InformationWriteQueryController extends BladeController {
                         //更新redis缓存
                         informationQueryService.delAsyncWbsTree(contractId);
                     }
-
-                    return R.success("操作成功");
+                    StringBuilder addNames = new StringBuilder();
+                    addNames.append("[");
+                    for (WbsTreeContract node : toCopyNodes) {
+                        addNames.append(node.getNodeName()+"-");
+                    }
+                    String substring = addNames.substring(0, addNames.length() - 1);
+                    needCopyNodeRoot.setNodeName(substring+"]");
+//                    return R.success("操作成功");
+                    return this.saveOrCopyNodeTree(addNodeList, null, 32, needCopyNodeRoot);
                 } else {
                     throw new ServiceException("没有找到需要复制的节点信息,请联系管理员");
                 }
@@ -2751,7 +2758,7 @@ public class InformationWriteQueryController extends BladeController {
                 }
             });
         }
-
+        treeContract.setNodeName(vo.getAllSelectedList().get(0).getNodeName());
         R<Boolean> booleanR = this.saveOrCopyNodeTree(saveList, saveLedger, 2, treeContract);
 
         //更新redis
@@ -2807,8 +2814,8 @@ public class InformationWriteQueryController extends BladeController {
                     operationType, WbsTreeContract currentNode) {
 
         if (saveList.size() > 0) {
-            StringBuilder str = new StringBuilder();
-            str.append("-" + saveList.get(0).getFullName());
+//            StringBuilder str = new StringBuilder();
+//            str.append("-" + saveList.get(0).getFullName());
             //保存施工日志
             /*if (saveLedger.size() > 0) {
                 this.constructionLedgerService.saveBatch(saveLedger, 1000);
@@ -2826,11 +2833,11 @@ public class InformationWriteQueryController extends BladeController {
                 result.add(currentNode);
                 this.queryParentNode(currentNode, result);
                 StringBuilder pathName = new StringBuilder();
-                for (int i = 1, l = result.size(); i <= l; i++) {
+                for (int i = 1, l = result.size(); i < l; i++) {
                     WbsTreeContract node = result.get(result.size() - i);
                     pathName.append("-").append(StringUtils.isNotEmpty(node.getFullName()) ? node.getFullName() : node.getNodeName());
                 }
-                pathName.append(str);
+                pathName.append("-"+currentNode.getNodeName());
                 JSONObject json = new JSONObject();
                 json.put("operationObjIds", JSONArray.parseArray(JSONObject.toJSONString(saveList.stream().map(WbsTreeContract::getPKeyId).distinct().collect(Collectors.toList())), String.class));
                 json.put("operationObjName", pathName.substring(1));