浏览代码

自定义数字化节点新增内页资料

chenr 6 月之前
父节点
当前提交
4c4297b068

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

@@ -42,4 +42,7 @@ public class CustomAddContractNodeDTO implements Serializable {
     @ApiModelProperty(value = "自定义数字化节点的时间")
     private String digitizeTime;
 
+    @ApiModelProperty(value = "自定义数字化节点的内页资料类型")
+    private Integer majorDataType;
+
 }

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

@@ -2696,7 +2696,7 @@ public class InformationWriteQueryController extends BladeController {
     public R<Boolean> updateContractNodeParameter(@RequestParam Long pKeyId, @RequestParam String
         nodeName, @RequestParam String partitionCode, @RequestParam(required = false) Integer className,
                                                   @RequestParam(required = false) Integer unitName, @RequestParam(required = false) Integer excellentNum,
-                                                  @RequestParam(required = false) Integer unitNum,@RequestParam(required = false)String digitizeTime) {
+                                                  @RequestParam(required = false) Integer unitNum,@RequestParam(required = false)String digitizeTime,@RequestParam(required =false)Integer majorDataType) {
         WbsTreeContract node = new WbsTreeContract();
         node.setPKeyId(pKeyId);
         node.setNodeName(nodeName);
@@ -2742,6 +2742,11 @@ public class InformationWriteQueryController extends BladeController {
                 node.setUnitNum(unitNum);
             }
         }
+        if(ObjectUtil.isNotEmpty(queries.getNodeClass())&&queries.getNodeClass()==Integer.valueOf(2)){
+            if(majorDataType!=null&&majorDataType!=0){
+                node.setMajorDataType(majorDataType);
+            }
+        }
         //保存操作记录
         try {
             JSONObject json = new JSONObject();
@@ -4066,7 +4071,12 @@ public class InformationWriteQueryController extends BladeController {
                 if (ObjectUtil.isEmpty(dto.getDigitizeTime())) {
                     throw new ServiceException("请选择节点时间");
                 }
+                if(dto.getMajorDataType()==null||dto.getMajorDataType().equals("0")){
+                    throw new ServiceException("请选择内页资料类型");
+                }
                 obj.setDigitizeTime(dto.getDigitizeTime());
+                obj.setMajorDataType(dto.getMajorDataType());
+
             }
                 if (wbsTreeContractClient.saveBatch(Collections.singletonList(obj))) {
                     informationQueryService.delAsyncWbsTree(parentNode.getContractId());

+ 3 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/feign/WbsTreeContractClientImpl.java

@@ -163,7 +163,9 @@ public class WbsTreeContractClientImpl implements WbsTreeContractClient {
         if(StringUtils.isNotEmpty(node.getDigitizeTime())){
             wrappers.set(WbsTreeContract::getDigitizeTime,node.getDigitizeTime());
         }
-
+        if(StringUtils.isNotEmpty(node.getMajorDataType())){
+            wrappers.set(WbsTreeContract::getMajorDataType,node.getMajorDataType());
+        }
         return this.wbsTreeContractService.update(wrappers.eq(WbsTreeContract::getPKeyId, node.getPKeyId()));
     }