Explorar el Código

销售合同详情版本列表加流程id

yzc hace 1 año
padre
commit
cd0e1c95af

+ 1 - 1
hx-sale/src/main/java/com/fjhx/sale/controller/contract/ContractController.java

@@ -217,7 +217,7 @@ public class ContractController {
      * 获取合同相关的所有版本列表
      */
     @PostMapping("/getVersionList")
-    public List<Contract> getVersionList(@RequestBody ContractDto dto) {
+    public List<ContractVo> getVersionList(@RequestBody ContractDto dto) {
         return contractService.getVersionList(dto.getId());
     }
 

+ 1 - 1
hx-sale/src/main/java/com/fjhx/sale/service/contract/ContractService.java

@@ -165,7 +165,7 @@ public interface ContractService extends BaseService<Contract> {
     /**
      * 获取合同相关的所有版本列表
      */
-    List<Contract> getVersionList(Long id);
+    List<ContractVo> getVersionList(Long id);
 
     /**
      * 获取合同相关的所有采购合同版本列表

+ 5 - 2
hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -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;
     }
 
     /**