diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingFeign.java index 7da5faf0f2..f946124904 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingFeign.java @@ -1,5 +1,8 @@ package com.yxt.anrui.terminal.api.supplychain.companyShunting; +import com.yxt.anrui.terminal.api.supplychain.companyShunting.flowable.CompanyShuntingDto; +import com.yxt.anrui.terminal.api.supplychain.companyShunting.flowable.CompanyShuntingQuery; +import com.yxt.anrui.terminal.api.supplychain.companyShunting.flowable.CompanyShuntingTaskQuery; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingQuery.java deleted file mode 100644 index 29f6b5aaca..0000000000 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingQuery.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.yxt.anrui.terminal.api.supplychain.companyShunting; - -import com.yxt.common.core.query.Query; -import lombok.Data; - -/** - * @Author dimengzhe - * @Date 2022/8/25 11:48 - * @Description - */ -@Data -public class CompanyShuntingQuery implements Query { - private static final long serialVersionUID = 5168595226107955454L; -} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/flowable/CompanyShuntingDto.java similarity index 89% rename from anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingDto.java rename to anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/flowable/CompanyShuntingDto.java index 9f3768edd5..c2ec368ae5 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/flowable/CompanyShuntingDto.java @@ -1,5 +1,6 @@ -package com.yxt.anrui.terminal.api.supplychain.companyShunting; +package com.yxt.anrui.terminal.api.supplychain.companyShunting.flowable; +import com.yxt.anrui.terminal.api.supplychain.companyShunting.CompanyShuntingList; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/flowable/CompanyShuntingQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/flowable/CompanyShuntingQuery.java new file mode 100644 index 0000000000..1620ea7fe5 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/flowable/CompanyShuntingQuery.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.terminal.api.supplychain.companyShunting.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/8/25 11:48 + * @Description + */ +@Data +public class CompanyShuntingQuery implements Query { + private static final long serialVersionUID = 5168595226107955454L; + + @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-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingTaskQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/flowable/CompanyShuntingTaskQuery.java similarity index 93% rename from anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingTaskQuery.java rename to anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/flowable/CompanyShuntingTaskQuery.java index 4feb49fb5b..ef76354e63 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingTaskQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/flowable/CompanyShuntingTaskQuery.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.terminal.api.supplychain.companyShunting; +package com.yxt.anrui.terminal.api.supplychain.companyShunting.flowable; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyShunting/CompanyShuntingRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyShunting/CompanyShuntingRest.java index 310fb886b1..1c8bc83656 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyShunting/CompanyShuntingRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyShunting/CompanyShuntingRest.java @@ -1,6 +1,9 @@ package com.yxt.anrui.terminal.biz.supplychain.companyShunting; import com.yxt.anrui.terminal.api.supplychain.companyShunting.*; +import com.yxt.anrui.terminal.api.supplychain.companyShunting.flowable.CompanyShuntingDto; +import com.yxt.anrui.terminal.api.supplychain.companyShunting.flowable.CompanyShuntingQuery; +import com.yxt.anrui.terminal.api.supplychain.companyShunting.flowable.CompanyShuntingTaskQuery; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyShunting/CompanyShuntingService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyShunting/CompanyShuntingService.java index 75393b4020..982712b27c 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyShunting/CompanyShuntingService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyShunting/CompanyShuntingService.java @@ -5,11 +5,18 @@ import com.yxt.anrui.base.api.baseinternalpurchase.AppCompanyShuntingVo; import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseFeign; import com.yxt.anrui.base.api.baseinternalpurchase.flow.BaseInterNalPurchaseCompleteDto; import com.yxt.anrui.base.api.baseinternalpurchase.flow.BaseInterNalPurchaseTaskQuery; -import com.yxt.anrui.terminal.api.supplychain.companyShunting.*; +import com.yxt.anrui.base.api.baseinternalpurchase.flow.GetNodeVo; +import com.yxt.anrui.base.api.baseoutsourcingapplication.GetNextNodeDto; +import com.yxt.anrui.terminal.api.supplychain.companyShunting.CompanyShuntingList; +import com.yxt.anrui.terminal.api.supplychain.companyShunting.CompanyShuntingVo; +import com.yxt.anrui.terminal.api.supplychain.companyShunting.flowable.CompanyShuntingDto; +import com.yxt.anrui.terminal.api.supplychain.companyShunting.flowable.CompanyShuntingQuery; +import com.yxt.anrui.terminal.api.supplychain.companyShunting.flowable.CompanyShuntingTaskQuery; import com.yxt.common.core.result.ResultBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -129,6 +136,31 @@ public class CompanyShuntingService { } public ResultBean getFlowOperateTitle(CompanyShuntingQuery query) { - return null; + ResultBean rb = ResultBean.fireFail(); + //0 上一环节 1下一环节 + int next = query.getNext(); + GetNextNodeDto getNodeQuery = new GetNextNodeDto(); + BeanUtil.copyProperties(query, getNodeQuery); + String data = ""; + if (next == 0) { + ResultBean> getPreviousNodesForReject = baseInternalPurchaseFeign.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 = baseInternalPurchaseFeign.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); } }