客户端填报相关

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、type")
-    public R searchNodeAllTable(String primaryKeyId, String type) {
-        List<WbsTreeContract> list = iWbsTreeContractService.searchNodeAllTable(primaryKeyId, type);
+    @ApiOperation(value = "查询当前节点下所有元素表信息", notes = "传入节点primaryKeyId、type、合同段id、项目id")
+    public R searchNodeAllTable(String primaryKeyId, String type, String contractId, String projectId) {
+        List<WbsTreeContract> list = iWbsTreeContractService.searchNodeAllTable(primaryKeyId, type, contractId, projectId);
         if (list.size() > 0) {
             return R.data(list);
         }

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

@@ -19,6 +19,7 @@ package org.springblade.manager.mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.manager.dto.FindAllUserByConditionDTO;
 import org.springblade.manager.entity.ContractInfo;
+import org.springblade.manager.entity.ContractRelationJlyz;
 import org.springblade.manager.entity.WbsTree;
 import org.springblade.manager.vo.*;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -73,4 +74,11 @@ public interface ContractInfoMapper extends BaseMapper<ContractInfo> {
 
     List<WbsTreeContractVO3> selectLists(@Param("contractInfo") ContractInfo contractInfo, @Param("contractType") Integer contractType);
 
+    void insertContractRelationJLYZ(Long id, Long contractId, String contractIdSG);
+
+    List<ContractRelationJlyz> selectByContractRelationJlyz(Long id);
+
+    void deleteContractRelationJLYZ(Long id);
+
+
 }

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

@@ -82,4 +82,7 @@ public interface WbsTreeContractMapper extends BaseMapper<WbsTreeContract> {
 
     ContractInfo selectContractInfo(String contractId);
 
+    ContractRelationJlyz selectContractRelationInfoByidSG(String contractId);
+
+
 }

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

@@ -491,7 +491,7 @@
         AND status = 1
         AND is_deleted = 0
         <if test="contractIdRelation != null and contractIdRelation!= ''">
-            AND contract_id_relation = #{contractIdRelation}
+            AND contract_id = #{contractIdRelation}
         </if>
         <if test="tableOwnerList != null and tableOwnerList!= ''">
             AND table_owner in
@@ -522,5 +522,11 @@
         SELECT contract_name FROM  m_contract_info WHERE id = #{contractId}
     </select>
 
+    <select id="selectContractRelationInfoByidSG" resultType="org.springblade.manager.entity.ContractRelationJlyz">
+        SELECT *
+        FROM m_contract_relation_jlyz
+        WHERE contract_id_sg = #{contractId}
+    </select>
+
 
 </mapper>

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

@@ -22,7 +22,7 @@ public interface IWbsTreeContractService extends BaseService<WbsTreeContract> {
 
     List<WbsTreeContractTreeVO3> lazyTreeThree(String contractIdRelation, Long parentId, String contractId);
 
-    List<WbsTreeContract> searchNodeAllTable(String primaryKeyId, String tableOwner);
+    List<WbsTreeContract> searchNodeAllTable(String primaryKeyId, String tableOwner,String contractId, String projectId);
 
     List<WbsTreeContract> searchParentAllNode(long primaryKeyId, Long contractId);
 

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

@@ -314,7 +314,7 @@ public class WbsTreeContractServiceImpl
     }
 
     @Override
-    public List<WbsTreeContract> searchNodeAllTable(String primaryKeyId, String tableOwner) {
+    public List<WbsTreeContract> searchNodeAllTable(String primaryKeyId, String tableOwner, String contractId, String projectId) {
         //获取当前节点
         WbsTreeContract wbsTreeContract = baseMapper.selectOne(Wrappers.<WbsTreeContract>query().lambda()
                 .eq(WbsTreeContract::getPKeyId, primaryKeyId));
@@ -322,8 +322,8 @@ public class WbsTreeContractServiceImpl
             throw new ServiceException("未查询到数据");
         }
 
-        //获取当前项目合同段的角色roleId
-        SaveUserInfoByProject userInfo = baseMapper.selectRoleInfo(AuthUtil.getUserId(), wbsTreeContract.getContractId(), wbsTreeContract.getProjectId());
+        //获取当前项目合同段的角色roleId-默认查询施工合同段
+        SaveUserInfoByProject userInfo = baseMapper.selectRoleInfo(AuthUtil.getUserId(), contractId, projectId);
         String roleId = userInfo.getRoleId();
 
         //获取当前用户角色与表单所属方关系信息
@@ -347,11 +347,9 @@ public class WbsTreeContractServiceImpl
         }
 
         //根据tableOwnerList、tableOwnerNumber 获取当前节点下表单
-        List<WbsTreeContract> wbsTreeContractList = baseMapper.selectWbsTreeContractList(tableOwnerNumbers, wbsTreeContract.getProjectId(),
-                wbsTreeContract.getWbsId(), wbsTreeContract.getContractId(), wbsTreeContract.getId()
-                , wbsTreeContract.getContractIdRelation(), tableOwnerList);
+        return baseMapper.selectWbsTreeContractList(tableOwnerNumbers, wbsTreeContract.getProjectId(),
+                wbsTreeContract.getWbsId(), wbsTreeContract.getContractId(), wbsTreeContract.getId(), wbsTreeContract.getContractIdRelation(), tableOwnerList);
 
-        return wbsTreeContractList;
     }
 
     @Override