查询资料过滤状态为3的,新增节点时任何节点都要设置isTypePrivatePid

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

@@ -3695,9 +3695,9 @@ public R<Boolean> saveContractTreeNode(@RequestBody AddContractTreeNodeVO vo) {
                 newData.setContractIdRelation(treeContract.getContractIdRelation());
                 newData.setContractType(treeContract.getContractType());
                 newData.setCreateTime(new Date());
-                if (Optional.ofNullable(half.getNodeType()).orElse(7) <= 6) {
+                //if (Optional.ofNullable(half.getNodeType()).orElse(7) <= 6) {
                     newData.setIsTypePrivatePid(half.getPKeyId());
-                }
+                //}
                 if (half.getType() != null && new Integer("2").equals(half.getType())) {
                     //2023年8月1日14:41:03更改需求，isBussShow默认=1
                     newData.setIsBussShow(1);

blade-service/blade-business/src/main/java/org/springblade/business/mapper/InformationQueryMapper.java

@@ -76,7 +76,7 @@ public interface InformationQueryMapper extends BaseMapper<InformationQuery> {
      * @param classify 1施工2质检
      * @return 结果对象
      */
-    InformationQuery getInformationQueryByWbsId(@Param("wbsId") Long wbsId, @Param("classify") Integer classify);
+    InformationQuery getInformationQueryByWbsId(@Param("wbsId") Long wbsId, @Param("classify") Integer classify,@Param("contractId")String contractId);
 
     /**
      * 获取当前合同段下所有的上报批次

blade-service/blade-business/src/main/java/org/springblade/business/mapper/InformationQueryMapper.xml

@@ -546,6 +546,8 @@
         where is_deleted = 0
           and wbs_id = #{wbsId}
           and classify = #{classify}
+          and status !=3
+          and contract_id=#{contractId}
     </select>
 
     <select id="getReportNumberByContractId" resultMap="intResultMap">

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/InformationQueryServiceImpl.java

@@ -388,7 +388,7 @@ public class InformationQueryServiceImpl extends BaseServiceImpl<InformationQuer
             WbsTreeContract contractTree = this.wbsTreeContractClient.getContractWbsTreeByPrimaryKeyId(Long.parseLong(primaryKeyId));
 
             //判断当前填报节点下是否已经存在相应数据
-            InformationQuery oldData = this.baseMapper.getInformationQueryByWbsId(contractTree.getPKeyId(), classify);
+            InformationQuery oldData = this.baseMapper.getInformationQueryByWbsId(contractTree.getPKeyId(), classify,contractTree.getContractId());
 
             if (oldData != null) {
                 //存在记录，修改