SalesReport 分组

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

@@ -886,7 +886,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			throw new RuntimeException("获取报表表头数据失败");
 		}
 		// 销售报告 SALES REPORT 费用
-		if (MagicValues.BUSINESS.equals(reportCode) && MagicValues.SALES_REPORT.equals(groupCode) && (MagicValues.HYCK.equals(type) || MagicValues.HYJK.equals(type))) {
+		if (MagicValues.COST.equals(reportCode) && MagicValues.SALES_REPORT.equals(groupCode) && (MagicValues.HYCK.equals(type) || MagicValues.HYJK.equals(type))) {
 			List<Bills> list = new ArrayList<>();
 			// String profitMargin = sysClient.getParamServiceNew(MagicValues.PROFIT_MARGIN);
 			Bills bills = billsService.getById(billId);
@@ -2219,7 +2219,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			} else {
 				map.put(MagicValues.DATA, null);
 			}
-		} else if (MagicValues.BUSINESS.equals(reportCode) && MagicValues.SALES_REPORT_AMEND.equals(groupCode) && (MagicValues.HYCK.equals(type) || MagicValues.HYJK.equals(type))) {
+		} else if (MagicValues.COST.equals(reportCode) && MagicValues.SALES_REPORT_AMEND.equals(groupCode) && (MagicValues.HYCK.equals(type) || MagicValues.HYJK.equals(type))) {
 			List<Bills> list = new ArrayList<>();
 			Bills bills = billsService.getById(billId);
 			if (bills != null) {
@@ -3139,7 +3139,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			.eq(BCurrency::getTenantId, AuthUtil.getTenantId())
 			.eq(BCurrency::getIsDeleted, 0)
 			.eq(BCurrency::getCode, MagicValues.USD));
-		if (MagicValues.BUSINESS.equals(reportCode) && MagicValues.SALES_REPORT.equals(groupCode) && (MagicValues.KYCK.equals(type) || MagicValues.KYJK.equals(type))) {
+		if (MagicValues.COST.equals(reportCode) && MagicValues.SALES_REPORT.equals(groupCode) && (MagicValues.KYCK.equals(type) || MagicValues.KYJK.equals(type))) {
 			List<AeaBills> list = new ArrayList<>();
 			AeaBills bills = aeaBillsService.getById(billId);
 			if (bills != null) {
@@ -6622,7 +6622,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			.eq(BCurrency::getTenantId, AuthUtil.getTenantId())
 			.eq(BCurrency::getIsDeleted, 0)
 			.eq(BCurrency::getCode, MagicValues.USD));
-		if (MagicValues.BUSINESS.equals(reportCode) && MagicValues.SALES_REPORT.equals(groupCode)
+		if (MagicValues.COST.equals(reportCode) && MagicValues.SALES_REPORT.equals(groupCode)
 			&& (MagicValues.BGSE.equals(type) || MagicValues.BGSI.equals(type) || MagicValues.BGAE.equals(type) || MagicValues.BGAI.equals(type))) {
 			List<CustomsDeclaration> list = new ArrayList<>();
 			CustomsDeclaration bills = customsDeclarationService.getById(billId);