问题处理

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

@@ -16,6 +16,7 @@ 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;
+import com.ruoyi.common.utils.wrapper.IWrapper;
 
 import java.util.List;
 import java.util.Map;
@@ -53,12 +54,15 @@ public interface ContractService extends BaseService<Contract> {
      */
     Page<ContractBudgetVo> getProfitBudgetPage(ContractSelectDto dto);
 
+    Page<ContractBudgetVo> getProfitBudgetPage(ContractSelectDto dto, IWrapper<Contract> wrapper);
+
     /**
      * 利润预算表头部统计
+     *
      * @param dto
      * @return
      */
-    Map<String,Object> getProfitBudgetHeadStatistic(ContractSelectDto dto);
+    Map<String, Object> getProfitBudgetHeadStatistic(ContractSelectDto dto);
 
     /**
      * 利润结算分页

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

@@ -501,7 +501,11 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
     @Override
     public Page<ContractBudgetVo> getProfitBudgetPage(ContractSelectDto dto) {
         IWrapper<Contract> wrapper = getProfitBudgetPageWrapper(dto);
+        return getProfitBudgetPage(dto, wrapper);
+    }
 
+    @Override
+    public Page<ContractBudgetVo> getProfitBudgetPage(ContractSelectDto dto, IWrapper<Contract> wrapper) {
 
         Page<ContractBudgetVo> page = this.baseMapper.getProfitBudgetPage(dto.getPage(), wrapper);
         List<ContractBudgetVo> list = page.getRecords();
@@ -689,7 +693,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
      * @return
      */
     private List<Contract> recursionOldContract(List<Long> contractIds) {
-        List<Contract> contract = this.list(q -> q.in(Contract::getId, contractIds).in(Contract::getStatus, 10, 30, 60, 70, 99));
+        List<Contract> contract = this.list(q -> q.in(Contract::getId, contractIds).in(Contract::getStatus, 10, 30, 60, 70));
         List<Long> contractIds1 = contract.stream().map(Contract::getOldContractId).distinct()
                 .filter(item -> ObjectUtil.isNotEmpty(item)).collect(Collectors.toList());
         if (ObjectUtil.isNotEmpty(contractIds1)) {
@@ -1134,9 +1138,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         result.setBuyCityName(areaMapByIds.get(result.getBuyCityId()));
 
         //赋值历史毛利图信息
-        ContractSelectDto contractSelectDto = new ContractSelectDto();
-        contractSelectDto.setId(result.getId());
-        Page<ContractBudgetVo> profitBudgetPage = getProfitBudgetPage(contractSelectDto);
+        IWrapper<Contract> wrapper = IWrapper.<Contract>getWrapper().eq("t1.contractId", result.getId());
+        Page<ContractBudgetVo> profitBudgetPage = getProfitBudgetPage(new ContractSelectDto(), wrapper);
+
         List<ContractBudgetVo> records = profitBudgetPage.getRecords();
         if (ObjectUtil.isNotEmpty(records)) {
             ContractBudgetVo contractBudgetVo = records.get(0);

hx-sale/src/main/java/com/fjhx/sale/service/purchase/impl/EhsdPurchaseServiceImpl.java

@@ -37,6 +37,7 @@ import com.fjhx.purchase.service.pay.PayDetailService;
 import com.fjhx.purchase.service.pay.PayService;
 import com.fjhx.purchase.service.subscribe.SubscribeDetailService;
 import com.fjhx.sale.entity.contract.dto.ContractSelectDto;
+import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.contract.po.ContractProduct;
 import com.fjhx.sale.entity.contract.vo.ContractBudgetVo;
 import com.fjhx.sale.entity.pack.po.PackDetail;
@@ -309,9 +310,8 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
         result.setPurchaseArrivalList(ehsdPurchaseArrivalList);
 
         //赋值历史毛利图信息
-        ContractSelectDto contractSelectDto = new ContractSelectDto();
-        contractSelectDto.setId(result.getDataResourceId());
-        Page<ContractBudgetVo> profitBudgetPage = contractService.getProfitBudgetPage(contractSelectDto);
+        IWrapper<Contract> wrapper = IWrapper.<Contract>getWrapper().eq("t1.contractId", result.getDataResourceId());
+        Page<ContractBudgetVo> profitBudgetPage = contractService.getProfitBudgetPage(new ContractSelectDto(), wrapper);
         List<ContractBudgetVo> records = profitBudgetPage.getRecords();
         if (ObjectUtil.isNotEmpty(records)) {
             ContractBudgetVo contractBudgetVo = records.get(0);