cr преди 1 ден
родител
ревизия
4805180d28

+ 12 - 0
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/SaveBatchWbsTreeDTO.java

@@ -0,0 +1,12 @@
+package org.springblade.manager.dto;
+
+import lombok.Data;
+import org.springblade.manager.vo.ExcelTabVO2;
+
+import java.util.List;
+@Data
+public class SaveBatchWbsTreeDTO {
+    private List<ExcelTabVO2> list;
+    private Long nodeId;
+    private Long wbsId;
+}

+ 3 - 2
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreeController.java

@@ -23,6 +23,7 @@ import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.manager.dto.FormElementDTO;
+import org.springblade.manager.dto.SaveBatchWbsTreeDTO;
 import org.springblade.manager.dto.WbsTreeDTO;
 import org.springblade.manager.dto.WbsTreeDTO2;
 import org.springblade.manager.entity.*;
@@ -590,8 +591,8 @@ public class WbsTreeController extends BladeController {
 
     @PostMapping("/saveBatchWbsTree")
     @ApiOperation("批量保存系统wbs表单")
-    public R saveBatchWbsTree(@RequestBody List<ExcelTabVO2> list,Long nodeId,Long wbsId){
-        return wbsTreeService.saveBatchWbsTree(list,nodeId,wbsId);
+    public R saveBatchWbsTree(@RequestBody SaveBatchWbsTreeDTO dto){
+        return wbsTreeService.saveBatchWbsTree(dto);
     }
 
 }

+ 2 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/service/IWbsTreeService.java

@@ -4,6 +4,7 @@ import org.springblade.core.mp.base.BaseService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.tool.api.R;
 import org.springblade.manager.dto.FormElementDTO;
+import org.springblade.manager.dto.SaveBatchWbsTreeDTO;
 import org.springblade.manager.dto.WbsTreeContractDTO;
 import org.springblade.manager.dto.WbsTreeDTO2;
 import org.springblade.manager.entity.WbsTree;
@@ -84,5 +85,5 @@ public interface IWbsTreeService extends BaseService<WbsTree> {
 
     boolean copyNode(List<Long> leftIds, List<Long> rightIds);
 
-    R saveBatchWbsTree(List<ExcelTabVO2> list,Long nodeId,Long wbsId);
+    R saveBatchWbsTree(SaveBatchWbsTreeDTO dto);
 }

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

@@ -657,20 +657,20 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
     }
 
     @Override
-    public R saveBatchWbsTree(List<ExcelTabVO2> list,Long nodeId,Long wbsId) {
+    public R saveBatchWbsTree(SaveBatchWbsTreeDTO dto) {
         List<WbsTree>insertList=new ArrayList<>();
-        WbsTree parentNode = this.getById(nodeId);
+        WbsTree parentNode = this.getById(dto.getNodeId());
         String tenantId = AuthUtil.getTenantId();
         if(parentNode==null){
             return R.fail(201, "父节点不存在");
         }
-        Integer maxSort=this.baseMapper.getMaxSort(nodeId);
-        for (ExcelTabVO2 vo2 : list) {
+        Integer maxSort=this.baseMapper.getMaxSort(dto.getNodeId());
+        for (ExcelTabVO2 vo2 : dto.getList()) {
             WbsTree wbsTree = new WbsTree();
             wbsTree.setId(SnowFlakeUtil.getId());
-            wbsTree.setWbsId(wbsId+"");
+            wbsTree.setWbsId(dto.getWbsId()+"");
             wbsTree.setTenantId(tenantId);
-            wbsTree.setParentId(nodeId);
+            wbsTree.setParentId(dto.getNodeId());
             wbsTree.setAncestors(parentNode.getAncestors()+","+parentNode.getId());
             wbsTree.setNodeType(1);
             wbsTree.setNodeName(vo2.getElementTableName());