From c6509fca517963df4ded9a58b3e06672aa735ce7 Mon Sep 17 00:00:00 2001 From: caojia <1301869380@qq.com> Date: Wed, 4 Nov 2026 10:08:03 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E5=90=88=E5=B9=B6=E6=AF=9B?= =?UTF-8?q?=E5=88=A9=E5=88=86=E6=9E=90=E5=AE=A2=E6=88=B7=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E5=B9=B6=E8=B0=83=E6=95=B4=E8=AE=A2=E5=8D=95=E5=8F=B7=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/PrcProfitReportController.java | 10 +++++ .../service/IPrcProfitReportService.java | 3 ++ .../impl/PrcProfitReportServiceImpl.java | 15 ++++++++ bms-front/src/api/report/profit.js | 8 ++++ bms-front/src/views/report/profit/index.vue | 38 ++++++------------- 5 files changed, 47 insertions(+), 27 deletions(-) diff --git a/bms-back/bms-admin/src/main/java/com/bms/web/controller/report/PrcProfitReportController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/report/PrcProfitReportController.java index cccb3df8..3183d9db 100644 --- a/bms-back/bms-admin/src/main/java/com/bms/web/controller/report/PrcProfitReportController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/report/PrcProfitReportController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import com.bms.common.annotation.Log; import com.bms.common.config.BmsConfig; @@ -48,6 +49,15 @@ public class PrcProfitReportController extends BaseController @Autowired private OssStorage ossStorage; + /** 客户筛选选项，沿用毛利报表的访问权限和查询范围。 */ + @PreAuthorize("@ss.hasPermi('report:profit:list')") + @GetMapping("/customer-options") + public TableDataInfo customerOptions(@RequestParam(required = false) String keywords) + { + startPage(); + return getDataTable(profitReportService.selectCustomerOptions(keywords)); + } + @PreAuthorize("@ss.hasPermi('report:profit:list')") @GetMapping("/summary") public AjaxResult summary(PrcProfitReportQuery query) diff --git a/bms-back/bms-system/src/main/java/com/bms/price/service/IPrcProfitReportService.java b/bms-back/bms-system/src/main/java/com/bms/price/service/IPrcProfitReportService.java index 069a2d3f..ad214559 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/service/IPrcProfitReportService.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/IPrcProfitReportService.java @@ -1,6 +1,7 @@ package com.bms.price.service; import java.util.List; +import com.bms.customer.customerinfo.domain.BmsCustomerOption; // 提成功能暂停使用：import com.bms.price.domain.PrcProfitCommissionRate; import com.bms.price.domain.PrcProfitReportExport; import com.bms.price.domain.vo.PrcProfitReportOrderRow; @@ -11,6 +12,8 @@ import com.bms.price.domain.vo.PrcProfitReportSummary; /** 毛利报表服务。 */ public interface IPrcProfitReportService { + List selectCustomerOptions(String keywords); + List selectOrderRows(PrcProfitReportQuery query); List selectProductRows(PrcProfitReportQuery query); diff --git a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcProfitReportServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcProfitReportServiceImpl.java index 6e1b5cad..8ab3023c 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcProfitReportServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcProfitReportServiceImpl.java @@ -9,6 +9,9 @@ import org.springframework.stereotype.Service; // 提成功能暂停使用：import org.springframework.transaction.annotation.Transactional; import com.bms.common.exception.ServiceException; import com.bms.common.utils.SecurityUtils; +import com.bms.customer.customerinfo.domain.BmsCustomer; +import com.bms.customer.customerinfo.domain.BmsCustomerOption; +import com.bms.customer.customerinfo.mapper.BmsCustomerMapper; // 提成功能暂停使用：import com.bms.price.domain.PrcProfitCommissionRate; // 提成功能暂停使用：import com.bms.price.mapper.PrcProfitCommissionRateMapper; import com.bms.price.domain.PrcProfitReportExport; @@ -28,11 +31,23 @@ public class PrcProfitReportServiceImpl implements IPrcProfitReportService @Autowired private PrcProfitReportMapper profitReportMapper; + @Autowired + private BmsCustomerMapper customerMapper; + /* 提成配置依赖暂停使用。 @Autowired private PrcProfitCommissionRateMapper commissionRateMapper; */ + @Override + public List selectCustomerOptions(String keywords) + { + // 报表不应用客户模块的 DataScope，只接收关键字并构造内部查询条件。 + BmsCustomer query = new BmsCustomer(); + query.setKeywords(keywords); + return customerMapper.selectCustomerOptions(query); + } + @Override public List selectOrderRows(PrcProfitReportQuery query) { diff --git a/bms-front/src/api/report/profit.js b/bms-front/src/api/report/profit.js index 76dcecbe..c7377abd 100644 --- a/bms-front/src/api/report/profit.js +++ b/bms-front/src/api/report/profit.js @@ -11,6 +11,14 @@ function createProfitExport(url, params) { }) } +export function listProfitCustomerOptions(params) { + return request({ + url: '/report/profit/customer-options', + method: 'get', + params + }) +} + export function listProfitSummary(params) { return request({ url: '/report/profit/summary', diff --git a/bms-front/src/views/report/profit/index.vue b/bms-front/src/views/report/profit/index.vue index 087bc175..ab76171d 100644 --- a/bms-front/src/views/report/profit/index.vue +++ b/bms-front/src/views/report/profit/index.vue @@ -28,27 +28,14 @@ - - - - - - @@ -57,8 +44,8 @@