催办部分

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowFeign.java

@@ -6,9 +6,9 @@ import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * @description:
@@ -32,4 +32,9 @@ public interface FlowFeign {
     @ResponseBody
     ResultBean<UpdateFlowFieldVo> handleProsess(@RequestBody BusinessVariables bv);
 
+    @ApiOperation(value = "超时的所有待办流程")
+    @GetMapping(value = "/getMessageMinutesList")
+    @ResponseBody
+    ResultBean<List<FlowableMessageVo>> getMessageList(@RequestParam("minutes") int minutes);
+
 }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowableMessageVo.java

@@ -0,0 +1,27 @@
+package com.yxt.anrui.flowable.api.flow2;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/9/10
+ **/
+@Data
+public class FlowableMessageVo implements Vo {
+    private static final long serialVersionUID = 5680927155476931545L;
+    @ApiModelProperty("流程id")
+    private String proDefId;
+    @ApiModelProperty("流程实例id")
+    private String procInstId;
+    @ApiModelProperty("环节名称")
+    private String nodeName;
+    @ApiModelProperty("环节id")
+    private String taskDefKey;
+    @ApiModelProperty("审核人员、被催办人")
+    private String assignee;
+    @ApiModelProperty("接收时间")
+    private String createTime;
+}

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowMapper.java

@@ -2,8 +2,11 @@ package com.yxt.anrui.flowable.biz.flow2;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.flowable.api.flow.Flowable;
+import com.yxt.anrui.flowable.api.flow2.FlowableMessageVo;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -11,4 +14,5 @@ import org.apache.ibatis.annotations.Mapper;
  **/
 @Mapper
 public interface FlowMapper extends BaseMapper<Flowable> {
+    List<FlowableMessageVo> getMessageList(int minutes);
 }

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowMapper.xml

@@ -1,4 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.flowable.biz.flow2.FlowMapper">
+    <select id="getMessageList" resultType="com.yxt.anrui.flowable.api.flow2.FlowableMessageVo">
+        select TIMESTAMPDIFF(SECOND, CREATE_TIME_, NOW()) as yuTime,
+               PROC_DEF_ID_                               as proDefId,
+               PROC_INST_ID_                              as procInstId,
+               TASK_DEF_KEY_                              as taskDefKey,
+               NAME_                                      as nodeName,
+               ASSIGNEE_                                  as assignee,
+               CREATE_TIME_                               as createTime
+        from act_ru_task
+        HAVING yuTime > (#{minutes} * 60)
+    </select>
 </mapper>

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowRest.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flow2.FlowFeign;
+import com.yxt.anrui.flowable.api.flow2.FlowableMessageVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
 import com.yxt.anrui.flowable.biz.process.ProcessService;
 import com.yxt.anrui.flowable.feign.MessageFeign;
@@ -100,5 +101,10 @@ public class FlowRest implements FlowFeign {
         return updateFlowFieldVoResultBean;
     }
 
+    @Override
+    public ResultBean<List<FlowableMessageVo>> getMessageList(int minutes) {
+        return flowService.getMessageList(minutes);
+    }
+
 
 }

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.yxt.anrui.flowable.api.flow.Flowable;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
+import com.yxt.anrui.flowable.api.flow2.FlowableMessageVo;
 import com.yxt.anrui.flowable.api.flowcomment.FlowComment;
 import com.yxt.anrui.flowable.api.flowtask.FlowTask;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
@@ -747,4 +748,11 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
         }
         return rb.success().setMsg("抄送" + userName.toString() + "成功！");
     }
+
+    public ResultBean<List<FlowableMessageVo>> getMessageList(int minutes) {
+        ResultBean<List<FlowableMessageVo>> rb = ResultBean.fireFail();
+        List<FlowableMessageVo> list = baseMapper.getMessageList(minutes);
+
+        return null;
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

@@ -731,7 +731,7 @@ public class AppBusSalesOrderService {
             LoanOrderPreloanVo loanOrderPreloanVo = resultBean.getData();
             BeanUtil.copyProperties(loanOrderPreloanVo, orderLoanVo);
             if ("信用审核".equals(loanOrderPreloanVo.getConfirmBtn())) {
-                CarModelVo finPage1 = commonService.getLoanSolution(sid).getData();
+                CarModelVo finPage1 = commonService.getLoanPreloan(sid).getData();
                 orderLoanVo.setPluginPage(finPage1);
             }
             return rb.setMsg(resultBean.getMsg()).setData(orderLoanVo);