试验重签，底层节点

blade-service-api/blade-business-api/src/main/java/org/springblade/business/dto/CustomAddContractNodeDTO.java

@@ -45,4 +45,7 @@ public class CustomAddContractNodeDTO implements Serializable {
     @ApiModelProperty(value = "自定义数字化节点的内页资料类型")
     private Integer majorDataType;
 
+    @ApiModelProperty(value = "新加的自定义划分编号")
+    private String newPartitionCode;
+
 }

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

@@ -1357,7 +1357,7 @@ public R<Object> batchTask(@RequestBody StartTaskVO startTaskVO) {
             Map<Long, Long> mapKey = new HashMap<>();
             if (queryList.size() == 0) {
                 //试验填报数据
-                queryList = new ArrayList<>(this.informationQueryService.list(Wrappers.<InformationQuery>lambdaQuery().in(InformationQuery::getWbsId, Arrays.asList(ids))));
+                queryList = new ArrayList<>(this.informationQueryService.list(Wrappers.<InformationQuery>lambdaQuery().in(InformationQuery::getWbsId, Arrays.asList(ids)).eq(InformationQuery::getContractId,startTaskVO.getContractId())));
                 //重新绑定trialSelfInspectionRecordId使用map
                 if (appType == 1L) { // 试验上报
                     for (InformationQuery informationQuery : queryList) {
@@ -4091,7 +4091,11 @@ public R<Object> customAddContractNode(@RequestBody CustomAddContractNodeDTO dto
                 obj.setNodeType(parentNode.getNodeType().equals(6) ? 6 : dto.getNodeType());
             }
         }
-        obj.setPartitionCode(dto.getPartitionCode());
+        if(dto.getNewPartitionCode()!=null&&!dto.getNewPartitionCode().equals("")){
+            obj.setPartitionCode(dto.getNewPartitionCode());
+        }else {
+            obj.setPartitionCode(dto.getPartitionCode());
+        }
         obj.setParentId(parentNode.getId());
         obj.setAncestors(parentNode.getAncestors() + "," + parentNode.getId());
         obj.setType(1);

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

@@ -139,5 +139,14 @@ public class NodeBaseInfoController extends BladeController {
         return R.data(nodeBaseInfoService.getNodeBaseInfoByPkeyId(pkeyId,nodeId,autoType,min,max));
     }
 
+	@GetMapping("/getAllNodeBaseInfoByPkeyId")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "自动获取表单所有的参数库数据", notes = "pkeyId表单Id")
+	public R getAllNodeBaseInfoByPkeyId(@RequestParam Long pkeyId){
+		return R.data(nodeBaseInfoService.getAllNodeBaseInfoByPkeyId(pkeyId));
+	}
+
+
+
 
 }

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

@@ -22,6 +22,7 @@ import org.springblade.core.mp.base.BaseService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import java.math.BigDecimal;
+import java.util.Map;
 
 /**
  *  服务类
@@ -43,4 +44,6 @@ public interface INodeBaseInfoService extends BaseService<NodeBaseInfo> {
     NodeBaseInfo getOrSaveNodeBaseInfo(Long pKeyId);
 
     Object getNodeBaseInfoByPkeyId(Long pkeyId, Long nodeId, Integer autoType, BigDecimal min,BigDecimal max);
+
+	Map<String,Object> getAllNodeBaseInfoByPkeyId(Long pkeyId);
 }

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

@@ -33,7 +33,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 /**
  *  服务实现类
@@ -154,4 +156,9 @@ public class NodeBaseInfoServiceImpl extends BaseServiceImpl<NodeBaseInfoMapper,
         return result;
     }
 
+    @Override
+    public Map<String, Object> getAllNodeBaseInfoByPkeyId(Long pkeyId) {
+        return Collections.emptyMap();
+    }
+
 }