Преглед на файлове

流程文件删除BUG修复

wangliang преди 3 години
родител
ревизия
37acf1d489

+ 31 - 0
distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/FlowParam.java

@@ -0,0 +1,31 @@
+package com.qmth.distributed.print.business.bean.params;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Description: 流程参数
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2021/8/6
+ */
+public class FlowParam implements Serializable {
+
+    @ApiModelProperty(value = "流程id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @NotNull(message = "流程id不能为空")
+    private Long id;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+}

+ 6 - 2
distributed-print/src/main/java/com/qmth/distributed/print/api/TFFlowController.java

@@ -7,6 +7,7 @@ import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.distributed.print.business.bean.params.FlowApproveParam;
+import com.qmth.distributed.print.business.bean.params.FlowParam;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.bean.result.FlowApproveResult;
 import com.qmth.distributed.print.business.bean.result.FlowTaskApprovePeopleAllResult;
@@ -133,8 +134,11 @@ public class TFFlowController {
     @ApiOperation(value = "流程逻辑删除")
     @ApiResponses({@ApiResponse(code = 200, message = "常规信息", response = ResultUtil.class)})
     @RequestMapping(value = "/enable", method = RequestMethod.POST)
-    public Result enable(@ApiParam(value = "流程id", required = true) @RequestParam String id) {
-        return ResultUtil.ok(activitiService.flowDelete(SystemConstant.convertIdToLong(id)));
+    public Result enable(@Valid @RequestBody FlowParam flowParam, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
+        }
+        return ResultUtil.ok(activitiService.flowDelete(flowParam.getId()));
     }
 
     @ApiOperation(value = "流程列表")