yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优惠包申请获取下一环节标题

master
fanzongzhe 2 years ago
parent
889a61caa5
commit
d7cd3136e3
2 changed files with 8 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyFeign.java
  2. 11
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageApply/AppDiscountPackageApplyService.java

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyFeign.java
View File

@ -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.AppDiscountpackageQuery;
import com.yxt.anrui.base.api.basediscountpackage.AppDiscountpackageVo; 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.GetNodeQuery;
import com.yxt.anrui.base.api.basediscountpackageapply.flow.BaseDiscountpackageApplyCompleteDto; import com.yxt.anrui.base.api.basediscountpackageapply.flow.BaseDiscountpackageApplyCompleteDto;
import com.yxt.anrui.base.api.basediscountpackageapply.flow.SubmitBaseDiscountpackageApplyDto; import com.yxt.anrui.base.api.basediscountpackageapply.flow.SubmitBaseDiscountpackageApplyDto;
@ -129,10 +130,10 @@ public interface BaseDiscountpackageApplyFeign {
@ApiOperation(value = "获取下一个环节") @ApiOperation(value = "获取下一个环节")
@GetMapping(value = "/getNextNodesForSubmit") @GetMapping(value = "/getNextNodesForSubmit")
ResultBean getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query); ResultBean<List<GetNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query);
@ApiOperation(value = "获取上一个环节") @ApiOperation(value = "获取上一个环节")
@GetMapping(value = "/getPreviousNodesForReject") @GetMapping(value = "/getPreviousNodesForReject")
ResultBean getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query); ResultBean<List<GetNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query);
} }

11
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageApply/AppDiscountPackageApplyService.java
View File

@ -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.commoncontract.CommonContractPackageVo;
import com.yxt.anrui.base.api.flow.FlowTaskVo; import com.yxt.anrui.base.api.flow.FlowTaskVo;
import com.yxt.anrui.terminal.api.autoservice.discountPackageApply.*; 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.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
@ -69,7 +68,7 @@ public class AppDiscountPackageApplyService {
AppDiscountpackageApplyDetailsVo vo = new AppDiscountpackageApplyDetailsVo(); AppDiscountpackageApplyDetailsVo vo = new AppDiscountpackageApplyDetailsVo();
if (voResultBean.getSuccess()) { if (voResultBean.getSuccess()) {
BaseDiscountpackageApplyDetailsVo data = voResultBean.getData(); BaseDiscountpackageApplyDetailsVo data = voResultBean.getData();
BeanUtil.copyProperties(data,vo); BeanUtil.copyProperties(data, vo);
} }
return rb.success().setData(vo); return rb.success().setData(vo);
} }
@ -125,7 +124,7 @@ public class AppDiscountPackageApplyService {
} }
String data = ""; String data = "";
if (next == 0) { if (next == 0) {
ResultBean<List<GetNodeVo>> getPreviousNodesForReject = baseDiscountpackageApplyFeign.getPreviousNodesForReject(getNodeQuery); ResultBean<List<com.yxt.anrui.base.api.basediscountpackage.flow.GetNodeVo>> getPreviousNodesForReject = baseDiscountpackageApplyFeign.getPreviousNodesForReject(getNodeQuery);
if (getPreviousNodesForReject.getSuccess()) { if (getPreviousNodesForReject.getSuccess()) {
getPreviousNodesForReject.getData().removeAll(Collections.singleton(null)); getPreviousNodesForReject.getData().removeAll(Collections.singleton(null));
data = getPreviousNodesForReject.getData().get(0).getName(); data = getPreviousNodesForReject.getData().get(0).getName();
@ -133,7 +132,7 @@ public class AppDiscountPackageApplyService {
return rb.setMsg(getPreviousNodesForReject.getMsg()); return rb.setMsg(getPreviousNodesForReject.getMsg());
} }
} else if (next == 1) { } else if (next == 1) {
ResultBean<List<GetNodeVo>> getNextNodesForSubmit = baseDiscountpackageApplyFeign.getNextNodesForSubmit(getNodeQuery); ResultBean<List<com.yxt.anrui.base.api.basediscountpackage.flow.GetNodeVo>> getNextNodesForSubmit = baseDiscountpackageApplyFeign.getNextNodesForSubmit(getNodeQuery);
if (getNextNodesForSubmit.getSuccess()) { if (getNextNodesForSubmit.getSuccess()) {
getNextNodesForSubmit.getData().removeAll(Collections.singleton(null)); getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));
data = getNextNodesForSubmit.getData().get(0).getName(); data = getNextNodesForSubmit.getData().get(0).getName();
@ -162,7 +161,7 @@ public class AppDiscountPackageApplyService {
if (null != data && data.size() > 0) { if (null != data && data.size() > 0) {
for (CommonContractPackageVo datum : data) { for (CommonContractPackageVo datum : data) {
AppCommonContractPackageVo vo = new AppCommonContractPackageVo(); AppCommonContractPackageVo vo = new AppCommonContractPackageVo();
BeanUtil.copyProperties(datum,vo); BeanUtil.copyProperties(datum, vo);
voList.add(vo); voList.add(vo);
} }
} }
@ -179,7 +178,7 @@ public class AppDiscountPackageApplyService {
if (null != data && data.size() > 0) { if (null != data && data.size() > 0) {
for (BaseDiscountpackageByApplyDto datum : data) { for (BaseDiscountpackageByApplyDto datum : data) {
AppBaseDiscountpackageByApplyDto vo = new AppBaseDiscountpackageByApplyDto(); AppBaseDiscountpackageByApplyDto vo = new AppBaseDiscountpackageByApplyDto();
BeanUtil.copyProperties(datum,vo); BeanUtil.copyProperties(datum, vo);
voList.add(vo); voList.add(vo);
} }
} }

Write Preview
Loading…
Cancel
Save