数据自定义quanan

blade-service/blade-los/src/main/java/org/springblade/los/statisticAnalysis/service/IStatisticAnalysisService.java

@@ -17,11 +17,13 @@
 package org.springblade.los.statisticAnalysis.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.los.business.sea.entity.Bills;
 import org.springblade.los.excel.BoxNumberProfitExcel;
 import org.springblade.los.statisticAnalysis.*;
+import org.springblade.los.view.entity.FinanceProfit;
 
 import java.util.List;
 import java.util.Map;
@@ -32,7 +34,7 @@ import java.util.Map;
  * @author BladeX
  * @since 2023-10-10
  */
-public interface IStatisticAnalysisService {
+public interface IStatisticAnalysisService extends IService<FinanceProfit> {
 
 
 	/**

blade-service/blade-los/src/main/java/org/springblade/los/statisticAnalysis/service/impl/StatisticAnalysisServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -54,7 +55,7 @@ import java.util.stream.Collectors;
  */
 @Service
 @AllArgsConstructor
-public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
+public class StatisticAnalysisServiceImpl extends ServiceImpl<FinanceProfitMapper, FinanceProfit> implements IStatisticAnalysisService {
 
 	private final BillsMapper billsMapper;
 	private final AeaBillsMapper aeaBillsMapper;
@@ -132,7 +133,7 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 		List<FinanceProfitDtoList> financeProfitList;
 		//是否合并amend费用  true 合并  false 不合并
 		if ("1".equals(financeProfit.getMergeAmendFee())) {
-			financeProfitList = financeProfitMapper.financeProfit(financeProfit, page);
+			financeProfitList = baseMapper.financeProfit(financeProfit, page);
 			String mblno = financeProfitList.stream().map(FinanceProfitDtoList::getMblNo).filter(Objects::nonNull).distinct().collect(Collectors.joining(","));
 			LambdaQueryWrapper<Amends> lambdaQueryWrapper = new LambdaQueryWrapper<Amends>()
 				.eq(Amends::getTenantId, AuthUtil.getTenantId())
@@ -240,12 +241,12 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 			if (ObjectUtils.isNotNull(financeProfit.getBillType())) {
 				financeProfit.setBillType(financeProfit.getBillType() + ",SEA,SIA,AEA,AIA");
 			}
-			financeProfitList = financeProfitMapper.financeProfit(financeProfit, page);
+			financeProfitList = baseMapper.financeProfit(financeProfit, page);
 		}
 		List<FinanceProfit> financeProfitDataList = new ArrayList<>();
 		if (!financeProfitList.isEmpty()) {
 			String mblNo = financeProfitList.stream().map(FinanceProfitDtoList::getMblNo).distinct().collect(Collectors.joining(","));
-			financeProfitDataList = financeProfitMapper.selectList(new LambdaQueryWrapper<FinanceProfit>()
+			financeProfitDataList = baseMapper.selectList(new LambdaQueryWrapper<FinanceProfit>()
 				.apply("find_in_set(mblno,'" + mblNo + "')")
 				.apply("find_in_set(business_type,'SE,SI,AE,AI')")
 			);
@@ -1029,7 +1030,7 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 		List<FinanceProfitDtoList> financeProfitList;
 		//是否合并amend费用  true 合并  false 不合并
 		if ("1".equals(financeProfit.getMergeAmendFee())) {
-			financeProfitList = financeProfitMapper.financeProfitSum(financeProfit);
+			financeProfitList = baseMapper.financeProfitSum(financeProfit);
 			String mblno = financeProfitList.stream().map(FinanceProfitDtoList::getMblNo).filter(Objects::nonNull).distinct().collect(Collectors.joining(","));
 			LambdaQueryWrapper<Amends> lambdaQueryWrapper = new LambdaQueryWrapper<Amends>()
 				.eq(Amends::getTenantId, AuthUtil.getTenantId())
@@ -1138,7 +1139,7 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 			if (ObjectUtils.isNotNull(financeProfit.getBillType())) {
 				financeProfit.setBillType(financeProfit.getBillType() + ",SEA,SIA,AEA,AIA");
 			}
-			financeProfitList = financeProfitMapper.financeProfitSum(financeProfit);
+			financeProfitList = baseMapper.financeProfitSum(financeProfit);
 			for (FinanceProfitDtoList item : financeProfitList) {
 				item.setRealAmountProfitLoc(item.getRealAmountDrLoc().subtract(item.getRealAmountCrLoc()).setScale(2, RoundingMode.HALF_UP));
 			}
@@ -1209,7 +1210,7 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 		List<FinanceProfitDtoList> financeProfitList = new ArrayList<>();
 		//是否合并amend费用  true 合并  false 不合并
 		if (ObjectUtils.isNotNull(financeProfit.getMergeAmendFee())) {
-			financeProfitList = financeProfitMapper.financeProfitSum(financeProfit);
+			financeProfitList = baseMapper.financeProfitSum(financeProfit);
 			String mblno = financeProfitList.stream().map(FinanceProfitDtoList::getMblNo).filter(Objects::nonNull).distinct().collect(Collectors.joining(","));
 			LambdaQueryWrapper<Amends> lambdaQueryWrapper = new LambdaQueryWrapper<Amends>()
 				.eq(Amends::getTenantId, AuthUtil.getTenantId())
@@ -1316,12 +1317,12 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 			}
 		} else {
 			financeProfit.setBillType(financeProfit.getBillType() + ",SEA,SIA,AEA,AIA");
-			financeProfitList = financeProfitMapper.financeProfitSum(financeProfit);
+			financeProfitList = baseMapper.financeProfitSum(financeProfit);
 		}
 		List<FinanceProfit> financeProfitDataList = new ArrayList<>();
 		if (!financeProfitList.isEmpty()) {
 			String mblNo = financeProfitList.stream().map(FinanceProfitDtoList::getMblNo).distinct().collect(Collectors.joining(","));
-			financeProfitDataList = financeProfitMapper.selectList(new LambdaQueryWrapper<FinanceProfit>()
+			financeProfitDataList = baseMapper.selectList(new LambdaQueryWrapper<FinanceProfit>()
 				.apply("find_in_set(mblno,'" + mblNo + "')")
 				.apply("find_in_set(business_type,'SE,SI,AE,AI')")
 			);