diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyFeign.java index f343198b58..3ca7e45887 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyFeign.java @@ -27,6 +27,7 @@ package com.yxt.anrui.base.api.basediscountpackageapply; import com.yxt.anrui.base.api.basediscountpackage.AppDiscountpackageQuery; import com.yxt.anrui.base.api.basediscountpackage.AppDiscountpackageVo; +import com.yxt.anrui.base.api.basediscountpackage.flow.GetNodeVo; import com.yxt.anrui.base.api.basediscountpackageapply.flow.GetNodeQuery; import com.yxt.anrui.base.api.basediscountpackageapply.flow.BaseDiscountpackageApplyCompleteDto; import com.yxt.anrui.base.api.basediscountpackageapply.flow.SubmitBaseDiscountpackageApplyDto; @@ -129,10 +130,10 @@ public interface BaseDiscountpackageApplyFeign { @ApiOperation(value = "获取下一个环节") @GetMapping(value = "/getNextNodesForSubmit") - ResultBean getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query); + ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query); @ApiOperation(value = "获取上一个环节") @GetMapping(value = "/getPreviousNodesForReject") - ResultBean getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query); + ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query); } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageApply/AppDiscountPackageApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageApply/AppDiscountPackageApplyService.java index c867320576..4f7e5a61cc 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageApply/AppDiscountPackageApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageApply/AppDiscountPackageApplyService.java @@ -14,7 +14,6 @@ import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.api.commoncontract.CommonContractPackageVo; import com.yxt.anrui.base.api.flow.FlowTaskVo; import com.yxt.anrui.terminal.api.autoservice.discountPackageApply.*; -import com.yxt.anrui.terminal.config.CoverUtils; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -69,7 +68,7 @@ public class AppDiscountPackageApplyService { AppDiscountpackageApplyDetailsVo vo = new AppDiscountpackageApplyDetailsVo(); if (voResultBean.getSuccess()) { BaseDiscountpackageApplyDetailsVo data = voResultBean.getData(); - BeanUtil.copyProperties(data,vo); + BeanUtil.copyProperties(data, vo); } return rb.success().setData(vo); } @@ -125,7 +124,7 @@ public class AppDiscountPackageApplyService { } String data = ""; if (next == 0) { - ResultBean> getPreviousNodesForReject = baseDiscountpackageApplyFeign.getPreviousNodesForReject(getNodeQuery); + ResultBean> getPreviousNodesForReject = baseDiscountpackageApplyFeign.getPreviousNodesForReject(getNodeQuery); if (getPreviousNodesForReject.getSuccess()) { getPreviousNodesForReject.getData().removeAll(Collections.singleton(null)); data = getPreviousNodesForReject.getData().get(0).getName(); @@ -133,7 +132,7 @@ public class AppDiscountPackageApplyService { return rb.setMsg(getPreviousNodesForReject.getMsg()); } } else if (next == 1) { - ResultBean> getNextNodesForSubmit = baseDiscountpackageApplyFeign.getNextNodesForSubmit(getNodeQuery); + ResultBean> getNextNodesForSubmit = baseDiscountpackageApplyFeign.getNextNodesForSubmit(getNodeQuery); if (getNextNodesForSubmit.getSuccess()) { getNextNodesForSubmit.getData().removeAll(Collections.singleton(null)); data = getNextNodesForSubmit.getData().get(0).getName(); @@ -162,7 +161,7 @@ public class AppDiscountPackageApplyService { if (null != data && data.size() > 0) { for (CommonContractPackageVo datum : data) { AppCommonContractPackageVo vo = new AppCommonContractPackageVo(); - BeanUtil.copyProperties(datum,vo); + BeanUtil.copyProperties(datum, vo); voList.add(vo); } } @@ -179,7 +178,7 @@ public class AppDiscountPackageApplyService { if (null != data && data.size() > 0) { for (BaseDiscountpackageByApplyDto datum : data) { AppBaseDiscountpackageByApplyDto vo = new AppBaseDiscountpackageByApplyDto(); - BeanUtil.copyProperties(datum,vo); + BeanUtil.copyProperties(datum, vo); voList.add(vo); } }