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 resultList = memberService.selectCensusSummary(censusSummaryParam, days); + List 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 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 days = new ArrayList(); + List 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 resultList = memberService.selectCensusSummary(censusSummaryParam, days); + censusSummaryParam.setPkCountry(SecurityUtils.getPkCountry()); + List resultList = iCuMemberService.selectCensusSummary(censusSummaryParam, days); + ExcelUtil util = new ExcelUtil<>(CensusSummaryVo.class, iMenuColumnServiceApi.queryMenuColumn("performanceTotal", SecurityUtils.getUserId()).getData()); util.exportExcel(response, resultList, "业绩汇总信息"); }