项目wbs保存相关

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

@@ -33,9 +33,9 @@ public class WbsTreeContractController extends BladeController {
 
     @GetMapping("/searchNodeAllTable")
     @ApiOperationSupport(order = 1)
-    @ApiOperation(value = "查询当前节点下所有元素表信息", notes = "传入节点primaryKeyId")
-    public R searchNodeAllTable(String primaryKeyId) {
-        List<WbsTreeContract> list = iWbsTreeContractService.searchNodeAllTable(primaryKeyId);
+    @ApiOperation(value = "查询当前节点下所有元素表信息", notes = "传入节点primaryKeyId、type")
+    public R searchNodeAllTable(String primaryKeyId,String typeOwner) {
+        List<WbsTreeContract> list = iWbsTreeContractService.searchNodeAllTable(primaryKeyId,typeOwner);
         if (list.size() > 0) {
             return R.data(list);
         }

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

@@ -400,6 +400,7 @@
         WHERE
             id = #{id}
         OR (parent_id = #{id} and type = 2)
+        AND is_deleted = 0 AND status = 1
     </select>
 
     <select id="selectByWbsId" resultType="org.springblade.manager.entity.WbsTree">

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IWbsTreeContractService.java

@@ -22,7 +22,7 @@ public interface IWbsTreeContractService extends BaseService<WbsTreeContract> {
 
     List<WbsTreeContractTreeVO> lazyTreeTwo(String contractIdRelation, Long parentId, Integer contractType, String contractId);
 
-    List<WbsTreeContract> searchNodeAllTable(String primaryKeyId);
+    List<WbsTreeContract> searchNodeAllTable(String primaryKeyId,String typeOwner);
 
     List<WbsTreeContract> searchParentAllNode(long primaryKeyId,Long contractId);
 }

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

@@ -279,7 +279,7 @@ public class WbsTreeContractServiceImpl
     }
 
     @Override
-    public List<WbsTreeContract> searchNodeAllTable(String primaryKeyId) {
+    public List<WbsTreeContract> searchNodeAllTable(String primaryKeyId, String typeOwner) {
         WbsTreeContract wbsTreeContract = baseMapper.selectOne(Wrappers.<WbsTreeContract>query().lambda()
                 .eq(WbsTreeContract::getPKeyId, primaryKeyId));
         //获取当前节点下表单
@@ -288,28 +288,36 @@ public class WbsTreeContractServiceImpl
         }
         if (StringUtils.isNotEmpty(wbsTreeContract.getContractIdRelation())) {
             //监理 业主
-            List<WbsTreeContract> wbsTreeContracts = baseMapper.selectList(Wrappers.<WbsTreeContract>query().lambda()
-                    .eq(WbsTreeContract::getProjectId, wbsTreeContract.getProjectId())
-                    .eq(WbsTreeContract::getWbsId, wbsTreeContract.getWbsId())
-                    .eq(WbsTreeContract::getContractId, wbsTreeContract.getContractId())
-                    .eq(WbsTreeContract::getType, 2)
-                    .eq(WbsTreeContract::getParentId, wbsTreeContract.getId())
-                    .eq(WbsTreeContract::getContractIdRelation, wbsTreeContract.getContractIdRelation())
-            );
-            return wbsTreeContracts;
+            if (typeOwner != null) {
+                List<WbsTreeContract> wbsTreeContracts = baseMapper.selectList(Wrappers.<WbsTreeContract>query().lambda()
+                        .eq(WbsTreeContract::getProjectId, wbsTreeContract.getProjectId())
+                        .eq(WbsTreeContract::getWbsId, wbsTreeContract.getWbsId())
+                        .eq(WbsTreeContract::getContractId, wbsTreeContract.getContractId())
+                        .eq(WbsTreeContract::getType, 2)
+                        .eq(WbsTreeContract::getParentId, wbsTreeContract.getId())
+                        .eq(WbsTreeContract::getContractIdRelation, wbsTreeContract.getContractIdRelation())
+                        .eq(WbsTreeContract::getTableOwner, typeOwner)
+                );
+                return wbsTreeContracts;
+            }
         } else {
             //施工
-            List<WbsTreeContract> wbsTreeContracts = baseMapper.selectList(Wrappers.<WbsTreeContract>query().lambda()
-                    .eq(WbsTreeContract::getProjectId, wbsTreeContract.getProjectId())
-                    .eq(WbsTreeContract::getWbsId, wbsTreeContract.getWbsId())
-                    .eq(WbsTreeContract::getContractId, wbsTreeContract.getContractId())
-                    .eq(WbsTreeContract::getType, 2)
-                    .eq(WbsTreeContract::getParentId, wbsTreeContract.getId())
-            );
-            return wbsTreeContracts;
+            if (typeOwner != null) {
+                List<WbsTreeContract> wbsTreeContracts = baseMapper.selectList(Wrappers.<WbsTreeContract>query().lambda()
+                        .eq(WbsTreeContract::getProjectId, wbsTreeContract.getProjectId())
+                        .eq(WbsTreeContract::getWbsId, wbsTreeContract.getWbsId())
+                        .eq(WbsTreeContract::getContractId, wbsTreeContract.getContractId())
+                        .eq(WbsTreeContract::getType, 2)
+                        .eq(WbsTreeContract::getParentId, wbsTreeContract.getId())
+                        .eq(WbsTreeContract::getTableOwner, typeOwner)
+                );
+                return wbsTreeContracts;
+            }
         }
+        throw new ServiceException("未查询到数据");
     }
 
+
     @Override
     public List<WbsTreeContract> searchParentAllNode(long primaryKeyId, Long contractId) {
         return baseMapper.searchParentAllNode(primaryKeyId, contractId);