From 32e4130bac3c57591b6fae073d85fb717d189ede Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Fri, 18 Jul 2025 15:21:27 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E4=B8=9A=E7=BB=A9=E6=B1=87=E6=80=BB?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/CensusSummaryController.java       | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/census/controller/manage/CensusSummaryController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/census/controller/manage/CensusSummaryController.java
index 17bf4d1a..a1ebe323 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/census/controller/manage/CensusSummaryController.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/census/controller/manage/CensusSummaryController.java
@@ -31,9 +31,9 @@ import java.util.stream.Collectors;
 public class CensusSummaryController extends BaseController {
 
     @Autowired
-    private ICuMemberSettlePeriodService memberSettlePeriodService;
+    private ICuMemberSettlePeriodService iCuMemberSettlePeriodService;
     @Autowired
-    private ICuMemberService memberService;
+    private ICuMemberService iCuMemberService;
 
     @DubboReference
     IMenuColumnServiceApi iMenuColumnServiceApi;
@@ -74,7 +74,7 @@ public class CensusSummaryController extends BaseController {
         }
 
         censusSummaryParam.setPkCountry(SecurityUtils.getPkCountry());
-        List<CensusSummaryVo> resultList = memberService.selectCensusSummary(censusSummaryParam, days);
+        List<CensusSummaryVo> resultList = iCuMemberService.selectCensusSummary(censusSummaryParam, days);
 
         return AjaxResult.success(resultList);
     }
@@ -84,7 +84,8 @@ public class CensusSummaryController extends BaseController {
      */
     @PostMapping("/export")
     public void export(CensusSummaryParam censusSummaryParam, HttpServletResponse response) {
-        if (censusSummaryParam.getStartDate() == null || censusSummaryParam.getEndDate() == null) {
+        if (null == censusSummaryParam.getStartDate()
+                || null == censusSummaryParam.getEndDate()) {
             ExcelUtil<CensusSummaryVo> util = new ExcelUtil<>(CensusSummaryVo.class);
             util.exportExcel(response, new ArrayList<>(), "业绩汇总信息");
         }
@@ -94,13 +95,13 @@ public class CensusSummaryController extends BaseController {
         // 查询当天
         String thisTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date);
         if (censusSummaryParam.getMemberSettlePeriodId() != null) {
-            memberSettlePeriodService.getById(censusSummaryParam.getMemberSettlePeriodId());
+            iCuMemberSettlePeriodService.getById(censusSummaryParam.getMemberSettlePeriodId());
         } else {
-            memberSettlePeriodService.getCuMemberSettlePeriodByDate(thisTime);
+            iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(thisTime);
         }
 
         // 查询当前时间范围
-        List<String> days = new ArrayList();
+        List<String> days = new ArrayList<>();
         if (censusSummaryParam.getStartDate() != null && censusSummaryParam.getEndDate() != null) {
             days = DateUtils.findDaysStr(DateUtils.parseDateTimeToStr(DateUtils.YYYY_MM_DD, censusSummaryParam.getStartDate()), DateUtils.parseDateTimeToStr(DateUtils.YYYY_MM_DD, censusSummaryParam.getEndDate()));
         } else {
@@ -108,7 +109,9 @@ public class CensusSummaryController extends BaseController {
             days.add(thisTime);
         }
 
-        List<CensusSummaryVo> resultList = memberService.selectCensusSummary(censusSummaryParam, days);
+        censusSummaryParam.setPkCountry(SecurityUtils.getPkCountry());
+        List<CensusSummaryVo> resultList = iCuMemberService.selectCensusSummary(censusSummaryParam, days);
+
         ExcelUtil<CensusSummaryVo> util = new ExcelUtil<>(CensusSummaryVo.class, iMenuColumnServiceApi.queryMenuColumn("performanceTotal", SecurityUtils.getUserId()).getData());
         util.exportExcel(response, resultList, "业绩汇总信息");
     }