Merge remote-tracking branch 'origin/dev' into dev

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

@@ -133,7 +133,7 @@ public class StatisticAnalysisServiceImpl extends ServiceImpl<FinanceProfitMappe
 		List<FinanceProfitDtoList> financeProfitList;
 		//是否合并amend费用  true 合并  false 不合并
 		if ("1".equals(financeProfit.getMergeAmendFee())) {
-			financeProfitList = baseMapper.financeProfit(financeProfit, page);
+			financeProfitList = baseMapper.financeProfitList(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())
@@ -241,7 +241,7 @@ public class StatisticAnalysisServiceImpl extends ServiceImpl<FinanceProfitMappe
 			if (ObjectUtils.isNotNull(financeProfit.getBillType())) {
 				financeProfit.setBillType(financeProfit.getBillType() + ",SEA,SIA,AEA,AIA");
 			}
-			financeProfitList = baseMapper.financeProfit(financeProfit, page);
+			financeProfitList = baseMapper.financeProfitList(financeProfit, page);
 		}
 		List<FinanceProfit> financeProfitDataList = new ArrayList<>();
 		if (!financeProfitList.isEmpty()) {
@@ -1030,7 +1030,7 @@ public class StatisticAnalysisServiceImpl extends ServiceImpl<FinanceProfitMappe
 		List<FinanceProfitDtoList> financeProfitList;
 		//是否合并amend费用  true 合并  false 不合并
 		if ("1".equals(financeProfit.getMergeAmendFee())) {
-			financeProfitList = baseMapper.financeProfitSum(financeProfit);
+			financeProfitList = baseMapper.financeProfitSumList(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())
@@ -1139,7 +1139,7 @@ public class StatisticAnalysisServiceImpl extends ServiceImpl<FinanceProfitMappe
 			if (ObjectUtils.isNotNull(financeProfit.getBillType())) {
 				financeProfit.setBillType(financeProfit.getBillType() + ",SEA,SIA,AEA,AIA");
 			}
-			financeProfitList = baseMapper.financeProfitSum(financeProfit);
+			financeProfitList = baseMapper.financeProfitSumList(financeProfit);
 			for (FinanceProfitDtoList item : financeProfitList) {
 				item.setRealAmountProfitLoc(item.getRealAmountDrLoc().subtract(item.getRealAmountCrLoc()).setScale(2, RoundingMode.HALF_UP));
 			}
@@ -1210,7 +1210,7 @@ public class StatisticAnalysisServiceImpl extends ServiceImpl<FinanceProfitMappe
 		List<FinanceProfitDtoList> financeProfitList = new ArrayList<>();
 		//是否合并amend费用  true 合并  false 不合并
 		if (ObjectUtils.isNotNull(financeProfit.getMergeAmendFee())) {
-			financeProfitList = baseMapper.financeProfitSum(financeProfit);
+			financeProfitList = baseMapper.financeProfitSumList(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())
@@ -1317,7 +1317,7 @@ public class StatisticAnalysisServiceImpl extends ServiceImpl<FinanceProfitMappe
 			}
 		} else {
 			financeProfit.setBillType(financeProfit.getBillType() + ",SEA,SIA,AEA,AIA");
-			financeProfitList = baseMapper.financeProfitSum(financeProfit);
+			financeProfitList = baseMapper.financeProfitSumList(financeProfit);
 		}
 		List<FinanceProfit> financeProfitDataList = new ArrayList<>();
 		if (!financeProfitList.isEmpty()) {

blade-service/blade-los/src/main/java/org/springblade/los/view/mapper/FinanceProfitMapper.java

@@ -16,12 +16,13 @@
  */
 package org.springblade.los.view.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.los.statisticAnalysis.FinanceProfitDtoList;
 import org.springblade.los.view.entity.FinanceProfit;
 import org.springblade.los.view.vo.FinanceProfitVO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+
 import java.util.List;
 
 /**
@@ -39,9 +40,12 @@ public interface FinanceProfitMapper extends BaseMapper<FinanceProfit> {
 	 * @param financeProfit
 	 * @return
 	 */
+
 	List<FinanceProfitVO> selectFinanceProfitPage(IPage page, FinanceProfitVO financeProfit);
 
-	List<FinanceProfitDtoList> financeProfit(@Param("data")FinanceProfitDtoList financeProfit, IPage<FinanceProfitDtoList> page);
 
-	List<FinanceProfitDtoList> financeProfitSum(@Param("data")FinanceProfitDtoList financeProfit);
+	List<FinanceProfitDtoList> financeProfitList(@Param("data")FinanceProfitDtoList financeProfit, IPage<FinanceProfitDtoList> page);
+
+
+	List<FinanceProfitDtoList> financeProfitSumList(@Param("data")FinanceProfitDtoList financeProfit);
 }

blade-service/blade-los/src/main/java/org/springblade/los/view/mapper/FinanceProfitMapper.xml

@@ -45,7 +45,7 @@
     <select id="selectFinanceProfitPage" resultMap="financeProfitResultMap">
         select * from los_finance_profit where is_deleted = 0
     </select>
-    <select id="financeProfit" resultType="org.springblade.los.statisticAnalysis.FinanceProfitDtoList">
+    <select id="financeProfitList" resultType="org.springblade.los.statisticAnalysis.FinanceProfitDtoList">
     select
         seb.business_type AS billType,
         seb.bill_no AS billNo,
@@ -167,7 +167,7 @@
         ORDER BY
         seb.create_time
     </select>
-    <select id="financeProfitSum" resultType="org.springblade.los.statisticAnalysis.FinanceProfitDtoList">
+    <select id="financeProfitSumList" resultType="org.springblade.los.statisticAnalysis.FinanceProfitDtoList">
         select
         seb.business_type AS billType,
         seb.bill_no AS billNo,