修改

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/DelegateQuery.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.flowable.api.flowtask;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 委派任务参数
+ * @author: dimengzhe
+ * @date: 2023/6/2
+ **/
+@Data
+public class DelegateQuery {
+
+    @ApiModelProperty("任务Id")
+    private String taskId;
+
+    @ApiModelProperty("审批人")
+    private String assignee;
+}

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskFeign.java

@@ -189,4 +189,25 @@ public interface FlowTaskFeign {
     @ApiOperation(value = "流程预演测试")
     @PostMapping(value = "/yuyanTest")
     ResultBean<List<Map<String,Object>>> yuyanTest(@RequestBody FlowableQuery flowableQuery);
+
+    /**
+     * taskId是当前环节的所在的taskId、assignee是加签到谁名下的userSid。
+     * 例子：A提交申请，B审批同意后提交给C，C不太确定是否需要审批通过，需要D的协助审批，
+     * 但是D不是该流程的环节。加签到D后，D审批通过后，该申请会回到C的名下，D驳回后，会到B名下。
+     * @param delegateQuery
+     * @return
+     */
+    @ApiOperation(value = "委派任务")
+    @PostMapping(value = "/delegate")
+    ResultBean delegate(@RequestBody DelegateQuery delegateQuery);
+
+    /**
+     * taskId是当前环节的所在的taskId、assignee是转办到谁名下的userSid
+     * 例子：A提交申请，B审批同意后提交给C，C不想办了，转办给D，D审批通过后继续往后走环节。
+     * @param delegateQuery
+     * @return
+     */
+    @ApiOperation(value = "转办任务")
+    @PostMapping(value = "/assignTask")
+    ResultBean assignTask(@RequestBody DelegateQuery delegateQuery);
 }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskFeignFallBack.java

@@ -8,7 +8,6 @@ import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.flowable.test.StartProcessInstanceQuery;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
-import feign.Param;
 import org.flowable.bpmn.model.FlowElement;
 import org.springframework.stereotype.Component;
 
@@ -188,4 +187,14 @@ public class FlowTaskFeignFallBack implements FlowTaskFeign {
         return null;
     }
 
+    @Override
+    public ResultBean delegate(DelegateQuery delegateQuery) {
+        return null;
+    }
+
+    @Override
+    public ResultBean assignTask(DelegateQuery delegateQuery) {
+        return null;
+    }
+
 }

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskController.java

@@ -334,4 +334,14 @@ public class FlowTaskController implements FlowTaskFeign {
     public ResultBean<List<Map<String,Object>>> yuyanTest(FlowableQuery flowableQuery) {
         return flowTaskService.yuyanTest(flowableQuery);
     }
+
+    @Override
+    public ResultBean delegate(DelegateQuery delegateQuery) {
+        return flowTaskService.delegate(delegateQuery);
+    }
+
+    @Override
+    public ResultBean assignTask(DelegateQuery delegateQuery) {
+        return flowTaskService.assignTask(delegateQuery);
+    }
 }

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

@@ -2106,4 +2106,16 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
         }
         return rb.success().setData(list);
     }
+
+    public ResultBean delegate(DelegateQuery delegateQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        taskService.delegateTask(delegateQuery.getTaskId(), delegateQuery.getAssignee());
+        return rb.success();
+    }
+
+    public ResultBean assignTask(DelegateQuery delegateQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        taskService.setAssignee(delegateQuery.getTaskId(),delegateQuery.getAssignee());
+        return rb.success();
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeign.java

@@ -125,4 +125,9 @@ public interface AppBusArrearsCarryVehicleApplyFeign {
     @GetMapping("/getFlowOperateTitleBy")
     @ResponseBody
     ResultBean<ArrearsVo> getFlowOperateTitleBy(@SpringQueryMap ArrearsQuery query);
+
+    @ApiOperation("移动端欠款提车详情pdf生成")
+    @GetMapping("/printApplyPdf")
+    @ResponseBody
+    ResultBean<String> printApplyPdf(@RequestParam("sid")String sid,@RequestParam("name")String name);
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java

@@ -109,4 +109,9 @@ public class AppBusArrearsCarryVehicleApplyFeignFallback implements AppBusArrear
     public ResultBean<ArrearsVo> getFlowOperateTitleBy(ArrearsQuery query) {
         return null;
     }
+
+    @Override
+    public ResultBean<String> printApplyPdf(String sid, String name) {
+        return null;
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java

@@ -67,7 +67,6 @@ public class AppService {
                     if (StringUtils.isNotBlank(processEndTime) && i == 0 && !"6".equals(type)) {
                         vo.setStateKey("8");//流程已办结
                     }
-
                 }
             }
         }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyRest.java

@@ -121,4 +121,9 @@ public class AppBusArrearsCarryVehicleApplyRest implements AppBusArrearsCarryVeh
     public ResultBean<ArrearsVo> getFlowOperateTitleBy(ArrearsQuery query) {
         return appBusArrearsCarryVehicleApplyService.getFlowOperateTitleBy(query);
     }
+
+    @Override
+    public ResultBean<String> printApplyPdf(String sid, String name) {
+        return appBusArrearsCarryVehicleApplyService.printApplyPdf(sid,name);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java

@@ -16,6 +16,7 @@ import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.ArrearsCarryVehicle
 import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.*;
 import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.*;
 import com.yxt.anrui.terminal.config.CoverUtils;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -54,6 +55,8 @@ public class AppBusArrearsCarryVehicleApplyService {
     private SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
 
     public ResultBean<PagerVo<ArrearsCarryVehiclePageVo>> getArrearsTakeCarList(PagerQuery<ArrearsCarryVehicleQuery> pagerQuery) {
         ResultBean<PagerVo<ArrearsCarryVehiclePageVo>> rb = ResultBean.fireFail();
@@ -360,4 +363,15 @@ public class AppBusArrearsCarryVehicleApplyService {
         }
         return rb.success().setData(arrearsVo);
     }
+
+    public ResultBean<String> printApplyPdf(String sid, String name) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        ResultBean<String> resultBean = busArrearsCarryVehicleApplyFeign.printApplyPdf(sid,name);
+        if(resultBean.getData() != null){
+            String url = resultBean.getData();
+            url =fileUploadComponent.getUrlPrefix()+url;
+            return rb.success().setData(url);
+        }
+        return rb;
+    }
 }