|
@@ -4,28 +4,20 @@ import cn.hutool.core.util.ObjectUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
import com.alibaba.fastjson2.JSON;
|
|
import com.alibaba.fastjson2.JSON;
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
-import com.fjhx.account.entity.account.po.AccountPayment;
|
|
|
|
-import com.fjhx.account.entity.account.po.AccountRequestFundsDetail;
|
|
|
|
-import com.fjhx.account.entity.account.po.AccountRunningWater;
|
|
|
|
import com.fjhx.account.entity.account.vo.AccountRequestFundsDetailVo;
|
|
import com.fjhx.account.entity.account.vo.AccountRequestFundsDetailVo;
|
|
import com.fjhx.account.entity.tax.po.TaxRefundDetails;
|
|
import com.fjhx.account.entity.tax.po.TaxRefundDetails;
|
|
-import com.fjhx.account.service.account.AccountPaymentService;
|
|
|
|
import com.fjhx.account.service.account.AccountRequestFundsDetailService;
|
|
import com.fjhx.account.service.account.AccountRequestFundsDetailService;
|
|
-import com.fjhx.account.service.account.AccountRequestFundsService;
|
|
|
|
import com.fjhx.account.service.account.AccountRunningWaterService;
|
|
import com.fjhx.account.service.account.AccountRunningWaterService;
|
|
import com.fjhx.account.service.tax.TaxRefundDetailsService;
|
|
import com.fjhx.account.service.tax.TaxRefundDetailsService;
|
|
import com.fjhx.common.entity.currency.po.CurrencyRate;
|
|
import com.fjhx.common.entity.currency.po.CurrencyRate;
|
|
import com.fjhx.common.enums.FlowStatusEnum1;
|
|
import com.fjhx.common.enums.FlowStatusEnum1;
|
|
import com.fjhx.common.service.currency.CurrencyRateService;
|
|
import com.fjhx.common.service.currency.CurrencyRateService;
|
|
import com.fjhx.customer.service.customer.CustomerService;
|
|
import com.fjhx.customer.service.customer.CustomerService;
|
|
-import com.fjhx.flow.enums.FlowStatusEnum;
|
|
|
|
import com.fjhx.purchase.entity.pay.po.Pay;
|
|
import com.fjhx.purchase.entity.pay.po.Pay;
|
|
import com.fjhx.purchase.entity.purchase.enums.PurchaseStatusEnum;
|
|
import com.fjhx.purchase.entity.purchase.enums.PurchaseStatusEnum;
|
|
import com.fjhx.purchase.entity.purchase.po.Purchase;
|
|
import com.fjhx.purchase.entity.purchase.po.Purchase;
|
|
import com.fjhx.purchase.service.pay.PayDetailService;
|
|
import com.fjhx.purchase.service.pay.PayDetailService;
|
|
-import com.fjhx.purchase.service.purchase.PurchaseDetailService;
|
|
|
|
import com.fjhx.purchase.service.purchase.PurchaseService;
|
|
import com.fjhx.purchase.service.purchase.PurchaseService;
|
|
import com.fjhx.sale.entity.claim.po.ClaimContract;
|
|
import com.fjhx.sale.entity.claim.po.ClaimContract;
|
|
import com.fjhx.sale.entity.contract.bo.ContractCurrencyRate;
|
|
import com.fjhx.sale.entity.contract.bo.ContractCurrencyRate;
|
|
@@ -33,15 +25,12 @@ import com.fjhx.sale.entity.contract.dto.ContractSelectDto;
|
|
import com.fjhx.sale.entity.contract.po.Contract;
|
|
import com.fjhx.sale.entity.contract.po.Contract;
|
|
import com.fjhx.sale.entity.contract.vo.ContractBudgetVo;
|
|
import com.fjhx.sale.entity.contract.vo.ContractBudgetVo;
|
|
import com.fjhx.sale.entity.contract.vo.ContractVo;
|
|
import com.fjhx.sale.entity.contract.vo.ContractVo;
|
|
-import com.fjhx.sale.entity.purchase.po.EhsdPurchase;
|
|
|
|
import com.fjhx.sale.entity.statement.dto.ProfitSettlementDto;
|
|
import com.fjhx.sale.entity.statement.dto.ProfitSettlementDto;
|
|
import com.fjhx.sale.entity.statement.vo.ProfitSettlementVo;
|
|
import com.fjhx.sale.entity.statement.vo.ProfitSettlementVo;
|
|
import com.fjhx.sale.service.claim.ClaimContractService;
|
|
import com.fjhx.sale.service.claim.ClaimContractService;
|
|
-import com.fjhx.sale.service.claim.ClaimService;
|
|
|
|
import com.fjhx.sale.service.contract.ContractService;
|
|
import com.fjhx.sale.service.contract.ContractService;
|
|
import com.fjhx.sale.service.statement.SaleStatementService;
|
|
import com.fjhx.sale.service.statement.SaleStatementService;
|
|
import com.github.pagehelper.util.StringUtil;
|
|
import com.github.pagehelper.util.StringUtil;
|
|
-import com.ruoyi.common.utils.wrapper.IWrapper;
|
|
|
|
import com.ruoyi.system.utils.UserUtil;
|
|
import com.ruoyi.system.utils.UserUtil;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
@@ -87,7 +76,6 @@ public class SaleStatementServiceImpl implements SaleStatementService {
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public Page<ProfitSettlementVo> getProfitSettlement(ProfitSettlementDto dto) {
|
|
public Page<ProfitSettlementVo> getProfitSettlement(ProfitSettlementDto dto) {
|
|
-
|
|
|
|
Page<ContractVo> contractPage = contractService.getProfitSettlement(dto);
|
|
Page<ContractVo> contractPage = contractService.getProfitSettlement(dto);
|
|
List<ContractVo> records = contractPage.getRecords();
|
|
List<ContractVo> records = contractPage.getRecords();
|
|
if (records.size() == 0) {
|
|
if (records.size() == 0) {
|