问题处理

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

@@ -5,13 +5,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.account.entity.account.vo.AccountRunningWaterVo;
 import com.fjhx.item.entity.product.dto.ProductInfoSelectDto;
-import com.fjhx.purchase.entity.purchase.po.Purchase;
 import com.fjhx.sale.entity.contract.dto.ContractDto;
 import com.fjhx.sale.entity.contract.dto.ContractSelectDto;
 import com.fjhx.sale.entity.contract.dto.DecisionAidDto;
 import com.fjhx.sale.entity.contract.dto.PayDecisionAidDto;
 import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.contract.vo.*;
+import com.fjhx.sale.entity.purchase.po.EhsdPurchase;
 import com.fjhx.sale.service.contract.ContractService;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.ruoyi.common.utils.StringUtils;
@@ -251,7 +251,7 @@ public class ContractController {
      * 获取合同相关的所有版本列表
      */
     @PostMapping("/getPurchaseListByContractId")
-    public List<Purchase> getPurchaseListByContractId(@RequestBody ContractDto dto) {
+    public List<EhsdPurchase> getPurchaseListByContractId(@RequestBody ContractDto dto) {
         return contractService.getPurchaseListByContractId(dto.getId());
     }
 

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

@@ -5,13 +5,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.account.entity.account.vo.AccountRunningWaterVo;
 import com.fjhx.customer.entity.customer.dto.CustomerDto;
 import com.fjhx.item.entity.product.dto.ProductInfoSelectDto;
-import com.fjhx.purchase.entity.purchase.po.Purchase;
 import com.fjhx.sale.entity.contract.dto.ContractDto;
 import com.fjhx.sale.entity.contract.dto.ContractSelectDto;
 import com.fjhx.sale.entity.contract.dto.DecisionAidDto;
 import com.fjhx.sale.entity.contract.dto.PayDecisionAidDto;
 import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.contract.vo.*;
+import com.fjhx.sale.entity.purchase.po.EhsdPurchase;
 import com.fjhx.sale.entity.sale.vo.SaleQuotationVo;
 import com.ruoyi.common.core.service.BaseService;
 
@@ -182,7 +182,7 @@ public interface ContractService extends BaseService<Contract> {
     /**
      * 获取合同相关的所有采购合同版本列表
      */
-    List<Purchase> getPurchaseListByContractId(Long id);
+    List<EhsdPurchase> getPurchaseListByContractId(Long id);
 
     /**
      * 根据合同id获取合同的资金流水信息

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

@@ -38,7 +38,6 @@ import com.fjhx.customer.entity.customer.po.Customer;
 import com.fjhx.customer.service.customer.CustomerService;
 import com.fjhx.file.entity.FileInfoVo;
 import com.fjhx.file.utils.ObsFileUtil;
-import com.fjhx.flow.entity.flow.po.FlowExample;
 import com.fjhx.flow.service.flow.FlowExampleService;
 import com.fjhx.item.entity.product.dto.ProductInfoSelectDto;
 import com.fjhx.item.entity.product.po.ProductInfo;
@@ -48,7 +47,6 @@ import com.fjhx.purchase.entity.pay.po.Pay;
 import com.fjhx.purchase.entity.purchase.po.Purchase;
 import com.fjhx.purchase.entity.purchase.po.PurchaseDetail;
 import com.fjhx.purchase.entity.purchase.vo.PurchaseDetailVo;
-import com.fjhx.purchase.entity.purchase.vo.PurchaseVo;
 import com.fjhx.purchase.entity.quality.po.QualityDetail;
 import com.fjhx.purchase.service.arrival.ArrivalDetailService;
 import com.fjhx.purchase.service.pay.PayDetailService;
@@ -1803,8 +1801,8 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
      * 获取合同相关的所有采购合同版本列表
      */
     @Override
-    public List<Purchase> getPurchaseListByContractId(Long id) {
-        return purchaseService.list(q -> q.eq(Purchase::getDataResourceId, id));
+    public List<EhsdPurchase> getPurchaseListByContractId(Long id) {
+        return ehsdPurchaseService.list(q -> q.eq(EhsdPurchase::getDataResourceId, id));
     }
 
     /**