1.模版导入箱量判断修改

2.费用模板复制接口修改
3.修改决策分析方法名

blade-service/blade-los/pom.xml

@@ -15,14 +15,21 @@
         <dependency>
             <groupId>com.echepei</groupId>
             <artifactId>common-utils</artifactId>
-            <version>1.2</version>
+            <version>1.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>ch.qos.logback</groupId>
+                    <artifactId>logback-classic</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+
         <!-- 邮件依赖，配置hutool工具包发送邮件  -->
-        <dependency>
+       <!-- <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>javax.mail</artifactId>
             <version>1.6.2</version>
-        </dependency>
+        </dependency>-->
         <!-- 模板引擎，制作邮件模板 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

blade-service/blade-los/src/main/java/org/springblade/los/basic/fees/service/impl/LosBFeesTemplateServiceImpl.java

@@ -313,7 +313,27 @@ public class LosBFeesTemplateServiceImpl extends ServiceImpl<LosBFeesTemplateMap
 			.eq(FeesTemplateItems::getIsDeleted, 0)
 			.eq(FeesTemplateItems::getTenantId, AuthUtil.getTenantId())
 			.eq(FeesTemplateItems::getPid, losBFeesTemplate.getId()));
+		List<FeesTemplateSonItems> templateSonItemsList = feesTemplateSonItemsService.list(new LambdaQueryWrapper<FeesTemplateSonItems>()
+			.eq(FeesTemplateSonItems::getIsDeleted, 0)
+			.eq(FeesTemplateSonItems::getTenantId, AuthUtil.getTenantId())
+			.eq(FeesTemplateSonItems::getPid, losBFeesTemplate.getId()));
 		for (FeesTemplateItems item : feesTemplateItemsList) {
+			if (!templateSonItemsList.isEmpty()) {
+				List<FeesTemplateSonItems> templateSonItems = templateSonItemsList.stream().filter(e -> e.getPpid().equals(item.getId()))
+					.collect(Collectors.toList());
+				for (FeesTemplateSonItems sonItems : templateSonItems) {
+					sonItems.setId(null);
+					sonItems.setPid(null);
+					sonItems.setPpid(null);
+					sonItems.setCreateTime(null);
+					sonItems.setCreateUserName(null);
+					sonItems.setCreateUser(null);
+					sonItems.setUpdateTime(null);
+					sonItems.setUpdateUser(null);
+					sonItems.setUpdateUserName(null);
+				}
+				item.setSonItemsList(templateSonItems.isEmpty() ? new ArrayList<>() : templateSonItems);
+			}
 			item.setId(null);
 			item.setPid(null);
 			item.setCreateDept(null);

blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/service/impl/ReportsServiceImpl.java

@@ -3531,7 +3531,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			new File(baseFilePath).mkdirs();
 		}
 		String realFileName = generateMailVo.getFileName() + "." + generateMailVo.getFileType().toLowerCase();
-		String filePath =  baseFilePath + "/" + realFileName;
+		String filePath = baseFilePath + "/" + realFileName;
 		try {
 			Files.write(Paths.get(filePath), generateMailVo.getFileContent());
 		} catch (Exception e) {

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/mapper/FinAccBillsMapper.java

@@ -52,17 +52,17 @@ public interface FinAccBillsMapper extends BaseMapper<FinAccBills> {
 													   @Param("deptPid") Long deptPid, @Param("postId") String postId
 		, @Param("corpId") Long corpId);
 
-	List<FeeSummaryRD> feeSummary(IPage<FeeSummaryRD> page, @Param("fee") FeeSummaryQ feeSummaryQ);
+	List<FeeSummaryRD> feeSummaryList(IPage<FeeSummaryRD> page, @Param("fee") FeeSummaryQ feeSummaryQ);
 
-	List<FeeSummaryRD> feeSummaryExport(@Param("fee") FeeSummaryQ feeSummaryQ);
+	List<FeeSummaryRD> feeSummaryExportList(@Param("fee") FeeSummaryQ feeSummaryQ);
 
-	List<FeeSummaryDetailRD> feeSummaryDetail(IPage<FeeSummaryDetailRD> page, @Param("fee")FeeSummaryQ feeSummaryQ);
+	List<FeeSummaryDetailRD> feeSummaryDetailList(IPage<FeeSummaryDetailRD> page, @Param("fee")FeeSummaryQ feeSummaryQ);
 
-	List<FeeSummaryDetailRD> feeSummaryDetailExport(@Param("fee")FeeSummaryQ feeSummaryQ);
+	List<FeeSummaryDetailRD> feeSummaryDetailExportList(@Param("fee")FeeSummaryQ feeSummaryQ);
 
-	List<FeeSummaryDetailNotRD> feeSummaryDetailNot(IPage<FeeSummaryDetailNotRD> page, @Param("fee")FeeSummaryQ feeSummaryQ);
+	List<FeeSummaryDetailNotRD> feeSummaryDetailNotList(IPage<FeeSummaryDetailNotRD> page, @Param("fee")FeeSummaryQ feeSummaryQ);
 
-	List<FeeSummaryDetailNotRD> feeSummaryDetailExportNot(@Param("fee")FeeSummaryQ feeSummaryQ);
+	List<FeeSummaryDetailNotRD> feeSummaryDetailExportNotList(@Param("fee")FeeSummaryQ feeSummaryQ);
 
 	List<AgingAnalysisRD> agingAnalysis(IPage<AgingAnalysisRD> page, @Param("fee")FeeSummaryQ feeSummaryQ);
 

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/mapper/FinAccBillsMapper.xml

@@ -174,7 +174,7 @@
         GROUP BY
         mblno
     </select>
-    <select id="feeSummary" resultType="org.springblade.los.statisticAnalysis.FeeSummaryRD">
+    <select id="feeSummaryList" resultType="org.springblade.los.statisticAnalysis.FeeSummaryRD">
         SELECT
         <if test='fee.type != null and fee.type != "" and fee.type == "1"'>
             acc.corp_cn_name corpName,
@@ -254,7 +254,7 @@
             GROUP BY acc.corp_id
         </if>
     </select>
-    <select id="feeSummaryExport" resultType="org.springblade.los.statisticAnalysis.FeeSummaryRD">
+    <select id="feeSummaryExportList" resultType="org.springblade.los.statisticAnalysis.FeeSummaryRD">
         SELECT
         <if test='fee.type != null and fee.type != "" and fee.type == "1"'>
             acc.corp_cn_name corpName,
@@ -334,7 +334,7 @@
             GROUP BY acc.corp_id
         </if>
     </select>
-    <select id="feeSummaryDetail" resultType="org.springblade.los.statisticAnalysis.FeeSummaryDetailRD">
+    <select id="feeSummaryDetailList" resultType="org.springblade.los.statisticAnalysis.FeeSummaryDetailRD">
         SELECT
         <if test='fee.type != null and fee.type != "" and fee.type == "1"'>
             acc.corp_cn_name corpName,
@@ -435,7 +435,7 @@
         </if>
         ORDER BY acc.corp_id
     </select>
-    <select id="feeSummaryDetailExport" resultType="org.springblade.los.statisticAnalysis.FeeSummaryDetailRD">
+    <select id="feeSummaryDetailExportList" resultType="org.springblade.los.statisticAnalysis.FeeSummaryDetailRD">
         SELECT
         <if test='fee.type != null and fee.type != "" and fee.type == "1"'>
             acc.corp_cn_name corpName,
@@ -536,7 +536,7 @@
         </if>
         ORDER BY acc.corp_id
     </select>
-    <select id="feeSummaryDetailNot" resultType="org.springblade.los.statisticAnalysis.FeeSummaryDetailNotRD">
+    <select id="feeSummaryDetailNotList" resultType="org.springblade.los.statisticAnalysis.FeeSummaryDetailNotRD">
         SELECT
         <if test='fee.type != null and fee.type != "" and fee.type == "1"'>
             acc.corp_cn_name corpName,
@@ -637,7 +637,7 @@
         </if>
         ORDER BY acc.corp_id
     </select>
-    <select id="feeSummaryDetailExportNot"
+    <select id="feeSummaryDetailExportNotList"
             resultType="org.springblade.los.statisticAnalysis.FeeSummaryDetailNotRD">
         SELECT
         <if test='fee.type != null and fee.type != "" and fee.type == "1"'>

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/impl/FeeCenterServiceImpl.java

@@ -361,7 +361,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 					}
 					feeCenter.setQuantity(new BigDecimal(quantity + ""));
 					feeCenter.setAmount(feeCenter.getPrice().multiply(feeCenter.getQuantity()));
-				} else if ("按箱量".equals(items.getQuantityRule())) {
+				} else if ("箱量".equals(items.getQuantityRule())) {
 					if (preContainers.isEmpty()) {
 						text.append("费用：").append(items.getFeeCnName()).append("未找到集装箱信息！");
 						continue;
@@ -514,7 +514,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 					}
 					feeCenter.setQuantity(new BigDecimal(quantity + ""));
 					feeCenter.setAmount(feeCenter.getPrice().multiply(feeCenter.getQuantity()));
-				} else if ("按箱量".equals(items.getQuantityRule())) {
+				} else if ("箱量".equals(items.getQuantityRule())) {
 					if (preContainers.isEmpty()) {
 						text.append("费用：").append(items.getFeeCnName()).append("未找到集装箱信息！");
 						continue;
@@ -1345,7 +1345,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 					}
 					feeCenter.setQuantity(new BigDecimal(quantity + ""));
 					feeCenter.setAmount(feeCenter.getPrice().multiply(feeCenter.getQuantity()));
-				} else if ("按箱量".equals(items.getQuantityRule())) {
+				} else if ("箱量".equals(items.getQuantityRule())) {
 					if (preContainers.isEmpty()) {
 						text.append("费用：").append(items.getFeeCnName()).append("未找到集装箱信息！");
 						continue;

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

@@ -46,16 +46,16 @@ public class FinanceStatisticsController {
 	@GetMapping("/financeProfit")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入decisionAnalysis")
-	public R<IPage<FinanceProfitDtoList>> financeProfit(FinanceProfitDtoList financeProfit, Query query) {
-		return statisticAnalysisService.financeProfit(financeProfit, Condition.getPage(query));
+	public R<IPage<FinanceProfitDtoList>> financeProfitList(FinanceProfitDtoList financeProfit, Query query) {
+		return statisticAnalysisService.financeProfitList(financeProfit, Condition.getPage(query));
 	}
 
 	/**
 	 * 分页 决策分析列表合计
 	 */
 	@GetMapping("/financeProfitSum")
-	public R financeProfitSum(FinanceProfitDtoList financeProfit) {
-		return statisticAnalysisService.financeProfitSum(financeProfit);
+	public R financeProfitListSum(FinanceProfitDtoList financeProfit) {
+		return statisticAnalysisService.financeProfitListSum(financeProfit);
 	}
 
 	/**
@@ -71,8 +71,8 @@ public class FinanceStatisticsController {
 	 * 分页 应收(付)实收(付)汇总
 	 */
 	@GetMapping("/feeSummary")
-	public R<IPage<FeeSummaryRD>> feeSummary(FeeSummaryQ feeSummaryQ, Query query) {
-		return statisticAnalysisService.feeSummary(feeSummaryQ, Condition.getPage(query));
+	public R<IPage<FeeSummaryRD>> feeSummaryList(FeeSummaryQ feeSummaryQ, Query query) {
+		return statisticAnalysisService.feeSummaryList(feeSummaryQ, Condition.getPage(query));
 	}
 
 	/**
@@ -80,7 +80,7 @@ public class FinanceStatisticsController {
 	 */
 	@GetMapping("/feeSummarySum")
 	public R feeSummarySum(FeeSummaryQ feeSummaryQ) {
-		List<FeeSummaryRD> list = statisticAnalysisService.feeSummaryExport(feeSummaryQ);
+		List<FeeSummaryRD> list = statisticAnalysisService.feeSummaryExportList(feeSummaryQ);
 		Map<String, BigDecimal> map = new HashMap<>();
 		if (!list.isEmpty()) {
 			map.put("amountUsd", list.stream().map(FeeSummaryRD::getAmountUsd).reduce(BigDecimal.ZERO, BigDecimal::add));
@@ -104,8 +104,8 @@ public class FinanceStatisticsController {
 	 * 应收(付)实收(付)汇总导出
 	 */
 	@GetMapping("/feeSummaryExport")
-	public void feeSummaryExport(FeeSummaryQ feeSummaryQ, HttpServletResponse response) {
-		List<FeeSummaryRD> list = statisticAnalysisService.feeSummaryExport(feeSummaryQ);
+	public void feeSummaryExportList(FeeSummaryQ feeSummaryQ, HttpServletResponse response) {
+		List<FeeSummaryRD> list = statisticAnalysisService.feeSummaryExportList(feeSummaryQ);
 		if ("D".equals(feeSummaryQ.getDc())) {
 			ExcelUtil.export(response, "应收实收汇总表", "应收实收汇总表", list, FeeSummaryRD.class);
 		} else {
@@ -117,8 +117,8 @@ public class FinanceStatisticsController {
 	 * 分页 应收(付)实收(付)明细表
 	 */
 	@GetMapping("/feeSummaryDetail")
-	public R<IPage<FeeSummaryDetailRD>> feeSummaryDetail(FeeSummaryQ feeSummaryQ, Query query) {
-		return statisticAnalysisService.feeSummaryDetail(feeSummaryQ, Condition.getPage(query));
+	public R<IPage<FeeSummaryDetailRD>> feeSummaryDetailList(FeeSummaryQ feeSummaryQ, Query query) {
+		return statisticAnalysisService.feeSummaryDetailList(feeSummaryQ, Condition.getPage(query));
 	}
 
 	/**
@@ -126,7 +126,7 @@ public class FinanceStatisticsController {
 	 */
 	@GetMapping("/feeSummaryDetailSum")
 	public R feeSummaryDetailSum(FeeSummaryQ feeSummaryQ) {
-		List<FeeSummaryDetailRD> list = statisticAnalysisService.feeSummaryDetailExport(feeSummaryQ);
+		List<FeeSummaryDetailRD> list = statisticAnalysisService.feeSummaryDetailExportList(feeSummaryQ);
 		Map<String, BigDecimal> map = new HashMap<>();
 		if (!list.isEmpty()) {
 			map.put("amountUsd", list.stream().map(FeeSummaryDetailRD::getAmountUsd).reduce(BigDecimal.ZERO, BigDecimal::add));
@@ -158,8 +158,8 @@ public class FinanceStatisticsController {
 	 * 应收(付)实收(付)明细表导出
 	 */
 	@GetMapping("/feeSummaryDetailExport")
-	public void feeSummaryDetailExport(FeeSummaryQ feeSummaryQ, HttpServletResponse response) {
-		List<FeeSummaryDetailRD> list = statisticAnalysisService.feeSummaryDetailExport(feeSummaryQ);
+	public void feeSummaryDetailExportList(FeeSummaryQ feeSummaryQ, HttpServletResponse response) {
+		List<FeeSummaryDetailRD> list = statisticAnalysisService.feeSummaryDetailExportList(feeSummaryQ);
 		if ("D".equals(feeSummaryQ.getDc())) {
 			ExcelUtil.export(response, "应收实收明细表", "应收实收明细表", list, FeeSummaryDetailRD.class);
 		} else {
@@ -171,8 +171,8 @@ public class FinanceStatisticsController {
 	 * 分页 未收(付)明细表
 	 */
 	@GetMapping("/feeSummaryDetailNot")
-	public R<IPage<FeeSummaryDetailNotRD>> feeSummaryDetailNot(FeeSummaryQ feeSummaryQ, Query query) {
-		return statisticAnalysisService.feeSummaryDetailNot(feeSummaryQ, Condition.getPage(query));
+	public R<IPage<FeeSummaryDetailNotRD>> feeSummaryDetailNotList(FeeSummaryQ feeSummaryQ, Query query) {
+		return statisticAnalysisService.feeSummaryDetailNotList(feeSummaryQ, Condition.getPage(query));
 	}
 
 	/**
@@ -180,7 +180,7 @@ public class FinanceStatisticsController {
 	 */
 	@GetMapping("/feeSummaryDetailNotSum")
 	public R feeSummaryDetailNotSum(FeeSummaryQ feeSummaryQ) {
-		List<FeeSummaryDetailNotRD> list = statisticAnalysisService.feeSummaryDetailExportNot(feeSummaryQ);
+		List<FeeSummaryDetailNotRD> list = statisticAnalysisService.feeSummaryDetailExportNotList(feeSummaryQ);
 		Map<String, BigDecimal> map = new HashMap<>();
 		if (!list.isEmpty()) {
 			map.put("amountUsdNot", list.stream().map(FeeSummaryDetailNotRD::getAmountUsdNot).reduce(BigDecimal.ZERO, BigDecimal::add));
@@ -205,7 +205,7 @@ public class FinanceStatisticsController {
 	 */
 	@GetMapping("/feeSummaryDetailExportNot")
 	public void feeSummaryDetailExportNot(FeeSummaryQ feeSummaryQ, HttpServletResponse response) {
-		List<FeeSummaryDetailNotRD> list = statisticAnalysisService.feeSummaryDetailExportNot(feeSummaryQ);
+		List<FeeSummaryDetailNotRD> list = statisticAnalysisService.feeSummaryDetailExportNotList(feeSummaryQ);
 		if ("D".equals(feeSummaryQ.getDc())) {
 			ExcelUtil.export(response, "未收明细表", "未收明细表", list, FeeSummaryDetailNotRD.class);
 		} else {

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

@@ -47,7 +47,7 @@ public interface IStatisticAnalysisService {
 
 	R<List<Map<String, Object>>> decisionAnalysisByYWY();
 
-    R<IPage<FinanceProfitDtoList>> financeProfit(FinanceProfitDtoList financeProfit, IPage<FinanceProfitDtoList> page);
+    R<IPage<FinanceProfitDtoList>> financeProfitList(FinanceProfitDtoList financeProfit, IPage<FinanceProfitDtoList> page);
 
 	R<Map<String, Object>> businessSum(String dateStart, String dateEnd);
 
@@ -57,23 +57,23 @@ public interface IStatisticAnalysisService {
 
 	R<List<Map<String, Object>>> trend(String date, String type);
 
-	R<IPage<FeeSummaryRD>> feeSummary(FeeSummaryQ feeSummaryQ, IPage<FeeSummaryRD> page);
+	R<IPage<FeeSummaryRD>> feeSummaryList(FeeSummaryQ feeSummaryQ, IPage<FeeSummaryRD> page);
 
-	List<FeeSummaryRD> feeSummaryExport(FeeSummaryQ feeSummaryQ);
+	List<FeeSummaryRD> feeSummaryExportList(FeeSummaryQ feeSummaryQ);
 
-	R<IPage<FeeSummaryDetailRD>> feeSummaryDetail(FeeSummaryQ feeSummaryQ, IPage<FeeSummaryDetailRD> page);
+	R<IPage<FeeSummaryDetailRD>> feeSummaryDetailList(FeeSummaryQ feeSummaryQ, IPage<FeeSummaryDetailRD> page);
 
-	List<FeeSummaryDetailRD> feeSummaryDetailExport(FeeSummaryQ feeSummaryQ);
+	List<FeeSummaryDetailRD> feeSummaryDetailExportList(FeeSummaryQ feeSummaryQ);
 
-	R<IPage<FeeSummaryDetailNotRD>> feeSummaryDetailNot(FeeSummaryQ feeSummaryQ, IPage<FeeSummaryDetailNotRD> page);
+	R<IPage<FeeSummaryDetailNotRD>> feeSummaryDetailNotList(FeeSummaryQ feeSummaryQ, IPage<FeeSummaryDetailNotRD> page);
 
-	List<FeeSummaryDetailNotRD> feeSummaryDetailExportNot(FeeSummaryQ feeSummaryQ);
+	List<FeeSummaryDetailNotRD> feeSummaryDetailExportNotList(FeeSummaryQ feeSummaryQ);
 
 	R<IPage<AgingAnalysisRD>> agingAnalysis(FeeSummaryQ feeSummaryQ, IPage<AgingAnalysisRD> page);
 
 	List<AgingAnalysisRD> agingAnalysisExport(FeeSummaryQ feeSummaryQ);
 
-	R financeProfitSum(FinanceProfitDtoList financeProfit);
+	R financeProfitListSum(FinanceProfitDtoList financeProfit);
 
 	List<FinanceProfitDtoList> financeProfitExport(FinanceProfitDtoList financeProfit);
 

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

@@ -81,7 +81,7 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 	}
 
 	@Override
-	public R<IPage<FinanceProfitDtoList>> financeProfit(FinanceProfitDtoList financeProfit, IPage<FinanceProfitDtoList> page) {
+	public R<IPage<FinanceProfitDtoList>> financeProfitList(FinanceProfitDtoList financeProfit, IPage<FinanceProfitDtoList> page) {
 		financeProfit.setTenantId(AuthUtil.getTenantId());
 		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
 			financeProfit.setBranchId(AuthUtil.getDeptId());
@@ -89,7 +89,7 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 		List<FinanceProfitDtoList> financeProfitList;
 		//是否合并amend费用  true 合并  false 不合并
 		if ("1".equals(financeProfit.getMergeAmendFee())) {
-			financeProfitList = financeProfitMapper.financeProfit(financeProfit, page);
+			financeProfitList = financeProfitMapper.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())
@@ -197,7 +197,7 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 			if (ObjectUtils.isNotNull(financeProfit.getBillType())) {
 				financeProfit.setBillType(financeProfit.getBillType() + ",SEA,SIA,AEA,AIA");
 			}
-			financeProfitList = financeProfitMapper.financeProfit(financeProfit, page);
+			financeProfitList = financeProfitMapper.financeProfitList(financeProfit, page);
 		}
 		List<FinanceProfit> financeProfitDataList = new ArrayList<>();
 		if (!financeProfitList.isEmpty()) {
@@ -525,57 +525,57 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 	}
 
 	@Override
-	public R<IPage<FeeSummaryRD>> feeSummary(FeeSummaryQ feeSummaryQ, IPage<FeeSummaryRD> page) {
+	public R<IPage<FeeSummaryRD>> feeSummaryList(FeeSummaryQ feeSummaryQ, IPage<FeeSummaryRD> page) {
 		feeSummaryQ.setTenantId(AuthUtil.getTenantId());
 		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
 			feeSummaryQ.setBranchId(AuthUtil.getDeptId());
 		}
-		return R.data(page.setRecords(finAccBillsMapper.feeSummary(page, feeSummaryQ)));
+		return R.data(page.setRecords(finAccBillsMapper.feeSummaryList(page, feeSummaryQ)));
 	}
 
 	@Override
-	public List<FeeSummaryRD> feeSummaryExport(FeeSummaryQ feeSummaryQ) {
+	public List<FeeSummaryRD> feeSummaryExportList(FeeSummaryQ feeSummaryQ) {
 		feeSummaryQ.setTenantId(AuthUtil.getTenantId());
 		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
 			feeSummaryQ.setBranchId(AuthUtil.getDeptId());
 		}
-		return finAccBillsMapper.feeSummaryExport(feeSummaryQ);
+		return finAccBillsMapper.feeSummaryExportList(feeSummaryQ);
 	}
 
 	@Override
-	public R<IPage<FeeSummaryDetailRD>> feeSummaryDetail(FeeSummaryQ feeSummaryQ, IPage<FeeSummaryDetailRD> page) {
+	public R<IPage<FeeSummaryDetailRD>> feeSummaryDetailList(FeeSummaryQ feeSummaryQ, IPage<FeeSummaryDetailRD> page) {
 		feeSummaryQ.setTenantId(AuthUtil.getTenantId());
 		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
 			feeSummaryQ.setBranchId(AuthUtil.getDeptId());
 		}
-		return R.data(page.setRecords(finAccBillsMapper.feeSummaryDetail(page, feeSummaryQ)));
+		return R.data(page.setRecords(finAccBillsMapper.feeSummaryDetailList(page, feeSummaryQ)));
 	}
 
 	@Override
-	public List<FeeSummaryDetailRD> feeSummaryDetailExport(FeeSummaryQ feeSummaryQ) {
+	public List<FeeSummaryDetailRD> feeSummaryDetailExportList(FeeSummaryQ feeSummaryQ) {
 		feeSummaryQ.setTenantId(AuthUtil.getTenantId());
 		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
 			feeSummaryQ.setBranchId(AuthUtil.getDeptId());
 		}
-		return finAccBillsMapper.feeSummaryDetailExport(feeSummaryQ);
+		return finAccBillsMapper.feeSummaryDetailExportList(feeSummaryQ);
 	}
 
 	@Override
-	public R<IPage<FeeSummaryDetailNotRD>> feeSummaryDetailNot(FeeSummaryQ feeSummaryQ, IPage<FeeSummaryDetailNotRD> page) {
+	public R<IPage<FeeSummaryDetailNotRD>> feeSummaryDetailNotList(FeeSummaryQ feeSummaryQ, IPage<FeeSummaryDetailNotRD> page) {
 		feeSummaryQ.setTenantId(AuthUtil.getTenantId());
 		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
 			feeSummaryQ.setBranchId(AuthUtil.getDeptId());
 		}
-		return R.data(page.setRecords(finAccBillsMapper.feeSummaryDetailNot(page, feeSummaryQ)));
+		return R.data(page.setRecords(finAccBillsMapper.feeSummaryDetailNotList(page, feeSummaryQ)));
 	}
 
 	@Override
-	public List<FeeSummaryDetailNotRD> feeSummaryDetailExportNot(FeeSummaryQ feeSummaryQ) {
+	public List<FeeSummaryDetailNotRD> feeSummaryDetailExportNotList(FeeSummaryQ feeSummaryQ) {
 		feeSummaryQ.setTenantId(AuthUtil.getTenantId());
 		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
 			feeSummaryQ.setBranchId(AuthUtil.getDeptId());
 		}
-		return finAccBillsMapper.feeSummaryDetailExportNot(feeSummaryQ);
+		return finAccBillsMapper.feeSummaryDetailExportNotList(feeSummaryQ);
 	}
 
 	@Override
@@ -597,7 +597,7 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 	}
 
 	@Override
-	public R financeProfitSum(FinanceProfitDtoList financeProfit) {
+	public R financeProfitListSum(FinanceProfitDtoList financeProfit) {
 		financeProfit.setTenantId(AuthUtil.getTenantId());
 		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
 			financeProfit.setBranchId(AuthUtil.getDeptId());
@@ -611,7 +611,7 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 		List<FinanceProfitDtoList> financeProfitList;
 		//是否合并amend费用  true 合并  false 不合并
 		if ("1".equals(financeProfit.getMergeAmendFee())) {
-			financeProfitList = financeProfitMapper.financeProfitSum(financeProfit);
+			financeProfitList = financeProfitMapper.financeProfitListSum(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())
@@ -720,7 +720,7 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 			if (ObjectUtils.isNotNull(financeProfit.getBillType())) {
 				financeProfit.setBillType(financeProfit.getBillType() + ",SEA,SIA,AEA,AIA");
 			}
-			financeProfitList = financeProfitMapper.financeProfitSum(financeProfit);
+			financeProfitList = financeProfitMapper.financeProfitListSum(financeProfit);
 			for (FinanceProfitDtoList item : financeProfitList) {
 				item.setRealAmountProfitLoc(item.getRealAmountDrLoc().subtract(item.getRealAmountCrLoc()).setScale(2, RoundingMode.HALF_UP));
 			}
@@ -768,7 +768,7 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 		List<FinanceProfitDtoList> financeProfitList;
 		//是否合并amend费用  true 合并  false 不合并
 		if (ObjectUtils.isNotNull(financeProfit.getMergeAmendFee())) {
-			financeProfitList = financeProfitMapper.financeProfitSum(financeProfit);
+			financeProfitList = financeProfitMapper.financeProfitListSum(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())
@@ -875,7 +875,7 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 			}
 		} else {
 			financeProfit.setBillType(financeProfit.getBillType() + ",SEA,SIA,AEA,AIA");
-			financeProfitList = financeProfitMapper.financeProfitSum(financeProfit);
+			financeProfitList = financeProfitMapper.financeProfitListSum(financeProfit);
 		}
 		List<FinanceProfit> financeProfitDataList = new ArrayList<>();
 		if (!financeProfitList.isEmpty()) {

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

@@ -42,7 +42,7 @@ public interface FinanceProfitMapper extends BaseMapper<FinanceProfit> {
 	 */
 	List<FinanceProfitVO> selectFinanceProfitPage(IPage page, FinanceProfitVO financeProfit);
 
-	List<FinanceProfitDtoList> financeProfit(@Param("data")FinanceProfitDtoList financeProfit, IPage<FinanceProfitDtoList> page);
+	List<FinanceProfitDtoList> financeProfitList(@Param("data")FinanceProfitDtoList financeProfit, IPage<FinanceProfitDtoList> page);
 
-	List<FinanceProfitDtoList> financeProfitSum(@Param("data")FinanceProfitDtoList financeProfit);
+	List<FinanceProfitDtoList> financeProfitListSum(@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,
@@ -154,7 +154,7 @@
         ORDER BY
         seb.create_time
     </select>
-    <select id="financeProfitSum" resultType="org.springblade.los.statisticAnalysis.FinanceProfitDtoList">
+    <select id="financeProfitListSum" resultType="org.springblade.los.statisticAnalysis.FinanceProfitDtoList">
         select
         seb.business_type AS billType,
         seb.bill_no AS billNo,