|
@@ -1440,7 +1440,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
|
|
|
* 获取合同相关的所有版本列表
|
|
|
*/
|
|
|
@Override
|
|
|
- public List<Contract> getVersionList(Long id) {
|
|
|
+ public List<ContractVo> getVersionList(Long id) {
|
|
|
List<Contract> contractList = new ArrayList<>();
|
|
|
|
|
|
while (true) {
|
|
@@ -1452,7 +1452,10 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
|
|
|
}
|
|
|
id = contract.getOldContractId();
|
|
|
}
|
|
|
- return contractList;
|
|
|
+ List<ContractVo> contractVos = BeanUtil.copyToList(contractList, ContractVo.class);
|
|
|
+ // 赋值流程id
|
|
|
+ flowExampleService.setFlowId(contractVos, ContractVo::setFlowId);
|
|
|
+ return contractVos;
|
|
|
}
|
|
|
|
|
|
/**
|