Ver código fonte

质检-表单设置
1、添加接口调整

LHB 6 dias atrás
pai
commit
36cc4adc34

+ 4 - 0
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/FormulaReferenceDTO.java

@@ -30,4 +30,8 @@ public class FormulaReferenceDTO {
     @ApiModelProperty(value = "状态 0禁用 1启用",required = true)
     @NotNull(message = "状态不能为空")
     private Integer status;
+
+        @ApiModelProperty(value = "类型 1-质检 2-试验",required = true)
+    @NotNull(message = "类型")
+    private Integer type;
 }

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

@@ -6134,8 +6134,12 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
     public void setFormulaReference(FormulaReferenceDTO dto) {
         try {
             dto.setKey(dto.getKey().split("__")[0]);
-            //查询父节点
-            WbsTreeContract parentNode = wbsTreeContractMapper.selectById(dto.getPId());
+            WbsTreeContract parentNode = null;
+            if(dto.getType() == 1){
+                //查询父节点
+                parentNode = wbsTreeContractMapper.selectById(dto.getPId());
+            }
+
             //查询父节点的扩展信息
             WbsTreeContractExtend byId = wbsTreeContractExtendService.getById(dto.getPKeyId());
 
@@ -6159,11 +6163,19 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
             }else{
                 if(dto.getStatus() == 0){
                     WbsTreeContractExtend wbsTreeContractExtend = new WbsTreeContractExtend();
-                    wbsTreeContractExtend.setPKeyId(parentNode.getPKeyId());
-                    wbsTreeContractExtend.setContractId(Long.valueOf(parentNode.getContractId()));
+                    if(dto.getType() == 1){
+                        if(parentNode == null){
+                            throw new ServiceException("父节点不存在");
+                        }
+                        wbsTreeContractExtend.setPKeyId(parentNode.getPKeyId());
+                        wbsTreeContractExtend.setContractId(Long.valueOf(parentNode.getContractId()));
+                        wbsTreeContractExtend.setAncestors(parentNode.getAncestorsPId());
+                    }
+                    if(dto.getType() == 2){
+                        wbsTreeContractExtend.setPKeyId(dto.getPId());
+                    }
                     wbsTreeContractExtend.setType(null);
                     wbsTreeContractExtend.setIsSync(0);
-                    wbsTreeContractExtend.setAncestors(parentNode.getAncestorsPId());
                     wbsTreeContractExtend.setFormulaConfig(dto.getInitTableName() + ":" + dto.getKey());
                     wbsTreeContractExtendService.save(wbsTreeContractExtend);
                 }