From 9553fc35b962a336500aef45306db503cb69a6e6 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 28 Jul 2022 18:20:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehicle/BaseVehicleUpdateQuery.java | 1 + .../anrui/base/common/enums/VehicleState.java | 2 +- .../BaseVehicleActualSalesService.java | 4 +- .../BusVehicleApplyService.java | 6 +++ .../flowable/api/sysprourl/SysProUrl.java | 3 ++ .../flowable/api/sysprourl/SysProUrlDto.java | 5 +- .../biz/sysprourl/SysProUrlMapper.xml | 8 +++- .../yxt/anrui/terminal/api/app/AppFeign.java | 34 ++++++++++++++ .../terminal/api/app/AppFeignFallback.java | 12 +++++ .../api/app/flowable/AppFlowCommentVo.java | 20 ++++++++ .../app/flowable/AppFlowableRecordQuery.java | 22 +++++++++ .../api/app/flowable/AppFlowableRecordVo.java | 46 +++++++++++++++++++ .../terminal/api/app/flowable/AppUserVo.java | 23 ++++++++++ .../AppScmVehicleGressionFeign.java | 6 +++ .../AppScmVehicleGressionFeignFallback.java | 6 +++ .../flowable/GressionQuery.java | 24 ++++++++++ .../yxt/anrui/terminal/biz/app/AppRest.java | 29 ++++++++++++ .../anrui/terminal/biz/app/AppService.java | 36 +++++++++++++++ .../AppScmVehicleGressionRest.java | 6 +++ .../AppScmVehicleGressionService.java | 37 +++++++++++++-- 20 files changed, 323 insertions(+), 7 deletions(-) create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/AppFeign.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/AppFeignFallback.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowCommentVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppUserVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/flowable/GressionQuery.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppRest.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleUpdateQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleUpdateQuery.java index 05d5cadc55..e90afa6e31 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleUpdateQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleUpdateQuery.java @@ -19,4 +19,5 @@ public class BaseVehicleUpdateQuery implements Query { private String vehicleState; private String vihicleStateValue; private String settlementStatus; + private String settlementStatusValue; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/VehicleState.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/VehicleState.java index 7ae48fc851..74a80adf24 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/VehicleState.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/VehicleState.java @@ -96,7 +96,7 @@ public class VehicleState { * 退库 */ RETURN_STOCK("0004", "退库"), - ING_STOCK("0004", "在途"); + ING_STOCK("0005", "在途"); /** * code值 diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java index 95ac535465..6ba580d3f3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java @@ -14,6 +14,7 @@ import com.yxt.anrui.base.api.basevehicleactualsales.flow.BaseActualSalesTaskQue import com.yxt.anrui.base.api.basevehicleactualsales.flow.SubmitActualSalesDto; import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService; import com.yxt.anrui.base.biz.basevehicleactualdetails.BaseVehicleActualDetailsService; +import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; @@ -196,9 +197,10 @@ public class BaseVehicleActualSalesService extends MybatisBaseService page = PagerUtil.queryToPage(pq); diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrl.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrl.java index 90f5890b9a..77670f5274 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrl.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrl.java @@ -59,4 +59,7 @@ public class SysProUrl extends BaseEntity { * app插件名称（模块名称） */ private String modulePluginName; + + @ApiModelProperty(value = "环节名称") + private String taskName; } diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlDto.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlDto.java index 976292bb5b..196da35d52 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlDto.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlDto.java @@ -53,7 +53,10 @@ public class SysProUrlDto implements Serializable { /** * app插件名称（模块名称） */ - @ApiModelProperty(value = "app插件名称") + @ApiModelProperty(value = "app版本sid#类型（1框架2插件）") private String modulePluginName; + @ApiModelProperty(value = "环节名称") + private String taskName; + } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.xml b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.xml index 58d8b27b46..62e9226221 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.xml +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.xml @@ -36,7 +36,10 @@ taskDefKey, - modulePluginName + modulePluginName, + + + taskName @@ -65,6 +68,9 @@ #{modulePluginName} + + #{taskName} + diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/AppFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/AppFeign.java new file mode 100644 index 0000000000..a61e755ef2 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/AppFeign.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.terminal.api.app; + +import com.yxt.anrui.terminal.api.app.flowable.AppFlowableRecordQuery; +import com.yxt.anrui.terminal.api.app.flowable.AppFlowableRecordVo; +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.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/7/28 16:15 + * @Description + */ +@Api(tags = "移动端公共") +@FeignClient( + contextId = "terminal-app", + name = "anrui-terminal", + path = "/app/v1/common", + fallback = AppFeignFallback.class) +public interface AppFeign { + + @ApiOperation("手机端-获取车辆移位列表") + @GetMapping("/getProgressList") + @ResponseBody + ResultBean> getProgressList(@SpringQueryMap AppFlowableRecordQuery appFlowableRecordQuery); + + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/AppFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/AppFeignFallback.java new file mode 100644 index 0000000000..6eb086d0ef --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/AppFeignFallback.java @@ -0,0 +1,12 @@ +package com.yxt.anrui.terminal.api.app; + +import org.springframework.stereotype.Component; + +/** + * @Author dimengzhe + * @Date 2022/7/28 16:16 + * @Description + */ +@Component +public class AppFeignFallback { +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowCommentVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowCommentVo.java new file mode 100644 index 0000000000..206093bb5c --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowCommentVo.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.terminal.api.app.flowable; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/7/28 16:35 + * @Description + */ +@Data +public class AppFlowCommentVo implements Vo { + private static final long serialVersionUID = -3500250935249492593L; + @ApiModelProperty(value = "类型") + private String type; + @ApiModelProperty(value = "意见") + private String comment; + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordQuery.java new file mode 100644 index 0000000000..c2fd75f54d --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordQuery.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.terminal.api.app.flowable; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/7/28 16:40 + * @Description + */ +@Data +public class AppFlowableRecordQuery implements Query { + private static final long serialVersionUID = -1052692071435565128L; + @ApiModelProperty(value = "流程实例id") + @JsonProperty("progressId") + private String procInsId; + + @ApiModelProperty(value = "流程id") + private String deployId; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordVo.java new file mode 100644 index 0000000000..8604c90a99 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordVo.java @@ -0,0 +1,46 @@ +package com.yxt.anrui.terminal.api.app.flowable; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/7/28 16:19 + * @Description + */ +@Data +public class AppFlowableRecordVo implements Vo { + private static final long serialVersionUID = -5672069366532392940L; + + @ApiModelProperty(value = "流程环节名称") + @JsonProperty("progressName") + private String taskName; + @ApiModelProperty(value = "流程状态") + private String stateKey; + + @ApiModelProperty(value = "流程状态value") + private String stateValue; + + @ApiModelProperty(value = "办理时间") + private String time; + @ApiModelProperty(value = "接收时间") + private String createTime; + + @ApiModelProperty(value = "任务耗时") + private String duration; + + @ApiModelProperty(value = "审批意见") + private String content; + @ApiModelProperty(value = "环节的办理人信息") + @JsonProperty("handleBean") + private List taskUserInfos; + @ApiModelProperty("任务意见") + @JsonIgnore + private AppFlowCommentVo comment; + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppUserVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppUserVo.java new file mode 100644 index 0000000000..a26f40ff07 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppUserVo.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.terminal.api.app.flowable; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/7/28 16:24 + * @Description + */ +@Data +public class AppUserVo implements Vo { + private static final long serialVersionUID = -3220584066025636920L; + @ApiModelProperty(value = "名称") + @JsonProperty("name") + private String assigneeName; + @ApiModelProperty(value = "头像") + @JsonProperty("image") + private String assigneeHeadImage; + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeign.java index d80cb53d03..209e430a0c 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeign.java @@ -26,6 +26,7 @@ package com.yxt.anrui.terminal.api.supplychain.scmvehiclegression; import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.CompleteGressionDto; +import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionQuery; import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionTaskQuery; import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.SubmitGressionDto; import com.yxt.common.core.query.PagerQuery; @@ -111,4 +112,9 @@ public interface AppScmVehicleGressionFeign { @PutMapping("/stopCarTransferInfo") @ResponseBody ResultBean stopCarTransferInfo(@RequestBody GressionTaskQuery query); + + @ApiOperation("获取流程操作标题") + @GetMapping("/getFlowOperateTitle") + @ResponseBody + ResultBean getFlowOperateTitle(GressionQuery query); } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeignFallback.java index 8d77d3ed0c..6aa74f1925 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeignFallback.java @@ -26,6 +26,7 @@ package com.yxt.anrui.terminal.api.supplychain.scmvehiclegression; import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.CompleteGressionDto; +import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionQuery; import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionTaskQuery; import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.SubmitGressionDto; import com.yxt.common.core.query.PagerQuery; @@ -104,4 +105,9 @@ public class AppScmVehicleGressionFeignFallback implements AppScmVehicleGression public ResultBean stopCarTransferInfo(GressionTaskQuery query) { return null; } + + @Override + public ResultBean getFlowOperateTitle(GressionQuery query) { + return null; + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/flowable/GressionQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/flowable/GressionQuery.java new file mode 100644 index 0000000000..da73f6d629 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/flowable/GressionQuery.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Author dimengzhe + * @Date 2022/7/28 10:48 + * @Description + */ +@Data +public class GressionQuery implements Query { + private static final long serialVersionUID = -668333972696058522L; + @ApiModelProperty(value = "节点key") + private String taskDefKey; + @ApiModelProperty(value = "业务sid") + private String businessSid; + @ApiModelProperty(value = "0 上一环节 1下一环节") + @NotNull(message = "参数错误：next") + private Integer next; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppRest.java new file mode 100644 index 0000000000..1243d04352 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppRest.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.terminal.biz.app; + +import com.yxt.anrui.terminal.api.app.AppFeign; +import com.yxt.anrui.terminal.api.app.flowable.AppFlowableRecordQuery; +import com.yxt.anrui.terminal.api.app.flowable.AppFlowableRecordVo; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/7/28 16:17 + * @Description + */ +@Controller +@RequestMapping("/app/v1/common") +public class AppRest implements AppFeign { + + @Autowired + private AppService appService; + + @Override + public ResultBean> getProgressList(AppFlowableRecordQuery appFlowableRecordQuery) { + return appService.getProgressList(appFlowableRecordQuery); + } +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java new file mode 100644 index 0000000000..5809ec728c --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java @@ -0,0 +1,36 @@ +package com.yxt.anrui.terminal.biz.app; + +import com.alibaba.fastjson.JSON; +import com.yxt.anrui.flowable.api.flowtask.FlowRecordVo; +import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; +import com.yxt.anrui.terminal.api.app.flowable.AppFlowableRecordQuery; +import com.yxt.anrui.terminal.api.app.flowable.AppFlowableRecordVo; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +/** + * @Author dimengzhe + * @Date 2022/7/28 16:18 + * @Description + */ +@Service +public class AppService { + + @Autowired + private FlowTaskFeign flowTaskFeign; + + public ResultBean> getProgressList(AppFlowableRecordQuery appFlowableRecordQuery) { + ResultBean> rb = ResultBean.fireFail(); + String procInsId = appFlowableRecordQuery.getProcInsId(); + String deployId = appFlowableRecordQuery.getDeployId(); + ResultBean resultBean = flowTaskFeign.businessFlowRecord(procInsId,deployId); + List voList = Optional.ofNullable(resultBean.getData().getFlowList()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppFlowableRecordVo.class)).collect(Collectors.toList()); + return rb.success().setData(voList); + } +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionRest.java index c2c9a4acff..362dee82fb 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionRest.java @@ -27,6 +27,7 @@ package com.yxt.anrui.terminal.biz.supplychain.scmvehiclegression; import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.*; import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.CompleteGressionDto; +import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionQuery; import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionTaskQuery; import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.SubmitGressionDto; import com.yxt.common.core.query.PagerQuery; @@ -118,4 +119,9 @@ public class AppScmVehicleGressionRest implements AppScmVehicleGressionFeign { public ResultBean stopCarTransferInfo(GressionTaskQuery query) { return appScmVehicleGressionService.stopCarTransferInfo(query); } + + @Override + public ResultBean getFlowOperateTitle(GressionQuery query) { + return appScmVehicleGressionService.getFlowOperateTitle(query); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java index dd26dfec59..55fd9b63bd 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java @@ -31,11 +31,10 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.scm.api.scmvehiclegression.*; -import com.yxt.anrui.scm.api.scmvehiclegression.flowable.ScmCarTransferCompleteDto; -import com.yxt.anrui.scm.api.scmvehiclegression.flowable.ScmCarTransferTaskQuery; -import com.yxt.anrui.scm.api.scmvehiclegression.flowable.SubmitCarTransferDto; +import com.yxt.anrui.scm.api.scmvehiclegression.flowable.*; import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.*; import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.CompleteGressionDto; +import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionQuery; import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionTaskQuery; import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.SubmitGressionDto; import com.yxt.anrui.terminal.config.CoverUtils; @@ -45,6 +44,9 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Collections; +import java.util.List; + /** * Project: scm(scm)
* File: ScmVehicleGressionService.java
@@ -192,4 +194,33 @@ public class AppScmVehicleGressionService { } return rb.success().setData(resultBean.getData()); } + + public ResultBean getFlowOperateTitle(GressionQuery query) { + ResultBean rb = ResultBean.fireFail(); + //0 上一环节 1下一环节 + int next = query.getNext(); + GetNodeQuery getNodeQuery = new GetNodeQuery(); + BeanUtil.copyProperties(getNodeQuery, query); + String data = ""; + if (next == 0) { + ResultBean> getPreviousNodesForReject = scmVehicleGressionFeign.getPreviousNodesForReject(getNodeQuery); + if (getPreviousNodesForReject.getSuccess()) { + getPreviousNodesForReject.getData().removeAll(Collections.singleton(null)); + data = getPreviousNodesForReject.getData().get(0).getName(); + } else { + return rb.setMsg(getPreviousNodesForReject.getMsg()); + } + } else if (next == 1) { + ResultBean> getNextNodesForSubmit = scmVehicleGressionFeign.getNextNodesForSubmit(getNodeQuery); + if (getNextNodesForSubmit.getSuccess()) { + getNextNodesForSubmit.getData().removeAll(Collections.singleton(null)); + data = getNextNodesForSubmit.getData().get(0).getName(); + } else { + return rb.setMsg(getNextNodesForSubmit.getMsg()); + } + } else { + return rb.setMsg("参数错误：next"); + } + return rb.success().setData(data); + } } \ No newline at end of file