|
|
@ -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<List<GetNodeVo>> getPreviousNodesForReject = baseDiscountpackageApplyFeign.getPreviousNodesForReject(getNodeQuery); |
|
|
|
ResultBean<List<com.yxt.anrui.base.api.basediscountpackage.flow.GetNodeVo>> 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<List<GetNodeVo>> getNextNodesForSubmit = baseDiscountpackageApplyFeign.getNextNodesForSubmit(getNodeQuery); |
|
|
|
ResultBean<List<com.yxt.anrui.base.api.basediscountpackage.flow.GetNodeVo>> 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); |
|
|
|
} |
|
|
|
} |
|
|
|