diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowFeign.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowFeign.java index 8a1054dbca..af9e01bd59 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowFeign.java +++ b/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 handleProsess(@RequestBody BusinessVariables bv); + @ApiOperation(value = "超时的所有待办流程") + @GetMapping(value = "/getMessageMinutesList") + @ResponseBody + ResultBean> getMessageList(@RequestParam("minutes") int minutes); + } diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowableMessageVo.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow2/FlowableMessageVo.java new file mode 100644 index 0000000000..56e450d944 --- /dev/null +++ b/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; +} diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowMapper.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowMapper.java index 75a54ab80c..58c8b8da84 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowMapper.java +++ b/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 { + List getMessageList(int minutes); } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowMapper.xml b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowMapper.xml index 155d9f2b05..bd17557ffc 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowMapper.xml +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowMapper.xml @@ -1,4 +1,15 @@ + \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowRest.java index 1c6e85e180..1d706431a9 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowRest.java +++ b/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> getMessageList(int minutes) { + return flowService.getMessageList(minutes); + } + } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java index d941fe4122..7100b79a31 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java +++ b/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 { } return rb.success().setMsg("抄送" + userName.toString() + "成功!"); } + + public ResultBean> getMessageList(int minutes) { + ResultBean> rb = ResultBean.fireFail(); + List list = baseMapper.getMessageList(minutes); + + return null; + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java index 4f0f721825..5b8a6d7e28 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java +++ b/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);