回退报告

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/externalOA/ExternalOAController.java

@@ -3,6 +3,7 @@ package cn.start.tz.module.pressure2.controller.admin.externalOA;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.start.tz.framework.common.pojo.CommonResult;
+import cn.start.tz.module.pressure2.controller.admin.externalOA.vo.ReturnFlowVO;
 import cn.start.tz.module.pressure2.service.boilertaskorder.BoilerTaskOrderService;
 import cn.start.tz.module.pressure2.service.boilertaskorderitemreport.BoilerTaskOrderItemReportService;
 import cn.start.tz.module.pressure2.service.externalOA.ExternalOAService;
@@ -143,8 +144,8 @@ public class ExternalOAController {
 
     @GetMapping("/returnFlow")
     @PermitAll
-    @Parameter(name = "summaryId", description = "流程id", required = true, example = "6700435696298025655")
-    public CommonResult<Boolean> returnFlow(@RequestParam("summaryId")String summaryId) {
-        return externalOAService.returnFlow(summaryId);
+    @Parameter(name = "returnFlowVO", description = "流程id", required = true)
+    public CommonResult<Boolean> returnFlow(ReturnFlowVO returnFlowVO) {
+        return externalOAService.returnFlow(returnFlowVO);
     }
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/externalOA/vo/ReturnFlowVO.java

@@ -0,0 +1,31 @@
+package cn.start.tz.module.pressure2.controller.admin.externalOA.vo;
+
+import cn.start.tz.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+import static cn.start.tz.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Data
+@ToString(callSuper = true)
+public class ReturnFlowVO{
+    @Schema(description = "流程ID")
+    private String summaryId;
+    @Schema(description = "账户ID")
+    private String accountId;
+    @Schema(description = "节点名称")
+    private String nodeName;
+    @Schema(description = "处理人")
+    private String handler;
+    @Schema(description = "处理类型")
+    private String handleType;
+    @Schema(description = "表单编码")
+    private String formcode;
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/externalOA/ExternalOAService.java

@@ -1,6 +1,7 @@
 package cn.start.tz.module.pressure2.service.externalOA;
 
 import cn.start.tz.framework.common.pojo.CommonResult;
+import cn.start.tz.module.pressure2.controller.admin.externalOA.vo.ReturnFlowVO;
 import cn.start.tz.module.pressure2.service.externalOA.vo.*;
 
 import java.io.InputStream;
@@ -58,8 +59,8 @@ public interface ExternalOAService {
 
     /**
      * 退回流程
-     * @param summaryId
+     * @param returnFlowVO
      * @return
      */
-    CommonResult<Boolean> returnFlow(String summaryId);
+    CommonResult<Boolean> returnFlow(ReturnFlowVO returnFlowVO);
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/externalOA/ExternalOAServiceImpl.java

@@ -9,6 +9,7 @@ import cn.start.tz.framework.common.pojo.CommonResult;
 import cn.start.tz.module.grape.city.api.GrapeCityApi;
 import cn.start.tz.module.grape.city.api.vo.GrapeCityReqDTO;
 import cn.start.tz.module.infra.api.file.FileApi;
+import cn.start.tz.module.pressure2.controller.admin.externalOA.vo.ReturnFlowVO;
 import cn.start.tz.module.pressure2.dal.dataobject.dynamictbval.DynamicTbValDO;
 import cn.start.tz.module.pressure2.service.dynamictbval.DynamicTbValService;
 import cn.start.tz.module.pressure2.service.externalOA.vo.*;
@@ -196,8 +197,8 @@ public class ExternalOAServiceImpl implements ExternalOAService {
     }
 
     @Override
-    public CommonResult<Boolean> returnFlow(String summaryId) {
-        log.info("退回OA流程,{}", summaryId);
+    public CommonResult<Boolean> returnFlow(ReturnFlowVO returnFlowVO) {
+        log.info("退回OA流程,{}", JSON.toJSONString(returnFlowVO));
         return CommonResult.success(true);
     }